fix bugs.

2025-11-18 18:28:16 +08:00
parent 3322cfeb22
commit 18bd2d3ba0
44 changed files with 400 additions and 517 deletions
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -32,12 +32,15 @@ import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ProcessUtils;
 import com.lahm.library.EasyProtectorLib;
 import com.lahm.library.EmulatorCheckCallback;
+import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.imsdk.v2.V2TIMAdvancedMsgListener;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMMessage;
 import com.tencent.imsdk.v2.V2TIMMessageManager;
 import com.tencent.imsdk.v2.V2TIMMessageReceipt;
 import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.interfaces.TUICallback;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.event.AppLifecycleEvent;
@@ -52,20 +55,8 @@ import com.xscm.moduleutil.utils.CrashHandler;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.UtilConfig;
 import com.xscm.moduleutil.utils.config.EnvironmentEnum;
-import com.xscm.moduleutil.utils.config.EnvironmentPrefs;
 import com.xscm.moduleutil.utils.cos.CosUploadManager;
 import com.xscm.moduleutil.widget.CommonAppConfig;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator;
-import com.scwang.smartrefresh.layout.api.DefaultRefreshHeaderCreator;
-import com.scwang.smartrefresh.layout.api.RefreshFooter;
-import com.scwang.smartrefresh.layout.api.RefreshHeader;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
-import com.scwang.smartrefresh.layout.header.ClassicsHeader;
-import com.tencent.bugly.crashreport.CrashReport;
-import com.tencent.qcloud.tuicore.TUILogin;
-import com.tencent.qcloud.tuicore.interfaces.TUICallback;

 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.greenrobot.eventbus.EventBus;
@@ -92,7 +83,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
    private boolean mFront;//是否前台
    public String emulator = "0";
    @Getter
-    private EnvironmentEnum currentEnvironment;
+    public EnvironmentEnum currentEnvironment;
    public UserBean mUserBean;

    public boolean isShow;
@@ -147,21 +138,34 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
        super.onCreate();
        sInstance = this;
        sMainThreadHandler = new Handler();
-        EnvironmentPrefs prefs = new EnvironmentPrefs(this);
        // 添加内存优化配置
        optimizeMemorySettings();
-        currentEnvironment = prefs.getSelectedEnvironment();
-        initialization();
+
+//        EnvironmentPrefs prefs = new EnvironmentPrefs(this);
+//        currentEnvironment = prefs.getSelectedEnvironment();
+
+
        registerActivityLifecycleCallbacks(this);
+
        appStateListener = AppStateManager.getInstance();
        startListeningUnreadMessageCount();
        // 全局设置字体不缩放
        adjustFontScale(getResources().getConfiguration());
+
        CrashHandler.init(this);

        if (SpUtil.getShelf()!=0) {
            SpUtil.setShelf(1);
        }
+
+        //设置mqtt环境 false 测试环境 true 正式环境
+//        ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
+        //设置http环境 false 测试环境 true 正式环境
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
+        currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
+
+
+        initialization();
    }

    public void adjustFontScale(Configuration configuration) {
@@ -446,7 +450,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
 //                    startService(mqttServiceIntent);
 //                }

-                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
+                mqttConnect=MqttConnect.getInstance(this, currentEnvironment.getMqttUrl(),"android-"+ MqttClient.generateClientId());
 //                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
                mqttConnect.mqttClient();

@@ -455,11 +459,8 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
                startInitSdk();
                // 初始化（通常在Application或Activity的onCreate中）
                CosUploadManager.getInstance(CommonAppContext.getInstance());
-                // 启动IM连接服务
-//                IMServiceManager.getInstance().startIMService(this);
            }
        }
-//        piaoPingManager = PiaoPingManager.getInstance(this);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            if (!Settings.canDrawOverlays(this)) {
@@ -525,8 +526,8 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
    }

    public void upMqtt(){
-        if (mqttConnect==null){
-            mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
+        if (mqttConnect == null){
+            mqttConnect=MqttConnect.getInstance(this,  currentEnvironment.getMqttUrl(),"android-"+ MqttClient.generateClientId());
 //                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
            mqttConnect.mqttClient();
        }
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/ExternalResConstants.kt
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/ExternalResConstants.kt
@@ -0,0 +1,31 @@
+package com.xscm.moduleutil.base
+
+import com.xscm.moduleutil.utils.config.EnvironmentEnum
+
+
+object ExternalResConstants {
+//================================================================================MQTT======================================================================================
+//    var IS_MQTT_RELEASE = true
+//    val MQTT_PATH_DEBUG = "tcp://1.13.181.248"
+//    val MQTT_PATH_RELEASE = "tcp://1.13.101.98"
+//
+//    fun MQTT_PATH(): String {
+//        return if (IS_MQTT_RELEASE) {
+//            MQTT_PATH_RELEASE
+//        } else {
+//            MQTT_PATH_DEBUG
+//        }
+//    }
+//================================================================================HTTP======================================================================================
+    var IS_HTTP_RELEASE = true
+    val HTTP_PATH_DEBUG:EnvironmentEnum = EnvironmentEnum.TEST
+    val HTTP_PATH_RELEASE:EnvironmentEnum = EnvironmentEnum.PRODUCTION
+    fun HTTP_PATH(): EnvironmentEnum {
+        return if (IS_HTTP_RELEASE) {
+            HTTP_PATH_RELEASE
+        } else {
+            HTTP_PATH_DEBUG
+        }
+    }
+//================================================================================END======================================================================================
+}
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt
@@ -0,0 +1,37 @@
+package com.xscm.moduleutil.base
+
+/**
+ * Created by xscm on 2020/7/23.
+ * 描述：web url 常量
+ */
+object WebUrlConstants {
+    val BASE_URL = CommonAppContext.getInstance().currentEnvironment.h5Url
+
+    /**青少年模式*/
+    val WEB_ADOLESCENT_URL = BASE_URL + "/web/index.html#/pages/feedback/teenage?id=%s"
+
+    val WEB_SET_GROUP_URL = BASE_URL + "/web/index.html#/pages/union/setGroup?id=%s&guildId=%s"
+
+    /**举报*/
+    val WEB_REPORT_URL =
+        BASE_URL + "/web/index.html#/pages/feedback/report?id=%s&fromType=%d&fromId=%s"
+
+    /**规则*/
+    val WEB_RULES_URL = BASE_URL + "/web/index.html#/pages/other/taskDesc"
+
+    /**道具商城*/
+    val WEB_PROP_MALL_URL = BASE_URL + "/web/index.html#/pages/prop/propMall?id=%s"
+
+    /**公会*/
+    val WEB_GUILD_URL = BASE_URL + "/web/index.html#/pages/union/index?id=%s"
+
+    /**等级*/
+    val WEB_GRADE_URL = BASE_URL + "/web/index.html#/pages/other/grade?id=%s"
+
+    /**反馈*/
+    val WEB_HELP_URL = BASE_URL + "/web/index.html#/pages/feedback/help?id=%s"
+
+    /**邀请*/
+    val WEB_INVITATION_URL = BASE_URL + "/web/index.html#/pages/other/income?id=%s"
+
+}