新的上架提交

app/releas/release/output-metadata.json

@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.qxcm.qxlive",
+  "variantName": "releasRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 51,
+      "versionName": "1.0.6.1",
+      "outputFile": "羽声_1.0.6.1_51.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/羽声_1.0.6.1_51.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/羽声_1.0.6.1_51.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 24
+}

app/src/main/AndroidManifest.xml

@@ -86,17 +86,13 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
 
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
-    <uses-feature
-            android:glEsVersion="0x00020000"
-            android:required="true"/>
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
     <queries>
         <package android:name="com.tencent.mm" />
     </queries>
 
-    <uses-permission
-            android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
         tools:ignore="ProtectedPermissions"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
@@ -120,7 +116,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
     <application
         android:name="com.qxcm.qxlive.AppContext"
         android:allowBackup="true"

app/src/main/java/com/qxcm/qxlive/AppContext.java

@@ -39,7 +39,6 @@ public class AppContext extends CommonAppContext {
 //        });
 //        L.setDeBug(BuildConfig.DEBUG);
     }
-
     public static void initSdk() {
 //        CommonAppContext context = CommonAppContext.getInstance();
 
@@ -73,6 +72,7 @@ public class AppContext extends CommonAppContext {
 //        OpenInstall.init(context);
 
 
+
     }
 
     /**

app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java

@@ -20,10 +20,9 @@ import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.dialog.PolicyDialog;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.SpUtil;
-
 /**
- * APP准备启动
- * <p>
+ APP准备启动
+ *
  *               _oo0oo_
  *              o8888888o
  *              88" . "88
@@ -42,7 +41,7 @@ import com.xscm.moduleutil.utils.SpUtil;
  * \  \ `_.   \_ __\ /__ _/   .-` /  /
  *=====`-.____`.___ \_____/___.-`___.-'=====
  *               `=---='
- * <p>
+ *
  * 佛祖保佑        永无BUG
  * 佛曰:
  *    写字楼里写字间，写字间里程序员；

app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java

@@ -62,7 +62,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     public PhoneNumberAuthHelper phoneNumberAuthHelper;
     private TokenResultListener tokenResultListener;
     private boolean canOnePass;
-
     @Override
     protected void initData() {
 
@@ -72,7 +71,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     protected int getLayoutId() {
         return R.layout.activity_password_login;
     }
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         // 检查是否已经创建过该Activity
@@ -93,7 +91,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
 //        EventBus.getDefault().register(this);
 //        AppLogUtil.reportAppLog(AppLogEvent.A0101);
     }
-
     private void checkAppVersion() {
         // 获取当前版本号
         int currentVersionCode = 0;
@@ -255,6 +252,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     }
 
 
+
     private void checkOnePass() {
         if (!TextUtils.isEmpty(CommonAppContext.getInstance().getToken()) &&  !TextUtils.isEmpty(CommonAppContext.getInstance().getUser().getTencent_im())) {
             isRoot();
@@ -433,6 +431,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     }
 
 
+
     @Override
     public void showLoadings() {
         showLoading();
@@ -478,7 +477,8 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
             }
 
 
-        } else if (id == R.id.fl_login) {
+        }
+        else if (id == R.id.fl_login) {
             if (!mBinding.cbPrivacy.isChecked()) {
                 ToastUtils.show("请先勾选服务条款");
                 return;
@@ -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) {
 
@@ -544,7 +544,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
             isPasswordVisible = !isPasswordVisible; // 切换状态
         }
     }
-
     private void wcLogin() {
         //发起登陆请求前先注册微信api
         IWXAPI api = WXAPIFactory.createWXAPI(this,CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(),true);
@@ -569,7 +568,6 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
             MvpPre.oauthLogin(authResp.code,1);
         }
     }
-
     private void releaseTimer() {
         if (mTimer != null) {
             mTimer.cancel();
@@ -577,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);
@@ -606,6 +604,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     @Override
     public void sendCodeSuccess1(String s) {
         LogUtils.e(s);
+        sendCodeSuccess();
     }
 
     @Override

app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java

@@ -106,4 +106,5 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
     }
 
 
+
 }

app/src/main/res/drawable/bg_launcher_skip.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="oval"
-       xmlns:android="http://schemas.android.com/apk/res/android">
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#80000000"/>
 </shape>

app/src/main/res/drawable/bg_launcher_skip_2.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="12sp"/>
-    <stroke
-            android:color="@color/white"
-            android:width="1dp"/>
+    <stroke android:color="@color/white" android:width="1dp"/>
     <solid android:color="#80000000"/>
 </shape>

app/src/main/res/layout/activity_password_login.xml

@@ -245,6 +245,7 @@
                     </RelativeLayout>
 
 
+
                     <FrameLayout
                         android:id="@+id/fl_login"
                         android:layout_width="match_parent"

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.2
+APP_VERSION_CODE=52
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

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) {
+//        if (currentEnvironment.getShelf()==1){
+            if (SpUtil.getShelf()!=0) {
                 SpUtil.setShelf(1);
             }
-        }
+//        }
 
     }
 
@@ -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);

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);
     }
 }

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) {

moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java

@@ -15,7 +15,7 @@ public enum EnvironmentEnum {
             "3e8f3add448d4692bc1d04c75ffe801b",
             "tcp://81.70.45.221",
             "https://vespa.qxyushen.top/h5",
-        1),
+        0),
     TEST(//测试环境
             "https://test.vespa.qxyushen.top/",
             "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",

moduleUtil/src/main/java/com/xscm/moduleutil/utils/logger/BaseUrlSwitcherInterceptor.java

@@ -0,0 +1,57 @@
+package com.xscm.moduleutil.utils.logger;
+
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * com.xscm.moduleutil.utils.logger
+ * qx
+ * 2025/11/6
+ */
+public class BaseUrlSwitcherInterceptor implements Interceptor {
+    private List<String> baseUrls;
+    private int currentIndex = 0;
+
+    public BaseUrlSwitcherInterceptor(List<String> baseUrls) {
+        this.baseUrls = baseUrls;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        HttpUrl originalHttpUrl = request.url();
+
+        // 获取当前应该使用的 baseUrl
+        String currentBaseUrl = baseUrls.get(currentIndex);
+        HttpUrl newBaseUrl = HttpUrl.parse(currentBaseUrl);
+
+        if (newBaseUrl == null) {
+            throw new IllegalArgumentException("Invalid base url: " + currentBaseUrl);
+        }
+
+        // 构建新的 HttpUrl
+        HttpUrl newUrl = originalHttpUrl.newBuilder()
+                .scheme(newBaseUrl.scheme())
+                .host(newBaseUrl.host())
+                .port(newBaseUrl.port())
+                .build();
+
+        Request.Builder builder = request.newBuilder().url(newUrl);
+        Request newRequest = builder.build();
+
+        // 尝试执行请求
+        try {
+            return chain.proceed(newRequest);
+        } catch (IOException e) {
+            // 如果请求失败，则切换到下一个 baseUrl 并重试
+            currentIndex = (currentIndex + 1) % baseUrls.size();
+            return intercept(chain); // 递归调用重新构建请求
+        }
+    }
+}
+

modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java

@@ -331,7 +331,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         mBinding.ivGuanbi.setOnClickListener(this);
         mBinding.riv.setOnClickListener(this);
 //        mBinding.ivShouchl.setOnClickListener( this);
-        requestGpsPermissions();
+//        requestGpsPermissions();
     }
 
     @Override

