From f5aeeb88d7596cd30a3671922513dc4ddf7f6541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Thu, 6 Nov 2025 14:42:01 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=92=8CH5=E7=9A=84=E5=9C=B0=E5=9D=80=202=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8A=E6=9E=B6=E7=89=88=E6=9C=AC=203=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=BB=98=E8=AE=A4=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qxcm/qxlive/PasswordLoginActivity.java    |  5 +++--
 gradle.properties                                 |  4 ++--
 .../xscm/moduleutil/base/CommonAppContext.java    | 12 ++++++------
 .../com/xscm/moduleutil/utils/CrashHandler.java   |  9 ++++++++-
 .../com/xscm/moduleutil/utils/ImageUtils.java     | 15 +++++++++++++++
 .../moduleutil/utils/config/EnvironmentEnum.java  |  6 +++---
 .../moduleroom/dialog/RoomSettingFragment.java    | 10 +++++-----
 .../modulevocal/adapter/TaskBoxAdapter.java       |  4 +++-
 .../classicui/page/TUIC2CChatFragment.java        |  2 +-
 9 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
index efe8ab33..5804606f 100644
--- a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
@@ -528,7 +528,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
                 ToastUtils.show("请输入手机号");
                 return;
             }
-            sendCodeSuccess(phone);
+
             MvpPre.sendCode(phone, 1);
         }else if (id == R.id.iv_eye) {
 
@@ -575,7 +575,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
         }
     }
 
-    public void sendCodeSuccess(String phoneNumber) {
+    public void sendCodeSuccess() {
         com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
         mBinding.tvSendCode.setEnabled(false);
         mBinding.tvSendCode.setAlpha(0.5f);
@@ -604,6 +604,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     @Override
     public void sendCodeSuccess1(String s) {
         LogUtils.e(s);
+        sendCodeSuccess();
     }
 
     @Override
diff --git a/gradle.properties b/gradle.properties
index 11db06a7..e4df18dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.5.9
-APP_VERSION_CODE=49
+APP_VERSION_NAME=1.0.6
+APP_VERSION_CODE=50
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 20a1341f..8372aaae 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -165,11 +165,11 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         adjustFontScale(getResources().getConfiguration());
         CrashHandler.init(this);
 
-        if (currentEnvironment.getShelf()==1){
-            if (SpUtil.getShelf()!=1) {
-                SpUtil.setShelf(1);
+//        if (currentEnvironment.getShelf()==1){
+            if (SpUtil.getShelf()!=0) {
+                SpUtil.setShelf(0);
             }
-        }
+//        }
 
     }
 
@@ -457,8 +457,8 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
 //                }
 
 //                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
-                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
-                mqttConnect.mqttClient();
+//                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
+//                mqttConnect.mqttClient();
 
                 // 每次启动应用时重置状态
                 SpUtil.getInstance().setBooleanValue("youth_model_shown", false);
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
index 98b608d4..de06982a 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
@@ -1,10 +1,13 @@
 package com.xscm.moduleutil.utils;
 
 import android.content.Context;
+import android.content.Intent;
 import android.util.Log;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 
+import static com.blankj.utilcode.util.ActivityUtils.startActivity;
+
 public class CrashHandler implements Thread.UncaughtExceptionHandler {
     private static CrashHandler instance;
     private Thread.UncaughtExceptionHandler defaultHandler;
@@ -36,6 +39,10 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
 
     private void restartApp() {
         // 实现应用重启逻辑
-        ARouter.getInstance().build(ARouteConstants.ME).navigation();
+//        ARouter.getInstance().build(ARouteConstants.ME).navigation();
+
+        Intent intent = new Intent("com.qxcm.qxlive.LAUNCH_PAGE");
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+       startActivity(intent);
     }
 }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
index 2183d6c5..ace5cd22 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
@@ -196,6 +196,21 @@ public class ImageUtils {
         }
         Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
 
+    }
+    public static void loadHeadCCTask(String path, ImageView mImageView,int errorImage) {
+        if (mImageView == null) {
+            return;
+        }
+
+        Context context = mImageView.getContext();
+        if (context instanceof android.app.Activity) {
+            android.app.Activity activity = (android.app.Activity) context;
+            if (activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) {
+                return;
+            }
+        }
+        Glide.with(mImageView).load(path).error(errorImage).placeholder(errorImage).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
+
     }
 
     public static void loadCompressImg(String path, ImageView mImageView, int width, int height) {
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index a5afa0f2..bd1d5f8f 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -3,7 +3,7 @@ package com.xscm.moduleutil.utils.config;
 public enum EnvironmentEnum {
 //     "https://vespa.qxyushen.top/",
     PRODUCTION(//生产环境
-            "https://vespa.qxyushen.top/",
+            "https://1.13.101.98/",
             "KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=",
             "https://oss-cn-beijing.aliyuncs.com/",
             "LTAI5tKgrfcFQxH46ZwWYgFW",
@@ -14,8 +14,8 @@ public enum EnvironmentEnum {
             1600096860,
             "3e8f3add448d4692bc1d04c75ffe801b",
             "tcp://81.70.45.221",
-            "https://vespa.qxyushen.top/h5",
-        1),
+            "http://1.13.101.98/h5",
+        0),
     TEST(//测试环境
             "https://test.vespa.qxyushen.top/",
             "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index bd400ae4..9991fea8 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -380,11 +380,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         // 房主显示全部
         if (roleLevel == 1) {
             if (onMic) {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                     return false;
                 }
             } else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                     return false;
                 }
             }
@@ -397,11 +397,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
                 if (onMic) {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                         return false;
                     }
                 } else {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                         return false;
                     }
                 }
@@ -412,7 +412,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
             ) {
                 return true;
             } else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                     return false;
                 }
             }
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
index 059d5944..09742314 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
@@ -38,8 +38,9 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
         TextView giftTitle = helper.getView(R.id.tv_title);
         giftName.setText(item.getName());
         giftTitle.setText(item.getTitle());
-        ImageUtils.loadHeadCC(item.getIcon(), helper.getView(R.id.task_box));
+
         if (position == 0) {
+            ImageUtils.loadHeadCCTask(item.getIcon(), helper.getView(R.id.task_box),com.xscm.moduleutil.R.mipmap.task_cj);
             itemView.setBackgroundColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_FCE4ED)); // 红色
             giftName.setTextColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_E24171));
             setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.xscm.moduleutil.R.color.color_E24171);
@@ -47,6 +48,7 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
 
 
         } else if (position == 1) {
+            ImageUtils.loadHeadCCTask(item.getIcon(), helper.getView(R.id.task_box),com.xscm.moduleutil.R.mipmap.task_gj);
             itemView.setBackgroundColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_FDE8AE)); // 黄色
             giftName.setTextColor(mContext.getResources().getColor(com.xscm.moduleutil.R.color.color_F35F07));
             setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.xscm.moduleutil.R.color.color_F35F07);
diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
index 0f107959..553e0948 100644
--- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
+++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
@@ -119,7 +119,7 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment {
             @Override
             public boolean onMenuItemClick(android.view.MenuItem item) {
                 if ("举报".equals(item.getTitle())) {
-                    ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
+                    ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "http://1.13.101.98/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
                     return true;
                 }
                 return false;