Merge remote-tracking branch 'origin/master'

1：修改房间activity
2：修改支付
2025-10-10 09:11:47 +08:00 · 2025-10-10 09:10:53 +08:00 · 2025-10-10 09:10:42 +08:00 · 2025-10-10 09:10:41 +08:00 · 2025-09-26 01:35:55 +08:00 · 2025-09-24 22:10:06 +08:00
294 changed files with 9920 additions and 22828 deletions
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-秘地
+MY语聊
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,21 +4,15 @@
    <selectionStates>
      <SelectionState runConfigName="app">
        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-18T12:45:46.137835600Z">
+        <DropdownSelection timestamp="2025-09-23T02:14:35.252005400Z">
          <Target type="DEFAULT_BOOT">
            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=6705124a" />
+              <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=dfc6548f" />
            </handle>
          </Target>
        </DropdownSelection>
        <DialogSelection />
      </SelectionState>
-      <SelectionState runConfigName="moduleactivity">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-      <SelectionState runConfigName="muduleactivity">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
    </selectionStates>
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
  <component name="NullableNotNullManager">
    <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
    <option name="myNullables">
      <value>
-        <list size="15">
+        <list size="17">
          <item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
          <item index="1" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
          <item index="2" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
@@ -21,12 +25,14 @@
          <item index="12" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
          <item index="13" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
          <item index="14" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="15" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+          <item index="16" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
        </list>
      </value>
    </option>
    <option name="myNotNulls">
      <value>
-        <list size="15">
+        <list size="17">
          <item index="0" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
          <item index="1" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
          <item index="2" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
@@ -42,6 +48,8 @@
          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
          <item index="13" class="java.lang.String" itemvalue="android.annotation.NonNull" />
          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
+          <item index="15" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="16" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
        </list>
      </value>
    </option>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,11 @@ plugins {

 }
 android {
-    namespace 'com.xscm.midi'
+    namespace 'com.jdf.myyuliao'
    compileSdk 35

    defaultConfig {
-        applicationId "com.xscm.midi"
+        applicationId "com.jdf.myyuliao"
        minSdk 24
        targetSdk 33
        versionCode Integer.parseInt(project.findProperty("APP_VERSION_CODE"))
@@ -39,14 +39,14 @@ android {
    signingConfigs {

        debug {
-            storeFile file("midi.jks")
+            storeFile file("myyl.jks")
            storePassword "123456"
            keyAlias "key0"
            keyPassword "123456"
        }

        release {
-            storeFile file("midi.jks")
+            storeFile file("myyl.jks")
            storePassword "123456"
            keyAlias "key0"
            keyPassword "123456"
@@ -66,7 +66,7 @@ android {
                        if (outputFile != null && outputFile.name.endsWith('.apk')) {
                            def versionName = variant.versionName
                            def versionCode = variant.versionCode
-                            def fileName = "秘地_${versionName}_${versionCode}.apk"
+                            def fileName = "MY语聊${versionName}_${versionCode}.apk"
                            output.outputFileName = fileName
                        }
                    }
@@ -116,7 +116,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '11'
    }
    dexOptions {
        dexInProcess true
@@ -144,8 +144,6 @@ dependencies {
    implementation files('libs/logger-2.2.2-release.aar')
    implementation files('libs/main-2.2.3-release.aar')

-    implementation files('libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar')
-    implementation files('libs/WbCloudNormal-v5.1.10-4e3e198.aar')


    implementation(libs.arouter.api.v150)
--- a/app/midi.jks
+++ b/app/midi.jks
--- a/app/myyl.jks
+++ b/app/myyl.jks
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,16 +4,16 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "com.xscm.midi",
+  "applicationId": "com.jdf.myyuliao",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 101,
-      "versionName": "1.0.5",
-      "outputFile": "秘地_1.0.5_101.apk"
+      "versionCode": 4,
+      "versionName": "1.0.0.2",
+      "outputFile": "MY语聊1.0.0.2_4.apk"
    }
  ],
  "elementType": "File",
@@ -22,14 +22,14 @@
      "minApi": 28,
      "maxApi": 30,
      "baselineProfiles": [
-        "baselineProfiles/1/秘地_1.0.5_101.dm"
+        "baselineProfiles/1/MY语聊1.0.0.2_4.dm"
      ]
    },
    {
      "minApi": 31,
      "maxApi": 2147483647,
      "baselineProfiles": [
-        "baselineProfiles/0/秘地_1.0.5_101.dm"
+        "baselineProfiles/0/MY语聊1.0.0.2_4.dm"
      ]
    }
  ],
--- a/app/release/release/output-metadata.json
+++ b/app/release/release/output-metadata.json
@@ -1,37 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.xscm.midi",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 151,
-      "versionName": "1.0.3",
-      "outputFile": "秘地_1.0.3_151.apk"
-    }
-  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/秘地_1.0.3_151.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/秘地_1.0.3_151.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 24
-}
--- a/app/src/androidTest/java/com/xscm/midi/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/xscm/midi/ExampleInstrumentedTest.java
@@ -1,26 +0,0 @@
-package com.xscm.midi;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.xscm.qxlive", appContext.getPackageName());
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    package="com.xscm.midi">
+    package="com.jdf.myyuliao">

    <!-- Features -->
    <!-- Features -->
@@ -148,6 +148,7 @@
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+<!--            com.xscm.action.LAUNCH_PAGE-->
            <intent-filter>
                <action android:name="com.xscm.action.LAUNCH_PAGE" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -199,9 +200,7 @@
            android:taskAffinity="com.xscm.qxlive"
            android:launchMode="singleTask">
        </activity>
-        <activity
-            android:name=".RealNameActivity"
-            android:exported="false" />
+

        <activity
            android:name=".PasswordLoginActivity"
--- a/app/src/main/java/com/jdf/myyuliao/AppContext.java
+++ b/app/src/main/java/com/jdf/myyuliao/AppContext.java
@@ -1,4 +1,4 @@
-package com.xscm.midi;
+package com.jdf.myyuliao;

 import com.alibaba.android.arouter.launcher.ARouter;
 import com.hjq.toast.ToastUtils;
--- a/app/src/main/java/com/jdf/myyuliao/LaunchContacter.java
+++ b/app/src/main/java/com/jdf/myyuliao/LaunchContacter.java
@@ -1,4 +1,4 @@
-package com.xscm.midi;
+package com.jdf.myyuliao;

 import android.app.Activity;

--- a/app/src/main/java/com/jdf/myyuliao/LaunchPageActivity.java
+++ b/app/src/main/java/com/jdf/myyuliao/LaunchPageActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.midi;
+package com.jdf.myyuliao;


 import android.content.Intent;
@@ -10,15 +10,16 @@ import android.util.Log;
 import androidx.annotation.Nullable;

 import com.alibaba.android.arouter.launcher.ARouter;
+import com.jdf.myyuliao.databinding.ActivityLaunchPageBinding;
 import com.xscm.modulelogin.activity.ImproveInfoActivity;
 import com.xscm.moduleutil.activity.BaseAppCompatActivity;
+import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.AppStateListener;
 import com.xscm.moduleutil.base.AppStateManager;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.dialog.PolicyDialog;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.SpUtil;
-import com.xscm.midi.databinding.ActivityLaunchPageBinding;

 public class LaunchPageActivity extends BaseAppCompatActivity<ActivityLaunchPageBinding> {
    private Handler handler;
@@ -37,8 +38,13 @@ public class LaunchPageActivity extends BaseAppCompatActivity<ActivityLaunchPage
        if (!isTaskRoot()) {

            if (SpUtil.getUnderagePassword() != null && !SpUtil.getUnderagePassword().isEmpty()) {
-                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken())
-                        .withString("type", "1").navigation();//type==1：青少年模式
+//                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken())
+//                        .withString("type", "1").navigation();//type==1：青少年模式
+
+                Intent intent = new Intent(this, WebViewActivity.class);
+                intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken());
+                intent.putExtra("title", "1");
+                startActivity(intent);
            } else {
                // 如果没有设置青少年模式，应该导航到首页
                try {
--- a/app/src/main/java/com/jdf/myyuliao/LaunchPresenter.java
+++ b/app/src/main/java/com/jdf/myyuliao/LaunchPresenter.java
@@ -1,4 +1,4 @@
-package com.xscm.midi;
+package com.jdf.myyuliao;

 import android.content.Context;
 import android.content.Intent;
--- a/app/src/main/java/com/jdf/myyuliao/PasswordLoginActivity.java
+++ b/app/src/main/java/com/jdf/myyuliao/PasswordLoginActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.midi;
+package com.jdf.myyuliao;

 import static android.view.View.VISIBLE;

@@ -22,6 +22,7 @@ import com.alipay.sdk.app.AuthTask;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ThreadUtils;
 import com.hjq.toast.ToastUtils;
+import com.jdf.myyuliao.databinding.ActivityPasswordLoginBinding;
 import com.mobile.auth.gatewayauth.AuthUIConfig;
 import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
 import com.mobile.auth.gatewayauth.PreLoginResultListener;
@@ -39,7 +40,6 @@ import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.utils.BarUtils;
 import com.xscm.moduleutil.utils.PreferencesUtils;
 import com.xscm.moduleutil.utils.logger.Logger;
-import com.xscm.midi.databinding.ActivityPasswordLoginBinding;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -360,13 +360,13 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
                .setLogBtnBackgroundPath("theme_bg")
                //切换到其他方式
                .setSwitchAccText("其他登录方式")
-                .setSwitchAccTextColor(Color.parseColor("#333333"))
+                .setSwitchAccTextColor(Color.parseColor("#FC7285"))
                .setSwitchAccTextSize(12)
                .setSwitchOffsetY(390)
                //协议栏
                .setAppPrivacyOne("《用户协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6")
                .setAppPrivacyTwo("《隐私协议》", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4")
-                .setAppPrivacyColor(Color.parseColor("#A8A8A8"), Color.parseColor("#FFBC00"))
+                .setAppPrivacyColor(Color.parseColor("#A8A8A8"), Color.parseColor("#FF8ACC"))
                .setPrivacyBefore("登录即代表同意")
                .setPrivacyEnd("并授权获得号码")
                .setPrivacyTextSize(11)
--- a/app/src/main/java/com/jdf/myyuliao/presenter/BasePresenter.java
+++ b/app/src/main/java/com/jdf/myyuliao/presenter/BasePresenter.java
@@ -1,4 +1,4 @@
-package com.xscm.midi.presenter;
+package com.jdf.myyuliao.presenter;


 import android.content.Context;
--- a/app/src/main/java/com/jdf/myyuliao/wxapi/WXEntryActivity.java
+++ b/app/src/main/java/com/jdf/myyuliao/wxapi/WXEntryActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.midi.wxapi;
+package com.jdf.myyuliao.wxapi;

 import android.app.Activity;
 import android.os.Bundle;
--- a/app/src/main/res/drawable/login_log.webp
+++ b/app/src/main/res/drawable/login_log.webp
--- a/app/src/main/res/layout/activity_password_login.xml
+++ b/app/src/main/res/layout/activity_password_login.xml
@@ -161,7 +161,7 @@
                                android:layout_marginRight="@dimen/dp_13"
                                android:gravity="right"
                                android:text="@string/login_send_code"
-                                android:textColor="#5F3EAB"
+                                android:textColor="#FF8ACC"
                                android:textSize="@dimen/sp_16"
                                tools:visibility="visible" />

@@ -295,7 +295,8 @@
                        android:text="@string/login_btn_qt"
                        android:textColor="@color/color_666666"
                        android:textSize="@dimen/sp_12"
-                        tools:visibility="visible" />
+                        android:visibility="invisible"
+                        tools:visibility="invisible" />

                    <LinearLayout
                        android:id="@+id/ll_other_login"
@@ -305,8 +306,8 @@
                        android:gravity="center_horizontal"
                        android:layout_marginBottom="@dimen/dp_55"
                        android:orientation="horizontal"
-                        android:visibility="visible"
-                        tools:visibility="visible">
+                        android:visibility="invisible"
+                        tools:visibility="invisible">


                        <ImageView
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_app.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_app.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round_app.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round_app.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_app.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_app.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round_app.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round_app.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_app.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_app.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round_app.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round_app.png
--- a/app/src/main/res/mipmap-xhdpi/screen.png
+++ b/app/src/main/res/mipmap-xhdpi/screen.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_app.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_app.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_app.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_app.png
--- a/app/src/main/res/mipmap-xxhdpi/screen.png
+++ b/app/src/main/res/mipmap-xxhdpi/screen.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_app.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_app.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_app.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_app.png
--- a/app/src/main/res/mipmap-xxxhdpi/screen.png
+++ b/app/src/main/res/mipmap-xxxhdpi/screen.png
--- a/app/src/main/res/mipmap-xxxhdpi/screen.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/screen.webp
--- a/app/src/test/java/com/xscm/midi/ExampleUnitTest.java
+++ b/app/src/test/java/com/xscm/midi/ExampleUnitTest.java
@@ -1,17 +0,0 @@
-package com.xscm.midi;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
--- a/build.gradle
+++ b/build.gradle
@@ -23,11 +23,20 @@ buildscript {
 //        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'  // add plugin
    }
 }
+
 plugins {
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.android.library) apply false
    alias(libs.plugins.kotlin.android) apply false
 }
+
+subprojects {
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = "11"
+        }
+    }
+}
 task clean(type: Delete) {
    delete rootProject.buildDir
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,8 +29,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false

-APP_VERSION_NAME=1.0.3
-APP_VERSION_CODE=151
+APP_VERSION_NAME=1.0.0.2
+APP_VERSION_CODE=3

 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
@@ -52,3 +52,6 @@ kapt.incremental.apt=false

 # 或者禁用特定模块的增量编译
 #org.gradle.configureondemand=false
+
+# 统一 Kotlin JVM 目标版本
+kotlin.jvm.target.validation.mode=warning
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -74,6 +74,7 @@ webpdecoder = "1.6.4.9.0"
 wechatSdkAndroid = "6.8.30"
 xbanner = "1.7.0"
 appcompatVersion = "1.3.1"
+lifecycleViewmodelKtxVersion = "2.2.0"

 [libraries]
 alipay-alipaysdk-android = { module = "com.alipay.sdk:alipaysdk-android", version.ref = "alipayAlipaysdkAndroid" }
@@ -155,6 +156,7 @@ wechat-sdk-android = { module = "com.tencent.mm.opensdk:wechat-sdk-android", ver
 xbanner = { module = "com.github.xiaohaibin:XBanner", version.ref = "xbanner" }
 zcw-togglebutton-library = { module = "com.zcw:togglebutton-library", version.ref = "togglebuttonLibraryVersion" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompatVersion" }
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtxVersion" }


 [plugins]
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
-#Wed May 07 09:31:48 CST 2025
+#Mon Sep 22 21:05:11 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-#distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.7-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-#distributionUrl=file:///D:/Greadle/gradle-8.10.2-all.zip
+zipStorePath=wrapper/distsl.
 distributionUrl=file:///D:/Gradle/gradle-8.10.2-bin.zip
+
--- a/hs_err_pid167656.log
+++ b/hs_err_pid167656.log
--- a/hs_err_pid409616.log
+++ b/hs_err_pid409616.log
--- a/hs_err_pid619772.log
+++ b/hs_err_pid619772.log
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ForgetPasswordActivity.java
+++ b/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ForgetPasswordActivity.java
@@ -1,5 +1,8 @@
 package com.xscm.modulelogin.activity;

+
+
+
 import android.os.CountDownTimer;
 import android.text.TextUtils;
 import android.view.View;
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginPresenter.java
+++ b/moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginPresenter.java
@@ -10,6 +10,7 @@ import com.blankj.utilcode.util.ToastUtils;
 import com.xscm.modulelogin.activity.ImproveInfoActivity;
 import com.xscm.modulelogin.activity.SwitchAccountsActivity;
 import com.xscm.modulemain.activity.MainActivity;
+import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.ThemeBean;
 import com.xscm.moduleutil.bean.UserBean;
@@ -184,7 +185,7 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement

    public void loginSuccess(List<UserBean> userBean) {
        if (userBean == null) {
-            ToastUtils.showShort("登录失败请重试");
+//            ToastUtils.showShort("登录失败请重试");
            return;
        }
        if (userBean.size() == 1) {
@@ -264,10 +265,20 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement
    }

    public void ysxl() {
-        ARouter.getInstance().build(ARouteConstants.H5).withString("url",CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
+        Intent intent = new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), WebViewActivity.class);
+        intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4");
+        intent.putExtra("title", "隐私协议");
+        com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
+
+//        ARouter.getInstance().build(ARouteConstants.H5).withString("url",CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
    }

    public void yhxy() {
-        ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6").withString("title", "用户协议").navigation();
+        Intent intent = new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), WebViewActivity.class);
+        intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6");
+        intent.putExtra("title", "用户协议");
+        com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
+
+//        ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6").withString("title", "用户协议").navigation();
    }
 }
