代码冲突

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

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

@@ -41,7 +41,6 @@ import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -575,13 +574,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 //        dbManager.closeDB();
 		doHiTask();
 		autoPresenter = AutoPresenter.onCreate();
-		handler.post(new Runnable() {
-			@Override
-			public void run() {
-				if (!BaseConfig.isDebug())
-				startService(new Intent(MainActivity.this, AutoErpService.class));
-			}
-		});
+		startService(new Intent(MainActivity.this, AutoErpService.class));
 		LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 
 	}

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

@@ -302,7 +302,7 @@ public class AutoErpService extends Service {
 	 * @throws Exception
 	 */
 	private void reckonWork() {
-		if (BaseConfig.isDebug()) return;
+		if (!BaseConfig.isDebug()) return;
 		if (System.currentTimeMillis() - updateTime < 30000) {
 			return;
 		}
@@ -466,6 +466,7 @@ public class AutoErpService extends Service {
 							MyApplication.getInstance().getBdLocationHelper().requestLocation();
 						}
 						if (missionIter == 0 || missionIter == MISSION_ITER) {
+							log("missionIter == 0 || missionIter == MISSION_ITER");
 							CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), getString(R.string.app_outplan_running));
 							missionIter = 0;
 							List<MissionModel> plans = MissionDao.getInstance().queryByEnCode();
@@ -477,19 +478,27 @@ public class AutoErpService extends Service {
 							//判断是否自动外勤
 							boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
 							boolean isAuto = isB2b || getBoolean(AppConfig.AUTO_MISSION, false);
+							log("isAuto=" + isAuto);
 							if (isAuto) {
 								MissionModel mission = getReckonAutoUtil().reckonMission(plans);//判断
 								if (mission != null) {
+									log("mission != null=" + isAuto);
 									log("符合外勤签到");
 									if (mission.getStatus() == 2) {
 										missionIter = -1;
 									}
-									Message message = handler.obtainMessage();
-									message.what = STATUS_MISSION;
-									Bundle bundle = new Bundle();
-									bundle.putParcelable("data", mission);
-									message.setData(bundle);
-									handler.sendMessage(message);
+									OAHttpHelper.getInstance().post(new Runnable() {
+										@Override
+										public void run() {
+											signinUitl.signinMission(mission);
+										}
+									});
+//									Message message = handler.obtainMessage();
+//									message.what = STATUS_MISSION;
+//									Bundle bundle = new Bundle();
+//									bundle.putParcelable("data", mission);
+//									message.setData(bundle);
+//									handler.sendMessage(message);
 								} else {
 									CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), "距离太远");
 								}
@@ -531,19 +540,26 @@ public class AutoErpService extends Service {
 	}
 
 	private void init() throws Exception {
-		try {
-			MyApplication.getInstance().getBdLocationHelper().requestLocation();
-		} catch (Exception e) {
-		}
+		MyApplication.getInstance().getBdLocationHelper().requestLocation();
 		if (dnoticeUtil == null)
 			dnoticeUtil = new DepositNoticeUtil();
 		if (signinUitl == null)
 			signinUitl = new AutoErpSigninUitl();
 		//TODO 这个接口没有用  先关闭
 //        signinUitl.loadIsCompany();
-		initWork();
-		initMission();
-		initDNotice();
+//		initWork();
+		OAHttpHelper.getInstance().postDelayed(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					initMission();
+					initDNotice();
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}, 5000);
+
 	}
 
 	/**

app_modular/applogin/src/main/java/com/modular/login/activity/EnterpriseRegisterActivity.java

@@ -430,8 +430,8 @@ public class EnterpriseRegisterActivity extends BaseActivity implements View.OnC
             startActivityForResult(intent, INDUSTRY_CHOOSE);
         } else if (i == R.id.enterprise_register_address_et) {
             String[] permissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION};
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (PermissionUtil.lacksPermissions(ct, permissions)) {
+            if (PermissionUtil.lacksPermissions(ct, permissions)) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     requestPermissions(permissions, 222);
                 }
             } else {

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 122,
-            versionName      : '6.0.1',
+            versionCode      : 123,
+            versionName      : '6.0.2',
     ]
 
     depsVersion = [