修改自动打卡逻辑前备份

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

@@ -85,7 +85,7 @@ import com.uas.appme.pedometer.utils.StepCountCheckUtil;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.settings.activity.FeedbackActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
+import com.core.dao.work.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;

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

@@ -38,7 +38,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

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

@@ -28,7 +28,7 @@ import com.core.base.BaseActivity;
 import com.core.net.location.BdLocationHelper;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
 
 import java.util.List;
 

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

@@ -27,7 +27,7 @@ import com.core.base.BaseActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.baidu.DrivingRouteOverlay;
 import com.xzjmyk.pm.activity.util.baidu.OnGetRoutePlanResult;
 

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

@@ -34,7 +34,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;

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

@@ -24,7 +24,7 @@ import com.uas.appworks.CRM.erp.adapter.SelectAimAdapter;
 import com.uas.appworks.CRM.erp.imp.ISelectAim;
 import com.uas.appworks.CRM.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/OutofficeFragment.java

@@ -32,6 +32,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.net.http.ViewUtil;
 import com.core.net.location.BdLocationHelper;
+import com.core.utils.BaiduMapUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.view.Activity.SearchLocationActivity;
@@ -44,7 +45,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutLogListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;

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

@@ -14,7 +14,7 @@ import com.core.net.location.BdLocationHelper;
 import com.core.widget.view.model.SearchPoiParam;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SearchLocationModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISearchView;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpService.java

@@ -26,18 +26,19 @@ import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.MessageDao;
+import com.core.dao.work.WorkModelDao;
 import com.core.model.MissionModel;
 import com.core.model.OAConfig;
 import com.core.model.WorkModel;
 import com.core.utils.CommonInterface;
 import com.core.utils.NotificationManage;
 import com.core.utils.TimeUtils;
+import com.modular.apptasks.util.ReckonAutoUtil;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appworks.OA.erp.activity.WorkActivity;
 import com.uas.appworks.OA.erp.utils.AutoErpSigninUitl;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;
-import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/DepositNoticeUtil.java

@@ -38,7 +38,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil.getInstence;
+import static com.core.utils.BaiduMapUtil.getInstence;
 
 /**
  * Created by ${FANGLH} on 2017/7/18.

app_core/common/src/main/java/com/core/app/AppConstant.java

@@ -68,6 +68,11 @@ public class AppConstant {
     public static final String DEPOSIT_NOTICE_TASK = "DEPOSIT_NOTICE_TASK";//预约计划提醒任务
     public static final String NEW_FUNCTION_NOTICE = "NEW_FUNCTION_NOTICE";
 
+    public static final String action_save_ = "NEW_FUNCTION_NOTICE";
+
+
+
+
     public static final String UPDATA_UUHELPER = "UPDATA_UUHELPER";
     public static final String UUSPORT_PUSH = "UUSPORT_PUSH";
     public static final String UPDATE_STEPRANKING_PRISE = "UPDATE_STEPRANKING_PRISE";

app_modular/apptasks/build.gradle

@@ -23,4 +23,5 @@ dependencies {
     testCompile deps.junit
     compile deps.appcompatV7
     compile project(':apputils')
+    compile project(':appworks')
 }

app_modular/apptasks/src/main/java/com/modular/apptasks/service/AutoTaskHttp.java

@@ -19,7 +19,7 @@ import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 /**
- * Created by Bitliker on 2017/9/29.
+ * Created by Bitliker on 2017/9/29
  */
 
 public class AutoTaskHttp implements OnSmartHttpListener {

app_modular/apptasks/src/main/java/com/modular/apptasks/service/AutoTaskReceiver.java

@@ -22,7 +22,6 @@ public class AutoTaskReceiver extends BroadcastReceiver {
 					case Constants.ACTION_WORK_SIGNIN:
 						MyApplication.getInstance().getBdLocationHelper().requestLocation();
 						LogUtil.i("当时间合理时候回调到计算打卡允许");
-
 						break;
 
 				}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/ReckonAutoUtil.java → app_modular/apptasks/src/main/java/com/modular/apptasks/util/ReckonAutoUtil.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.util.oa;
+package com.modular.apptasks.util;
 
 import android.util.Log;
 
@@ -8,16 +8,14 @@ import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
+import com.core.dao.work.WorkModelDao;
 import com.core.model.MissionModel;
 import com.core.model.WorkModel;
-import com.core.utils.TimeUtils;
-import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
+import com.core.utils.BaiduMapUtil;
+import com.core.utils.CommonUtil;
 
 import java.util.List;
 
-import static com.core.utils.TimeUtils.f_str_2_long;
-
 /**
  * 计算自动外勤和自动打卡工具类
  * Created by Bitliker on 2016/12/13.
@@ -85,7 +83,7 @@ public class ReckonAutoUtil {
      * @return
      */
     private boolean long2LastTime(String lastSignin) {
-        long last = TimeUtils.f_str_2_long(lastSignin);
+        long last =  DateFormatUtil.str2Long(lastSignin,DateFormatUtil.YMD_HMS);
         if ((System.currentTimeMillis() - last) > (15 * 60 * 1000)){
             //如果遍历到了，但是时间相差很小，就更新
             return true;
@@ -188,7 +186,7 @@ public class ReckonAutoUtil {
     private long getTimeByHHmm(String time) {
         if (StringUtil.isEmpty(time)) return 0;
         String che = DateFormatUtil.long2Str(DateFormatUtil.YMD) + " " + time + ":00";//当天下班时间
-        return f_str_2_long(che);
+        return DateFormatUtil.str2Long(che,DateFormatUtil.YMD_HMS);
     }
 
     //5.判断是否离开工作范围

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -766,8 +766,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                             @Override
                             public void run() {
                                 Intent intent = new Intent();
-                                intent.putExtra(CHANGE_WORK_TASK, true);
                                 intent.setAction(CHANGE_WORK_TASK);//保存到数据库成功，开启
+                                intent.putExtra(CHANGE_WORK_TASK, true);
                                 MsgBroadcast.sendLocalBroadcast(intent);
                             }
                         });