modulemain/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

modulemain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt

@@ -108,8 +108,8 @@ import java.util.*
 import java.util.stream.Collectors
 
 @Route(path = ARouteConstants.ROOM_DETAILS)
-class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
-    RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener, QXRedPacketManager.QXRedPacketManagerDelegate {
+class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(), RoomContacts.View, PermissionCallbacks,
+    OnMessageReceivedListener, QXRedPacketManager.QXRedPacketManagerDelegate {
     private var roomFragment: RoomFragment? = null
     var commonPageAdapter: CommonPageAdapter? = null
     private var mRoomBean: RoomBean? = null
@@ -1702,9 +1702,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         toPitNumber: String,
         messageEvent: RoomMessageEvent
     ) {
+
+        if ("9" == toPitNumber && messageEvent.text.fromUserInfo.user_id == SpUtil.getUserId()) {
             mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber)
 
-        if ("9" == toPitNumber && messageEvent.text.user_id.equals(SpUtil.getUserId().toString())) {
             mBinding!!.roomTop.rl.visibility = View.VISIBLE
             ivSoundEffects(true)
         } else {
@@ -1740,6 +1741,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if (mRoomInfoResp!!.user_info.pit_number == 9) {
             mBinding!!.roomTop.rl.visibility = View.VISIBLE
             ivSoundEffects(true)
+            setRoleType(3, 9)
         }
     }
 
@@ -1943,9 +1945,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             aBoolean = true
             ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding)
             setBoolean(aBoolean)
-            if (mRoomInfoResp!!.user_info != null) {
-                mRoomInfoResp!!.user_info.pit_number = 0
-            }
+
+            mRoomInfoResp?.user_info?.pit_number = 0
             setRoleType(0, 0)
             switchMic(2)
         }