--- a/moduleLogin/src/main/res/layout/activity_improve_info.xml
+++ b/moduleLogin/src/main/res/layout/activity_improve_info.xml
@@ -341,7 +341,7 @@
                        android:layout_gravity="center"
                        android:enabled="false"
                        android:gravity="center"
-                        android:text="开启秘地之旅"
+                        android:text="开启MY语聊之旅"
                        android:textColor="@color/white"
                        android:textSize="16sp"
                        android:textStyle="bold"
@@ -350,7 +350,7 @@
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="21dp"
-                        android:text="进入秘地"
+                        android:text="进入MY语聊"
                        android:textColor="@color/color_white"
                        android:textSize="16sp" />
                </RelativeLayout>
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
@@ -2,28 +2,32 @@ package com.xscm.moduleutil.activity;

 import static androidx.core.content.ContextCompat.getSystemService;

+import static com.xscm.moduleutil.base.CommonAppContext.postDelayed;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.WindowManager;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Animation;
 import android.view.animation.DecelerateInterpolator;
+import android.view.animation.TranslateAnimation;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -50,11 +54,11 @@ import com.xscm.moduleutil.event.MqttBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.BackgroundManager;
 import com.xscm.moduleutil.utils.ColorManager;
-import com.xscm.moduleutil.utils.DialogUtils;
 import com.xscm.moduleutil.utils.DisplayUtil;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.xscm.moduleutil.utils.LanguageUtil;
 import com.xscm.moduleutil.utils.SpUtil;
+import com.xscm.moduleutil.utils.SystemUtils;
+import com.xscm.moduleutil.widget.QXGiftDriftView;

 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -68,10 +72,6 @@ import java.util.Map;
 public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends AppCompatActivity
        implements BackgroundManager.BackgroundUpdateListener, ColorManager.ColorChangeListener {

-    //    @Override
-//    protected void attachBaseContext(Context newBase) {
-//        super.attachBaseContext(LanguageUtil.attachBaseContext(newBase));
-//    }
    @Override
    protected void attachBaseContext(Context newBase) {
        // 设置字体缩放比例为1.0f，即不跟随系统字体大小变化
@@ -104,7 +104,7 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
        ActivityUtils.finishAllActivities();
    }

-
+    QXGiftDriftView qxGiftDriftView;
    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -147,7 +147,6 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
            EventBus.getDefault().register(this);
        }

-
    }

    // 在Activity中
@@ -399,11 +398,6 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
        return false;
    }

-    // 在类中添加以下成员变量
-    private final List<MqttBean> messageQueue = new ArrayList<>(); // 消息队列
-    private boolean isPlaying = false; // 播放状态标志
-    private boolean isPlaying2 = false; // 播放状态标志
-    private final Object queueLock = new Object(); // 队列同步锁

    /// 礼物特效
    // 在类中添加以下成员变量
@@ -425,10 +419,10 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
            synchronized (mqttQueueLock) {

                mqttMessageQueue.addAll(mqttBean.getList());
-                if (!isMqttPlaying) {
-                    isMqttPlaying = true;
-                    processNextMqttMessage();
-                }
+//                if (!isMqttPlaying) {
+//                    isMqttPlaying = true;
+                processNextMqttMessage();
+//                }
            }
        }else {
            mqttMessageQueue.clear();
@@ -483,6 +477,11 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
    ViewGroup decorView1;

    private void showFloatingMessage(MqttBean.ListBean mqttBean) {
+
+//        QXGiftDriftView.getInstance( this).addGiftModel(mqttBean);
+
+
+
        try {
            // 清理之前的视图（如果存在）
            if (currentMqttView != null && currentMqttView.getParent() != null) {
@@ -573,43 +572,113 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
            }
        }
    }
-
    private void resetAndStartMqttAnimation(View view, Runnable onAnimationEnd) {
        try {
-            view.setTranslationX(view.getWidth());
-            ObjectAnimator animator1 = ObjectAnimator.ofFloat(view, "translationX", view.getWidth(), 0f);
-            animator1.setDuration(1500);
-            animator1.setInterpolator(new DecelerateInterpolator(2.0f));
-            animator1.start();
+            int screenWidth = getScreenWidth();
+            // 设置初始位置：在屏幕右侧外部（完全不可见）
+            view.setTranslationX(screenWidth);

-            view.postDelayed(() -> {
-                try {
-                    ObjectAnimator animator2 = ObjectAnimator.ofFloat(view, "translationX", 0f, -view.getWidth());
-                    animator2.setDuration(1500);
-                    animator2.setInterpolator(new DecelerateInterpolator(2.0f));
-                    animator2.addListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            onAnimationEnd.run();
-                        }

-                        @Override
-                        public void onAnimationCancel(Animator animation) {
-                            onAnimationEnd.run();
-                        }
-                    });
-                    animator2.start();
-                } catch (Exception e) {
-                    LogUtils.e("MQTT动画执行失败", e);
-                    onAnimationEnd.run();
+            TranslateAnimation enterAnim = new TranslateAnimation(
+                    Animation.ABSOLUTE, screenWidth,
+                    Animation.ABSOLUTE, (screenWidth - SystemUtils.getWidth(316)) / 2,
+                    Animation.ABSOLUTE, 0,
+                    Animation.ABSOLUTE, 0
+            );
+            enterAnim.setDuration(1500);
+            enterAnim.setAnimationListener(new Animation.AnimationListener() {
+                @Override
+                public void onAnimationStart(Animation animation) {}
+
+                @Override
+                public void onAnimationEnd(Animation animation) {
+                    // 停留后退出
+                    postDelayed(() -> {
+                        TranslateAnimation exitAnim = new TranslateAnimation(
+                                Animation.ABSOLUTE, (screenWidth - SystemUtils.getWidth(316)) / 2,
+                                Animation.ABSOLUTE, -screenWidth,
+                                Animation.ABSOLUTE, 0,
+                                Animation.ABSOLUTE, 0
+                        );
+                        exitAnim.setDuration(2000);
+                        exitAnim.setAnimationListener(new Animation.AnimationListener() {
+                            @Override
+                            public void onAnimationStart(Animation animation) {}
+
+                            @Override
+                            public void onAnimationEnd(Animation animation) {
+                                // 移除视图并处理下一个
+//                                ViewGroup rootView = (ViewGroup) getParent();
+//                                if (rootView != null) {
+//                                    rootView.removeView(QXGiftDriftView.this);
+//                                }
+//
+//                                if (!dataArray.isEmpty()) {
+//                                    dataArray.remove(0);
+//                                }
+//                                isPlaying = false;
+//
+//                                if (!dataArray.isEmpty()) {
+//                                    giftAction();
+//                                }
+                                onAnimationEnd.run();
+                            }
+
+                            @Override
+                            public void onAnimationRepeat(Animation animation) {}
+                        });
+                        view.startAnimation(exitAnim);
+                    }, 3000); // 停留1秒
                }
-            }, 3000);
+
+                @Override
+                public void onAnimationRepeat(Animation animation) {}
+            });
+            view.startAnimation(enterAnim);
+
+
+
+//            ObjectAnimator animator1 = ObjectAnimator.ofFloat(view, "translationX", view.getWidth(), 0f);
+//            animator1.setDuration(1500);
+//            animator1.setInterpolator(new DecelerateInterpolator(1f));
+//            animator1.start();
+
+//            view.postDelayed(() -> {
+//                try {
+//                    ObjectAnimator animator2 = ObjectAnimator.ofFloat(view, "translationX", 0f, -view.getWidth());
+//                    animator2.setDuration(3000);
+//                    animator2.setInterpolator(new DecelerateInterpolator(2.0f));
+//                    animator2.addListener(new AnimatorListenerAdapter() {
+//                        @Override
+//                        public void onAnimationEnd(Animator animation) {
+//                            onAnimationEnd.run();
+//                        }
+//
+//                        @Override
+//                        public void onAnimationCancel(Animator animation) {
+//                            onAnimationEnd.run();
+//                        }
+//                    });
+//                    animator2.start();
+//                } catch (Exception e) {
+//                    LogUtils.e("MQTT动画执行失败", e);
+//                    onAnimationEnd.run();
+//                }
+//            }, 3000);
        } catch (Exception e) {
            LogUtils.e("MQTT动画启动失败", e);
            onAnimationEnd.run();
        }
    }
-
+    //     添加获取屏幕宽度的方法
+    private int getScreenWidth() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        if (getWindowManager() != null) {
+            getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+            return displayMetrics.widthPixels;
+        }
+        return getResources().getDisplayMetrics().widthPixels;
+    }
    private void resetAndStartXlhAnimation(View view, Runnable onAnimationEnd) {
        try {
            view.setTranslationX(view.getWidth());
@@ -697,7 +766,10 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onEvent(ChatInfo event) {
        String id = event.getId().replace("g", "");
-        ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/union/setGroup?id=" + SpUtil.getToken() + "&guildId=" + id).navigation();
+        Intent intent = new Intent(this, WebViewActivity.class);
+        intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/union/setGroup?id=" + SpUtil.getToken() + "&guildId=" + id);
+        startActivity( intent);
+//        ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/union/setGroup?id=" + SpUtil.getToken() + "&guildId=" + id).navigation();
    }


--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
@@ -4,6 +4,9 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.view.View;

 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
@@ -11,9 +14,21 @@ import androidx.core.content.ContextCompat;
 import androidx.databinding.ViewDataBinding;

 import com.blankj.utilcode.util.LogUtils;
+import com.tencent.imsdk.v2.V2TIMConversationListener;
+import com.tencent.imsdk.v2.V2TIMConversationManager;
+import com.tencent.imsdk.v2.V2TIMSDKListener;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.TUILoginListener;
 import com.xscm.moduleutil.base.CommonAppContext;
+import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.bean.UserInfo;
+import com.xscm.moduleutil.dialog.ConfirmDialog;
+import com.xscm.moduleutil.event.UnreadCountEvent;
+import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.utils.LanguageUtil;
 import com.xscm.moduleutil.utils.location.LocationProvider;
 import com.xscm.moduleutil.utils.location.SystemLocationProvider;
@@ -28,12 +43,12 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

 public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewDataBinding> extends BaseAppCompatActivity<VDB> implements
-        IView<Activity>  , LocationProvider.LocationCallback
-    {
+        IView<Activity>, LocationProvider.LocationCallback {

    protected P MvpPre;

    protected abstract P bindPresenter();
+
    private String city1;

    @Override
@@ -77,36 +92,100 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void logOutEvent(UserBean userBean) {
        // 在用户 UI 点击登录的时候调用
-        TUILogin.login(getBaseContext(), CommonAppContext.getInstance().getCurrentEnvironment().getSdkAppId(), "u"+userBean.getUser_id(), userBean.getTencent_im(), new TUICallback() {
+        TUILogin.login(getBaseContext(), CommonAppContext.getInstance().getCurrentEnvironment().getSdkAppId(), "u" + userBean.getUser_id(), userBean.getTencent_im(), new TUICallback() {
            @Override
            public void onError(final int code, final String desc) {
-                LogUtils.e("@@@1",code,"描述：",desc);
+                LogUtils.e("@@@1", code, "描述：", desc);
            }
+
            @Override
            public void onSuccess() {
-                LogUtils.e("@@@","成功");
-//                V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
-//                userFullInfo.setNickname(userBean.getNickname());
-//                userFullInfo.setFaceUrl(userBean.getAvatar());
-//                userFullInfo.setAllowType(userBean.getSex());
-//                V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
-//                    @Override
-//                    public void onSuccess() {
-//                        LogUtils.e("@@@", "成功");
-//                    }
-//
-//                    @Override
-//                    public void onError(int code, String desc) {
-//                        LogUtils.e("@@@", "描述"+desc);
-//                    }
-//                });
+                LogUtils.e("@@@", "成功");
+                V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long aLong) {
+                        // 通知未读数变化
+                        UnreadCountEvent event =CommonAppContext.getInstance().unreadCountEvent;
+                        if (event==null){
+                            event=new UnreadCountEvent();
+                        }
+                        event.setALong(aLong);
+                        // 使用EventBus通知
+                        CommonAppContext.getInstance().setUnreadCountEvent(event);
+                        EventBus.getDefault().post(event);
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        // 错误处理
+                    }
+                });
                initLocation();
            }
        });
-
+        V2TIMManager.getInstance().addIMSDKListener(imSdkListener);

    }
+
+    private final V2TIMSDKListener imSdkListener = new V2TIMSDKListener() {
+        @Override
+        public void onConnecting() {
+        }
+
+        @Override
+        public void onConnectSuccess() {//重连成功
+            if (CommonAppContext.getInstance().playId!=null){
+                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
+            }
+        }
+
+        @Override
+        public void onConnectFailed(int code, String error) {
+        }
+
+        @Override
+        public void onKickedOffline() {
+//            queren1();
+
+        }
+
+        @Override
+        public void onUserSigExpired() {
+        }
+
+        @Override
+        public void onSelfInfoUpdated(V2TIMUserFullInfo info) {
+        }
+    };
+
+    private void queren1() {
+        // 创建并显示确认对话框
+        new ConfirmDialog(this,
+                "温馨提示",
+                "您的账号已在别处登录，请确认密码是否已经泄露",
+                "知道了",
+                "",
+                v -> {
+                    // 点击“确认”按钮时执行删除操作
+
+                    if (CommonAppContext.getInstance().playId!=null){
+                        RoomManager.getInstance().exitRoom(CommonAppContext.getInstance().playId);
+                    }
+                    try {
+                        CommonAppContext.getInstance().clearLoginInfo();
+                    } catch (ClassNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+
+                },
+                v -> {
+                    // 点击“取消”按钮时什么都不做
+
+                }, false, 0).show();
+    }
+
    private SystemLocationProvider locationProvider;
+
    private void initLocation() {
        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {

@@ -126,24 +205,24 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
        locationProvider.getLastKnownLocation(this, this);
    }

-        @Override
-        public void onLocationReceived(double latitude, double longitude, String city) {
-          LogUtils.e("当前位置：" + city);
-           city1=city;
-            EventBus.getDefault().post(city1);
-        }
+    @Override
+    public void onLocationReceived(double latitude, double longitude, String city) {
+        LogUtils.e("当前位置：" + city);
+        city1 = city;
+        EventBus.getDefault().post(city1);
+    }

-        @Override
-        public void onFailed(String errorMessage) {
-            LogUtils.e("定位失败");
-        }
+    @Override
+    public void onFailed(String errorMessage) {
+        LogUtils.e("定位失败");
+    }

    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);

        if (requestCode == 1001) {
-            if (locationProvider==null) {
+            if (locationProvider == null) {
                locationProvider = new SystemLocationProvider();
            }
            locationProvider.getLastKnownLocation(this, this);
@@ -151,6 +230,20 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData

    }

+    @Override
+    public Resources getResources() {
+        Resources resources = super.getResources();
+        if (resources != null) {
+            Configuration configuration = resources.getConfiguration();
+            if (configuration != null) {
+                // 设置字体缩放比例不随系统变化
+                configuration.fontScale = 1.0f; // 1.0f表示默认大小
+                resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+            }
+        }
+        return resources;
+    }
+
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void userInfoEvent(UserInfo event) {
 //        V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
@@ -169,10 +262,10 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
 //            }
 //        });
    }
-        /**
-         * 显示全局飘屏消息（支持任意位置飘过）
-         *
-         */
+    /**
+     * 显示全局飘屏消息（支持任意位置飘过）
+     *
+     */
 //        @Subscribe(threadMode = ThreadMode.MAIN)
 //        public void showPiaoPingMessage(MqttBean mqttBean) {
 //            WindowManager windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/WebViewActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/WebViewActivity.java
@@ -405,14 +405,16 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
        public void enterGroupChat(String group_id, String cover, String guild_name) {
            Intent intent = new Intent(mContext, TUIGroupChatActivity.class);
            intent.putExtra(TUIConstants.TUIChat.CHAT_ID, group_id);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_NAME, guild_name);
            intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP);
            mContext.startActivity(intent);
        }

        @JavascriptInterface
        public void chatWithUser(String user_id, String nickname) {
-            Intent intent = new Intent(mContext, TUIC2CChatActivity.class);
+            Intent intent = new Intent(mContext, TUIGroupChatActivity.class);
            intent.putExtra(TUIConstants.TUIChat.CHAT_ID, user_id);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_NAME, nickname);
            intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
            mContext.startActivity(intent);
        }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/news/OfficialNoticeActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/news/OfficialNoticeActivity.java
@@ -3,6 +3,7 @@ package com.xscm.moduleutil.activity.news;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;

+import android.content.Intent;
 import android.text.Html;
 import android.view.View;

@@ -14,6 +15,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
+import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.NewsMessageList;
 import com.xscm.moduleutil.databinding.ActivityOfficialNoticeBinding;
@@ -30,6 +32,7 @@ public class OfficialNoticeActivity extends BaseMvpActivity<NewsPresenter, Activ
    private int page = 1;
    private BaseQuickAdapter<NewsMessageList, BaseViewHolder> mAdapter;
    private String type;
+    private boolean isRefresh = true; // 添加标志位区分刷新和加载更多

    @Override
    protected void initData() {
@@ -46,12 +49,14 @@ public class OfficialNoticeActivity extends BaseMvpActivity<NewsPresenter, Activ
            @Override
            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
                page++;
+                isRefresh = false; // 设置为加载更多模式
                MvpPre.getMessagetitle(type, page + "", "10");
            }

            @Override
            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
                page = 1;
+                isRefresh = true; // 设置为刷新模式
                MvpPre.getMessagetitle(type, page + "", "10");
            }
        });
