修复bug，写企业架构树界面

WeiChat/src/main/AndroidManifest.xml

@@ -775,7 +775,7 @@
             android:label="@string/activity_signing" />
 
         <service
-            android:name=".ui.erp.util.attendance.AutoErpService"
+            android:name=".ui.erp.util.auto.AutoErpService"
             android:enabled="true"
             android:exported="true" />
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -48,7 +48,7 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.attendance.AutoErpService;
+import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoErpService;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationSearchActivity.java

@@ -301,12 +301,12 @@ public class LocationSearchActivity extends BaseActivity {
 
         Comparator<Bean> comparator = new Comparator<Bean>() {
             public int compare(Bean s1, Bean s2) {
-                return (int) (s1.dis-s2.dis);
+                return (int) (s1.dis - s2.dis);
             }
         };
 
         Collections.sort(beans, comparator);
-        List<PoiInfo> list=new ArrayList<>();
+        List<PoiInfo> list = new ArrayList<>();
         for (Bean o : beans) {
             list.add(o.p);
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -18,7 +18,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.attendance.AutoErpService;
+import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoErpService;
 import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -183,6 +183,22 @@ public class Constants {
             + "title  varchar(20)," //出错位置
             + "msg  varchar(100)" //出错信息
             + ")";
+
+    //考勤地址表
+    public static final String WORK_LOCATION = "CREATE TABLE work_location ("
+            + "id integer primary key autoincrement,"
+            + "latitude double,"//纬度
+            + "longitude double,"//经度
+
+            + "shortName varchar(20),"//位置
+            + "workaddr varchar(20),"//地址
+            + "validrange integer,"//打卡距离
+            + "innerdistance integer,"//办公范围
+
+            + "title  varchar(20)," //出错位置
+            + "msg  varchar(100)" //出错信息
+            + ")";
+
     //外勤计划表
     public static final String TABLE_MISSION = "CREATE TABLE mission ("
             + "id integer UNIQUE,"//id  唯一不可重复

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpService.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/auto/AutoErpService.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.attendance;
+package com.xzjmyk.pm.activity.ui.erp.util.auto;
 
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ -26,7 +26,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.NotificationManage;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -138,7 +137,6 @@ public class AutoErpService extends Service {
             } catch (Exception e) {
                 if (e != null) log("BroadcastReceiver Exception=" + e.getMessage());
             }
-
             if (PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP) == 1 && intent.getAction().equals("uu.step.destory")) {
                 Intent i = new Intent(context, StepService.class);
                 context.startService(i);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/auto/AutoErpSigninUitl.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.attendance;
+package com.xzjmyk.pm.activity.ui.erp.util.auto;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,8 +26,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.NotificationManage;
 import com.xzjmyk.pm.activity.ui.erp.util.baidu.OnGetDrivingRouteResult;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/auto/AutoMemoryUtil.java

@@ -0,0 +1,17 @@
+package com.xzjmyk.pm.activity.ui.erp.util.auto;
+
+/**
+ * 自动打卡变量集合
+ * 1.上班地址（数组）
+ * 2.迟到早退时间。。。最早打卡时间
+ * 3.是否自动打卡自动外勤
+ * 4.打卡范围 办公范围
+ * 5.
+ * Created by Bitliker on 2017/2/9.
+ */
+
+public class AutoMemoryUtil {
+
+
+
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/ReckonAutoUtil.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/auto/ReckonAutoUtil.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.attendance;
+package com.xzjmyk.pm.activity.ui.erp.util.auto;
 
 import android.util.Log;