@@ -1969,9 +1970,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             if ("9" == pitNumber) {
                 if (userId == currentUserId) {
                     mRoomInfoResp!!.room_info.pit_list[0] = getPitBean2(messageEvent, "9")
-                    if (mRoomInfoResp!!.user_info != null) {
-                        mRoomInfoResp!!.user_info.pit_number = 0
-                    }
+//                    if (mRoomInfoResp!!.user_info != null) {
+//                        mRoomInfoResp!!.user_info.pit_number = 0
+//                    }
                 }
             } else if ("888" == pitNumber) {
                 mRoomInfoResp!!.room_auction = null
@@ -3078,14 +3079,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     switchMic(2) // 关闭麦克风
                 }
             }
+
             pit_number == 888 -> {
                 rl_mic?.visibility = View.VISIBLE
                 switchMic(2) // 关闭麦克风
             }
+
             pit_number == -1 -> {
                 rl_mic?.visibility = View.VISIBLE
                 switchMic(1) // 打开麦克风
             }
+
             else -> {
                 rl_mic?.visibility = View.GONE
                 switchMic(2) // 关闭麦克风
@@ -4565,6 +4569,4 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             }
         }
     }
-
-
 }

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;
                 }
             }

moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java

@@ -16,7 +16,6 @@ import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.presenter.BasePresenter;
 import com.xscm.moduleutil.rtc.AgoraManager;
-import com.xscm.moduleutil.rtc.VolumeManager;
 import com.xscm.moduleutil.utils.SpUtil;
 
 import java.lang.ref.WeakReference;
@@ -71,7 +70,7 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
                     AgoraManager.getInstance(mContext.getApplicationContext())
                             .joinRoom(token, roomId, uid, enableMic,enableJs);
                 }
-                VolumeManager.getInstance().clearCurrentVolumes();
+
 // 初始化 Agora 并加入房间
 
 

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);

modulevocal/src/main/res/layout/activity_currency_exchange.xml

@@ -64,7 +64,7 @@
                     android:layout_marginStart="@dimen/dp_4"
                     android:layout_toRightOf="@+id/im_1"
                     android:gravity="left|center"
-                    android:text="111111000"
+                    tools:text="111111000"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/sp_28" />
             </RelativeLayout>

modulevocal/src/main/res/layout/activity_recharge.xml

@@ -60,7 +60,7 @@
                     android:layout_marginStart="@dimen/dp_4"
                     android:layout_toRightOf="@+id/im_1"
                     android:gravity="left|center"
-                    android:text="111111000"
+                    tools:text="111111000"
                     android:textColor="@color/colorWhite100"
                     android:textSize="@dimen/sp_28" />
             </RelativeLayout>

modulevocal/src/main/res/layout/activity_withdrawal.xml

@@ -65,7 +65,7 @@
                     android:layout_marginStart="@dimen/dp_4"
                     android:layout_toRightOf="@+id/im_1"
                     android:gravity="left|center"
-                    android:text="111111000"
+                    tools:text="111111000"
                     android:textColor="@color/colorWhite100"
                     android:textSize="@dimen/sp_28" />
             </RelativeLayout>

timcommon/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/timcommon/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.tencent.qcloud.tuikit.timcommon;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.timcommon";
-  public static final String BUILD_TYPE = "debug";
-}

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;

tuiconversation/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuiconversation/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.tencent.qcloud.tuikit.tuiconversation;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuiconversation";
-  public static final String BUILD_TYPE = "debug";
-}