1.修改登录规则

2.TODO 单独菜单

app/src/main/java/com/wd/workoffice/ui/activity/login/MainLoginActivity.java

@@ -61,7 +61,9 @@ public class MainLoginActivity extends WorkBaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_bat:
-                startActivity(BatTypeActivity.class);
+//                startActivity(BatTypeActivity.class);
+                //TODO 多账套需要修改
+                startActivity(LoginActivity.class);
                 break;
             case R.id.tv_mes:
                 startActivity(MesLoginActivity.class);

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -74,8 +74,9 @@ public class WorkUtils {
     public static String getDomain() {
         String domain = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/%s/" : "http://zwang.bat100.net.cn:8000/%s/";
         String loginType = TextUtils.isEmpty(DataKeeper.getInstance().getBatLoginType()) ? BatLoginType.GK.getCode() : DataKeeper.getInstance().getBatLoginType();
-        return String.format(domain, loginType);
-//        return "http://zwang.bat100.net.cn:8000/gt/";
+
+        return "http://pre-release.bat100.net.cn:9001/";
+//        return String.format(domain, loginType);
     }
 
 
@@ -898,7 +899,11 @@ public class WorkUtils {
                 JPushInterface.deleteAlias(WorkApp.getAppContext(), sequence);
                 break;
             case 2:
-                JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + DataKeeper.getInstance().getBatLoginType().toUpperCase());
+//                JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + DataKeeper.getInstance().getBatLoginType().toUpperCase());
+                //TODO 多账套需要修改
+                JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + "gk");
+
+
                 break;
             default:
                 return;