Merge remote-tracking branch 'origin/master'

base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -99,6 +99,8 @@ public class GsaCloudApplication extends BaseApplication {
         CC.enableVerboseLog(true);
         CC.enableDebug(true);
         CC.enableRemoteCC(true);
+        //初始化服務器地址
+        initDomainUrl();
 
         //初始化側滑回退
 //        QMUISwipeBackActivityManager.init(this);
@@ -114,8 +116,6 @@ public class GsaCloudApplication extends BaseApplication {
         initPrint();
         //初始化日誌管理庫
         initXLog();
-        //初始化服務器地址
-        initDomainUrl();
         //初始化crash記錄
         AppCrashHandler.getInstance().init(this);
 
@@ -151,8 +151,7 @@ public class GsaCloudApplication extends BaseApplication {
     }
 
     public static void initDomainUrl() {
-        HttpsConstans.isFormal = (boolean) SPUtils.get(getAppContext(), "isFormal", true);
-        HttpsConstans.init();
+        HttpsConstans.init(mAppContext);
         //需要單獨配置域名URL的，在接口上添加@Headers({"Domain-Name: settlement_report_server"})，不添加則是使用默認域名
         setGlobalDomain();
         //清機報表請求地址

base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java

 package com.gingersoft.gsa.cloud.constans;
 
+import android.content.Context;
+import android.util.Log;
+
+import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
+
 /**
  * Created by Wyh on 2019/12/21.
  */
@@ -63,30 +68,33 @@ public class HttpsConstans {
     public static boolean isFormal = true;
 
     //沽清控制地址
-    public static String _SERVER_ADDRESS = (isFormal ? HTTP_ADDRESS_URL_FORMAL : "http://a.ricepon.com:61177") + "/member-web/api/";
+    public static String _SERVER_ADDRESS;// = (isFormal ? HTTP_ADDRESS_URL_FORMAL : "http://a.ricepon.com:61177") + "/member-web/api/";
 
     //清機接口地址
-    public static String ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = isFormal ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS;
+    public static String ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL;// = isFormal ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS;
 
     //默認url，配置這個值修改環境
     public static String ROOT_SERVER_ADDRESS_FORMAL = (isFormal ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK) + PATH;
 
     //修改這個值，配置外賣接單環境
-    public static String ROOT_URL = isFormal ? ROOT_FORMAL_URL : ROOT_HK_TEST_URL;//正式：ROOT_FORMAL_URL   測試：ROOT_HK_TEST_URL
+    public static String ROOT_URL;// = isFormal ? ROOT_FORMAL_URL : ROOT_HK_TEST_URL;//正式：ROOT_FORMAL_URL   測試：ROOT_HK_TEST_URL
 
     //修改這個值，修改報表默認環境
-    public static String REPORT_SERVER_ADDRESS = (isFormal ? REPORT_FORMAL_ADDRESS : REPORT_TEST_ADDRESS) + REPORT_PATH;//測試：REPORT_FORMAL_ADDRESS 正式：REPORT_TEST_ADDRESS
+    public static String REPORT_SERVER_ADDRESS;// = (isFormal ? REPORT_FORMAL_ADDRESS : REPORT_TEST_ADDRESS) + REPORT_PATH;//測試：REPORT_FORMAL_ADDRESS 正式：REPORT_TEST_ADDRESS
 
     //修改這個值，修改微信公眾號報表地址：首頁曲線圖數據，支付分析報表數據
-    public static String WECHAR_REPORT_SERVER_ADDRESS = (isFormal ? WECHAR_REPORT_FORMAL_ADDRESS : WECHAR_REPORT_TEST_ADDRESS) + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
+    public static String WECHAR_REPORT_SERVER_ADDRESS;// = (isFormal ? WECHAR_REPORT_FORMAL_ADDRESS : WECHAR_REPORT_TEST_ADDRESS) + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
 
-    public static void init() {
+    public static void init(Context context) {
+        isFormal = (boolean) SPUtils.get(context, "isFormal", true);
+        Log.e("eee", "是否正式" + isFormal);
         _SERVER_ADDRESS = (isFormal ? HTTP_ADDRESS_URL_FORMAL : "http://a.ricepon.com:61177") + "/member-web/api/";
         ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = isFormal ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS;
         ROOT_SERVER_ADDRESS_FORMAL = (isFormal ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK) + PATH;
         ROOT_URL = isFormal ? ROOT_FORMAL_URL : ROOT_HK_TEST_URL;//正式：ROOT_FORMAL_URL   測試：ROOT_HK_TEST_URL
         REPORT_SERVER_ADDRESS = (isFormal ? REPORT_FORMAL_ADDRESS : REPORT_TEST_ADDRESS) + REPORT_PATH;//測試：REPORT_FORMAL_ADDRESS 正式：REPORT_TEST_ADDRESS
         WECHAR_REPORT_SERVER_ADDRESS = (isFormal ? WECHAR_REPORT_FORMAL_ADDRESS : WECHAR_REPORT_TEST_ADDRESS) + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
+
     }
 
 }
\ No newline at end of file

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/SwitchServerActivity.java

@@ -85,7 +85,12 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
             }
             GsaCloudApplication.initDomainUrl();
             finish();
+            try {
+                Thread.sleep(2000);
                 System.exit(0);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         });
     }