1.去除弹窗，修改极光推送别名规则

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

@@ -62,8 +62,6 @@ public class BatTypeActivity extends WorkBaseActivity {
         switch (view.getId()) {
             case R.id.tv_first:
                 DataKeeper.getInstance().keepBatLoginType(BatLoginType.GK.getCode());
-                toast(DataKeeper.getInstance().getBatLoginType());
-
                 RtfHelper.getInstance().init(WorkUtils.getDomain(), chain -> {
                     Request original = chain.request();
                     Request request = original.newBuilder()
@@ -78,8 +76,6 @@ public class BatTypeActivity extends WorkBaseActivity {
                 break;
             case R.id.tv_second:
                 DataKeeper.getInstance().keepBatLoginType(BatLoginType.GT.getCode());
-                toast(DataKeeper.getInstance().getBatLoginType());
-
                 RtfHelper.getInstance().init(WorkUtils.getDomain(), chain -> {
                     Request original = chain.request();
                     Request request = original.newBuilder()

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

@@ -52,6 +52,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import cn.jpush.android.api.JPushInterface;
 import flexible.xd.android_base.network.rtfhttp.RtfHelper;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.LogUtils;
 import io.reactivex.disposables.Disposable;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
@@ -70,10 +71,10 @@ public class WorkUtils {
      *
      * @return
      */
-    public static String getDomain (){
+    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);
+        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/";
     }
 
@@ -897,7 +898,7 @@ public class WorkUtils {
                 JPushInterface.deleteAlias(WorkApp.getAppContext(), sequence);
                 break;
             case 2:
-                JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "");
+                JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + DataKeeper.getInstance().getBatLoginType().toUpperCase());
                 break;
             default:
                 return;