@@ -79,7 +84,10 @@ public class OfficialNoticeActivity extends BaseMvpActivity<NewsPresenter, Activ
                            RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id()+"","");
 //                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getRoom_id() + "").navigation();
                        }else if (item.getRoom_id() == 0 && item.getUrl() != null && !item.getUrl().isEmpty()){
-                            ARouter.getInstance().build(ARouteConstants.H5).withString("url", item.getUrl()).navigation();
+                            Intent intent = new Intent(OfficialNoticeActivity.this, WebViewActivity.class);
+                            intent.putExtra("url", item.getUrl());
+                            startActivity(intent);
+//                            ARouter.getInstance().build(ARouteConstants.H5).withString("url", item.getUrl()).navigation();
                        }
                    }
                });
@@ -119,7 +127,15 @@ public class OfficialNoticeActivity extends BaseMvpActivity<NewsPresenter, Activ

    @Override
    public void showNews(List<NewsMessageList> newsList) {
-        mAdapter.setNewData(newsList);
+        if (isRefresh) {
+            // 下拉刷新
+            mAdapter.setNewData(newsList);
+        } else {
+            if (newsList != null) {
+                // 上拉加载更多
+                mAdapter.addData(newsList);
+            }
+        }
    }

    @Override
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
@@ -80,7 +80,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
    }

    public void loadDataIfNeeded(String id, int type, String roomId) {
-        if (MvpPre==null){
+        if (MvpPre == null) {
            MvpPre = new RewardGiftPresenter(this, getActivity());
        }
        if (id.equals("0")) {
@@ -100,7 +100,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,

    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onString(GiftPackEvent event) {
-        if (event!=null && event.getBdid()!=null) {
+        if (event != null && event.getBdid() != null) {
            bdgiftId = event.getBdid();
            MvpPre.giftPack();
        }
@@ -108,7 +108,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,

    @Override
    protected void initData() {
-        if (type==0){
+        if (type == 0) {
            MvpPre.getGiftList("0", type, roomId);
        }
 //        if (id.equals("0")) {
@@ -159,7 +159,12 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
    @Override
    public void setGiftList(List<RoonGiftModel> data, int type) {
        giftList = new ArrayList<>();
+        if (data == null) {
+            data = new ArrayList<>();
+            return;
+        }
        giftList.addAll(data);
+
        pageCount = (int) Math.ceil(data.size() * 1.0 / pageSize);

        // 只需要创建一次Adapter并设置，循环设置没有意义
@@ -219,7 +224,6 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
        }


-
    }

    @Override
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -1,7 +1,5 @@
 package com.xscm.moduleutil.base;

-import static androidx.core.app.ActivityCompat.startActivityForResult;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.Application;
@@ -19,6 +17,7 @@ import android.os.Handler;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.util.Base64;
+import android.util.DisplayMetrics;
 import android.webkit.WebView;

 import androidx.annotation.NonNull;
@@ -31,17 +30,24 @@ import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.FileUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ProcessUtils;
-import com.blankj.utilcode.util.ServiceUtils;
 import com.lahm.library.EasyProtectorLib;
 import com.lahm.library.EmulatorCheckCallback;
-import com.xscm.moduleutil.R;
+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.xscm.moduleutil.bean.UserBean;
+import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.event.AppLifecycleEvent;
+import com.xscm.moduleutil.event.UnreadCountEvent;
 import com.xscm.moduleutil.interfaces.AppLifecycleUtil;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.rtc.AgoraManager;
 import com.xscm.moduleutil.service.MqttConnect;
 import com.xscm.moduleutil.utils.ARouteConstants;
+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;
@@ -64,10 +70,10 @@ import org.greenrobot.eventbus.EventBus;

 import java.lang.reflect.Method;
 import java.security.MessageDigest;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.List;

 import lombok.Getter;
+import lombok.Setter;


 /**
@@ -89,6 +95,13 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
    public boolean isPlaying;

    public String playId;
+    public String lable_id;
+    public boolean isMicPlace;
+
+    public boolean isShowAg;
+
+    public boolean isRoomJoininj=false;
+
    public String playCover;
    public boolean showSelf;//盲盒是否能送自己
    public String playName;
@@ -110,7 +123,14 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
    }

    private int activityCount = 0;
+
    private AppStateListener appStateListener;
+    private boolean isListeningUnreadCount = false;
+
+    @Setter
+    @Getter
+    public UnreadCountEvent unreadCountEvent;
+
    @Override
    public void onCreate() {
        super.onCreate();
@@ -123,7 +143,143 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
        initialization();
        registerActivityLifecycleCallbacks(this);
        appStateListener = AppStateManager.getInstance();
+        startListeningUnreadMessageCount();
+        // 全局设置字体不缩放
+        adjustFontScale(getResources().getConfiguration());
+        CrashHandler.init(this);

+
+    }
+
+    public void adjustFontScale(Configuration configuration) {
+        if (configuration.fontScale != 1.0f) {
+            configuration.fontScale = 1.0f;
+            DisplayMetrics metrics = getResources().getDisplayMetrics();
+            getResources().updateConfiguration(configuration, metrics);
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        // 配置变化时重新应用字体设置
+        adjustFontScale(newConfig);
+    }
+
+    // 在适当的位置（如onCreate或onResume）添加实时监听
+    protected void startListeningUnreadMessageCount() {
+        if (!isListeningUnreadCount) {
+            // 添加未读消息数变化监听器
+            V2TIMMessageManager messageManager = V2TIMManager.getMessageManager();
+            messageManager.addAdvancedMsgListener(new V2TIMAdvancedMsgListener() {
+                @Override
+                public void onRecvNewMessage(V2TIMMessage msg) {
+                    // 收到新消息时更新未读数
+                    updateUnreadMessageCount();
+                }
+
+                @Override
+                public void onRecvC2CReadReceipt(List<V2TIMMessageReceipt> receiptList) {
+                    // 收到C2C消息已读回执时更新未读数
+                    updateUnreadMessageCount();
+                }
+
+            });
+
+
+            isListeningUnreadCount = true;
+            // 首次获取未读数
+            updateUnreadMessageCount();
+        }
+    }
+
+    // 更新未读消息数的方法
+    private void updateUnreadMessageCount() {
+        V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback<Long>() {
+            @Override
+            public void onSuccess(Long aLong) {
+                // 通知未读数变化
+                notifyUnreadCountChanged(aLong != null ? aLong : 0L);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                // 错误处理
+                notifyUnreadCountChanged(0L);
+            }
+        });
+    }
+
+    // 通知未读数变化的方法（可以发送广播或EventBus事件）
+    private void notifyUnreadCountChanged(long unreadCount) {
+        UnreadCountEvent event =unreadCountEvent;
+        if (event==null){
+            event=new UnreadCountEvent();
+        }
+        event.setALong(unreadCount);
+        // 使用EventBus通知
+        CommonAppContext.getInstance().setUnreadCountEvent(event);
+        EventBus.getDefault().post(event);
+    }
+    /**
+     * 检查网络是否可用
+     * @return true表示网络可用，false表示网络不可用
+     */
+    public boolean isNetworkAvailable() {
+        try {
+            // 获取网络连接管理器
+            android.net.ConnectivityManager connectivityManager =
+                    (android.net.ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+            if (connectivityManager != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    // Android 6.0及以上版本
+                    android.net.Network network = connectivityManager.getActiveNetwork();
+                    if (network != null) {
+                        android.net.NetworkCapabilities capabilities =
+                                connectivityManager.getNetworkCapabilities(network);
+                        if (capabilities != null) {
+                            // 检查是否有网络连接并且可以访问互联网
+                            return capabilities.hasCapability(android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                                    capabilities.hasCapability(android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+                        }
+                    }
+                } else {
+                    // Android 6.0以下版本
+                    android.net.NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+                    return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+                }
+            }
+        } catch (Exception e) {
+            LogUtils.e("Network availability check failed: " + e.getMessage());
+        }
+
+        return false;
+    }
+
+    /**
+     * 检查网络是否可用（简化版本）
+     * @return true表示网络可用，false表示网络不可用
+     */
+    public boolean isNetworkConnected() {
+        try {
+            android.net.ConnectivityManager connectivityManager =
+                    (android.net.ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+            if (connectivityManager != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    android.net.Network network = connectivityManager.getActiveNetwork();
+                    return network != null;
+                } else {
+                    android.net.NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+                    return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+                }
+            }
+        } catch (Exception e) {
+            LogUtils.e("Network connection check failed: " + e.getMessage());
+        }
+
+        return false;
    }

    /**
@@ -278,11 +434,12 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
 //                    startService(mqttServiceIntent);
 //                }

-                mqttConnect=MqttConnect.getInstance(this,"tcp://62.234.12.147","android-"+ MqttClient.generateClientId());
+                mqttConnect=MqttConnect.getInstance(this,"tcp://119.45.34.13","android-"+ MqttClient.generateClientId());
                mqttConnect.mqttClient();

                // 每次启动应用时重置状态
                SpUtil.getInstance().setBooleanValue("youth_model_shown", false);
+                startInitSdk();
            }
        }
 //        piaoPingManager = PiaoPingManager.getInstance(this);
@@ -294,7 +451,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
            }
        }

-        requestBatteryOptimizationExemption();
+//        requestBatteryOptimizationExemption();
    }
    private void requestBatteryOptimizationExemption() {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -552,6 +709,11 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
        return mUserBean;
    }

+    public UserInfo getUserInfo() {
+        UserInfo userInfo = SpUtil.getUserInfo();
+        return userInfo;
+    }
+
    public void setUserBean(UserBean bean) {
        mUserBean = bean;
    }
@@ -684,7 +846,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
        if (appStateListener != null && appStateListener.isFloatingWindowVisible()) {
            // 有悬浮窗，直接回到首页
 //            if (!className.contains("MainActivity")) {
-                ARouter.getInstance().build(ARouteConstants.ME).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
+            ARouter.getInstance().build(ARouteConstants.ME).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 //            }
        } else if (appStateListener != null && appStateListener.shouldShowSplash()) {
            // 需要显示启动页
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/RoomManager.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/RoomManager.java
@@ -1,11 +1,14 @@
 package com.xscm.moduleutil.base;

+import static android.app.PendingIntent.getActivity;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;

 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
@@ -43,7 +46,8 @@ public class RoomManager {
    // 缓存有效期（5分钟）
    private static final long CACHE_DURATION = 5 * 60 * 1000;

-    private RoomManager() {}
+    private RoomManager() {
+    }

    public static synchronized RoomManager getInstance() {
        if (instance == null) {
@@ -54,8 +58,9 @@ public class RoomManager {

    /**
     * 进入房间 - 自动获取房间数据
+     *
     * @param context 上下文
-     * @param roomId 房间ID
+     * @param roomId  房间ID
     */
    public void enterRoom(Context context, String roomId) {
        enterRoom(context, roomId, null, null);
@@ -63,8 +68,9 @@ public class RoomManager {

    /**
     * 进入房间 - 使用密码
-     * @param context 上下文
-     * @param roomId 房间ID
+     *
+     * @param context  上下文
+     * @param roomId   房间ID
     * @param password 房间密码
     */
    public void enterRoom(Context context, String roomId, String password) {
@@ -73,9 +79,10 @@ public class RoomManager {

    /**
     * 进入房间 - 使用缓存数据
-     * @param context 上下文
-     * @param roomId 房间ID
-     * @param password 房间密码
+     *
+     * @param context    上下文
+     * @param roomId     房间ID
+     * @param password   房间密码
     * @param cachedData 缓存的房间数据
     */
    public void enterRoom(Context context, String roomId, String password, RoomInfoResp cachedData) {
@@ -98,22 +105,37 @@ public class RoomManager {

    /**
     * 获取房间数据并进入房间
-     * @param context 上下文
-     * @param roomId 房间ID
+     *
+     * @param context  上下文
+     * @param roomId   房间ID
     * @param password 房间密码
     */
    public void fetchRoomDataAndEnter(Context context, String roomId, String password) {
        // 显示加载提示
        // 这里可以根据需要添加加载对话框
-
+        if (CommonAppContext.getInstance().isRoomJoininj){
+            return;
+        }
+        CommonAppContext.getInstance().isRoomJoininj=true;
        // 检查是否有有效的缓存数据
 //        RoomInfoResp roomInfo =  getCachedRoomData(roomId);
        // 检查是否是当前房间且用户在线
 //        boolean isCurrentRoom = isCurrentRoom(roomId);
-        if (CommonAppContext.getInstance().playId==null){
+        if (CommonAppContext.getInstance().playId == null) {
            fetchAndJoinRoom(context, roomId, password);
-        }else {
+        } else {
+            if (!CommonAppContext.getInstance().playId.equals(roomId)) {
+                MessageListenerSingleton.getInstance().joinGroup(roomId);
+                exitRoom(CommonAppContext.getInstance().playId);
+                CommonAppContext.getInstance().isShow = false;
+                CommonAppContext.getInstance().isPlaying = false;
+                EventBus.getDefault().post(new RoomOutEvent());
+            } else if (CommonAppContext.getInstance().lable_id.equals("6")) {
+                upInfo(context, roomId, password, true, null, true);
+                return;
+            }
            isUserOnline(context, roomId, password, null);
+
        }

 //        try {
@@ -166,12 +188,12 @@ public class RoomManager {
 //        navigateToRoom(context, roomId, password, null);
    }

-    private void upInfo(Context context, String roomId, String password,boolean isOnline, RoomInfoResp roomInfo,boolean isCurrentRoom){
+    private void upInfo(Context context, String roomId, String password, boolean isOnline, RoomInfoResp roomInfo, boolean isCurrentRoom) {


-        if (isOnline){
-            navigateToRoom(context, roomId, password, roomInfo,isOnline);
-        }else {
+        if (isOnline) {
+            navigateToRoom(context, roomId, password, roomInfo, isOnline);
+        } else {
 //            CommonAppContext.getInstance().isShow = false;
 //            CommonAppContext.getInstance().isPlaying = false;
 //            EventBus.getDefault().post(new RoomOutEvent());
@@ -184,7 +206,6 @@ public class RoomManager {
        }


-
 //        if (isCurrentRoom&& isOnline) {
 //            if (roomInfo != null) {
 //                navigateToRoom(context, roomId, password, roomInfo);
@@ -214,7 +235,7 @@ public class RoomManager {

 //            cacheRoomData(roomId, roomInfo);
 //            navigateToRoom(context, roomId, password, roomInfo);
-            return;
+        return;
 //        }

        // 其他情况，获取新的房间数据并加入房间
@@ -223,20 +244,21 @@ public class RoomManager {

    /**
     * 获取新的房间数据并加入房间
-     * @param context 上下文
-     * @param roomId 房间ID
+     *
+     * @param context  上下文
+     * @param roomId   房间ID
     * @param password 房间密码
     */
    private void fetchAndJoinRoom(Context context, String roomId, String password) {
        // 获取房间数据
-        MessageListenerSingleton.getInstance().joinGroup(roomId);
+
        // 等待一段时间确保退出完成
        try {
            Thread.sleep(300);
        } catch (InterruptedException e) {
            Thread.currentThread().interrupt();
        }
-        navigateToRoom(context, roomId, password, null,false);
+        navigateToRoom(context, roomId, password, null, false);

 //        RetrofitClient.getInstance().roomGetIn(roomId, password, new BaseObserver<RoomInfoResp>() {
 //
@@ -270,6 +292,7 @@ public class RoomManager {

    /**
     * 检查是否是当前房间
+     *
     * @param roomId 房间ID
     * @return true表示是当前房间，false表示不是
     */
@@ -279,24 +302,26 @@ public class RoomManager {
        // 目前返回false，需要根据实际需求实现具体逻辑

        RoomInfoResp roomInfo = getCachedRoomData(roomId);
-        if (roomInfo != null){
-            if (roomInfo.getRoom_info().getRoom_id().equals(roomId)){
+        if (roomInfo != null) {
+            if (roomInfo.getRoom_info().getRoom_id().equals(roomId)) {
                return true;
-            }else {
+            } else {
                return false;
            }
        }

        return false;
    }
+
    /**
     * 跳转到房间页面
-     * @param context 上下文
-     * @param roomId 房间ID
+     *
+     * @param context  上下文
+     * @param roomId   房间ID
     * @param password 房间密码
     * @param roomInfo 房间信息
     */
-    private void navigateToRoom(Context context, String roomId, String password, RoomInfoResp roomInfo,boolean isOnline) {
+    private void navigateToRoom(Context context, String roomId, String password, RoomInfoResp roomInfo, boolean isOnline) {
        try {
            // 构建跳转参数
            Bundle bundle = new Bundle();
@@ -315,7 +340,6 @@ public class RoomManager {
            ARouter.getInstance()
                    .build(ARouteConstants.ROOM_DETAILS)
                    .with(bundle)
-                    .withFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
                    .navigation(context);

        } catch (Exception e) {
@@ -325,7 +349,8 @@ public class RoomManager {

    /**
     * 缓存房间数据
-     * @param roomId 房间ID
+     *
+     * @param roomId   房间ID
     * @param roomInfo 房间信息
     */
    public void cacheRoomData(String roomId, RoomInfoResp roomInfo) {
@@ -342,6 +367,7 @@ public class RoomManager {

    /**
     * 获取缓存的房间数据
+     *
     * @param roomId 房间ID
     * @return 房间信息，如果缓存无效则返回null
     */
@@ -365,21 +391,23 @@ public class RoomManager {

        return roomDataCache.get(roomId);
    }
+
    /**
     * 检查用户是否在线
+     *
     * @param roomId 房间ID
     * @return true表示用户在线，false表示不在线
     */
-    private boolean isUserOnline(Context context, String roomId,String password,RoomInfoResp roomInfo) {
+    private boolean isUserOnline(Context context, String roomId, String password, RoomInfoResp roomInfo) {
        // 这里应该实现检查用户是否在线的逻辑
        // 可以通过检查Agora是否还在房间中，或者通过服务端接口查询用户状态等方式实现
        // 目前返回false，需要根据实际需求实现具体逻辑
 //        boolean isCurrentRoom=isCurrentRoom(roomId);
-        try {
-            Thread.sleep(300);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
+//        try {
+//            Thread.sleep(300);
+//        } catch (InterruptedException e) {
+//            Thread.currentThread().interrupt();
+//        }
        final boolean[] isOnline = {false};
        RetrofitClient.getInstance().getRoomOnline(roomId, "1", "50", new BaseObserver<RoomOnline>() {
            @Override
@@ -389,33 +417,43 @@ public class RoomManager {

            @Override
            public void onNext(RoomOnline roomOnline) {
-                if (roomOnline!=null){
-                    if (roomOnline.getOn_pit()!=null){
-                        for (RoomOnlineBean roomOnlineBean : roomOnline.getOn_pit()) {
-                            if (roomOnlineBean.getUser_id()==SpUtil.getUserId()){
-                                isOnline[0] = true;
-                                break;
+                try {
+                    if (roomOnline != null) {
+                        if (roomOnline.getOn_pit() != null) {
+                            for (RoomOnlineBean roomOnlineBean : roomOnline.getOn_pit()) {
+                                if (roomOnlineBean.getUser_id() == SpUtil.getUserId()) {
+                                    isOnline[0] = true;
+                                    break;
+                                }
                            }
                        }
-                    }
-                    if (roomOnline.getOff_pit()!=null){
-                        for (RoomOnlineBean roomOnlineBean : roomOnline.getOff_pit()){
-                            if (roomOnlineBean.getUser_id()==SpUtil.getUserId()){
-                                isOnline[0] = true;
-                                break;
+                        if (roomOnline.getOff_pit() != null) {
+                            for (RoomOnlineBean roomOnlineBean : roomOnline.getOff_pit()) {
+                                if (roomOnlineBean.getUser_id() == SpUtil.getUserId()) {
+                                    isOnline[0] = true;
+                                    break;
+                                }
                            }
                        }
+                        upInfo(context, roomId, password, isOnline[0], roomInfo, true);
+                    } else {
+                        isOnline[0] = false;
                    }
-                    upInfo(context,roomId,password,isOnline[0],roomInfo,true);
-                }else {
+                } catch (Exception e) {
+                    // 捕获所有可能的异常，避免崩溃
+                    e.printStackTrace();
                    isOnline[0] = false;
+                    // 即使出现异常也继续执行
+                    upInfo(context, roomId, password, isOnline[0], roomInfo, true);
                }
            }
        });
-        return  isOnline[0];
+        return isOnline[0];
    }
+
    /**
     * 清除指定房间的缓存数据
+     *
     * @param roomId 房间ID
     */
    public void clearRoomCache(String roomId) {
@@ -435,6 +473,7 @@ public class RoomManager {

    /**
     * 退出房间
+     *
     * @param roomId 房间ID
     */
    public void exitRoom(String roomId) {
@@ -444,11 +483,24 @@ public class RoomManager {
        // 可以在这里添加其他退出房间的逻辑
        // 例如：通知服务器用户已退出、清理房间相关资源等

+        RetrofitClient.getInstance().quitRoom(roomId, SpUtil.getUserId() + "", new BaseObserver<String>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(String s) {
+
+            }
+        });
+
        Logger.d(TAG, "退出房间: " + roomId);
    }

    /**
     * 批量退出房间
+     *
     * @param roomIds 房间ID列表
     */
    public void exitRooms(String... roomIds) {
@@ -461,6 +513,7 @@ public class RoomManager {

    /**
     * 获取房间缓存状态
+     *
     * @param roomId 房间ID
     * @return 缓存状态信息
     */
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/AppPay.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/AppPay.java
@@ -10,6 +10,7 @@ import lombok.Data;
 public class AppPay {
    private String ali;
    private WxBean wx;
+    private String xlx;

    @Data
    public static class WxBean {
@@ -20,4 +21,14 @@ public class AppPay {
       private String timestamp;
       private String sign;
   }
+
+   @Data
+    public static class XlxBean {
+       private int  pid;
+       private String noncestr;
+       private String partnerid;
+       private String prepayid;
+       private String timestamp;
+       private String sign;
+   }
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/BindDetail.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/BindDetail.java
@@ -0,0 +1,23 @@
+package com.xscm.moduleutil.bean;
+
+import lombok.Data;
+
+/**
+ *@author qx
+ *@data 2025/9/25
+ *@description: 绑定详情
+ */
+@Data
+public class BindDetail {
+
+    private String id;
+    private String alipay_name;//支付宝姓名
+    private String alipay_account;//支付宝账户
+
+    private String bank_card_number;//银行卡号
+
+    private String bank_user_name;//姓名
+    private String bank_card;//所属行
+    private String open_bank;//开户行
+
+}
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/BindType.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/BindType.java
@@ -14,6 +14,9 @@ public class BindType {
    private AllData bank;
    private AllData ali_tl;
    private AllData wx_tl;
+    private AllData xlx_wx;
+    private AllData xlx_ali;
+    private AllData xlx_bank;


    @Data
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java
@@ -74,7 +74,7 @@ public class RoomMessageEvent {
        private int count;//排麦模式下的人数
        private int step ; //1:等待邂逅 2：心动连线 3：牵手良缘
        private int friend_id; //场次id
-//        private List<FriendInfo.HeartList> list;//交友心动值发生变化
+        //        private List<FriendInfo.HeartList> list;//交友心动值发生变化
        private List<UserInfo> list;//交友房麦位发生变化 //推送的事麦上用户信息，这里使用了userinfo接收的

        private FriendUserBean friend_user;//这是推送过来需要卡关系的数据
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserBean.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserBean.java
@@ -19,6 +19,8 @@ public class UserBean implements Serializable {
    private String mobile;
    private int sex;
    private int auth;
+    private int is_can_chat;//是否可以私聊，1：可以，0：不可以
+    private int can_chat_money;//需要充值的金额

    private List<MultiUserBean> multi_user;

--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
@@ -55,6 +55,9 @@ public class UserInfo implements Serializable {
    private String red_status;
    private String gift_num;

+    private int is_can_chat;//是否可以私聊，1：可以，0：不可以
+    private int can_chat_money;//需要充值的金额
+
    private RelationshipBean qinmi;
    private RelationshipBean zhenai;

--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java
@@ -26,6 +26,7 @@ public class BlindBoxBean {
    private int  is_xlh; ///是否开启巡乐会  0 关闭  1 开启
    private Object xlh_data;
    private List<GiftBean> gift_list;
+    private String end_time;//巡乐会结束时间

    private GiveGift give_homeowner_gift;//房主礼物
    private GiveGift locking_gift;//锁定礼物
@@ -95,6 +96,14 @@ public class BlindBoxBean {
                        }
                    }
                }
+                Object endTime = map.get("end_time");
+                if (endTime != null) {
+                    if (endTime instanceof String){
+                        xlhData.setEnd_time(endTime.toString());
+                    }else {
+                        xlhData.setEnd_time(endTime.toString());
+                    }
+                }

                return xlhData;
            }
@@ -118,6 +127,9 @@ public class BlindBoxBean {
                if (jsonObject.has("status")) {
                    xlhData.setStatus(jsonObject.get("status").getAsInt());
                }
+                if (jsonObject.has("end_time")){
+                    xlhData.setEnd_time(jsonObject.get("end_time").getAsString());
+                }

                return xlhData;
            }
@@ -126,10 +138,11 @@ public class BlindBoxBean {
    }
    @Data
    public static class XlhData {
-    	private String waiting_start_num;//等待开始需要达到的次数
-    	private String start_num;//巡乐会开启需要达到的次数
-    	private int current_num;//当前已抽奖次数
-    	private int  status;
+        private String waiting_start_num;//等待开始需要达到的次数
+        private String start_num;//巡乐会开启需要达到的次数
+        private int current_num;//当前已抽奖次数
+        private int  status;
+        private String end_time;
    }
    @Data
    public static class GiveGift {
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java
@@ -29,6 +29,7 @@ public class RoomInfoResp implements Serializable {
    private PkRoomInfo pk_info;
    private List<RoomPitBean> song_pit_list;
    private FriendInfo friend_info;
+    private GiftXlh gift_cycle;


    //弹出麦位操作弹出
@@ -114,4 +115,18 @@ public class RoomInfoResp implements Serializable {
    public boolean isFreedomMode() {
        return "1".equals(room_info.getWheat());
    }
+
+    @Data
+    public class GiftXlh implements Serializable{
+        private XlhInfo xlh_info ;
+    }
+    @Data
+    public class XlhInfo implements Serializable{
+        private String activities_name;
+        private String icon;
+
+        private String xlh_status;
+
+        private String end_time;
+    }
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java
@@ -34,7 +34,7 @@ public class RoomPitBean implements Serializable {
    private int is_lock;//0未锁麦 1锁麦
    private int is_mute;//0未禁麦 1禁麦
    private int count_down;//麦位倒计时
-    private String user_id;//麦位上用户id
+    private String user_id="";//麦位上用户id
    private String nickname;//麦位上用户昵称
    private String avatar;//用户头像
    private String sex;//性别
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/PolicyDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/PolicyDialog.java
@@ -1,7 +1,10 @@
 package com.xscm.moduleutil.dialog;

+import static com.blankj.utilcode.util.ActivityUtils.startActivity;
+
 import android.app.Dialog;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.text.TextPaint;
@@ -16,6 +19,7 @@ import androidx.databinding.DataBindingUtil;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.SpanUtils;
 import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.databinding.DialogPolicBinding;
 import com.xscm.moduleutil.utils.ARouteConstants;
@@ -42,7 +46,12 @@ public class PolicyDialog extends Dialog {
        ClickableSpan clickSpan = new ClickableSpan() {
            @Override
            public void onClick(@NonNull View widget) {
-                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6" ).withString("title", "用户协议").navigation();
+                Intent intent = new Intent(getContext(), WebViewActivity.class);
+                intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6");
+                intent.putExtra("title", "用户协议");
+                startActivity(intent);
+
+//                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=6" ).withString("title", "用户协议").navigation();
            }

            @Override
@@ -54,7 +63,12 @@ public class PolicyDialog extends Dialog {
        ClickableSpan ysClickSpan = new ClickableSpan() {
            @Override
            public void onClick(@NonNull View widget) {
-                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
+                Intent intent = new Intent(getContext(), WebViewActivity.class);
+                intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4");
+                intent.putExtra("title", "隐私协议");
+                startActivity(intent);
+
+//                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
            }

            @Override
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RealNameDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RealNameDialog.java
@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;

 import com.blankj.utilcode.util.ScreenUtils;
 import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.bean.FirstChargeGiftBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.databinding.DialogRealNameBinding;
 import com.xscm.moduleutil.databinding.IndexDialogYouthModelBinding;
@@ -20,6 +21,18 @@ import com.xscm.moduleutil.widget.dialog.BaseDialog;
 */
 public class RealNameDialog extends BaseDialog<DialogRealNameBinding> {

+
+
+    public interface OnFirstChargeListener {
+        void onFirstChargeConfirmed(String giftBean, int type);
+        void onFirstChargeCancelled();
+    }
+    private OnFirstChargeListener listener;
+    // 设置监听器的方法
+    public void setOnFirstChargeListener(OnFirstChargeListener listener) {
+        this.listener = listener;
+    }
+
    public RealNameDialog(@NonNull Context context) {
        super(context);
    }
@@ -36,8 +49,19 @@ public class RealNameDialog extends BaseDialog<DialogRealNameBinding> {
        Window window = getWindow();
        window.setLayout((int) (ScreenUtils.getScreenWidth() * 315.f / 375), WindowManager.LayoutParams.WRAP_CONTENT);

-        mBinding.tvIKnow.setOnClickListener(v -> dismiss());
-        mBinding.ivClose.setOnClickListener(v -> dismiss());
+//        mBinding.tvIKnow.setOnClickListener(v -> dismiss());
+//        mBinding.ivClose.setOnClickListener(v -> dismiss());
+
+        mBinding.tvIKnow.setOnClickListener(v -> {
+            if (listener != null) {
+                listener.onFirstChargeConfirmed(null, 0);
+            }
+        });
+        mBinding.ivClose.setOnClickListener(v -> {
+            if (listener != null) {
+                listener.onFirstChargeCancelled();
+            }
+        });

        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.tvIKnow, ColorManager.getInstance().getPrimaryColorInt(), 53);
        mBinding.tvIKnow.setTextColor(ColorManager.getInstance().getButtonColorInt());
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
@@ -1,6 +1,9 @@
 package com.xscm.moduleutil.dialog;

+import android.content.ActivityNotFoundException;
 import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;

 import androidx.annotation.NonNull;
@@ -182,7 +185,15 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
        if (bindType.getWx_tl().getIs_pay_open().equals("1")) {
            allData.add(bindType.getWx_tl());
        }
-
+        if (bindType.getXlx_wx().getIs_pay_open().equals("1")){
+            allData.add(bindType.getXlx_wx());
+        }
+        if (bindType.getXlx_ali().getIs_pay_open().equals("1")){
+            allData.add(bindType.getXlx_ali());
+        }
+        if (bindType.getXlx_bank().getIs_pay_open().equals("1")){
+            allData.add(bindType.getXlx_bank());
+        }
        bindTypeAdapter.setNewData(allData);
    }

@@ -195,6 +206,22 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
            IWXAPI wxapi = WXAPIFactory.createWXAPI(getContext(),  CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId());
            PaymentUtil.payWxMiniProgram2(wxapi,appPay);

+        }else if (appPay.getXlx()!=null){
+//            ARouter.getInstance().build(ARouteConstants.H5).withString("url", appPay.getXlx()).navigation();
+            openInExternalBrowser(appPay.getXlx());
+
+        }
+    }
+
+    private void openInExternalBrowser(String url) {
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            // 确保在新任务中打开
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            ToastUtils.showShort("无法找到浏览器应用");
        }
    }

--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RoomAuctionWebViewDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RoomAuctionWebViewDialog.java
@@ -0,0 +1,228 @@
+package com.xscm.moduleutil.dialog;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebSettings;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.ScreenUtils;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
+import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIGroupChatActivity;
+import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.base.CommonAppContext;
+import com.xscm.moduleutil.base.RoomManager;
+import com.xscm.moduleutil.databinding.DialogRoomAuctionWebviewBinding;
+import com.xscm.moduleutil.databinding.WebViewDialogBinding;
+import com.xscm.moduleutil.utils.ARouteConstants;
+import com.xscm.moduleutil.widget.dialog.BaseDialog;
+/**
+ *@author qx
+ *@data 2025/9/24
+ *@description: 这是拍卖房的规则界面
+ */
+public class RoomAuctionWebViewDialog extends BaseDialog<DialogRoomAuctionWebviewBinding> {
+
+    String mUrl;
+    int type;//10：天空之境 11：岁月之城 12：时空之巅
+
+    public RoomAuctionWebViewDialog(@NonNull Context context, Bundle args) {
+        super(context, R.style.BaseDialogStyleH);
+        this.mUrl = args.getString("url");
+        this.type = args.getInt("type");
+        initData1();
+    }
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (getWindow() != null) {
+            // 获取屏幕尺寸
+            android.util.DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
+            // 设置高度为屏幕高度的80%
+            android.view.WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.height = (int) (displayMetrics.heightPixels * 0.9);
+            params.width = android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+            getWindow().setAttributes(params);
+        }
+    }
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_room_auction_webview;
+    }
+
+    @Override
+    public void initView() {
+        setCancelable(true);
+        setCanceledOnTouchOutside(true);
+        Window window = getWindow();
+        assert window != null;
+        window.setGravity(Gravity.BOTTOM);
+        window.setLayout((int) (ScreenUtils.getScreenWidth() * 320.f / 375), WindowManager.LayoutParams.MATCH_PARENT);
+        mBinding.topBar.setTitle("规则");
+        mBinding.topBar.getIvBack().setOnClickListener(v -> dismiss());
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+
+    public void initData1() {
+//        WebSettings webSettings = mBinding.webView.getSettings();
+//        webSettings.setUseWideViewPort(true);
+//        webSettings.setLoadWithOverviewMode(true);
+//        webSettings.setJavaScriptEnabled(true);
+//        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); //关闭webview中缓存
+//        //增加JSBridge
+//        mBinding.webView.addJavascriptInterface(new WebAppInterface(getContext()), "Android");
+////        mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME);
+//        webSettings.setBuiltInZoomControls(false);
+//        webSettings.setSupportZoom(false);
+//        webSettings.setDomStorageEnabled(true);
+//        webSettings.setBlockNetworkImage(false);//解决图片不显示
+//        // 启用 WebView 内容的滚动
+//        mBinding.webView.setVerticalScrollBarEnabled(true);
+//        mBinding.webView.setScrollbarFadingEnabled(true);
+//        webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+//        mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示
+//        mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示
+//        mBinding.webView.setWebViewClient(new WebViewClient());
+//        mBinding.webView.setBackgroundColor(Color.TRANSPARENT);
+//        mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+//
+//        mBinding.webView.requestFocus();
+//        mBinding.webView.loadUrl(mUrl);
+
+        WebSettings webSettings = mBinding.webView.getSettings();
+        webSettings.setUseWideViewPort(true);
+        webSettings.setLoadWithOverviewMode(true);
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); //关闭webview中缓存
+        //增加JSBridge
+        mBinding.webView.addJavascriptInterface(new WebAppInterface(getContext()), "Android");
+//        mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME);
+        webSettings.setBuiltInZoomControls(false);
+        webSettings.setSupportZoom(false);
+        webSettings.setDomStorageEnabled(true);
+        webSettings.setBlockNetworkImage(false);//解决图片不显示
+        webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        // 启用 WebView 内容的滚动，但隐藏滚动条
+        mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示
+        mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示滚动条
+        mBinding.webView.setWebViewClient(new WebViewClient());
+        mBinding.webView.setBackgroundColor(Color.TRANSPARENT);
+        mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+
+        // 确保内容可以滚动
+        webSettings.setDomStorageEnabled(true);
+
+        mBinding.webView.requestFocus();
+        mBinding.webView.loadUrl(mUrl);
+    }
+
+    private Resources getResources() {
+        return getContext().getResources();
+    }
+
+    public class WebAppInterface {
+        Context mContext;
+
+        WebAppInterface(Context c) {
+            mContext = c;
+        }
+
+        // 被 H5 调用的方法
+        @JavascriptInterface
+        public void showToast(String toast) {
+            Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show();
+        }
+
+        @JavascriptInterface
+        public void closeWeb() {
+            LogUtils.e("value: ");
+            dismiss();
+        }
+
+        @JavascriptInterface
+        public void customerService() {
+            String appId = CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(); // 填移动应用(App)的 AppId
+            IWXAPI api = WXAPIFactory.createWXAPI(mContext, appId);
+
+// 判断当前版本是否支持拉起客服会话
+            WXOpenCustomerServiceChat.Req req = new WXOpenCustomerServiceChat.Req();
+            req.corpId = "ww1de4300858c0b461";                                  // 企业ID
+            req.url = "https://work.weixin.qq.com/kfid/kfcb3d23a59c188a0e7";    // 客服URL
+            api.sendReq(req);
+        }
+
+        @JavascriptInterface
+        public void jumpRoomPage(String room_id) {
+            RoomManager.getInstance().fetchRoomDataAndEnter(getContext(), room_id,"");
+
+//            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id).navigation();
+        }
+        @JavascriptInterface
+        public void jumpWebPage(String objects) {
+//            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).navigation();
+            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", objects).navigation();
+        }
+
+        @JavascriptInterface
+        public void enterGroupChat(String group_id,String cover,String guild_name) {
+            Intent intent = new Intent(mContext, TUIGroupChatActivity.class);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_ID, group_id);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP);
+            mContext.startActivity(intent);
+        }
+
+        @JavascriptInterface
+        public void chatWithUser(String user_id,String nickname) {
+            Intent intent = new Intent(mContext, TUIC2CChatActivity.class);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_ID, user_id);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
+            mContext.startActivity(intent);
+        }
+        @JavascriptInterface
+        public void exchange(){
+            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
+
+        }
+
+        @JavascriptInterface
+        public void Withdrawal() {
+            ARouter.getInstance().build(ARouteConstants.WITHDRAWAL_ACTIVITY).navigation();
+        }
+
+        @JavascriptInterface
+        public void enterAuthent() {//实名认证
+            ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
+        }
+
+        @JavascriptInterface
+        public void Recharge(){
+            ARouter.getInstance().build(ARouteConstants.RECHARGE_ACTIVITY).navigation();
+        }
+    }
+
+}
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/WebViewDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/WebViewDialog.java
@@ -58,7 +58,7 @@ public class WebViewDialog extends BaseDialog<WebViewDialogBinding> {
            android.util.DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
            // 设置高度为屏幕高度的80%
            android.view.WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = (int) (displayMetrics.heightPixels * 0.7);
+            params.height = (int) (displayMetrics.heightPixels * 0.9);
            params.width = android.view.ViewGroup.LayoutParams.MATCH_PARENT;
            getWindow().setAttributes(params);
        }
@@ -102,6 +102,32 @@ public class WebViewDialog extends BaseDialog<WebViewDialogBinding> {


    public void initData1() {
+//        WebSettings webSettings = mBinding.webView.getSettings();
+//        webSettings.setUseWideViewPort(true);
+//        webSettings.setLoadWithOverviewMode(true);
+//        webSettings.setJavaScriptEnabled(true);
+//        webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); //关闭webview中缓存
+//        //增加JSBridge
+//        mBinding.webView.addJavascriptInterface(new WebAppInterface(getContext()), "Android");
+////        mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME);
+//        webSettings.setBuiltInZoomControls(false);
+//        webSettings.setSupportZoom(false);
+//        webSettings.setDomStorageEnabled(true);
+//        webSettings.setBlockNetworkImage(false);//解决图片不显示
+//        // 启用 WebView 内容的滚动
+//        mBinding.webView.setVerticalScrollBarEnabled(true);
+//        mBinding.webView.setScrollbarFadingEnabled(true);
+//        webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+//        mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示
+//        mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示
+//        mBinding.webView.setWebViewClient(new WebViewClient());
+//        mBinding.webView.setBackgroundColor(Color.TRANSPARENT);
+//        mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+//
+//        mBinding.webView.requestFocus();
+//        mBinding.webView.loadUrl(mUrl);
+
        WebSettings webSettings = mBinding.webView.getSettings();
        webSettings.setUseWideViewPort(true);
        webSettings.setLoadWithOverviewMode(true);
@@ -116,12 +142,16 @@ public class WebViewDialog extends BaseDialog<WebViewDialogBinding> {
        webSettings.setBlockNetworkImage(false);//解决图片不显示
        webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        // 启用 WebView 内容的滚动，但隐藏滚动条
        mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示
-        mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示
+        mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示滚动条
        mBinding.webView.setWebViewClient(new WebViewClient());
        mBinding.webView.setBackgroundColor(Color.TRANSPARENT);
        mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);

+        // 确保内容可以滚动
+        webSettings.setDomStorageEnabled(true);
+
        mBinding.webView.requestFocus();
        mBinding.webView.loadUrl(mUrl);
    }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/YouthModelDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/YouthModelDialog.java
@@ -1,6 +1,7 @@
 package com.xscm.moduleutil.dialog;

 import android.content.Context;
+import android.content.Intent;
 import android.view.Window;
 import android.view.WindowManager;

@@ -9,6 +10,7 @@ import androidx.annotation.NonNull;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ScreenUtils;
 import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.TeenagerInfo;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
@@ -55,7 +57,11 @@ public class YouthModelDialog extends BaseDialog<IndexDialogYouthModelBinding> {
 //            } else {
 //                ARouter.getInstance().build(ARouteConstants.SET_YOUTH_PWD_ACTIVITY).withInt("type", SetYouthPasswordActivity.SET_TYPE).navigation();
 //            }
-            ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken()).navigation();
+
+            Intent intent = new Intent(getContext(), WebViewActivity.class);
+            intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken());
+            getContext().startActivity(intent);
+//            ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/teenage?id=" + SpUtil.getToken()).navigation();
            dismiss();
        });

--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
@@ -35,6 +35,7 @@ import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
 import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
 import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
 import com.xscm.moduleutil.databinding.DialogGiftLotteryBinding;
+import com.xscm.moduleutil.dialog.RechargeDialogFragment;
 import com.xscm.moduleutil.dialog.WebViewDialog;
 import com.xscm.moduleutil.event.LotteryEvent;
 import com.xscm.moduleutil.utils.ARouteConstants;
@@ -440,7 +441,8 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                }
            }
        } else if (id == R.id.exchange_layout) {
-            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
+//            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
+            RechargeDialogFragment.show(roomId, null, getActivity().getSupportFragmentManager());
        }
    }

@@ -604,6 +606,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente

        // 停止之前的定时器
        stopFastAnimate();
+        stopPlay();
        Log.e("isOpenSound===","isOpenSound111"+isOpenSound);
        if (isOpenSound) {
            // 假设此处有播放音乐的逻辑
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
@@ -30,6 +30,7 @@ import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
 import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
 import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
 import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding;
+import com.xscm.moduleutil.dialog.RechargeDialogFragment;
 import com.xscm.moduleutil.dialog.WebViewDialog;
 import com.xscm.moduleutil.event.MqttBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
@@ -81,7 +82,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    private Runnable autoScrollRunnable;
    private boolean isAutoScrolling = false;
    private static final int AUTO_SCROLL_DELAY = 1000; // 1秒滚动一个item
-
+    private boolean vCheckbox=false;

    @Override
    protected GiftLotteryPresenter bindPresenter() {
@@ -154,8 +155,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
        mBinding.tvBd.setOnClickListener(this::onClick);
        mBinding.tvJl.setOnClickListener(this::onClick);
        mBinding.exchangeLayout.setOnClickListener(this::onClick);
-
-
+        mBinding.vCheckbox.setOnClickListener(this::onClick);
        giftXlhChouAdapter = new GiftXlhChouAdapter();
        // 使用 LinearLayoutManager 横向滚动
        LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false);
@@ -313,7 +313,11 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
            xlhRecordDialog = XlhRecordDialog.newInstance(roomId);
            xlhRecordDialog.show(getChildFragmentManager(), "XlhRecordDialog");
        } else if (id == R.id.exchange_layout) {//钻石兑换
-            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
+//            ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
+            RechargeDialogFragment.show(roomId, null, getActivity().getSupportFragmentManager());
+        }else if (id==R.id.v_checkbox){
+            mBinding.vCheckbox.setSelected(!mBinding.vCheckbox.isSelected());
+            vCheckbox=mBinding.vCheckbox.isSelected();
        }
    }

@@ -586,76 +590,78 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
    @Override
    public void xlhChouSuccess(List<XlhDrawBean> data) {
        if (data != null) {
-
+            if (vCheckbox){
+                showResultDialog(data);
+            }else {
 //            showResultDialog(data);

 //             取消之前可能存在的任务
-            clearPendingTasks();
-            // 抽奖完成后执行动画滚动
-            pendingLotteryRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    // 清理之前的状态
-                    if (giftXlhChouAdapter != null) {
-                        giftXlhChouAdapter.clearSelection();
-                    }
-                    int winningPosition = findHighestValueWinningPosition(data);//这是获取到的中奖位置下标
-                    if (winningPosition != -1) {
-                        if (scrollHelper == null) {
-                            scrollHelper = new CenterScrollHelper(mBinding.recycleView);
+                clearPendingTasks();
+                // 抽奖完成后执行动画滚动
+                pendingLotteryRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        // 清理之前的状态
+                        if (giftXlhChouAdapter != null) {
+                            giftXlhChouAdapter.clearSelection();
                        }
+                        int winningPosition = findHighestValueWinningPosition(data);//这是获取到的中奖位置下标
+                        if (winningPosition != -1) {
+                            if (scrollHelper == null) {
+                                scrollHelper = new CenterScrollHelper(mBinding.recycleView);
+                            }

-                        // 计算在循环列表中的目标位置（滚动几圈后停在目标位置）
-                        int loopCount = 4; // 滚动4圈
-                        int originalSize = giftLists.size();///这是列表的总大小
-                        // 计算目标在循环列表中的位置（确保在中间区域）
-                        ///这是计算总圈数的大小
-                        int middleBaseIndex = (loopCount * originalSize);
-                        ///这里是展示在中奖的位置，加上总圈数的大小，
-                        int targetLoopIndex = middleBaseIndex + (winningPosition % originalSize);
+                            // 计算在循环列表中的目标位置（滚动几圈后停在目标位置）
+                            int loopCount = 4; // 滚动4圈
+                            int originalSize = giftLists.size();///这是列表的总大小
+                            // 计算目标在循环列表中的位置（确保在中间区域）
+                            ///这是计算总圈数的大小
+                            int middleBaseIndex = (loopCount * originalSize);
+                            ///这里是展示在中奖的位置，加上总圈数的大小，
+                            int targetLoopIndex = middleBaseIndex + (winningPosition % originalSize);

-                        // 使用scrollWithCircles方法执行带动画的滚动（带完成回调）
-                        scrollHelper.scrollWithCircles(
-                                targetLoopIndex,  // 在循环列表中的位置
-                                loopCount,  // 滚动圈数
-                                1000, // 每个item滚动时间200ms（控制速度）
-                                originalSize, // 原始数据大小
-                                () -> { // 滚动完成回调
-                                    // 滚动完成后更新选中状态（使用原始位置）
-                                    if (giftXlhChouAdapter != null) {
-                                        giftXlhChouAdapter.setSelectedPosition(winningPosition);
-                                    }
-                                    // 滚动完成后延迟一小段时间再居中，确保UI更新完成
-                                    pendingCenteringRunnable = new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            // 手动将选中项居中
-                                            centerSelectedItem(winningPosition, originalSize);
-
-                                            // 显示结果对话框
-                                            getActivity().runOnUiThread(() -> {
-                                                scrollHelper = null;
-                                                showResultDialog(data);
-                                                // 抽奖结束后重新启动自动滚动
-//                                                resumeAutoScrollAfterLottery();
-                                            });
+                            // 使用scrollWithCircles方法执行带动画的滚动（带完成回调）
+                            scrollHelper.scrollWithCircles(
+                                    targetLoopIndex,  // 在循环列表中的位置
+                                    loopCount,  // 滚动圈数
+                                    1000, // 每个item滚动时间200ms（控制速度）
+                                    originalSize, // 原始数据大小
+                                    () -> { // 滚动完成回调
+                                        // 滚动完成后更新选中状态（使用原始位置）
+                                        if (giftXlhChouAdapter != null) {
+                                            giftXlhChouAdapter.setSelectedPosition(winningPosition);
                                        }
-                                    };
-                                    mBinding.recycleView.postDelayed(pendingCenteringRunnable, 1000);
-                                }
-                        );
+                                        // 滚动完成后延迟一小段时间再居中，确保UI更新完成
+                                        pendingCenteringRunnable = new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                // 手动将选中项居中
+                                                centerSelectedItem(winningPosition, originalSize);

-                    } else {
-                        // 如果没有找到中奖位置，直接显示对话框
-                        showResultDialog(data);
-                        // 抽奖结束后重新启动自动滚动
+                                                // 显示结果对话框
+                                                getActivity().runOnUiThread(() -> {
+                                                    scrollHelper = null;
+                                                    showResultDialog(data);
+                                                    // 抽奖结束后重新启动自动滚动
+//                                                resumeAutoScrollAfterLottery();
+                                                });
+                                            }
+                                        };
+                                        mBinding.recycleView.postDelayed(pendingCenteringRunnable, 1000);
+                                    }
+                            );
+
+                        } else {
+                            // 如果没有找到中奖位置，直接显示对话框
+                            showResultDialog(data);
+                            // 抽奖结束后重新启动自动滚动
 //                        resumeAutoScrollAfterLottery();
+                        }
                    }
-                }
-            };
-            mBinding.recycleView.postDelayed(pendingLotteryRunnable, 1000);
-
+                };
+                mBinding.recycleView.postDelayed(pendingLotteryRunnable, 1000);

+            }
        }else {
            isDrawing=false;
            // 抽奖失败也重新启动自动滚动
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/event/UnreadCountEvent.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/event/UnreadCountEvent.java
@@ -9,8 +9,18 @@ import lombok.Data;
@Data
 public class UnreadCountEvent {
    private long aLong;
+    private long bLong;

-    public UnreadCountEvent(long aLong) {
-        this.aLong = aLong;
-    }
+
+
+//    public UnreadCountEvent(long aLong, long bLong) {
+//        this.aLong = aLong;
+//        this.bLong = bLong;
+//    }
+//
+//    public UnreadCountEvent() {
+//    }
+//    public UnreadCountEvent(long aLong) {
+//        this.aLong = aLong;
+//    }
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiResponseCallback.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiResponseCallback.java
@@ -0,0 +1,131 @@
+package com.xscm.moduleutil.http;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import com.blankj.utilcode.util.LogUtils;
+import com.xscm.moduleutil.base.CommonAppContext;
+
+import java.io.IOException;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * 通用的API响应处理回调类
+ * 统一处理所有接口的响应和错误情况
+ */
+public abstract class ApiResponseCallback<T> implements Callback<BaseModel<T>> {
+    private Context mContext;
+
+    // 构造方法，传入上下文用于显示提示
+    public ApiResponseCallback(Context context) {
+        this.mContext = context;
+    }
+
+    @Override
+    public void onResponse(Call<BaseModel<T>> call, Response<BaseModel<T>> response) {
+        // 统一处理HTTP响应
+        if (response.isSuccessful()) {
+            // 处理200-299范围内的HTTP状态码
+            BaseModel<T> body = response.body();
+
+            if (body != null) {
+                // 根据code值进行不同处理
+                switch (body.getCode()) {
+                    case 1: // 接口返回成功
+                        // 业务成功，回调给具体实现
+                        // 即使data为null也调用onSuccess，由具体实现决定如何处理null值
+                        onSuccess(body.getData());
+                        break;
+                    case 0: // 接口请求成功但数据错误
+                        // 显示错误信息
+//                        String errorMsg = body.getMsg() != null ? body.getMsg() : "操作失败，请重试";
+//                        showToast(errorMsg);
+                        onFailure(new Exception(body.getMsg()));
+                        break;
+                    case 301: // 登录失效
+                        // 显示错误信息并退出应用
+//                        String loginErrorMsg = body.getMsg() != null ? body.getMsg() : "登录已失效，请重新登录";
+                        showToast(body.getMsg());
+                        
+                        try {
+                            // 发送退出登录事件
+//                            EventBus.getDefault().post(new com.xscm.moduleutil.event.LogOutEvent());
+                            
+                            // 清除登录信息
+                            CommonAppContext.getInstance().clearLoginInfo();
+                            
+                            // 跳转到登录页面
+//                            android.content.Intent intent = new android.content.Intent(CommonAppContext.getInstance(), Class.forName("com.xscm.midi.LaunchPageActivity"));
+//                            intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK | android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK);
+//                            CommonAppContext.getInstance().startActivity(intent);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                        onFailure(new Exception(body.getMsg()));
+                        break;
+                    default:
+                        // 其他错误情况
+                        String defaultErrorMsg = body.getMsg() != null ? body.getMsg() : "未知错误";
+                        showToast(defaultErrorMsg);
+                        onFailure(new Exception(defaultErrorMsg));
+                        break;
+                }
+            } else {
+                // 响应体为空的情况
+                String errorMsg = "获取数据失败，请重试";
+                showToast(errorMsg);
+                onFailure(new Exception(errorMsg));
+            }
+        } else {
+            // 处理HTTP错误状态码
+            String errorInfo;
+            try {
+                if (response.errorBody() != null) {
+                    errorInfo = response.errorBody().string();
+                    // 可以在这里统一解析错误响应体
+                } else {
+                    errorInfo = "请求失败，状态码：" + response.code();
+                }
+            } catch (IOException e) {
+                errorInfo = "请求失败，状态码：" + response.code();
+                e.printStackTrace();
+            }
+            showToast("");
+            onFailure(new Exception(errorInfo));
+        }
+    }
+
+    @Override
+    public void onFailure(Call<BaseModel<T>> call, Throwable t) {
+        // 统一处理网络异常
+        String errorMsg;
+        if (t instanceof IOException) {
+//            errorMsg = "网络异常，请检查网络连接";
+        } else {
+//            errorMsg = "请求处理失败，请重试";
+        }
+        showToast("");
+        // 回调给具体实现处理
+        onFailure(t);
+    }
+
+    // 显示提示信息
+    private void showToast(String message) {
+        if (mContext != null) {
+            Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    // 业务成功时的回调，由具体接口实现
+    public abstract void onSuccess(T data);
+
+    // 错误时的回调，可选实现
+    public void onFailure(Throwable t) {
+        // 可以留空，由子类选择性实现
+        LogUtils.e("接口错误：",t);
+    }
+}
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
@@ -5,6 +5,7 @@ import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.bean.AppPay;
 import com.xscm.moduleutil.bean.AppUpdateModel;
 import com.xscm.moduleutil.bean.BannerModel;
+import com.xscm.moduleutil.bean.BindDetail;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.BlackUserBean;
 import com.xscm.moduleutil.bean.CharmRankingResp;
@@ -91,7 +92,7 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.LOGIN)
-    Observable<BaseModel<List<UserBean>>> login(@Field("user_login") String user_login, @Field("sms_code") String sms_code);
+    Call<BaseModel<List<UserBean>>> login(@Field("user_login") String user_login, @Field("sms_code") String sms_code);

    @FormUrlEncoded  //手机换绑
    @POST(Constants.MODIFY_MOBILE)
@@ -165,13 +166,17 @@ public interface ApiServer {
    @GET(Constants.GET_WITHDRAWAL_LIST)
    Observable<BaseModel<List<WithdrawalBean>>> withdrawalList(@Query("page") String page, @Query("page_limit") String page_limit, @Query("search_stime") String search_stime, @Query("search_etime") String search_etime);

+    @FormUrlEncoded
+    @POST(Constants.POST_BIND_DETAIL)
+    Call<BaseModel<BindDetail>> bindDetai(@Field("user_id") String user_id, @Field("type") String type);
+
    @FormUrlEncoded
    @POST(Constants.POST_MESSAGE_LIST)
-    Observable<BaseModel<List<NewsMessageList>>> getMessagetitle(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<NewsMessageList>>> getMessagetitle(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_RANK)
-    Observable<BaseModel<List<CharmRankingResp>>> getRoomRank(@Field("room_id") String room_id, @Field("type") String type, @Field("time_type") String time_type, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<CharmRankingResp>>> getRoomRank(@Field("room_id") String room_id, @Field("type") String type, @Field("time_type") String time_type, @Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_RANKING)
@@ -182,16 +187,16 @@ public interface ApiServer {
    Observable<BaseModel<PlaceholderBean>> loveRanking(@Field("type") String type);

    @GET(Constants.GET_REAL_NAME)
-    Observable<BaseModel<RealNameBean>> realNameInfo();
+    Call<BaseModel<RealNameBean>> realNameInfo();

    @GET(Constants.GET_DAILY_TASK_BOX)
-    Observable<BaseModel<List<GiftBoxRecordBean>>> dailyTasksBoxRecord();
+    Call<BaseModel<List<GiftBoxRecordBean>>> dailyTasksBoxRecord();

    @GET(Constants.GET_MY_BAG_DATA)
-    Observable<BaseModel<List<MyBagDataBean>>> packIncome(@Query("page") String page, @Query("page_limit") String page_size);
+    Call<BaseModel<List<MyBagDataBean>>> packIncome(@Query("page") String page, @Query("page_limit") String page_size);

    @GET(Constants.GET_MY_BAG_OUTCOME)
-    Observable<BaseModel<List<MyBagDataBean>>> packOutcome(@Query("page") String page, @Query("page_limit") String page_size);
+    Call<BaseModel<List<MyBagDataBean>>> packOutcome(@Query("page") String page, @Query("page_limit") String page_size);

    @GET(Constants.GET_GIFT_PACK)
    Call<BaseModel<List<GiftPackBean>>> giftPack();
@@ -213,7 +218,7 @@ public interface ApiServer {
    Call<ResponseBody> endPk(@Field("pk_id") String is_pk, @Field("type") String type, @Field("user_id") String user_id);

    @GET(Constants.GET_RECHARGE)
-    Observable<BaseModel<List<RechargeBean>>> recharge();
+    Call<BaseModel<List<RechargeBean>>> recharge();

    @FormUrlEncoded
    @POST(Constants.POST_START_PK)
@@ -225,7 +230,7 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.SWITCH_ACCOUNTS)
-    Observable<BaseModel<List<UserBean>>> switchAccounts(@Field("user_login") String user_id);
+    Call<BaseModel<List<UserBean>>> switchAccounts(@Field("user_login") String user_id);

    @FormUrlEncoded
    @POST(Constants.FORGOT_PASSWORD)
@@ -233,7 +238,7 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.USER_UPDATE)
-    Observable<BaseModel<UserBean>> userUpdate(@Field("nickname") String nickname, @Field("birthday") String birthday, @Field("sex") String sex, @Field("avatar") String avatar, @Field("init_code") String init_code, @Field("user_id") String user_id);
+    Call<BaseModel<UserBean>> userUpdate(@Field("nickname") String nickname, @Field("birthday") String birthday, @Field("sex") String sex, @Field("avatar") String avatar, @Field("init_code") String init_code, @Field("user_id") String user_id);

    @GET(Constants.AUTHORIZATION)
    Call<ResponseBody> authorization();
@@ -263,18 +268,18 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.REAL_NAME)
-    Observable<BaseModel<RealNameBean>> realName(@Field("real_name") String real_name, @Field("card_number") String card_number);
+    Call<BaseModel<RealNameBean>> realName(@Field("real_name") String real_name, @Field("card_number") String card_number);

    @FormUrlEncoded
    @POST(Constants.GET_EXPAND_COLUMN)
-    Observable<BaseModel<List<ExpandColumnBean>>> getExpandColumn(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<ExpandColumnBean>>> getExpandColumn(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);

    @GET(Constants.GET_OFFICIAL_NOTICE)
-    Observable<BaseModel<NewsDataBean>> getOfficialNotice();
+    Call<BaseModel<NewsDataBean>> getOfficialNotice();

    @FormUrlEncoded
    @POST(Constants.GET_ALBUM_LIST)
-    Observable<BaseModel<List<AlbumBean>>> getAlbumList(@Field("page") String page, @Field("page_limit") String page_limit, @Field("user_id") String user_id);
+    Call<BaseModel<List<AlbumBean>>> getAlbumList(@Field("page") String page, @Field("page_limit") String page_limit, @Field("user_id") String user_id);

    @FormUrlEncoded
    @POST(Constants.CREATE_ALBUM)
@@ -289,19 +294,19 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.POST_FOLLOW_LIST)
-    Observable<BaseModel<List<BlackUserBean>>> getUserFollowList(@Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<BlackUserBean>>> getUserFollowList(@Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.POST_FANS_LIST)
-    Observable<BaseModel<List<BlackUserBean>>> getUserFansList(@Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<BlackUserBean>>> getUserFansList(@Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.POST_BLACK_LIST)
-    Observable<BaseModel<List<BlackUserBean>>> getBlacklist(@Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<BlackUserBean>>> getBlacklist(@Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.POST_LOCK_MI_LIST)
-    Observable<BaseModel<List<BlackUserBean>>> getLockMiniList(@Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<BlackUserBean>>> getLockMiniList(@Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.GET_MY_ROOM)
@@ -316,7 +321,7 @@ public interface ApiServer {
    Call<BaseModel<List<TopRoom>>> getTopRooms(@Field("page") String page, @Field("page_limit") String page_limit, @Field("is_top") String is_top, @Field("label_id") String label_id);

    @GET(Constants.GET_ROOM_TYPE)
-    Observable<BaseModel<List<RoomTypeModel>>> getRoomCategories();
+    Call<BaseModel<List<RoomTypeModel>>> getRoomCategories();

    @FormUrlEncoded
    @POST(Constants.CHECK_TXT)
@@ -324,35 +329,35 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.GET_REWARD_LIST)
-    Observable<BaseModel<List<RewardUserBean>>> getRewardList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<RewardUserBean>>> getRewardList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit);

    @GET(Constants.GET_GIFT_LABEL)
-    Observable<BaseModel<List<GiftLabelBean>>> getGiftLabel(@Query("have_hot") String have_hot);
+    Call<BaseModel<List<GiftLabelBean>>> getGiftLabel(@Query("have_hot") String have_hot);

    @GET(Constants.GIFT_LIST)
 //获取礼物列表
-    Observable<BaseModel<List<RoonGiftModel>>> getGiftList(@Query("label") int label,@Query("room_id")String room_id);
+    Call<BaseModel<List<RoonGiftModel>>> getGiftList(@Query("label") int label,@Query("room_id")String room_id);

    @GET(Constants.TOPIC_LIST)
 //获取话题
-    Observable<BaseModel<List<HeatedBean>>> topicList(@Query("page") String page, @Query("page_limit") String page_limit);
+    Call<BaseModel<List<HeatedBean>>> topicList(@Query("page") String page, @Query("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.PUBLISH_ZONE)
    Call<BaseModel<String>> publishZone(@Field("images") String images, @Field("content") String content, @Field("topic_id") String topic_id, @Field("room_id") String room_id, @Field("ip") String ip);

    @GET(Constants.GET_CATEGORIES)
-    Observable<BaseModel<List<HeatedBean>>> getCategories();
+    Call<BaseModel<List<HeatedBean>>> getCategories();

    @GET(Constants.GET_CIRCLE_LIST)
    Call<BaseModel<List<CircleListBean>>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.GET_USER_HOME_ZONE)
-    Observable<BaseModel<List<CircleListBean>>> getCircleUserList(@Field("user_id") String user_id, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<List<CircleListBean>>> getCircleUserList(@Field("user_id") String user_id, @Field("page") String page, @Field("page_limit") String page_limit);

    @GET(Constants.GET_MY_FOOT)
-    Observable<BaseModel<List<MyFootResp>>> getMyFoot(@Query("page") String page, @Query("page_limit") String page_limit);
+    Call<BaseModel<List<MyFootResp>>> getMyFoot(@Query("page") String page, @Query("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.LIKE_ZONE)
@@ -360,15 +365,15 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.TOPIC_ID)
-    Observable<BaseModel<List<CircleListBean>>> topicId(@Field("topic_id") String topic_id);
+    Call<BaseModel<List<CircleListBean>>> topicId(@Field("topic_id") String topic_id);

    @FormUrlEncoded
    @POST(Constants.ZONE_DETAIL)
-    Observable<BaseModel<CircleListBean>> zoneDetail(@Field("id") String topic_id);
+    Call<BaseModel<CircleListBean>> zoneDetail(@Field("id") String topic_id);

    @FormUrlEncoded
    @POST(Constants.GET_USER_HOME)
-    Observable<BaseModel<UserInfo>> getUserHome(@Field("user_id") String user_id);
+    Call<BaseModel<UserInfo>> getUserHome(@Field("user_id") String user_id);

    @FormUrlEncoded
    @POST(Constants.DELETE_COMMENT)
@@ -376,11 +381,11 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.GET_COMMENT_LIST)
-    Observable<BaseModel<CommentBean>> getCommentList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<CommentBean>> getCommentList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.POST_SONG)
-    Observable<BaseModel<List<SongMusicBean>>> song(@Field("room_id") String roomId, @Field("user_id") String userId, @Field("song_code") String songCode, @Field("song_name") String songName, @Field("singer") String singer, @Field("poster") String poster, @Field("duration") String duration);
+    Call<BaseModel<List<SongMusicBean>>> song(@Field("room_id") String roomId, @Field("user_id") String userId, @Field("song_code") String songCode, @Field("song_name") String songName, @Field("singer") String singer, @Field("poster") String poster, @Field("duration") String duration);

    @FormUrlEncoded
    @POST(Constants.COMMENT_ZONE)
@@ -403,7 +408,7 @@ public interface ApiServer {
    Call<BaseModel<String>> deleteZone(@Field("id") String id);

    @GET(Constants.GET_MY_INFO)
-    Observable<BaseModel<UserInfo>> getMyInfo();
+    Call<BaseModel<UserInfo>> getMyInfo();

    @FormUrlEncoded
    @POST(Constants.ED_USER_INFO)
@@ -414,25 +419,25 @@ public interface ApiServer {
    Call<BaseModel<String>> editUserBg(@Field("images") String images);

    @GET(Constants.GET_USER_TAG_LIST)
-    Observable<BaseModel<List<UserTagBean>>> getUserTagList();
+    Call<BaseModel<List<UserTagBean>>> getUserTagList();

    @FormUrlEncoded
    @POST(Constants.GET_LIKE_LIST)
-    Observable<BaseModel<List<CircleListBean.LikeList>>> getLikeList(@Field("id") String id);
+    Call<BaseModel<List<CircleListBean.LikeList>>> getLikeList(@Field("id") String id);

    @FormUrlEncoded
    @POST(Constants.GET_ALBUM_DETAIL)
-    Observable<BaseModel<AlbumBean>> getAlbumDetail(@Field("album_id") String albumId, @Field("pwd") String pwd, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<AlbumBean>> getAlbumDetail(@Field("album_id") String albumId, @Field("pwd") String pwd, @Field("page") String page, @Field("page_limit") String page_limit);

    @GET(Constants.GET_PERSONALTY)
-    Observable<BaseModel<List<PersonaltyBean>>> getPersonaltyList();
+    Call<BaseModel<List<PersonaltyBean>>> getPersonaltyList();

    @FormUrlEncoded
    @POST(Constants.GET_SUBSIDY)
-    Observable<BaseModel<RoomSubsidy>> getSubsidy(@Field("room_id") String roomId);
+    Call<BaseModel<RoomSubsidy>> getSubsidy(@Field("room_id") String roomId);

    @GET(Constants.GET_DECORATE)
-    Observable<BaseModel<List<ZhuangBanShangChengBean>>> getDecorateList(@Query("type") String type);
+    Call<BaseModel<List<ZhuangBanShangChengBean>>> getDecorateList(@Query("type") String type);

    @FormUrlEncoded
    @POST(Constants.POST_GZ)
@@ -497,11 +502,11 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.UPDATEPASSWORD)
-    Observable<BaseModel<String>> updatePassword(@Field("room_id") String roomId, @Field("password") String password);
+    Call<BaseModel<String>> updatePassword(@Field("room_id") String roomId, @Field("password") String password);

    @FormUrlEncoded
    @POST(Constants.GET_ROOM_ONLINE)
-    Observable<BaseModel<RoomOnline>> getRoomOnline(@Field("room_id") String roomId, @Field("page") String page, @Field("page_limit") String page_limit);
+    Call<BaseModel<RoomOnline>> getRoomOnline(@Field("room_id") String roomId, @Field("page") String page, @Field("page_limit") String page_limit);

    @FormUrlEncoded
    @POST(Constants.GET_GIVE_GIFT)
@@ -512,29 +517,29 @@ public interface ApiServer {
    Call<BaseModel<String>> roomGift(@Field("room_id") String room_id, @Field("gift_id") String gift_id, @Field("gift_num") String num, @Field("to_uid") String to_uid, @Field("type") String gift_type, @Field("pit_number") String pit_number, @Field("heart_id") String heat_id);

    @GET(Constants.GET_FIRST_CHARGE_GIFT)
-    Observable<BaseModel<FirstChargeGiftBean>> firstChargeGift();
+    Call<BaseModel<FirstChargeGiftBean>> firstChargeGift();

    @GET(Constants.GET_WALLET)
-    Observable<BaseModel<WalletBean>> wallet();
+    Call<BaseModel<WalletBean>> wallet();

    @FormUrlEncoded
    @POST(Constants.POST_APPLY_Pay)
-    Observable<BaseModel<AppPay>> appPay(@Field("user_id") String user_id, @Field("money") String money, @Field("coin") String coin, @Field("type") String type);
+    Call<BaseModel<AppPay>> appPay(@Field("user_id") String user_id, @Field("money") String money, @Field("coin") String coin, @Field("type") String type);

    @FormUrlEncoded
    @POST(Constants.POST_APPLY_LIST)
-    Observable<BaseModel<RoomApplyListBean>> roomApplyListBean(@Field("room_id") String room_id);
+    Call<BaseModel<RoomApplyListBean>> roomApplyListBean(@Field("room_id") String room_id);

    @FormUrlEncoded
    @POST(Constants.GET_ROOM_USER)
-    Observable<BaseModel<UserInfo>> getRoomUserInfo(@Field("room_id") String roomId, @Field("user_id") String userId);
+    Call<BaseModel<UserInfo>> getRoomUserInfo(@Field("room_id") String roomId, @Field("user_id") String userId);

    @FormUrlEncoded
    @POST(Constants.POST_BIND_TYPE)
-    Observable<BaseModel<BindType>> bindType(@Field("user_id") String userId);
+    Call<BaseModel<BindType>> bindType(@Field("user_id") String userId);

    @GET(Constants.GET_WALLET_CONFIG)
-    Observable<BaseModel<WalletConfig>> getWalletConfig();
+    Call<BaseModel<WalletConfig>> getWalletConfig();

    @FormUrlEncoded
    @POST(Constants.POST_BIND)
@@ -542,7 +547,7 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.POST_SONG_LIST)
-    Observable<BaseModel<List<MusicSongBean>>> songList(@Field("room_id") String room_id);
+    Call<BaseModel<List<MusicSongBean>>> songList(@Field("room_id") String room_id);

    @FormUrlEncoded
    @POST(Constants.APPLY_PIT)
@@ -626,23 +631,23 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.POST_HOST_LIST)
-    Observable<BaseModel<List<HostBean>>> getHostList(@Query("room_id") String room_id, @Field("type") String type);
+    Call<BaseModel<List<HostBean>>> getHostList(@Query("room_id") String room_id, @Field("type") String type);

    @FormUrlEncoded
    @POST(Constants.GET_CHARM_RANK)
-    Observable<BaseModel<List<RoomCharmRankBean>>> getCharmRank(@Field("room_id") String roomId);
+    Call<BaseModel<List<RoomCharmRankBean>>> getCharmRank(@Field("room_id") String roomId);

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_RELATION_LIST)
-    Observable<BaseModel<List<RoomRelationBean>>> roomRelationList(@Field("type") String type);
+    Call<BaseModel<List<RoomRelationBean>>> roomRelationList(@Field("type") String type);

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_AUCTION_LIST)
-    Observable<BaseModel<List<RoomAuction.AuctionListBean>>> roomAuctionList(@Field("auction_id") String auction_id);
+    Call<BaseModel<List<RoomAuction.AuctionListBean>>> roomAuctionList(@Field("auction_id") String auction_id);

    @FormUrlEncoded
    @POST(Constants.POST_SEARCH)
-    Observable<BaseModel<List<RoomSearchResp>>> getSearch(@Query("search") String room_id, @Field("type") String type);
+    Call<BaseModel<List<RoomSearchResp>>> getSearch(@Query("search") String room_id, @Field("type") String type);

    @FormUrlEncoded
    @POST(Constants.SET_PRESIDED_RATIO)
@@ -670,11 +675,11 @@ public interface ApiServer {
    Call<BaseModel<String>> setLockPit(@Field("room_id") String room_id, @Field("pit_number") String pit_number, @Field("is_lock") String is_lock);

    @GET(Constants.GET_ROOM_BJ)
-    Observable<BaseModel<RoomBgBean>> getBackgroundList();
+    Call<BaseModel<RoomBgBean>> getBackgroundList();

    @FormUrlEncoded
    @POST(Constants.POST_CHARM_LIST)
-    Observable<BaseModel<RoomDetails>> getCharmList(@Field("room_id") String room_id, @Field("start_time") String start_time, @Field("end_time") String end_time, @Field("page") String page);
+    Call<BaseModel<RoomDetails>> getCharmList(@Field("room_id") String room_id, @Field("start_time") String start_time, @Field("end_time") String end_time, @Field("page") String page);

    @FormUrlEncoded
    @POST(Constants.POST_SET_UPLOAD_BG_IMG)
@@ -707,7 +712,7 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.POST_RELATION_CARD)
-    Observable<BaseModel<RelationCardBean>> relationCard(@Field("user_id") String user_id);
+    Call<BaseModel<RelationCardBean>> relationCard(@Field("user_id") String user_id);

    @FormUrlEncoded
    @POST(Constants.POST_TOP_RELATION_CARD)
@@ -720,11 +725,11 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_AUCTION)
-    Observable<BaseModel<AuctionBean>> roomAuction(@Field("room_id") String room_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("relation_id") String relation_id, @Field("auction_type") String auction_type, @Field("time_day") String time_day);
+    Call<BaseModel<AuctionBean>> roomAuction(@Field("room_id") String room_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("relation_id") String relation_id, @Field("auction_type") String auction_type, @Field("time_day") String time_day);

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_AUCTION_TIME)
-    Observable<BaseModel<RoomTime>> roomAuctionTime(@Field("gift_id") String gift_id);
+    Call<BaseModel<RoomTime>> roomAuctionTime(@Field("gift_id") String gift_id);

    @FormUrlEncoded
    @POST(Constants.POST_ROOM_AUCTION_JOIN)
@@ -733,7 +738,7 @@ public interface ApiServer {

    @FormUrlEncoded
    @POST(Constants.POST_SEARCH_PK_ROOM)
-    Observable<BaseModel<List<RoomBean>>> searchPkRoom(@Field("room_id") String room_id, @Field("page") String page, @Field("limit") String limit);
+    Call<BaseModel<List<RoomBean>>> searchPkRoom(@Field("room_id") String room_id, @Field("page") String page, @Field("limit") String limit);

    @GET(Constants.GET_BOX_GIFT_LIST)
    Call<BaseModel<BlindBoxBean>> getBoxGiftList(@Query("gift_bag_id") String gift_bag_id, @Query("room_id") String room_id);
@@ -777,4 +782,8 @@ public interface ApiServer {
    @GET(Constants.GET_GIFT_PACK_LIST_COUNT)
    Call<BaseModel<GiftPackListCount>> getGiftPackListCount();

+    @FormUrlEncoded
+    @POST(Constants.ROOM_USER_RECONNECT)
+    Call<BaseModel<String>> roomUserReconnect(@Field("room_id") String room_id);
+
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/BaseObserver.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/BaseObserver.java
@@ -53,9 +53,11 @@ public abstract class BaseObserver<T> implements Observer<T>  {
        } else if (e instanceof APIException) {
            APIException apiException = (APIException) e;
            if (apiException.getCode() == 301) {
-                EventBus.getDefault().post(new LogOutEvent());
+
                try {
-                    com.blankj.utilcode.util.ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码");
+                    ToastUtils.show(extractChinese(apiException.getMessage()));
+//                    com.blankj.utilcode.util.ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码");
+                    EventBus.getDefault().post(new LogOutEvent());
                    CommonAppContext.getInstance().clearLoginInfo();
                } catch (ClassNotFoundException ex) {
                    throw new RuntimeException(ex);
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/BusinessAwareConverterFactory.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/BusinessAwareConverterFactory.java
@@ -0,0 +1,74 @@
+package com.xscm.moduleutil.http;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.xscm.moduleutil.base.CommonAppContext;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import okhttp3.ResponseBody;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class BusinessAwareConverterFactory extends Converter.Factory {
+    private final GsonConverterFactory originalFactory;
+    private final Context context;
+
+    public BusinessAwareConverterFactory(Context context) {
+        this.context = context;
+        this.originalFactory = GsonConverterFactory.create();
+    }
+
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(Type type,
+                                                            Annotation[] annotations,
+                                                            Retrofit retrofit) {
+        final Converter<ResponseBody, ?> delegate =
+                originalFactory.responseBodyConverter(type, annotations, retrofit);
+
+        return new Converter<ResponseBody, Object>() {
+            @Override
+            public Object convert(ResponseBody value) throws IOException {
+                // 先读取响应字符串检查业务状态码
+                String responseString = value.string();
+                try {
+                    JSONObject jsonObject = new JSONObject(responseString);
+                    int code = jsonObject.getInt("code");
+                    String msg = jsonObject.getString("msg");
+
+                    if (code == 301) {
+                        handleForceLogout();
+                        ToastUtils.showShort(msg);
+                    }
+
+                    // 重新构建 ResponseBody 供原始转换器使用
+                    ResponseBody newValue = ResponseBody.create(value.contentType(), responseString);
+                    return delegate.convert(newValue);
+
+                } catch (JSONException e) {
+                    throw new IOException("");
+                }
+            }
+
+            private void handleForceLogout() {
+                new Handler(Looper.getMainLooper()).post(() -> {
+                    try {
+                        CommonAppContext.getInstance().clearLoginInfo();
+                    } catch (ClassNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+
+                });
+            }
+        };
+    }
+}
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/DefaultTransformer.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/DefaultTransformer.java
@@ -2,8 +2,13 @@ package com.xscm.moduleutil.http;



+import com.blankj.utilcode.util.ToastUtils;
 import com.xscm.moduleutil.base.CommonAppContext;

+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
@@ -23,17 +28,27 @@ public class DefaultTransformer<T> implements ObservableTransformer<BaseModel<T>
        return upstream
                .map(response -> {
                    if (response.isTokenExpired()) {
-                        // 触发登出事件（EventBus）
-                        com.blankj.utilcode.util.ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码");
-                        CommonAppContext.getInstance().clearLoginInfo();
-                        throw new APIException(-1, "登录已过期");
+                        if (response.getCode()==301){
+                            CommonAppContext.getInstance().clearLoginInfo();
+                            ToastUtils.showShort(response.getMsg());
+                        }else {
+                            // 触发登出事件（EventBus）
+//                        com.blankj.utilcode.util.ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码");
+                            CommonAppContext.getInstance().clearLoginInfo();
+                        }
+                        throw new APIException(response.getCode(), response.getMsg());
                    }

                    if (!response.isSuccess()) {
                        throw new APIException(response.getCode(), response.getMsg());
                    }
-
-                    return response.getData();
+                    // 确保不会返回null值
+                    T data = response.getData();
+                    if (data == null) {
+                        return getDefaultValue();
+                    }
+                    return data;
+//                    return response.getData();
                })
                .onErrorResumeNext(throwable -> {
                    // 可以在这里统一处理异常
@@ -45,4 +60,32 @@ public class DefaultTransformer<T> implements ObservableTransformer<BaseModel<T>
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }
+
+    @SuppressWarnings("unchecked")
+    private T getDefaultValue() {
+        try {
+            // 根据类型返回合理的默认值
+            Class<T> type = (Class<T>) Object.class;
+            if (String.class.isAssignableFrom(type)) {
+                return (T) "";
+            } else if (List.class.isAssignableFrom(type)) {
+                return (T) new ArrayList<>();
+            } else if (Integer.class.isAssignableFrom(type) || int.class.isAssignableFrom(type)) {
+                return (T) Integer.valueOf(0);
+            } else if (Long.class.isAssignableFrom(type) || long.class.isAssignableFrom(type)) {
+                return (T) Long.valueOf(0L);
+            } else if (Double.class.isAssignableFrom(type) || double.class.isAssignableFrom(type)) {
+                return (T) Double.valueOf(0.0);
+            } else if (Float.class.isAssignableFrom(type) || float.class.isAssignableFrom(type)) {
+                return (T) Float.valueOf(0.0f);
+            } else if (Boolean.class.isAssignableFrom(type) || boolean.class.isAssignableFrom(type)) {
+                return (T) Boolean.FALSE;
+            } else {
+                // 对于其他对象类型，返回一个新的Object实例
+                return (T) new Object();
+            }
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ResponseBodyConverter.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ResponseBodyConverter.java
@@ -3,6 +3,7 @@ package com.xscm.moduleutil.http;

 import com.blankj.utilcode.util.ToastUtils;
 import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.xscm.moduleutil.utils.GsonUtils;

@@ -25,21 +26,76 @@ public class ResponseBodyConverter<T> implements Converter<ResponseBody, T> {
    @Override
    public T convert(@NonNull ResponseBody value) throws IOException {
        String json = value.string();
-        BaseModel obj = GsonUtils.GsonToBean(json, BaseModel.class);
-        if (obj.getCode() != 1) {
-            String info = obj.getMsg();
-            if ("当前余额不足".equals(info)) {
-                value.close();
-                return adapter.fromJson(json);
-            } else {
-                if(!info.contains("更新失败")) {
+        try {
+            BaseModel obj = GsonUtils.GsonToBean(json, BaseModel.class);
+            if (obj.getCode() != 1) {
+                String info = obj.getMsg();
+                if ("当前余额不足".equals(info)) {
+                    value.close();
+                    return parseDataSafely(json);
+                } else {
+                    if (!info.contains("更新失败")) {
 //                    ToastUtils.showShort(info);
-                }
+                    }
 //                throw new APIException(obj.getCode(), info);
+                }
+            }
+            value.close();
+            return parseDataSafely(json);
+        } catch (Exception e) {
+            // 处理解析异常，避免崩溃
+            value.close();
+            try {
+                // 尝试返回默认值
+                return createDefaultInstance();
+            } catch (Exception ex) {
+                return null;
+            }
+        }
+    }
+    /**
+     * 安全地解析数据，处理各种可能的返回类型
+     */
+    private T parseDataSafely(String json) {
+        try {
+            return adapter.fromJson(json);
+        } catch (IOException | JsonParseException e) {
+            // 当解析失败时，尝试其他方式处理
+            try {
+                // 尝试返回默认值
+                return createDefaultInstance();
+            } catch (Exception ex) {
+                return null;
            }
        }
-        value.close();
-        return adapter.fromJson(json);
    }

+    /**
+     * 创建默认实例以避免null返回
+     */
+    @SuppressWarnings("unused")
+    private T createDefaultInstance() {
+        try {
+            // 对于基本类型和常见集合类型，返回默认值
+            Class<?> rawType = adapter.getClass();
+            if (rawType.isAssignableFrom(String.class)) {
+                return (T) "";
+            } else if (rawType.isAssignableFrom(Boolean.class) || rawType.isAssignableFrom(boolean.class)) {
+                return (T) Boolean.FALSE;
+            } else if (rawType.isAssignableFrom(Integer.class) || rawType.isAssignableFrom(int.class)) {
+                return (T) Integer.valueOf(0);
+            } else if (rawType.isAssignableFrom(Long.class) || rawType.isAssignableFrom(long.class)) {
+                return (T) Long.valueOf(0L);
+            } else if (rawType.isAssignableFrom(Double.class) || rawType.isAssignableFrom(double.class)) {
+                return (T) Double.valueOf(0.0);
+            } else if (rawType.isAssignableFrom(Float.class) || rawType.isAssignableFrom(float.class)) {
+                return (T) Float.valueOf(0.0f);
+            } else {
+                // 对于其他类型，返回null而不是抛出异常
+                return null;
+            }
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
@@ -9,6 +9,7 @@ import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.HeadlineBean;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.room.EMMessageInfo;
@@ -512,7 +513,15 @@ public class MessageListenerSingleton {
                @Override
                public void onTotalUnreadMessageCountChanged(long totalUnreadCount) {
                    super.onTotalUnreadMessageCountChanged(totalUnreadCount);
-                    EventBus.getDefault().post(new UnreadCountEvent(totalUnreadCount));
+
+                    UnreadCountEvent event = CommonAppContext.getInstance().getUnreadCountEvent();
+                    if (event== null){
+                        event = new UnreadCountEvent();
+                        event.setBLong(0);
+                    }
+                    event.setALong( totalUnreadCount);
+                    CommonAppContext.getInstance().setUnreadCountEvent(event);
+                    EventBus.getDefault().post(event);
                }
            };
        }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/service/MqttInitCallback.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/service/MqttInitCallback.java
@@ -85,9 +85,11 @@ public class MqttInitCallback implements MqttCallback {
                XLHBean xlhBean= GsonUtils.fromJson(message, XLHBean.class);
                if (xlhBean!=null && xlhBean.getRoom_id()!=null && SpUtil.getMyRoomId()!=null) {
                    if (xlhBean.getRoom_id().equals(SpUtil.getMyRoomId())) {
-                        MqttXlhEnd mqttXlhEnd = new MqttXlhEnd();
-                        mqttXlhEnd.setMessage(message);
-                        EventBus.getDefault().post(mqttXlhEnd);
+                        if (xlhBean.getFrom_type()==3) {
+                            MqttXlhEnd mqttXlhEnd = new MqttXlhEnd();
+                            mqttXlhEnd.setMessage(message);
+                            EventBus.getDefault().post(mqttXlhEnd);
+                        }
                    }
                }
                break;
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ARouteConstants.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ARouteConstants.java
@@ -21,9 +21,9 @@ public class ARouteConstants {
    public static final String CREATED_ROOM = "/modulevocal/CreatedRoomActivity"; //创建房间
    public static final String WITHDRAWAL_ACTIVITY = "/modulevocal/WithdrawalActivity"; //提现
    public static final String REAL_NAME_ACTIVITY ="/modulevocal/RealNameActivity"; //实名认证
-    public static final String REAL_NAME_ACTIVITY2 ="/app/RealNameActivity"; //实名认证
-    public static final String H5 ="/moduleutil/WebViewActivity"; //网页
-    public static final String GIFT_WALL ="/moduleroom/UserGiftWallFragment"; //实名认证
+    public static final String REAL_NAME_ACTIVITY2 ="/modulevocal/RealNameActivity"; //实名认证
+    public static final String H5 ="/moduleUtil/WebViewActivity"; //网页
+    //    public static final String GIFT_WALL ="/moduleroom/UserGiftWallFragment"; //实名认证
    public static final String RECHARGE_ACTIVITY ="/modulevocal/RechargeActivity"; //实名认证


--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ColorManager.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ColorManager.java
@@ -18,7 +18,7 @@ import java.util.Map;
 */
 public class ColorManager {
    private static ColorManager instance;
-    private String primaryColor = "#6C49E4"; // 默认主题色
+    private String primaryColor = "#FC7285"; // 默认主题色
    private String buttonColor = "#FFFFFF"; // 默认按钮色

    // 监听器列表，用于通知颜色变化
@@ -71,7 +71,7 @@ public class ColorManager {
        try {
            return Color.parseColor(primaryColor);
        } catch (Exception e) {
-            return Color.parseColor("#6C49E4"); // 默认颜色
+            return Color.parseColor("#FC7285"); // 默认颜色
        }
    }

--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
@@ -0,0 +1,41 @@
+package com.xscm.moduleutil.utils;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+
+public class CrashHandler implements Thread.UncaughtExceptionHandler {
+    private static CrashHandler instance;
+    private Thread.UncaughtExceptionHandler defaultHandler;
+
+    private CrashHandler(Context context) {
+        defaultHandler = Thread.getDefaultUncaughtExceptionHandler();
+    }
+
+    public static void init(Context context) {
+        if (instance == null) {
+            instance = new CrashHandler(context);
+            Thread.setDefaultUncaughtExceptionHandler(instance);
+        }
+    }
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+        // 记录崩溃日志
+        Log.e("CrashHandler", "未捕获异常: " + e.getMessage());
+        // 简单处理空指针
+        if (e instanceof NullPointerException) {
+            // 重启应用或跳转错误页
+            restartApp();
+        } else {
+            // 交给系统默认处理
+            defaultHandler.uncaughtException(t, e);
+        }
+    }
+
+    private void restartApp() {
+        // 实现应用重启逻辑
+        ARouter.getInstance().build(ARouteConstants.ME).navigation();
+    }
+}
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -2,18 +2,18 @@ package com.xscm.moduleutil.utils.config;

 public enum EnvironmentEnum {
    PRODUCTION(//生产环境
-            "http://md.xscmmidi.site/",
-            "yIZtKT0bz5hhD3wb30p+n5+qoasPj0XGza1qRuYXhtm9nFJdf1fA5B4tB6MjGRQNrCIAmlRMiiUP2DhjsDcih9Szx8HmZADuwCI0YTnva6kibqgbuYOtU2zeem3phkbZe27vbZ94aCWAZulloMeXuAFHd0jSaCBxNctKTYLjGQUGnDt/IDQr6mvLHSbb19X9vgQBa2gsTHjt3HYh2EY7dRJA020SPDe35hKf54v826Vgd34isc+BERQ7dwSH0NJ16OqFP181nlGRZvFFbuab3mweFyDOXQTpuN4NbixO5QQ=",
+            "https://my.qixing2.top/",
+            "a/0XMgDa0h3iljlYhvH/zqMLzGQk5YDjF6iEsJdb17mBTlB1+9be2hQmDheV7PkuB+adQu3mSI7ledn0hmfKqEXDhTsNbL7JZ98+xk0ln3QUNBD0JNViY6mC/utOH+xD/2D5xSnq0xe8odd09vuyifxUuMhluLFKf8Bta7Q6NPi4REOzBLjq5lrdXbiJYHoTl/nK6XSCYw8hQuKRyztkZyFnlHzPM7rA34S8X1RMfYDL6DiVpbwY1IP9Yl+pY7Gr+wY+aX8izzK8IW7wCzODRqI+B0auNFso69smj0ECVLc=",
            "https://oss-cn-beijing.aliyuncs.com/",
-            "LTAI5tKgrfcFQxH46ZwWYgFW",
-            "ZOjTqAJmUL563EKFKySrUwAHtx4hKt",
-            "midi01",
-            "https://midi01.oss-cn-beijing.aliyuncs.com/",
-            "wxef1289d8a89b41d4",
-            1600101474,
-            "a3f0f0c78307434fa1c697c3429fbdcf",
-            "tcp://81.70.45.221",
-            "https://md.xscmmidi.site/h5"),
+            "LTAI5tPBEux6EFkknyNbcDGK",
+            "3pPqhBsF6y6O3q4euKg7MUOvKK7CYZ",
+            "myyuliao",
+            "https://myyuliao.oss-cn-beijing.aliyuncs.com/",
+            "wx7e232c2dae5f2ea5",
+            1600106900,
+            "b48912a0b10d48f88be7ac5ee8675a6b",
+            "tcp://119.45.34.13",
+            "https://myh5.qixing2.top"),
    TEST(//测试环境
            "http://md.qxmier.com/",
            "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
@@ -22,11 +22,11 @@ public enum EnvironmentEnum {
            "DhpCS82gaigZljYqsWsUWUAZ20dREz",
            "qx-yusheng",
            "https://qx-yusheng.oss-cn-hangzhou.aliyuncs.com/",
-            "wxc7681513be9f926b",
-            1600101474,
-            "05b406b4541e413887d8d2bf9be8642c",
+            "wx7e232c2dae5f2ea5",
+            1600106900,
+            "b48912a0b10d48f88be7ac5ee8675a6b",
            "tcp://47.120.21.132",
-            "https://chatvespa.qxmier.com");
+            "https://myh5.qixing2.top");

    private final String serverUrl;
    private final String ALI_AUTH_KEY;//阿里云授权key
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
@@ -235,10 +235,10 @@ public class AvatarFrameView extends FrameLayout {
 //        }

        // 检查特效是否开启
-        if (SpUtil.getOpenEffect() != 1) {
-            clearQueue();
-            return;
-        }
+//        if (SpUtil.getOpenEffect() != 1) {
+//            clearQueue();
+//            return;
+//        }
        // 检查是否可以开始新的播放
 //        if (!playbackManager.canStartNewPlayback()) {
 //            Logger.d("AvatarFrameView", "Max concurrent playbacks reached, waiting...");
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
@@ -250,7 +250,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
                            if (!mIvRipple.isAnimating()) {
                                mIvRipple.startAnimation();
                            }
-//                            iv_on_line.setVisibility(GONE);
+                            iv_on_line.setVisibility(GONE);

                        });
                    }
@@ -270,7 +270,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
                        if (!mIvRipple.isAnimating()) {
                            mIvRipple.startAnimation();
                        }
-//                        iv_on_line.setVisibility(GONE);
+                        iv_on_line.setVisibility(GONE);

                    });
                }
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java
@@ -356,6 +356,7 @@ public class Constants {
    public static final String GET_APP_UPDATE = "/api/Version/get_app_version";//版本更新
    public static final String POST_CLEAR_USER_CHARM = "/api/Room/clear_user_charm";//清除魅力值
    public static final String POST_MESSAGE_LIST = "/api/UserMessage/get_user_message_list";//消息列表
+    public static final String POST_BIND_DETAIL = "/api/Bind/bind_detail";//绑定详情
    public static final String POST_USER_WALL = "/api/User/user_gift_wall";//礼物墙
    public static final String POST_USER_OLINE_STATUS = "/api/Room/user_online_status";//用户在线状态
    public static final String DELETE_ROOM_HISTORY = "/api/Room/delete_room_history";//删除历史足迹
@@ -380,13 +381,14 @@ public class Constants {
    public static final String GET_ALL_RECORD = "/api/BlindBoxTurntable/get_all_record";//获取全服抽奖记录
    public static final String GIFT_SEND = "/api/BlindBoxTurntable/gift_send";//礼物发放

-    public static final String GET_BOX_GIFT_LIST_XLH = "/api/BlindBoxTurntable/xlh";///巡乐会
-    public static final String POST_DRAW_GIFT_LIST_XLH = "/api/BlindBoxTurntable/xlh_draw_gift";///巡乐会抽奖
-    public static final String POST_XLH_ALL_RECORD = "/api/BlindBoxTurntable/get_xlh_all_record";///巡乐会榜单
-    public static final String GET_XLH_MY_RECORD = "/api/BlindBoxTurntable/get_xlh_my_record";///巡乐会记录
-    public static final String POST_GIFT_ALL_CLEAR = "/api/Room/room_gift_all_clear";///背包礼物全清
-    public static final String POST_ROOM_USER_CHARM_LIST = "/api/Room/room_user_charm_list";///房间用户当前魅力值列表
-    public static final String GET_GIFT_PACK_LIST_COUNT = "/api/UserGiftPack/get_gift_pack_list_count";///背包礼物总价值
+    public static final String GET_BOX_GIFT_LIST_XLH = "/api/BlindBoxTurntable/xlh";//巡乐会
+    public static final String POST_DRAW_GIFT_LIST_XLH = "/api/BlindBoxTurntable/xlh_draw_gift";//巡乐会抽奖
+    public static final String POST_XLH_ALL_RECORD = "/api/BlindBoxTurntable/get_xlh_all_record";//巡乐会榜单
+    public static final String GET_XLH_MY_RECORD = "/api/BlindBoxTurntable/get_xlh_my_record";//巡乐会记录
+    public static final String POST_GIFT_ALL_CLEAR = "/api/Room/room_gift_all_clear";//背包礼物全清
+    public static final String POST_ROOM_USER_CHARM_LIST = "/api/Room/room_user_charm_list";//房间用户当前魅力值列表
+    public static final String GET_GIFT_PACK_LIST_COUNT = "/api/UserGiftPack/get_gift_pack_list_count";//背包礼物总价值
+    public static final String ROOM_USER_RECONNECT = "/api/Room/user_reconnect";//用户重连



--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
梁小江	01f09a0895	Merge remote-tracking branch 'origin/master'	2025-10-10 09:11:47 +08:00
梁小江	d793c65471	1：修改房间activity 2：修改支付	2025-10-10 09:10:53 +08:00
梁小江	61cd9616b9	1：修改房间activity 2：修改支付	2025-10-10 09:10:42 +08:00
梁小江	c125f78353	将 .java 重命名为 .kt	2025-10-10 09:10:41 +08:00
yujiankang	4d58e96c43	1.测试	2025-09-26 01:35:55 +08:00
yujiankang	aa26d9f9f5	1.动态只留一个发现 2.去掉真爱榜 3.隐藏第三方登录 4.一键登录 5.登陆	2025-09-24 22:10:06 +08:00
yujiankang	a79e5268b5	Merge remote-tracking branch 'origin/master'	2025-09-24 19:25:35 +08:00
yujiankang	b82a991f40	1.登陆修改	2025-09-24 19:25:13 +08:00
梁小江	3de455c004	1:修改页面的图标 2：修改更换实名认证 3：隐藏关系卡 4：房间类型删除只保留点唱、男神、女神	2025-09-24 19:24:26 +08:00
梁小江	91c3eb5342	1:修改页面的图标	2025-09-24 17:19:18 +08:00
梁小江	b4eb142c86	1:修改页面的图标	2025-09-24 17:19:02 +08:00