diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 06f3368b..edd08c0c 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-13T12:53:07.787808500Z">
+        <DropdownSelection timestamp="2025-05-20T06:42:14.989297Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=6705124a" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=88Y4C19912006888" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index cb751264..9a0c7d8b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -30,7 +30,7 @@
       <option name="composableFile" value="true" />
     </inspection_tool>
     <inspection_tool class="JavadocDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ADDITIONAL_TAGS" value="data" />
+      <option name="ADDITIONAL_TAGS" value="data,description:" />
     </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
diff --git a/app/build.gradle b/app/build.gradle
index 449d38b2..3326ee1b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.qxcm.qxlive"
         minSdk 24
         targetSdk 35
-        versionCode 1
-        versionName "1.0"
+        versionCode Integer.parseInt(project.findProperty("APP_VERSION_CODE"))
+        versionName project.findProperty("APP_VERSION_NAME")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -57,6 +57,7 @@ android {
         }
 
         debug {
+            debuggable true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index be5eb1e9..10bc2b54 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -765,4 +765,25 @@ public static java.lang.String TABLENAME;
 -dontwarn **.R$*
 -keep class com.hln.game.grabmarbles.**{*;}
 
+-keep class com.alibaba.sdk.android.oss.** { *; }
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
 
+
+-keep class com.tencent.mm.opensdk.** {
+
+*;
+
+}
+
+-keep class com.tencent.wxop.** {
+
+*;
+
+}
+
+-keep class com.tencent.mm.sdk.** {
+
+*;
+
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f8aa8919..0b019e2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.qxcm.qxlive">
 
+    <!-- Features -->
     <!-- Features -->
     <uses-feature
         android:name="android.hardware.telephony"
@@ -11,12 +12,51 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <!-- Tools override -->
-    <uses-sdk xmlns:tools="http://schemas.android.com/tools"
-        tools:overrideLibrary="cn.sharesdk.onekeyshare" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission
+        android:name="android.permission.GET_ACCOUNTS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.CALL_PHONE"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.READ_LOGS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.READ_CALL_LOG"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.WRITE_CALL_LOG"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.READ_SMS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.SEND_SMS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.WRITE_SMS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.RECEIVE_SMS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.RECEIVE_WAP_PUSH"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.RECEIVE_MMS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.SEND_MMS"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.PROCESS_OUTGOING_CALLS"
+        tools:node="remove" />
 
-    <!-- Permissions -->
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.NETWORK_PROVIDER" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -25,41 +65,52 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+      />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REORDER_TASKS" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
+
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
+
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+    <queries>
+        <package android:name="com.tencent.mm" />
+    </queries>
 
     <application
         android:name="AppContext"
         android:allowBackup="true"
+        android:extractNativeLibs="true"
+        android:largeHeap="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
+        android:requestLegacyExternalStorage="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:theme"
-        tools:targetApi="31">
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31"
+        tools:ignore="SelectedPhotoAccess">
         <activity
             android:name=".LaunchPageActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -67,6 +118,8 @@
             android:screenOrientation="behind"
             android:launchMode="singleTop">
             <intent-filter>
+                <action android:name="com.example.action.LAUNCH_PAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -94,6 +147,14 @@
             android:launchMode="singleTop"
             android:screenOrientation="behind"
             android:theme="@style/authsdk_activity_dialog" />
+
+        <activity
+            android:name=".wxapi.WXEntryActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true"
+            android:taskAffinity="com.qxcm.qxlive"
+            android:launchMode="singleTask">
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 00000000..7dc078d7
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/qxcm/qxlive/AppContext.java b/app/src/main/java/com/qxcm/qxlive/AppContext.java
index 5746537e..b42fc8b0 100644
--- a/app/src/main/java/com/qxcm/qxlive/AppContext.java
+++ b/app/src/main/java/com/qxcm/qxlive/AppContext.java
@@ -1,13 +1,9 @@
 package com.qxcm.qxlive;
 
-import android.text.TextUtils;
-
-import com.hjq.toast.IToastInterceptor;
 import com.hjq.toast.ToastUtils;
 import com.qxcm.moduleutil.utils.config.EnvironmentEnum;
 import com.qxcm.moduleutil.utils.config.EnvironmentPrefs;
-import com.qxcm.moduleutil.widget.CommonAppConfig;
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
 
 
 /**
@@ -17,7 +13,6 @@ import com.qxcm.moduleutil.widget.CommonAppContext;
 public class AppContext extends CommonAppContext {
 
     private boolean mBeautyInited;
-    private EnvironmentEnum currentEnvironment;
 
     @Override
     public void onCreate() {
@@ -30,11 +25,6 @@ public class AppContext extends CommonAppContext {
 //            }
 //        });
 //        L.setDeBug(BuildConfig.DEBUG);
-        EnvironmentPrefs prefs = new EnvironmentPrefs(this);
-        currentEnvironment = prefs.getSelectedEnvironment();
-    }
-    public EnvironmentEnum getCurrentEnvironment() {
-        return currentEnvironment;
     }
     public static void initSdk() {
         CommonAppContext context = CommonAppContext.getInstance();
diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchContacter.java b/app/src/main/java/com/qxcm/qxlive/LaunchContacter.java
index d548a9f8..15e69b3a 100644
--- a/app/src/main/java/com/qxcm/qxlive/LaunchContacter.java
+++ b/app/src/main/java/com/qxcm/qxlive/LaunchContacter.java
@@ -13,6 +13,6 @@ public final class LaunchContacter {
 
     public interface ILoginPre extends IPresenter {
 
-
+        void oauthLogin(String login_token);
     }
 }
diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
index 3d375fde..df15e9f9 100644
--- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
@@ -4,6 +4,7 @@ package com.qxcm.qxlive;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -19,21 +20,24 @@ import com.mobile.auth.gatewayauth.PreLoginResultListener;
 import com.mobile.auth.gatewayauth.ResultCode;
 import com.mobile.auth.gatewayauth.TokenResultListener;
 import com.mobile.auth.gatewayauth.model.TokenRet;
+import com.qxcm.modulelogin.activity.ImproveInfoActivity;
 import com.qxcm.modulelogin.activity.LoginActivity;
 import com.qxcm.modulelogin.activity.PasswordLoginActivity;
 import com.qxcm.modulemain.activity.MainActivity;
 import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.dialog.PolicyDialog;
 import com.qxcm.moduleutil.utils.SpUtil;
 import com.qxcm.moduleutil.utils.logger.Logger;
 import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding;
 
-public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, ActivityLaunchPageBinding> implements LaunchContacter.View{
+public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, ActivityLaunchPageBinding> implements LaunchContacter.View {
     private Handler handler;
     public PhoneNumberAuthHelper phoneNumberAuthHelper;
     private TokenResultListener tokenResultListener;
     private boolean canOnePass;
-    private boolean isCanOnePass=false;
+    private boolean isCanOnePass = true;
 
     @Override
     protected void initData() {
@@ -51,8 +55,8 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
 //            BaseApplication.getInstance().checkInEmulator();
 //            BaseApplication.getInstance().initHeartBeat();
 //            //延迟1.5秒执行
-//            handler.postDelayed(runnable, 100);
-            initLogin();
+            handler.postDelayed(runnable, 100);
+//            initLogin();
         } else {
             PolicyDialog policyDialog = new PolicyDialog(this);
             policyDialog.setCancelable(false);
@@ -82,12 +86,8 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
 
     private void initLogin() {
 
-        if (isCanOnePass){
-            initQuickLogin();
-            checkOnePass();
-        }else {
-            startActivity(new Intent(this, MainActivity.class));
-        }
+        initQuickLogin();
+        checkOnePass();
     }
 
     private void checkOnePass() {
@@ -116,6 +116,7 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
             isRoot();
         }
     }
+
     private void isRoot() {
         runOnUiThread(new Runnable() {
             @Override
@@ -156,18 +157,20 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
             }
         } else {
             Logger.e("SplashEnd", "ARouters.MAIN");
-//            UserBean userBean = MyApplication.getInstance().getUser();
-//            if (userBean.getSex() == 0) {
-//                Intent intent = new Intent(this, ImproveInfoActivity.class);
-//                intent.putExtra("nickname", String.format("用户%s", userBean.getUser_code()));
-//                intent.putExtra("user_no_parent", userBean.getUser_no_parent());
-//                startActivity(intent);
-//            } else {
-//                startActivity(new Intent(this, MainActivity.class));
-//            }
+            UserBean userBean = CommonAppContext.getInstance().getUser();
+            if (userBean.getSex() == 0) {
+                Intent intent = new Intent(this, ImproveInfoActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putSerializable("userBean", userBean);
+                intent.putExtras(bundle);
+                startActivity(intent);
+            } else {
+                startActivity(new Intent(this, MainActivity.class));
+            }
             finish();
         }
     }
+
     private void doOnePass() {
         AuthUIConfig authUIConfig = new AuthUIConfig.Builder()
                 //导航栏
@@ -237,6 +240,7 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
         phoneNumberAuthHelper.setAuthUIConfig(authUIConfig);
         phoneNumberAuthHelper.getLoginToken(getApplicationContext(), 5000);
     }
+
     private void initQuickLogin() {
         tokenResultListener = new TokenResultListener() {
             @Override
@@ -252,7 +256,8 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
                                 phoneNumberAuthHelper.hideLoginLoading();
                                 //获取成功 dimiss就去登录、登录成功
                                 phoneNumberAuthHelper.quitLoginPage();
-//                                MvpPre.oauthLogin(null, tokenRet.getToken(), 4);
+                                LogUtils.e("@@@",tokenRet.getToken());
+                                MvpPre.oauthLogin(tokenRet.getToken());
                             }
                         } catch (Exception e) {
                             go2Login();
@@ -277,20 +282,22 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
         };
 
         try {
-            phoneNumberAuthHelper = PhoneNumberAuthHelper.getInstance(getApplicationContext(),tokenResultListener);
+            phoneNumberAuthHelper = PhoneNumberAuthHelper.getInstance(getApplicationContext(), null);
             phoneNumberAuthHelper.getReporter().setLoggerEnable(true);
-            LogUtils.e("initAuthSDK", ((AppContext) getApplication()).getCurrentEnvironment().getALI_AUTH_KEY());
-            phoneNumberAuthHelper.setAuthSDKInfo("6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=");
+//            phoneNumberAuthHelper.setAuthSDKInfo("6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=");
+            phoneNumberAuthHelper.setAuthSDKInfo(((AppContext) getApplication()).getCurrentEnvironment().getALI_AUTH_KEY());
             phoneNumberAuthHelper.checkEnvAvailable(2);
 
         } catch (Throwable ignored) {
             Logger.e("initAuthSDK", ignored);
         }
     }
+
     private void go2Login() {
         startActivity(new Intent(this, PasswordLoginActivity.class));
         finish();
     }
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_launch_page;
@@ -298,7 +305,7 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
 
     @Override
     protected LaunchPresenter bindPresenter() {
-        return new LaunchPresenter( this,this);
+        return new LaunchPresenter(this, this);
     }
 
 
diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java b/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java
index 33b73b86..9384af87 100644
--- a/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java
+++ b/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java
@@ -1,13 +1,83 @@
 package com.qxcm.qxlive;
 
 import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
 
+import com.blankj.utilcode.util.ToastUtils;
+import com.qxcm.modulelogin.activity.ImproveInfoActivity;
+import com.qxcm.modulelogin.activity.SwitchAccountsActivity;
+import com.qxcm.modulemain.activity.MainActivity;
 import com.qxcm.moduleutil.activity.IPresenter;
-import com.qxcm.qxlive.presenter.BasePresenter;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.http.BaseObserver;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
 
 public class LaunchPresenter extends BasePresenter<LaunchContacter.View> implements LaunchContacter.ILoginPre {
 
     public LaunchPresenter(LaunchContacter.View view, Context context) {
         super(view, context);
     }
+
+    @Override
+    public void oauthLogin(String login_token) {
+        api.oauthLogin(login_token, new BaseObserver<List<UserBean>>() {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(List<UserBean> userBeans) {
+                loginSuccess(userBeans);
+            }
+        });
+    }
+
+    public void loginSuccess(List<UserBean> userBean) {
+        if (userBean==null) {
+            ToastUtils.showShort("登录失败请重试");
+            return;
+        }
+        if (userBean.size()==1) {
+
+            CommonAppContext.getInstance().setUser(userBean.get(0));
+
+//        PreferencesUtils.putString(  CommonAppContext.getInstance(), "mobile", userBean.get());
+
+            if (isViewAttach()) {
+//            MvpRef.get().disLoadings();
+            }
+            if (userBean.get(0).getSex() == 0) {
+                try {
+                    Intent intent = new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), ImproveInfoActivity.class);
+
+                    Bundle bundle = new Bundle();
+                    bundle.putSerializable("userBean", userBean.get(0));
+                    intent.putExtras(bundle);
+                    com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                com.blankj.utilcode.util.ActivityUtils.startActivity(MainActivity.class);
+            }
+        }else {
+            Intent intent=new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), SwitchAccountsActivity.class);
+            Bundle bundle=new Bundle();
+            bundle.putSerializable("userBean", userBean.get(0));
+            intent.putExtras(bundle);
+            com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
+
+        }
+//        EventBus.getDefault().post(new LoginFinishEvent());
+//        EventBus.getDefault().post(new SplashFinishEvent());
+//        AppLog.setUserUniqueID(userBean.getUser_id()); // 设置您自己的账号体系ID, 并保证其唯一性 ！
+    }
 }
diff --git a/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java b/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java
new file mode 100644
index 00000000..34fdcb11
--- /dev/null
+++ b/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java
@@ -0,0 +1,233 @@
+package com.qxcm.qxlive.wxapi;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.tencent.mm.opensdk.modelbase.BaseReq;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+
+import org.greenrobot.eventbus.EventBus;
+
+public class WXEntryActivity extends Activity implements IWXAPIEventHandler{
+//	private static String TAG = "MicroMsg.WXEntryActivity";
+//
+//	private IWXAPI api;
+//	private MyHandler handler;
+//
+//	private static class MyHandler extends Handler {
+//		private final WeakReference<WXEntryActivity> wxEntryActivityWeakReference;
+//
+//		public MyHandler(WXEntryActivity wxEntryActivity){
+//			wxEntryActivityWeakReference = new WeakReference<WXEntryActivity>(wxEntryActivity);
+//		}
+//
+//		@Override
+//		public void handleMessage(Message msg) {
+//			int tag = msg.what;
+//			switch (tag) {
+//				case 0: {
+//					Bundle data = msg.getData();
+//					JSONObject json = null;
+//					try {
+//						json = new JSONObject(data.getString("result"));
+//						String openId, accessToken, refreshToken, scope;
+//						openId = json.getString("openid");
+//						accessToken = json.getString("access_token");
+//						refreshToken = json.getString("refresh_token");
+//						scope = json.getString("scope");
+////						Intent intent = new Intent(wxEntryActivityWeakReference.get(), SendToWXActivity.class);
+////						intent.putExtra("openId", openId);
+////						intent.putExtra("accessToken", accessToken);
+////						intent.putExtra("refreshToken", refreshToken);
+////						intent.putExtra("scope", scope);
+////						wxEntryActivityWeakReference.get().startActivity(intent);
+//					} catch (JSONException e) {
+//						Log.e(TAG, e.getMessage());
+//					}
+//				}
+//			}
+//		}
+//	}
+//
+//	@Override
+//	public void onCreate(Bundle savedInstanceState) {
+//		super.onCreate(savedInstanceState);
+//
+//		api = WXAPIFactory.createWXAPI(this, CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(), false);
+//		handler = new MyHandler(this);
+//
+//		try {
+//			Intent intent = getIntent();
+//			api.handleIntent(intent, this);
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//	}
+//
+//	@Override
+//	protected void onNewIntent(Intent intent) {
+//		super.onNewIntent(intent);
+//
+//		setIntent(intent);
+//		api.handleIntent(intent, this);
+//	}
+//
+//	@Override
+//	public void onReq(BaseReq req) {
+//		switch (req.getType()) {
+//			case ConstantsAPI.COMMAND_GETMESSAGE_FROM_WX:
+////				goToGetMsg();
+//				break;
+//			case ConstantsAPI.COMMAND_SHOWMESSAGE_FROM_WX:
+////				goToShowMsg((ShowMessageFromWX.Req) req);
+//				break;
+//			default:
+//				break;
+//		}
+//		finish();
+//	}
+//
+//	@Override
+//	public void onResp(BaseResp resp) {
+//		int result = 0;
+//
+//		switch (resp.errCode) {
+//			case BaseResp.ErrCode.ERR_OK:
+////				result = com.qxcm.moduleutil.R.string.errcode_success;
+//				break;
+//			case BaseResp.ErrCode.ERR_USER_CANCEL:
+////				result = R.string.errcode_cancel;
+//				break;
+//			case BaseResp.ErrCode.ERR_AUTH_DENIED:
+////				result = R.string.errcode_deny;
+//				break;
+//			case BaseResp.ErrCode.ERR_UNSUPPORT:
+////				result = R.string.errcode_unsupported;
+//				break;
+//			default:
+////				result = R.string.errcode_unknown;
+//				break;
+//		}
+//
+//		Toast.makeText(this, getString(result) + ", type=" + resp.getType(), Toast.LENGTH_SHORT).show();
+//
+//
+//		if (resp.getType() == ConstantsAPI.COMMAND_SUBSCRIBE_MESSAGE) {
+//			SubscribeMessage.Resp subscribeMsgResp = (SubscribeMessage.Resp) resp;
+//			String text = String.format("openid=%s\ntemplate_id=%s\nscene=%d\naction=%s\nreserved=%s",
+//					subscribeMsgResp.openId, subscribeMsgResp.templateID, subscribeMsgResp.scene, subscribeMsgResp.action, subscribeMsgResp.reserved);
+//
+//			Toast.makeText(this, text, Toast.LENGTH_LONG).show();
+//		}
+//
+//		if (resp.getType() == ConstantsAPI.COMMAND_LAUNCH_WX_MINIPROGRAM) {
+//			WXLaunchMiniProgram.Resp launchMiniProgramResp = (WXLaunchMiniProgram.Resp) resp;
+//			String text = String.format("openid=%s\nextMsg=%s\nerrStr=%s",
+//					launchMiniProgramResp.openId, launchMiniProgramResp.extMsg,launchMiniProgramResp.errStr);
+//
+//			Toast.makeText(this, text, Toast.LENGTH_LONG).show();
+//		}
+//
+//		if (resp.getType() == ConstantsAPI.COMMAND_OPEN_BUSINESS_VIEW) {
+//			WXOpenBusinessView.Resp launchMiniProgramResp = (WXOpenBusinessView.Resp) resp;
+//			String text = String.format("openid=%s\nextMsg=%s\nerrStr=%s\nbusinessType=%s",
+//					launchMiniProgramResp.openId, launchMiniProgramResp.extMsg,launchMiniProgramResp.errStr,launchMiniProgramResp.businessType);
+//
+//			Toast.makeText(this, text, Toast.LENGTH_LONG).show();
+//		}
+//
+//		if (resp.getType() == ConstantsAPI.COMMAND_OPEN_BUSINESS_WEBVIEW) {
+//			WXOpenBusinessWebview.Resp response = (WXOpenBusinessWebview.Resp) resp;
+//			String text = String.format("businessType=%d\nresultInfo=%s\nret=%d",response.businessType,response.resultInfo,response.errCode);
+//
+//			Toast.makeText(this, text, Toast.LENGTH_LONG).show();
+//		}
+//
+//		if (resp.getType() == ConstantsAPI.COMMAND_SENDAUTH) {
+//			SendAuth.Resp authResp = (SendAuth.Resp)resp;
+//			final String code = authResp.code;
+////			NetworkUtil.sendWxAPI(handler, String.format("https://api.weixin.qq.com/sns/oauth2/access_token?" +
+////							"appid=%s&secret=%s&code=%s&grant_type=authorization_code", "wxd930ea5d5a258f4f",
+////					"1d6d1d57a3dd063b36d917bc0b44d964", code), NetworkUtil.GET_TOKEN);
+//		}
+//		finish();
+//	}
+//
+////	private void goToGetMsg() {
+////		Intent intent = new Intent(this, GetFromWXActivity.class);
+////		intent.putExtras(getIntent());
+////		startActivity(intent);
+////		finish();
+////	}
+////
+////	private void goToShowMsg(ShowMessageFromWX.Req showReq) {
+////		WXMediaMessage wxMsg = showReq.message;
+////		WXAppExtendObject obj = (WXAppExtendObject) wxMsg.mediaObject;
+////
+////		StringBuffer msg = new StringBuffer();
+////		msg.append("description: ");
+////		msg.append(wxMsg.description);
+////		msg.append("\n");
+////		msg.append("extInfo: ");
+////		msg.append(obj.extInfo);
+////		msg.append("\n");
+////		msg.append("filePath: ");
+////		msg.append(obj.filePath);
+////
+////		Intent intent = new Intent(this, ShowFromWXActivity.class);
+////		intent.putExtra(Constants.ShowMsgActivity.STitle, wxMsg.title);
+////		intent.putExtra(Constants.ShowMsgActivity.SMessage, msg.toString());
+////		intent.putExtra(Constants.ShowMsgActivity.BAThumbData, wxMsg.thumbData);
+////		startActivity(intent);
+////		finish();
+////	}
+
+
+	private final String TAG = this.getClass().getSimpleName();
+	public static final String APP_ID = CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId();
+	public static final String APP_SECRET = "请自己填写";
+	private IWXAPI mApi;
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		mApi = WXAPIFactory.createWXAPI(this, APP_ID, true);
+		mApi.handleIntent(this.getIntent(), this);
+	}
+
+	//微信发送的请求将回调到onReq方法
+	@Override
+	public void onReq(BaseReq baseReq) {
+	}
+
+	//发送到微信请求的响应结果
+	@Override
+	public void onResp(BaseResp resp) {
+		switch (resp.errCode) {
+			case BaseResp.ErrCode.ERR_OK:
+				//发送成功
+				ToastUtils.showShort("发送成功",resp.transaction);
+				EventBus.getDefault().post(resp);
+				break;
+			case BaseResp.ErrCode.ERR_USER_CANCEL:
+				//发送取消
+				ToastUtils.showShort("发送取消",resp);
+				break;
+			case BaseResp.ErrCode.ERR_AUTH_DENIED:
+				ToastUtils.showShort("发送被拒绝",resp);
+				//发送被拒绝
+				break;
+			default:
+				//发送返回
+				break;
+		}
+		finish();
+
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6f3b755b..036d09bc 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6f3b755b..036d09bc 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
index c209e78e..3e2c62ae 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..5aa3b17c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index b2dfe3d1..801186c5 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
index 4f0f1d64..1775922c 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..6fc8b7dc
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index 62b611da..fe10b2c8 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 948a3070..4bd90eb0 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..d9ca21a2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index 1b9a6956..90287988 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 28d4b77f..6f9198bf 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..761883fa
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index 9287f508..b0c8ac20 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index aa7d6427..e4ae93b7 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..a4640838
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index 9126ae37..73592cf6 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/values-en-rUs/strings.xml b/app/src/main/res/values-en-rUs/strings.xml
index 7fde2d52..ec3d88e6 100644
--- a/app/src/main/res/values-en-rUs/strings.xml
+++ b/app/src/main/res/values-en-rUs/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Vespa</string>
+
     <string name="recommend_skip">Skip</string>
     <string name="a_067">Click to jump to third-party applications</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..c5d5899f
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3311453c..b26f9828 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name" translatable="false">羽声</string>
+
     <string name="recommend_skip">跳过</string>
     <string name="a_067">点击跳转第三方应用</string>
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 8e54bbd0..16ade3a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,3 +29,7 @@ org.gradle.parallel=false
 org.gradle.deamon=false
 android.injected.testOnly=false
 
+APP_VERSION_NAME=1.0.0
+APP_VERSION_CODE=1
+
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5146866c..9c0e8606 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,11 @@
 [versions]
 agp = "8.8.0"
+alipayAlipaysdkAndroid = "15.8.33"
 comJacktuotuoCustomviewVerificationcodeview2 = "1.0.5"
+custompopwindow = "2.1.1"
 databindingRuntimeVersion = "7.0.2"
+easypermissions = "3.0.0"
+easyProtectorRelease = "1.1.2"
 flexboxVersion = "1.0.0"
 githubBannerviewpagerVersion = "3.5.12"
 githubGlide = "4.12.0"
@@ -11,6 +15,7 @@ junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 appcompat = "1.6.1"
+lombok = "1.18.32"
 marqueeview = "1.1.0"
 material = "1.10.0"
 activity = "1.8.0"
@@ -28,6 +33,8 @@ eventbusVersion = "3.3.1"
 logger = "2.2.0"
 loggingInterceptorVersion = "3.10.0"
 multidex = "2.0.1"
+ossAndroidSdkVersion = "2.9.21"
+persistentcookiejar = "v1.0.1"
 picture_libraryVersion = "v2.6.0"
 reactivexRxjava = "2.2.21"
 retrofit2KotlinCoroutinesAdapterVersion = "0.9.2"
@@ -48,13 +55,20 @@ kotlinVersion = "1.9.24"
 coreKtx = "1.10.1"
 lifecycleLivedataKtx = "2.6.1"
 lifecycleViewmodelKtx = "2.6.1"
+wechatSdkAndroid = "6.8.30"
+xbanner = "1.7.0"
 
 [libraries]
+alipay-alipaysdk-android = { module = "com.alipay.sdk:alipaysdk-android", version.ref = "alipayAlipaysdkAndroid" }
 android-flexbox = { module = "com.google.android:flexbox", version.ref = "flexboxVersion" }
 com-github-bumptech-glide-glide = { module = "com.github.bumptech.glide:glide", version.ref = "githubGlide" }
 com-github-zhpanvip-bannerviewpager = { module = "com.github.zhpanvip:bannerviewpager", version.ref = "githubBannerviewpagerVersion" }
 com-jacktuotuo-customview-verificationcodeview3 = { module = "com.jacktuotuo.customview:verificationcodeview", version.ref = "comJacktuotuoCustomviewVerificationcodeview2" }
+custompopwindow = { module = "com.github.pinguo-zhouwei:CustomPopwindow", version.ref = "custompopwindow" }
 databinding-runtime-v702 = { module = "androidx.databinding:databinding-runtime", version.ref = "databindingRuntimeVersion" }
+dpa-oss-android-sdk = { module = "com.aliyun.dpa:oss-android-sdk", version.ref = "ossAndroidSdkVersion" }
+easy-protector-release = { module = "com.lahm.library:easy-protector-release", version.ref = "easyProtectorRelease" }
+easypermissions = { module = "pub.devrel:easypermissions", version.ref = "easypermissions" }
 github-photoview = { module = "com.github.chrisbanes:PhotoView", version.ref = "githubPhotoview" }
 github-shadowlayout = { module = "com.github.lihangleo2:ShadowLayout", version.ref = "githubShadowlayout" }
 glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "githubGlide" }
@@ -62,6 +76,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 marqueeview = { module = "com.sunfusheng:marqueeview", version.ref = "marqueeview" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
@@ -82,6 +97,7 @@ google-gson = { module = "com.google.code.gson:gson", version.ref = "gsonVersion
 logger = { module = "com.orhanobut:logger", version.ref = "logger" }
 multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
 okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptorVersion" }
+persistentcookiejar = { module = "com.github.franmontiel:PersistentCookieJar", version.ref = "persistentcookiejar" }
 pictureselector-picture_library = { module = "com.github.LuckSiege.PictureSelector:picture_library", version.ref = "picture_libraryVersion" }
 reactivex-rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "reactivexRxjava" }
 roundedimageview = { module = "com.makeramen:roundedimageview", version.ref = "roundedimageview" }
@@ -105,6 +121,8 @@ material3 = { group = "androidx.compose.material3", name = "material3" }
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
 lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
+wechat-sdk-android = { module = "com.tencent.mm.opensdk:wechat-sdk-android", version.ref = "wechatSdkAndroid" }
+xbanner = { module = "com.github.xiaohaibin:XBanner", version.ref = "xbanner" }
 
 
 [plugins]
diff --git a/moduleLogin/build.gradle b/moduleLogin/build.gradle
index 8ed8acf9..924f25cf 100644
--- a/moduleLogin/build.gradle
+++ b/moduleLogin/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     implementation libs.activity
     implementation libs.constraintlayout
     implementation project(':modulemain')
+    implementation project(':modulevocal')
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
diff --git a/moduleLogin/src/main/AndroidManifest.xml b/moduleLogin/src/main/AndroidManifest.xml
index 69cfd2c8..2f97632b 100644
--- a/moduleLogin/src/main/AndroidManifest.xml
+++ b/moduleLogin/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        >
+    <application android:allowBackup="true">
+        <activity
+            android:name=".activity.SwitchAccountsActivity"
+            android:exported="true" />
         <activity
             android:name=".activity.ImproveInfoActivity"
             android:exported="true" />
@@ -17,6 +17,7 @@
             android:name=".activity.LoginActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ForgetPasswordActivity.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ForgetPasswordActivity.java
index 3d02ade4..5d425d04 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ForgetPasswordActivity.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ForgetPasswordActivity.java
@@ -15,6 +15,7 @@ import com.qxcm.modulelogin.databinding.ActivityLoginBinding;
 import com.qxcm.modulelogin.present.LoginContacter;
 import com.qxcm.modulelogin.present.LoginPresenter;
 import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserBean;
 
 public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, ActivityForgetPasswordBinding> implements LoginContacter.View, View.OnClickListener {
 
@@ -35,8 +36,19 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
 
     }
 
+
     @Override
-    public void sendCodeSuccess(String phoneNumber) {
+    public void sendCodeSuccess1(String phoneNumber) {
+
+    }
+
+    @Override
+    public void loginSuccess(UserBean userBean) {
+
+    }
+
+    @Override
+    public void authorizationSuccess(String s) {
 
     }
 
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ImproveInfoActivity.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ImproveInfoActivity.java
index 0d79df2f..89afa69f 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ImproveInfoActivity.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/ImproveInfoActivity.java
@@ -1,6 +1,7 @@
 package com.qxcm.modulelogin.activity;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 
@@ -18,11 +19,14 @@ import com.qxcm.modulelogin.present.ImproveInfoContacts;
 import com.qxcm.modulelogin.present.ImproveInfoPresenter;
 import com.qxcm.modulemain.activity.MainActivity;
 import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.bean.UserPictrue;
 import com.qxcm.moduleutil.utils.DateSelectDialog;
 import com.qxcm.moduleutil.utils.GlideEngine;
 import com.qxcm.moduleutil.utils.ImageLoader;
+import com.qxcm.moduleutil.utils.ImageUtils;
 import com.qxcm.moduleutil.utils.MyPictureParameterStyle;
+import com.qxcm.moduleutil.utils.SpUtil;
 import com.qxcm.moduleutil.widget.Constants;
 
 
@@ -43,6 +47,7 @@ public class ImproveInfoActivity extends BaseMvpActivity<ImproveInfoPresenter, A
     private boolean isBoySelected = false;
     private DateSelectDialog mDateSelectDialog;
     private boolean isFirst = false;
+    UserBean userBean;
 
     HashMap<String, String> map = new HashMap<>();
 
@@ -54,8 +59,16 @@ public class ImproveInfoActivity extends BaseMvpActivity<ImproveInfoPresenter, A
     @Override
     protected void initView() {
         super.initView();
-        mBinding.edNickName.setText(nickname);
+        Bundle extras = getIntent().getExtras();
+        userBean= extras != null ? (UserBean) extras.getSerializable("userBean") : null;
+        assert userBean != null;
+        if (userBean.getNickname().isEmpty()){
+            MvpPre.updateNickname();
+        }else {
+            mBinding.edNickName.setText(userBean.getNickname());
+        }
         mBinding.edNickName.setClearIconVisible(true);
+        ImageUtils.loadHeadCC(userBean.getAvatar(), mBinding.rvUserHead);
         if (!TextUtils.isEmpty(user_no_parent) && !"0".equals(user_no_parent)) {
             mBinding.etInviteCode.setText(user_no_parent);
             mBinding.etInviteCode.setKeyListener(null);
@@ -234,13 +247,16 @@ public class ImproveInfoActivity extends BaseMvpActivity<ImproveInfoPresenter, A
 
     @Override
     public void upLoadSuccess(String url, int type) {
-        MvpPre.updateAvatar(url);
+//        MvpPre.updateAvatar(url);
+        ImageUtils.loadHeadCC(url, mBinding.rvUserHead);
+        map.put("avatar", url);
+        isFirst = true;
     }
 
     @Override
     public void updateAvatarSuccess(String headPicture) {
         ImageLoader.loadHead(this, mBinding.rvUserHead, headPicture);
-        map.put("head_picture", headPicture);
+        map.put("avatar", headPicture);
         isFirst = true;
     }
 
@@ -251,14 +267,15 @@ public class ImproveInfoActivity extends BaseMvpActivity<ImproveInfoPresenter, A
     }
 
     @Override
-    public void updateSexTrue(UserPictrue sex) {
-        ImageLoader.loadHead(this, mBinding.rvUserHead,sex.getDefaultAvatar());
-        map.put("head_picture", sex.getDefaultAvatar());
+    public void updateSexTrue(String sex) {
+        ImageLoader.loadHead(this, mBinding.rvUserHead,sex);
+        map.put("avatar", sex);
 
     }
 
     @Override
-    public void updateSuccess() {
+    public void updateSuccess(UserBean userBean) {
+        SpUtil.saveUserInfo(userBean);
         Intent intent = new Intent(this, MainActivity.class);
         startActivity(intent);
         finish();
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/LoginActivity.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/LoginActivity.java
index 7a2a3177..251f3c0e 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/LoginActivity.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/LoginActivity.java
@@ -1,8 +1,11 @@
 package com.qxcm.modulelogin.activity;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -12,6 +15,11 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import com.alipay.sdk.app.AlipayApi;
+import com.alipay.sdk.app.AlipayResultActivity;
+import com.alipay.sdk.app.AuthTask;
+import com.blankj.utilcode.util.GsonUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.qxcm.modulelogin.R;
 import com.qxcm.modulelogin.databinding.ActivityLoginBinding;
@@ -20,19 +28,28 @@ import com.qxcm.modulelogin.present.LoginContacter;
 import com.qxcm.modulelogin.present.LoginPresenter;
 import com.qxcm.modulemain.activity.MainActivity;
 import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.utils.BarUtils;
-import com.qxcm.moduleutil.utils.LanguageUtil;
 import com.qxcm.moduleutil.utils.PreferencesUtils;
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.tencent.mm.opensdk.constants.ConstantsAPI;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
- *@author
- *@data
- *@description: 密码登录
+ * @author
+ * @data
+ * @description: 密码登录
  */
 public class LoginActivity extends BaseMvpActivity<LoginPresenter, ActivityLoginBinding> implements LoginContacter.View, View.OnClickListener {
 
@@ -168,11 +185,24 @@ public class LoginActivity extends BaseMvpActivity<LoginPresenter, ActivityLogin
         disLoading();
     }
 
+
     @Override
-    public void sendCodeSuccess(String phoneNumber) {
-//        ARouter.getInstance().build(ARouters.INPUT_CODE).withString("mobile", phoneNumber).navigation();
+    public void sendCodeSuccess1(String phoneNumber) {
+
     }
+
+    @Override
+    public void loginSuccess(UserBean userBean) {
+
+    }
+
+    @Override
+    public void authorizationSuccess(String s) {
+        zfbLogin(s);
+    }
+
     boolean isPasswordVisible = false;
+
     @Override
     public void onClick(View view) {
         int id = view.getId();
@@ -196,22 +226,24 @@ public class LoginActivity extends BaseMvpActivity<LoginPresenter, ActivityLogin
                 ToastUtils.showShort("请输入登录密码");
                 return;
             }
-//            MvpPre.login(phoneNumber, password, "", 1);
-            Intent intent = new Intent(this, MainActivity.class);
-            startActivity(intent);
-            finish();
+            MvpPre.login(phoneNumber, password, "", 2);
+//            Intent intent = new Intent(this, MainActivity.class);
+//            startActivity(intent);
+//            finish();
         } else if (id == R.id.iv_zfb) {
             if (!mBinding.cbPrivacy.isChecked()) {
                 com.hjq.toast.ToastUtils.show("请先勾选服务条款");
                 return;
             }
-            MvpPre.authorization();
+            MvpPre.authorization("zfb");
+//            zfbLogin();
         } else if (id == R.id.iv_weixin) {
+
             if (!mBinding.cbPrivacy.isChecked()) {
                 com.hjq.toast.ToastUtils.show("请先勾选服务条款");
                 return;
             }
-            MvpPre.authorization();
+            wcLogin();
         } else if (id == R.id.tv_yhxy) {
             MvpPre.ysxl();
         } else if (id == R.id.tv_ysxy) {
@@ -226,12 +258,71 @@ public class LoginActivity extends BaseMvpActivity<LoginPresenter, ActivityLogin
                 mBinding.edPassword.setTransformationMethod(PasswordTransformationMethod.getInstance());
                 mBinding.ivEye.setImageResource(com.qxcm.moduleutil.R.mipmap.eye_close); // 设置按钮文本为显示密码
             }
-            mBinding.edPassword.setSelection( mBinding.edPassword.getText().length()); // 将光标移动到文字末尾
+            mBinding.edPassword.setSelection(mBinding.edPassword.getText().length()); // 将光标移动到文字末尾
             isPasswordVisible = !isPasswordVisible; // 切换状态
-        }else if (id == R.id.tv_forget_password) {
+        } else if (id == R.id.tv_forget_password) {
             Intent intent = new Intent(this, ForgetPasswordActivity.class);
             startActivity(intent);
         }
     }
 
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+    private void wcLogin() {
+        //发起登陆请求前先注册微信api
+        IWXAPI api = WXAPIFactory.createWXAPI(this, CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(), true);
+        api.registerApp(CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId());
+        if (!api.isWXAppInstalled()) {
+            //todo 提醒未安装微信
+            ToastUtils.showShort("请安装微信客户端");
+            return;
+        }
+        //开始发起登陆请求
+        final SendAuth.Req req = new SendAuth.Req();
+        req.scope = "snsapi_userinfo";
+        req.state = "wechat_sdk_demo_test";
+        api.sendReq(req);
+    }
+
+    private void zfbLogin(String s) {
+        LogUtils.e("@@@",s);
+        CommonAppContext.getInstance();
+        if (!CommonAppContext.isAlipayInstalled(this)){
+            ToastUtils.showShort("请安装支付宝客户端");
+            return;
+        }
+        String authInfo = s;
+//        String authInfo = "apiname=com.alipay.account.auth&app_id=2021005152631691&app_name=yusheng&auth_type=AUTHACCOUNT&biz_type=openservice&method=alipay.open.auth.sdk.code.get&pid=2088170624624316&product_id=APP_FAST_LOGIN&scope=kuaijie&sign_type=RSA2&target_id=20141225xxxx&sign=fMcp4GtiM6rxSIeFnJCVePJKV43eXrUP86CQgiLhDHH2u%2FdN75eEvmywc2ulkm7qKRetkU9fbVZtJIqFdMJcJ9Yp%2BJI%2FF%2FpESafFR6rB2fRjiQQLGXvxmDGVMjPSxHxVtIqpZy5FDoKUSjQ2%2FILDKpu3%2F%2BtAtm2jRw1rUoMhgt0%3D";
+        Runnable authRunnable = new Runnable() {
+
+            @Override
+            public void run() {
+                // 构造AuthTask 对象
+                AuthTask authTask = new AuthTask(LoginActivity.this);
+                // 调用授权接口，获取授权结果
+                Map<String, String> result = authTask.authV2(authInfo, true);
+                LogUtils.e(result);
+                if (result.get("resultStatus").equals("9000")){
+                    Pattern pattern = Pattern.compile("auth_code=([^&]*)");
+                    Matcher matcher = pattern.matcher(result.get("result"));
+
+                    if (matcher.find()) {
+                        String authCode = matcher.group(1);
+                        LogUtils.e("AuthCode", authCode);
+                        MvpPre.oauthLogin(authCode,2);
+                    }
+                }
+            }
+        };
+        Thread authThread = new Thread(authRunnable);
+        authThread.start();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void loginEvent(BaseResp event) {
+       if (event.errCode ==BaseResp.ErrCode.ERR_OK){
+           SendAuth.Resp authResp = (SendAuth.Resp)event;
+           LogUtils.e("@@@",authResp.code);
+           MvpPre.oauthLogin(authResp.code,1);
+       }
+    }
 }
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/PasswordLoginActivity.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/PasswordLoginActivity.java
index bc28ff91..9e54ffe0 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/PasswordLoginActivity.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/PasswordLoginActivity.java
@@ -8,29 +8,35 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 
-import androidx.activity.EdgeToEdge;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 
+import com.alipay.sdk.app.AuthTask;
+import com.blankj.utilcode.util.LogUtils;
 import com.hjq.toast.ToastUtils;
 import com.qxcm.modulelogin.R;
-import com.qxcm.modulelogin.databinding.ActivityLoginBinding;
 import com.qxcm.modulelogin.databinding.ActivityPasswordLoginBinding;
 import com.qxcm.modulelogin.even.LoginFinishEvent;
 import com.qxcm.modulelogin.present.LoginContacter;
 import com.qxcm.modulelogin.present.LoginPresenter;
 import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.utils.BarUtils;
 import com.qxcm.moduleutil.utils.PreferencesUtils;
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.utils.logger.DataLogger;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, ActivityPasswordLoginBinding> implements LoginContacter.View, View.OnClickListener {
 
     private CountDownTimer mTimer;
@@ -109,6 +115,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
         mBinding.ivZfb.setOnClickListener(this::onClick);
         mBinding.ivWeixin.setOnClickListener(this::onClick);
         mBinding.tvSendCode.setOnClickListener(this::onClick);
+
     }
 
     @Override
@@ -147,7 +154,8 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
             intent.putExtra("mobile", mBinding.edPhone.getText().toString());
             startActivity(intent);
             finish();
-        } else if (id == R.id.fl_login) {
+        }
+        else if (id == R.id.fl_login) {
             if (!mBinding.cbPrivacy.isChecked()) {
                 ToastUtils.show("请先勾选服务条款");
                 return;
@@ -157,7 +165,12 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
                 com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
                 return;
             }
-            MvpPre.sendCode(phone, 1);
+            String code=mBinding.edPassword.getText().toString().trim();
+            if (TextUtils.isEmpty(code)){
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
+                return;
+            }
+            MvpPre.login(phone, "", code, 1);
         } else if (id == R.id.tv_yhxy) {
             MvpPre.yhxy();
         } else if (id == R.id.tv_ysxy) {
@@ -167,18 +180,49 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
                 ToastUtils.show("请先勾选服务条款");
                 return;
             }
+            MvpPre.authorization("zfb");
 //            MvpPre.authorization(SHARE_MEDIA.QQ);
         } else if (id == R.id.iv_weixin) {
             if (!mBinding.cbPrivacy.isChecked()) {
                 ToastUtils.show("请先勾选服务条款");
                 return;
             }
-//            MvpPre.authorization(SHARE_MEDIA.WEIXIN);
+//            MvpPre.authorization("wx");
+            wcLogin();
         } else if (id == R.id.tv_send_code) {
-            sendCodeSuccess(mBinding.edPhone.getText().toString().trim());
+            String phone = mBinding.edPhone.getText().toString().trim();
+            if (TextUtils.isEmpty(phone)) {
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
+                return;
+            }
+            sendCodeSuccess(phone);
+            MvpPre.sendCode(phone, 1);
         }
     }
+    private void wcLogin() {
+        //发起登陆请求前先注册微信api
+        IWXAPI api = WXAPIFactory.createWXAPI(this,CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(),true);
+        api.registerApp(CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId());
+        if (!api.isWXAppInstalled()){
+            //todo 提醒未安装微信
+            com.blankj.utilcode.util.ToastUtils.showShort("请安装微信客户端");
+            return;
+        }
+        //开始发起登陆请求
+        final SendAuth.Req req = new SendAuth.Req();
+        req.scope = "snsapi_userinfo";
+        req.state = "wechat_sdk_demo_test";
+        api.sendReq(req);
+    }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void loginEvent(BaseResp event) {
+        if (event.errCode ==BaseResp.ErrCode.ERR_OK){
+            SendAuth.Resp authResp = (SendAuth.Resp)event;
+            LogUtils.e("@@@",authResp.code);
+            MvpPre.oauthLogin(authResp.code,1);
+        }
+    }
     private void releaseTimer() {
         if (mTimer != null) {
             mTimer.cancel();
@@ -211,4 +255,53 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
         };
         mTimer.start();
     }
+
+    @Override
+    public void sendCodeSuccess1(String s) {
+        LogUtils.e(s);
+    }
+
+    @Override
+    public void loginSuccess(UserBean userBean) {
+
+    }
+
+    @Override
+    public void authorizationSuccess(String s) {
+        zfbLogin(s);
+    }
+
+    private void zfbLogin(String s) {
+        LogUtils.e("@@@",s);
+        CommonAppContext.getInstance();
+        if (!CommonAppContext.isAlipayInstalled(this)){
+            com.blankj.utilcode.util.ToastUtils.showShort("请安装支付宝客户端");
+            return;
+        }
+        String authInfo = s;
+//        String authInfo = "apiname=com.alipay.account.auth&app_id=2021005152631691&app_name=yusheng&auth_type=AUTHACCOUNT&biz_type=openservice&method=alipay.open.auth.sdk.code.get&pid=2088170624624316&product_id=APP_FAST_LOGIN&scope=kuaijie&sign_type=RSA2&target_id=20141225xxxx&sign=fMcp4GtiM6rxSIeFnJCVePJKV43eXrUP86CQgiLhDHH2u%2FdN75eEvmywc2ulkm7qKRetkU9fbVZtJIqFdMJcJ9Yp%2BJI%2FF%2FpESafFR6rB2fRjiQQLGXvxmDGVMjPSxHxVtIqpZy5FDoKUSjQ2%2FILDKpu3%2F%2BtAtm2jRw1rUoMhgt0%3D";
+        Runnable authRunnable = new Runnable() {
+
+            @Override
+            public void run() {
+                // 构造AuthTask 对象
+                AuthTask authTask = new AuthTask(PasswordLoginActivity.this);
+                // 调用授权接口，获取授权结果
+                Map<String, String> result = authTask.authV2(authInfo, true);
+                LogUtils.e(result);
+                if (result.get("resultStatus").equals("9000")){
+                    Pattern pattern = Pattern.compile("auth_code=([^&]*)");
+                    Matcher matcher = pattern.matcher(result.get("result"));
+
+                    if (matcher.find()) {
+                        String authCode = matcher.group(1);
+                        LogUtils.e("AuthCode", authCode);
+                        MvpPre.oauthLogin(authCode,2);
+                    }
+                }
+            }
+        };
+        Thread authThread = new Thread(authRunnable);
+        authThread.start();
+    }
 }
\ No newline at end of file
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/SwitchAccountsActivity.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/SwitchAccountsActivity.java
new file mode 100644
index 00000000..00ec01be
--- /dev/null
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/activity/SwitchAccountsActivity.java
@@ -0,0 +1,88 @@
+package com.qxcm.modulelogin.activity;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.qxcm.modulelogin.R;
+import com.qxcm.modulelogin.adapter.SwitchAccountsAdapter;
+import com.qxcm.modulelogin.databinding.ActivitySwitchAccountsBinding;
+import com.qxcm.modulelogin.present.LoginContacter;
+import com.qxcm.modulelogin.present.LoginPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserBean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *@author qx
+ *@data 2025/5/19
+ *@description: 选择账号
+ */
+public class SwitchAccountsActivity extends BaseMvpActivity<LoginPresenter, ActivitySwitchAccountsBinding> implements LoginContacter.View {
+
+    private List<UserBean> userBeanList=new ArrayList<>();
+    private SwitchAccountsAdapter switchAccountsAdapter;
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle("选择账号");
+        Bundle bundle = getIntent().getExtras();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (bundle != null) {
+                Object serializable = bundle.getSerializable("userbean", null);
+                if (serializable instanceof List<?>) {
+                    userBeanList = (List<UserBean>) serializable;
+                } else {
+                    // 可选：记录错误或提示
+                    Log.e("UserBeanError", "Expected List<UserBean> but got: " + (serializable != null ? serializable.getClass().getName() : "null"));
+                }
+            } else {
+                Log.e("UserBeanError", "Bundle is null");
+            }
+        }
+        if (userBeanList!=null&&userBeanList.size()>0){
+            switchAccountsAdapter=new SwitchAccountsAdapter();
+            mBinding.rvList.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+            mBinding.rvList.setAdapter(switchAccountsAdapter);
+            switchAccountsAdapter.setNewData(userBeanList);
+            switchAccountsAdapter.setOnItemClickListener(item -> {
+                MvpPre.switchAccounts(String.valueOf(item.getUser_id()));
+            });
+        }
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_switch_accounts;
+    }
+
+    @Override
+    protected LoginPresenter bindPresenter() {
+        return new LoginPresenter(this, this);
+    }
+
+    @Override
+    public void sendCodeSuccess1(String phoneNumber) {
+
+    }
+
+    @Override
+    public void loginSuccess(UserBean userBean) {
+
+    }
+
+    @Override
+    public void authorizationSuccess(String s) {
+
+    }
+}
\ No newline at end of file
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/adapter/SwitchAccountsAdapter.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/adapter/SwitchAccountsAdapter.java
new file mode 100644
index 00000000..35141816
--- /dev/null
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/adapter/SwitchAccountsAdapter.java
@@ -0,0 +1,51 @@
+package com.qxcm.modulelogin.adapter;
+
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.qxcm.modulelogin.R;
+import com.qxcm.moduleutil.bean.BlackUserBean;
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+/**
+ *@author qx
+ *@data 2025/5/19
+ *@description: 用户列表适配器
+ */
+public class SwitchAccountsAdapter extends BaseQuickAdapter<UserBean, BaseViewHolder> {
+
+    // 定义接口用于回调点击事件
+    public interface OnItemClickListener {
+        void onItemClick(UserBean item);
+    }
+
+    private OnItemClickListener onItemClickListener;
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.onItemClickListener = listener;
+    }
+
+    public SwitchAccountsAdapter() {
+        super(R.layout.item_switch_accounts);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, UserBean item) {
+        ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(R.id.im_user));
+        helper.setText(R.id.tv_nick_name, item.getNickname());
+        ImageView imageView= helper.getView(R.id.im_g);
+        // 根据 type 设置图片资源
+        // 根据 type 和 status 设置图片资源
+        imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.yigz);
+        // 设置点击事件
+        imageView.setOnClickListener(v -> {
+            if (onItemClickListener != null) {
+                onItemClickListener.onItemClick(item);
+            }
+        });
+
+
+    }
+}
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoContacts.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoContacts.java
index 159a8878..1736a169 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoContacts.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoContacts.java
@@ -6,6 +6,7 @@ import android.app.Activity;
 import com.qxcm.modulelogin.bean.UserFillResp;
 import com.qxcm.moduleutil.activity.IPresenter;
 import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.bean.UserPictrue;
 
 import java.io.File;
@@ -23,9 +24,9 @@ public final class ImproveInfoContacts {
 
         void updateNicknameSuccess(String nickname);
 
-        void updateSexTrue(UserPictrue sex);
+        void updateSexTrue(String sex);
 
-        void updateSuccess();
+        void updateSuccess(UserBean userBean);
     }
 
     public interface IImproveInfoPre extends IPresenter {
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoPresenter.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoPresenter.java
index d086502c..4cc8bda3 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoPresenter.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/ImproveInfoPresenter.java
@@ -4,8 +4,10 @@ import android.content.Context;
 
 
 import com.qxcm.modulelogin.bean.UserFillResp;
+import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.http.BaseObserver;
 import com.qxcm.moduleutil.presenter.BasePresenter;
+import com.qxcm.moduleutil.utils.oss.OSSOperUtils;
 
 import java.io.File;
 import java.util.Map;
@@ -18,21 +20,18 @@ public class ImproveInfoPresenter extends BasePresenter<ImproveInfoContacts.View
     }
     @Override
     public void upDateUserInfo(Map<String, String> map) {
-//        ApiClient.getInstance().userUpdate(map, new BaseObserver<String>() {
-//            @Override
-//            public void onSubscribe(Disposable d) {
-//                addDisposable(d);
-//            }
-//
-//            @Override
-//            public void onNext(String s) {
-//                MvpRef.get().updateSuccess();
-//            }
-//
-//            @Override
-//            public void onComplete() {
-//            }
-//        });
+        api.userUpdate(map, new BaseObserver<UserBean>() {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(UserBean userBean) {
+                MvpRef.get().updateSuccess(userBean);
+            }
+        });
     }
     @Override
     public void fill(String user_no, String nickname, String sex) {
@@ -57,29 +56,29 @@ public class ImproveInfoPresenter extends BasePresenter<ImproveInfoContacts.View
 
     @Override
     public void uploadFile(File file, int type) {
-//        MvpRef.get().showLoadings("上传中...");
-//        String url = OSSOperUtils.getPath(file, type);
-//        OSSOperUtils.newInstance().putObjectMethod(url, file.getPath(), new OSSOperUtils.OssCallback() {
-//            @Override
-//            public void onSuccess() {
-//                if (isViewAttach()) {
-//                    MvpRef.get().disLoadings();
-//                    MvpRef.get().upLoadSuccess(OSSOperUtils.AliYunOSSURLFile + url, type);
-//                }
-//            }
-//
-//            @Override
-//            public void onFail() {
-//                if (isViewAttach()) {
-//                    MvpRef.get().disLoadings();
-//                }
-//            }
-//        });
+        MvpRef.get().showLoadings("上传中...");
+        String url = OSSOperUtils.getPath(file, type);
+        OSSOperUtils.newInstance().putObjectMethod(url, file.getPath(), new OSSOperUtils.OssCallback() {
+            @Override
+            public void onSuccess() {
+                if (isViewAttach()) {
+                    MvpRef.get().disLoadings();
+                    MvpRef.get().upLoadSuccess(OSSOperUtils.AliYunOSSURLFile + url, type);
+                }
+            }
+
+            @Override
+            public void onFail() {
+                if (isViewAttach()) {
+                    MvpRef.get().disLoadings();
+                }
+            }
+        });
     }
 
     @Override
     public void updateAvatar(String headPicture) {
-        MvpRef.get().showLoadings();
+//        MvpRef.get().showLoadings();
 //        ApiClient.getInstance().updateAvatar(headPicture, new BaseObserver<String>() {
 //            @Override
 //            public void onSubscribe(Disposable d) {
@@ -101,46 +100,42 @@ public class ImproveInfoPresenter extends BasePresenter<ImproveInfoContacts.View
     @Override
     public void updateNickname() {
         // TODO: 2019/1/15 完善昵称修改功能
-        MvpRef.get().showLoadings();
-//        api.upUserNickname(new BaseObserver<UserNickBean>() {
-//            @Override
-//            public void onSubscribe(Disposable d) {
-//                addDisposable(d);
-//            }
-//
-//            @Override
-//            public void onNext(UserNickBean s) {
-//                MvpRef.get().updateNicknameSuccess(s.getNickname());
-//            }
-//
-//            @Override
-//            public void onComplete() {
-//                MvpRef.get().disLoadings();
-//            }
-//        });
+        api.upUserNickname(new BaseObserver<String>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(String s) {
+                MvpRef.get().updateNicknameSuccess(s);
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
 
     }
 
     @Override
     public void getSexTrue(String sex) {
         // TODO: 2019/1/15 完善性别获取头像信息
-        MvpRef.get().showLoadings();
-//       api.upUserTrue(sex, new BaseObserver<UserPictrue>() {
-//            @Override
-//            public void onSubscribe(Disposable d) {
-//                addDisposable(d);
-//            }
-//
-//            @Override
-//            public void onNext(UserPictrue userPictrue) {
-//                MvpRef.get().updateSexTrue(userPictrue);
-//            }
-//
-//            @Override
-//            public void onComplete() {
-//                MvpRef.get().disLoadings();
-//            }
-//        });
+       api.upUserPic(sex, new BaseObserver<String>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(String userPictrue) {
+                MvpRef.get().updateSexTrue(userPictrue);
+            }
+
+           @Override
+            public void onComplete() {
+            }
+        });
     }
 
 
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginContacter.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginContacter.java
index 7e8ac558..e63a66d1 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginContacter.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginContacter.java
@@ -4,10 +4,14 @@ import android.app.Activity;
 
 import com.qxcm.moduleutil.activity.IPresenter;
 import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.UserBean;
 
 public final class LoginContacter {
     public interface View extends IView<Activity> {
-        void sendCodeSuccess(String phoneNumber);
+        void sendCodeSuccess1(String phoneNumber);
+        void loginSuccess(UserBean userBean);
+
+        void authorizationSuccess(String s);
     }
 
     public interface ILoginPre extends IPresenter {
@@ -15,9 +19,12 @@ public final class LoginContacter {
 
         void login(String mobile, String password, String code, int type);
 
-        void thirdPartyLogin(String oldOpenId, String openId, int three_party, String nickname, String head_pic);
 
-        void oauthLogin(String netease_token, String access_token, int type);
+        void oauthLogin(String auth_code,int type);//阿里登录
+
+        void switchAccounts(String loginId);//切换账号
+
+
 
     }
 
diff --git a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginPresenter.java b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginPresenter.java
index aac560b6..129e3012 100644
--- a/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginPresenter.java
+++ b/moduleLogin/src/main/java/com/qxcm/modulelogin/present/LoginPresenter.java
@@ -1,104 +1,214 @@
 package com.qxcm.modulelogin.present;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 
+import com.alipay.sdk.app.AuthTask;
 import com.blankj.utilcode.util.AppUtils;
+import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.qxcm.modulelogin.activity.ImproveInfoActivity;
+import com.qxcm.modulelogin.activity.LoginActivity;
+import com.qxcm.modulelogin.activity.SwitchAccountsActivity;
+import com.qxcm.modulemain.activity.MainActivity;
 import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.http.BaseObserver;
 import com.qxcm.moduleutil.presenter.BasePresenter;
+import com.qxcm.moduleutil.utils.PreferencesUtils;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
 
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.List;
 import java.util.Map;
 
-public class LoginPresenter  extends BasePresenter<LoginContacter.View> implements LoginContacter.ILoginPre {
+import io.reactivex.disposables.Disposable;
+
+public class LoginPresenter extends BasePresenter<LoginContacter.View> implements LoginContacter.ILoginPre {
     public LoginPresenter(LoginContacter.View view, Context context) {
         super(view, context);
     }
 
     @Override
     public void sendCode(String phoneNumber, int type) {
+        api.sendCode(phoneNumber,"default", new BaseObserver<Object>() {
 
+            @Override
+            public void onSubscribe(Disposable d) {
+                    addDisposable(d);
+            }
+
+            @Override
+            public void onNext(Object o) {
+                MvpRef.get().sendCodeSuccess1(o+"");
+            }
+
+
+        });
     }
 
+    /**
+     * 登录
+     * @param mobile 手机号
+     * @param password 密码
+     * @param code 验证码
+     * @param type 1:手机号登录 2:密码登录
+     */
     @Override
     public void login(String mobile, String password, String code, int type) {
+        if (type==1){
+            api.login(mobile, code, new BaseObserver<List<UserBean>>() {
+                @Override
+                public void onSubscribe(Disposable d) {
+                    addDisposable(d);
+                }
+
+                @Override
+                public void onNext(List<UserBean> userBeans) {
+                    loginSuccess(userBeans);
+                }
+
+            });
+        }else if (type==2){
+            api.userLogin(mobile,password,  new BaseObserver<List<UserBean>>(){
+                @Override
+                public void onSubscribe(Disposable d) {
+                    addDisposable(d);
+                }
+
+                @Override
+                public void onNext(List<UserBean> userBeans) {
+                    loginSuccess(userBeans);
+                }
+
+            });
+        }
+    }
+
+
+    /**
+     * 支付宝登录
+     * @param auth_code
+     * @param type type=1:微信登录；type=2:支付宝登录
+     */
+
+    @Override
+    public void oauthLogin(String auth_code,  int type) {
+        api.authCode(auth_code,type, new BaseObserver<List<UserBean>>() {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(List<UserBean> userBeans) {
+                loginSuccess(userBeans);
+            }
+        });
 
     }
 
     @Override
-    public void thirdPartyLogin(String oldOpenId, String openId, int three_party, String nickname, String head_pic) {
+    public void switchAccounts(String loginId) {
+        api.switchAccounts(loginId, new BaseObserver<List<UserBean>>() {
 
-    }
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
 
-    @Override
-    public void oauthLogin(String netease_token, String access_token, int type) {
+            @Override
+            public void onNext(List<UserBean> userBeans) {
+                loginSuccess(userBeans);
+            }
 
+        });
     }
 
     @Override
     public void detachView() {
 
     }
-    public void authorization() {
-//        if (share_media.getName().equals(SHARE_MEDIA.QQ.getName())) {
-//            AppLogUtil.reportAppLog(AppLogEvent.A010304_qq, "be_null", "be_null");
-//            if (!AppUtils.isAppInstalled("com.tencent.mobileqq")) {
-//                ToastUtils.showShort("请安装QQ客户端");
-//                return;
-//            }
-//        }
-//        if (share_media.getName().equals(SHARE_MEDIA.WEIXIN.getName())) {
-//            AppLogUtil.reportAppLog(AppLogEvent.A010304_wx, "be_null", "be_null");
-//            if (!AppUtils.isAppInstalled("com.tencent.mm")) {
-//                ToastUtils.showShort("请安装微信客户端");
-//                return;
-//            }
-//        }
-//        UMShareAPI.get(MvpRef.get().getSelfActivity()).getPlatformInfo(MvpRef.get().getSelfActivity(), share_media, new UMAuthListener() {
-//            @Override
-//            public void onStart(SHARE_MEDIA share_media) {
-//                Log.d(TAG, "onStart " + "授权开始");
-//            }
-//
-//            @Override
-//            public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
-//                Log.d(TAG, "onComplete " + "授权完成");
-//
-//                //sdk是6.4.4的,但是获取值的时候用的是6.2以前的(access_token)才能获取到值,未知原因
-//                String uid = map.get("uid");
-//                String openid = map.get("openid");//微博没有
-//                String unionid = map.get("unionid");//微博没有
-//                String access_token = map.get("access_token");
-//                String refresh_token = map.get("refresh_token");//微信,qq,微博都没有获取到
-//                String expires_in = map.get("expires_in");
-//                String name = map.get("name");
-//                String gender = map.get("gender");
-//                String iconurl = map.get("iconurl");
-//
-//                if (isViewAttach() && MvpRef.get().getSelfActivity() != null) {
-//                    MvpRef.get().getSelfActivity().runOnUiThread(new Runnable() {
-//                        @Override
-//                        public void run() {
-//                            if (share_media.getName().equals(SHARE_MEDIA.QQ.getName())) {
-//                                thirdPartyLogin(uid, openid, 2, name, iconurl);
-//                            } else {
-//                                thirdPartyLogin(uid, openid, 1, name, iconurl);
-//                            }
-//                        }
-//                    });
-//                }
-//            }
-//
-//            @Override
-//            public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
-//                Log.d(TAG, "onError " + "授权失败");
-//            }
-//
-//            @Override
-//            public void onCancel(SHARE_MEDIA share_media, int i) {
-//                Log.d(TAG, "onCancel " + "授权取消");
-//            }
-//        });
+    public void loginSuccess(List<UserBean> userBean) {
+        if (userBean==null) {
+            ToastUtils.showShort("登录失败请重试");
+            return;
+        }
+        if (userBean.size()==1) {
+
+            CommonAppContext.getInstance().setUser(userBean.get(0));
+
+//        PreferencesUtils.putString(  CommonAppContext.getInstance(), "mobile", userBean.get());
+
+            if (isViewAttach()) {
+//            MvpRef.get().disLoadings();
+            }
+            if (userBean.get(0).getSex() == 0) {
+                try {
+                    Intent intent = new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), ImproveInfoActivity.class);
+
+                    Bundle bundle = new Bundle();
+                    bundle.putSerializable("userBean", userBean.get(0));
+                    intent.putExtras(bundle);
+                    com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                com.blankj.utilcode.util.ActivityUtils.startActivity(MainActivity.class);
+            }
+        }else {
+            Intent intent=new Intent(com.blankj.utilcode.util.ActivityUtils.getTopActivity(), SwitchAccountsActivity.class);
+            Bundle bundle=new Bundle();
+            bundle.putSerializable("userBean", userBean.get(0));
+            intent.putExtras(bundle);
+            com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
+
+        }
+//        EventBus.getDefault().post(new LoginFinishEvent());
+//        EventBus.getDefault().post(new SplashFinishEvent());
+//        AppLog.setUserUniqueID(userBean.getUser_id()); // 设置您自己的账号体系ID, 并保证其唯一性 ！
     }
+    public void authorization(String type) {
+
+        if (type.equals("wx")) {
+            if (!AppUtils.isAppInstalled("com.tencent.mm")) {
+                ToastUtils.showShort("请安装微信客户端");
+                return;
+            }
+//            IWXAPI api = WXEntryActivity.getWXAPI();
+//            final SendAuth.Req req = new SendAuth.Req();
+//            req.scope = "snsapi_userinfo"; // 只能填 snsapi_userinfo
+//            req.state = "wechat_sdk_demo_test";
+//            api.sendReq(req);
+        }else if (type.equals("zfb")){
+//            Map<String, String> result = authTask.authV2(authInfo, true);
+            api.authorization(new BaseObserver<String>() {
+                @Override
+                public void onSubscribe(Disposable d) {
+                    addDisposable(d);
+                }
+
+                @Override
+                public void onNext(String s) {
+                    MvpRef.get().authorizationSuccess(s);
+                }
+            });
+        }
+
+
+
+    }
+
     public void ysxl() {
 //        ARouter.getInstance().build(ARouters.H5).withString("url", Constant.URL.URL_USER_YSXY).withString("title", "隐私协议").navigation();
     }
diff --git a/moduleLogin/src/main/res/layout/activity_improve_info.xml b/moduleLogin/src/main/res/layout/activity_improve_info.xml
index f11924c5..004ca8d5 100644
--- a/moduleLogin/src/main/res/layout/activity_improve_info.xml
+++ b/moduleLogin/src/main/res/layout/activity_improve_info.xml
@@ -138,8 +138,8 @@
 
                     <ImageView
                         android:id="@+id/iv_girl"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/dp_160"
+                        android:layout_height="@dimen/dp_77"
                         android:src="@mipmap/check_girl"
                         android:scaleType="fitXY"
                         />
@@ -157,8 +157,8 @@
 
                     <ImageView
                         android:id="@+id/iv_boy"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/dp_160"
+                        android:layout_height="@dimen/dp_77"
                         android:src="@mipmap/check_boy"
                         android:scaleType="fitXY"
                         />
diff --git a/moduleLogin/src/main/res/layout/activity_password_login.xml b/moduleLogin/src/main/res/layout/activity_password_login.xml
index 81f100d7..49f56cc9 100644
--- a/moduleLogin/src/main/res/layout/activity_password_login.xml
+++ b/moduleLogin/src/main/res/layout/activity_password_login.xml
@@ -137,7 +137,7 @@
                             android:layout_centerInParent="true"
                             android:background="@android:color/transparent"
                             android:hint="@string/login_hint_code"
-                            android:inputType="textPassword"
+                            android:inputType="number"
                             android:maxLength="20"
                             android:singleLine="true"
                             android:textColor="@color/black"
diff --git a/moduleLogin/src/main/res/layout/activity_switch_accounts.xml b/moduleLogin/src/main/res/layout/activity_switch_accounts.xml
new file mode 100644
index 00000000..9581b5ad
--- /dev/null
+++ b/moduleLogin/src/main/res/layout/activity_switch_accounts.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.SwitchAccountsActivity">
+
+    <data>
+
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/rv_list"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            android:background="@color/white"
+            android:clipToPadding="false"
+            android:paddingBottom="10dp"
+            android:paddingTop="10dp"/>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/moduleLogin/src/main/res/layout/item_switch_accounts.xml b/moduleLogin/src/main/res/layout/item_switch_accounts.xml
new file mode 100644
index 00000000..cf5bb66d
--- /dev/null
+++ b/moduleLogin/src/main/res/layout/item_switch_accounts.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:id="@+id/ll_szmm"
+        style="@style/My_Info_Item_LL_Style"
+        android:background="@drawable/bg_r15_white">
+
+        <com.qxcm.moduleutil.widget.GifAvatarOvalView
+            android:id="@+id/im_user"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
+            android:layout_gravity="center"
+            android:layout_marginRight="10dp"
+            android:src="@mipmap/me_img_upld_head" />
+
+        <TextView
+            android:id="@+id/tv_nick_name"
+            style="@style/My_Info_Item_Title_Style"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            tools:text="@string/set_password" />
+
+        <ImageView
+            android:id="@+id/im_g"
+            android:layout_width="@dimen/dp_79"
+            android:layout_height="@dimen/dp_31"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_gravity="center"
+            />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/moduleLogin/src/main/res/values/strings.xml b/moduleLogin/src/main/res/values/strings.xml
index 1a59c2a5..6b30d8d9 100644
--- a/moduleLogin/src/main/res/values/strings.xml
+++ b/moduleLogin/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
 <resources>
-    <string name="app_name">moduleLogin</string>
 
 </resources>
\ No newline at end of file
diff --git a/moduleUtil/build.gradle b/moduleUtil/build.gradle
index f1ae1bc9..ec728f42 100644
--- a/moduleUtil/build.gradle
+++ b/moduleUtil/build.gradle
@@ -10,6 +10,9 @@ android {
     defaultConfig {
         minSdk 24
 
+        versionCode Integer.parseInt(project.findProperty("APP_VERSION_CODE"))
+        versionName project.findProperty("APP_VERSION_NAME")
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -38,6 +41,7 @@ dependencies {
     implementation libs.appcompat
     implementation libs.material
     implementation libs.core.ktx
+    implementation project(':moduletablayout')
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
@@ -95,6 +99,23 @@ dependencies {
 
     api(libs.github.shadowlayout)
 
-    compileOnly 'org.projectlombok:lombok:1.18.32'
+    //判断是否是模拟器
+    api(libs.easy.protector.release)
+    //第三方Popup
+    api(libs.custompopwindow)
+//    cookie
+    api(libs.persistentcookiejar)
+
+    //noinspection GradleDynamicVersion
+    api(libs.dpa.oss.android.sdk)
+    //微信登录
+    api(libs.wechat.sdk.android)
+    //支付宝
+    api(libs.alipay.alipaysdk.android)
+
+    api(libs.easypermissions)
+    api(libs.xbanner)
+
+    api(libs.lombok)
     annotationProcessor 'org.projectlombok:lombok:1.18.32'
 }
\ No newline at end of file
diff --git a/moduleUtil/src/main/AndroidManifest.xml b/moduleUtil/src/main/AndroidManifest.xml
index fb4fe8de..a98f53fb 100644
--- a/moduleUtil/src/main/AndroidManifest.xml
+++ b/moduleUtil/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <application
         android:allowBackup="true">
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/adapter/CirleListAdapter.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/CirleListAdapter.java
similarity index 94%
rename from modulecircle/src/main/java/com/example/modulecircle/adapter/CirleListAdapter.java
rename to moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/CirleListAdapter.java
index 74a720c5..52d0717d 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/adapter/CirleListAdapter.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/CirleListAdapter.java
@@ -1,27 +1,19 @@
-package com.example.modulecircle.adapter;
+package com.qxcm.moduleutil.adapter;
 
-import android.media.MediaPlayer;
-import android.os.CountDownTimer;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.blankj.utilcode.util.LogUtils;
-import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulecircle.R;
-import com.qxcm.moduleutil.adapter.OneImageYuanJiaoAdapter;
+import com.qxcm.moduleutil.R;
 import com.qxcm.moduleutil.bean.CircleListBean;
 import com.qxcm.moduleutil.utils.ImageUtils;
 import com.qxcm.moduleutil.widget.MyGridView;
 import com.qxcm.moduleutil.widget.img.FullScreenUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class CirleListAdapter extends BaseQuickAdapter<CircleListBean, BaseViewHolder> {
     public CirleListAdapter() {
         super(R.layout.item_cirle_list);
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/MyPagerAdapter.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/MyPagerAdapter.java
new file mode 100644
index 00000000..a7511d7a
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/adapter/MyPagerAdapter.java
@@ -0,0 +1,42 @@
+package com.qxcm.moduleutil.adapter;
+
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import java.util.List;
+
+public class MyPagerAdapter extends FragmentStatePagerAdapter {
+
+    private List<Fragment> fragments;
+    private List<String> typeOnes;
+
+    public MyPagerAdapter(FragmentManager fm, List<Fragment> mFragments, List<String> ones) {
+        super(fm);
+        this.fragments = mFragments;
+        this.typeOnes = ones;
+    }
+
+    @Override
+    public int getCount() {
+        return fragments.size();
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return typeOnes.get(position);
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return fragments.get(position);
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        super.destroyItem(container, position, object);
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/base/BaseApplication.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/base/BaseApplication.java
deleted file mode 100644
index 7c23d138..00000000
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/base/BaseApplication.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.qxcm.moduleutil.base;
-
-import android.app.Application;
-
-public class BaseApplication extends Application {
-
-}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppContext.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/base/CommonAppContext.java
similarity index 58%
rename from moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppContext.java
rename to moduleUtil/src/main/java/com/qxcm/moduleutil/base/CommonAppContext.java
index 57ea7975..8c53b1d0 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppContext.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/base/CommonAppContext.java
@@ -1,28 +1,52 @@
-package com.qxcm.moduleutil.widget;
+package com.qxcm.moduleutil.base;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.Application;
+import android.app.LauncherActivity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Base64;
+import android.webkit.WebView;
 
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
+import com.blankj.utilcode.util.AppUtils;
 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.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.event.AppLifecycleEvent;
 import com.qxcm.moduleutil.interfaces.AppLifecycleUtil;
 import com.qxcm.moduleutil.utils.FloatWindowHelper;
+import com.qxcm.moduleutil.utils.SPConstants;
 import com.qxcm.moduleutil.utils.SpUtil;
+import com.qxcm.moduleutil.utils.UtilConfig;
+import com.qxcm.moduleutil.utils.config.EnvironmentEnum;
+import com.qxcm.moduleutil.utils.config.EnvironmentPrefs;
+import com.qxcm.moduleutil.widget.CommonAppConfig;
+import com.qxcm.moduleutil.widget.Constants;
 
 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.concurrent.TimeUnit;
+
+import io.reactivex.disposables.Disposable;
+import lombok.Getter;
 
 
 /**
@@ -35,14 +59,47 @@ public class CommonAppContext extends MultiDexApplication {
     private static Handler sMainThreadHandler;
     private int mCount;
     private boolean mFront;//是否前台
-
-
+    public String emulator = "0";
+    @Getter
+    private EnvironmentEnum currentEnvironment;
+    public UserBean mUserBean;
+    private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
+    private ScheduledExecutorService scheduledExecutorServiceRoom = null;
     @Override
     public void onCreate() {
         super.onCreate();
         sInstance = this;
         sMainThreadHandler=new Handler();
+        UtilConfig.init(this);
         registerActivityLifecycleCallbacks();
+        initWebView();
+        if (ProcessUtils.isMainProcess()) {
+            if (SpUtil.isAgreePolicy()) {
+                checkInEmulator();
+                UtilConfig.checkInEmulator();
+            }
+        }
+        EnvironmentPrefs prefs = new EnvironmentPrefs(this);
+        currentEnvironment = prefs.getSelectedEnvironment();
+    }
+    private void initWebView() {
+        //Android P 以及之后版本不支持同时从多个进程使用具有相同数据目录的WebView
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            String processName = getProcessName(this);
+            if (!AppUtils.getAppPackageName().equals(processName)) {//判断不等于默认进程名称
+                WebView.setDataDirectorySuffix(processName);
+            }
+        }
+    }
+    public String getProcessName(Context context) {
+        if (context == null) return null;
+        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningAppProcessInfo processInfo : manager.getRunningAppProcesses()) {
+            if (processInfo.pid == android.os.Process.myPid()) {
+                return processInfo.processName;
+            }
+        }
+        return null;
     }
     @Override
     protected void attachBaseContext(Context base) {
@@ -66,7 +123,14 @@ public class CommonAppContext extends MultiDexApplication {
         return sInstance;
     }
 
-
+    public void checkInEmulator() {
+        emulator = EasyProtectorLib.checkIsRunningInEmulator(this, new EmulatorCheckCallback() {
+            @Override
+            public void findEmulator(String emulatorInfo) {
+//                Logger.e(emulatorInfo);
+            }
+        }) ? "1" : "0";
+    }
 
     public static void postDelayed(Runnable runnable, long delayMillis) {
         if (sMainThreadHandler != null) {
@@ -195,4 +259,44 @@ public class CommonAppContext extends MultiDexApplication {
     public void startInitSdk(){
 
     }
+
+    public void setUser(UserBean userBean) {
+        mUserBean = userBean;
+        SpUtil.saveUserId(userBean.getUser_id());
+        SpUtil.saveUserInfo(userBean);
+        SpUtil.putToken(userBean.getToken());
+    }
+
+    public UserBean getUser() {
+        if (mUserBean == null) {
+            mUserBean = SpUtil.getUserInfo();
+        }
+        return mUserBean;
+    }
+    public void setUserBean(UserBean bean) {
+        mUserBean = bean;
+    }
+    public void clearLoginInfo() throws ClassNotFoundException {
+//        mUid = null;
+//        mToken = null;
+//        SpUtil.getInstance().removeValue(
+//                SPConstants.USER_ID, SPConstants.TOKEN, SPConstants.USER_INFO
+//        );
+        mUserBean = null;
+        SpUtil.saveUserId(-1);
+        SpUtil.saveUserInfo(new UserBean());
+        SpUtil.putToken("");
+        Intent intent = new Intent("com.example.action.LAUNCH_PAGE");
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+        getApplicationContext().startActivity(intent);
+    }
+
+    public static boolean isAlipayInstalled(Context context){
+        try {
+            context.getPackageManager().getPackageInfo("com.eg.android.AlipayGphone", 0);
+            return true;//安装了支付宝
+        } catch (PackageManager.NameNotFoundException e) {
+            return false; //未安装支付宝
+        }
+    }
 }
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/AttentionResp.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/AttentionResp.java
new file mode 100644
index 00000000..f621b28a
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/AttentionResp.java
@@ -0,0 +1,114 @@
+package com.qxcm.moduleutil.bean;
+
+import android.text.TextUtils;
+
+public class AttentionResp {
+
+    private String room_id;
+    private String room_name;
+    private String room_code;
+    private String popularity;
+    private String label_name;
+    private String label_icon;
+    private String owner_picture;
+    private String owner_nickname;
+    private int locked;
+
+    private String label_id;
+
+    public String getLabel_id() {
+        return label_id;
+    }
+
+    public void setLabel_id(String label_id) {
+        this.label_id = label_id;
+    }
+    private String cover_picture;
+
+    public String getRoomPicture() {
+        if (!TextUtils.isEmpty(cover_picture)) {
+            return cover_picture;
+        }
+        return owner_picture;
+    }
+
+    public String getCover_picture() {
+        return cover_picture;
+    }
+
+    public void setCover_picture(String cover_picture) {
+        this.cover_picture = cover_picture;
+    }
+
+    public int getLocked() {
+        return locked;
+    }
+
+    public void setLocked(int locked) {
+        this.locked = locked;
+    }
+
+    public String getRoom_id() {
+        return room_id;
+    }
+
+    public void setRoom_id(String room_id) {
+        this.room_id = room_id;
+    }
+
+    public String getRoom_name() {
+        return room_name;
+    }
+
+    public void setRoom_name(String room_name) {
+        this.room_name = room_name;
+    }
+
+    public String getRoom_code() {
+        return room_code;
+    }
+
+    public void setRoom_code(String room_code) {
+        this.room_code = room_code;
+    }
+
+    public String getPopularity() {
+        return popularity;
+    }
+
+    public void setPopularity(String popularity) {
+        this.popularity = popularity;
+    }
+
+    public String getLabel_name() {
+        return label_name;
+    }
+
+    public void setLabel_name(String label_name) {
+        this.label_name = label_name;
+    }
+
+    public String getLabel_icon() {
+        return label_icon;
+    }
+
+    public void setLabel_icon(String label_icon) {
+        this.label_icon = label_icon;
+    }
+
+    public String getOwner_picture() {
+        return owner_picture;
+    }
+
+    public void setOwner_picture(String owner_picture) {
+        this.owner_picture = owner_picture;
+    }
+
+    public String getOwner_nickname() {
+        return owner_nickname;
+    }
+
+    public void setOwner_nickname(String owner_nickname) {
+        this.owner_nickname = owner_nickname;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/BlackUserBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/BlackUserBean.java
new file mode 100644
index 00000000..34c6cd4e
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/BlackUserBean.java
@@ -0,0 +1,13 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.Data;
+
+@Data
+public class BlackUserBean {
+    private String userName;
+    private String userId;
+    private String userAvatar;
+    private int type;//0:关注；1：黑名单；2：粉丝
+    private int status;//0:未关注 1：已关注
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/CheckTxtResp.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/CheckTxtResp.java
new file mode 100644
index 00000000..f050c0b8
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/CheckTxtResp.java
@@ -0,0 +1,15 @@
+package com.qxcm.moduleutil.bean;
+
+public class CheckTxtResp {
+
+
+    private int result;
+
+    public int getResult() {
+        return result;
+    }
+
+    public void setResult(int result) {
+        this.result = result;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/DateBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/DateBean.java
index 29d135c6..e67b51ee 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/DateBean.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/DateBean.java
@@ -3,6 +3,9 @@ package com.qxcm.moduleutil.bean;
 
 import com.qxcm.moduleutil.widget.picker.PickerView;
 
+import lombok.Data;
+
+@Data
 public class DateBean implements PickerView.PickerItem {
 
     private String text;
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/GiftBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/GiftBean.java
new file mode 100644
index 00000000..3fc5f490
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/GiftBean.java
@@ -0,0 +1,51 @@
+package com.qxcm.moduleutil.bean;
+
+public class GiftBean {
+
+    private String number;
+    private String gift_id;
+    private String name;
+    private String picture;
+    private String price;
+
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getGift_id() {
+        return gift_id;
+    }
+
+    public void setGift_id(String gift_id) {
+        this.gift_id = gift_id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPicture() {
+        return picture;
+    }
+
+    public void setPicture(String picture) {
+        this.picture = picture;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/HomePageTabBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/HomePageTabBean.java
new file mode 100644
index 00000000..3b12111b
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/HomePageTabBean.java
@@ -0,0 +1,42 @@
+package com.qxcm.moduleutil.bean;
+
+
+import com.example.moduletablayout.listener.CustomTabEntity;
+
+/**
+ * 项目名称 qipao-android
+ * 包名：com.qpyy.module.me.bean
+ * 创建人 黄强
+ * 创建时间 2020/12/1 17:40
+ * 描述 describe
+ */
+public class HomePageTabBean implements CustomTabEntity {
+    public HomePageTabBean(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    private String title;
+
+    @Override
+    public String getTabTitle() {
+        return title;
+    }
+
+    @Override
+    public int getTabSelectedIcon() {
+        return 0;
+    }
+
+    @Override
+    public int getTabUnselectedIcon() {
+        return 0;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/HomeRoomInfo.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/HomeRoomInfo.java
new file mode 100644
index 00000000..e8af77a0
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/HomeRoomInfo.java
@@ -0,0 +1,13 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class HomeRoomInfo {
+    private String room_name;
+    private String cover_picture;
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/ManageRoomResp.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/ManageRoomResp.java
new file mode 100644
index 00000000..497de405
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/ManageRoomResp.java
@@ -0,0 +1,132 @@
+package com.qxcm.moduleutil.bean;
+
+import android.text.TextUtils;
+
+public class ManageRoomResp {
+
+    private String id;
+    private String room_id;
+    private String room_name;
+    private String room_code;
+    private String popularity;
+    private String label_name;
+    private String label_icon;
+    private String owner_picture;
+    private String owner_nickname;
+    private int sys_type_id;
+    private int locked;
+    private String label_id;
+
+    public String getLabel_id() {
+        return label_id;
+    }
+
+    public void setLabel_id(String label_id) {
+        this.label_id = label_id;
+    }
+
+    private String cover_picture;
+
+    public String getRoomPicture() {
+        if (!TextUtils.isEmpty(cover_picture)) {
+            return cover_picture;
+        }
+        return owner_picture;
+    }
+
+    public String getCover_picture() {
+        return cover_picture;
+    }
+
+    public void setCover_picture(String cover_picture) {
+        this.cover_picture = cover_picture;
+    }
+
+    public int getLocked() {
+        return locked;
+    }
+
+    public void setLocked(int locked) {
+        this.locked = locked;
+    }
+
+    public int getSys_type_id() {
+        return sys_type_id;
+    }
+
+    public void setSys_type_id(int sys_type_id) {
+        this.sys_type_id = sys_type_id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRoom_id() {
+        return room_id;
+    }
+
+    public void setRoom_id(String room_id) {
+        this.room_id = room_id;
+    }
+
+    public String getRoom_name() {
+        return room_name;
+    }
+
+    public void setRoom_name(String room_name) {
+        this.room_name = room_name;
+    }
+
+    public String getRoom_code() {
+        return room_code;
+    }
+
+    public void setRoom_code(String room_code) {
+        this.room_code = room_code;
+    }
+
+    public String getPopularity() {
+        return popularity;
+    }
+
+    public void setPopularity(String popularity) {
+        this.popularity = popularity;
+    }
+
+    public String getLabel_name() {
+        return label_name;
+    }
+
+    public void setLabel_name(String label_name) {
+        this.label_name = label_name;
+    }
+
+    public String getLabel_icon() {
+        return label_icon;
+    }
+
+    public void setLabel_icon(String label_icon) {
+        this.label_icon = label_icon;
+    }
+
+    public String getOwner_picture() {
+        return owner_picture;
+    }
+
+    public void setOwner_picture(String owner_picture) {
+        this.owner_picture = owner_picture;
+    }
+
+    public String getOwner_nickname() {
+        return owner_nickname;
+    }
+
+    public void setOwner_nickname(String owner_nickname) {
+        this.owner_nickname = owner_nickname;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyBagBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyBagBean.java
new file mode 100644
index 00000000..ce2adedb
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyBagBean.java
@@ -0,0 +1,14 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.Data;
+
+@Data
+public class MyBagBean {
+    private String myBagTitle;
+    private String myBagType;
+
+    public MyBagBean(String myBagTitle, String myBagType) {
+        this.myBagTitle = myBagTitle;
+        this.myBagType = myBagType;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyBagDataBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyBagDataBean.java
new file mode 100644
index 00000000..aeed37d5
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyBagDataBean.java
@@ -0,0 +1,12 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.Data;
+
+@Data
+public class MyBagDataBean {
+    private String title;
+    private String giftName;
+    private String time;
+    private String base_image;
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyFootResp.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyFootResp.java
new file mode 100644
index 00000000..8f44a57b
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyFootResp.java
@@ -0,0 +1,114 @@
+package com.qxcm.moduleutil.bean;
+
+import android.text.TextUtils;
+
+public class MyFootResp {
+
+    private String room_name;
+    private String room_code;
+    private String popularity;
+    private String label_name;
+    private String label_icon;
+    private String owner_picture;
+    private String owner_nickname;
+    private String room_id;
+    private int locked;
+
+    private String cover_picture;
+    private String label_id;
+
+    public String getLabel_id() {
+        return label_id;
+    }
+
+    public void setLabel_id(String label_id) {
+        this.label_id = label_id;
+    }
+
+    public String getRoomPicture() {
+        if (!TextUtils.isEmpty(cover_picture)) {
+            return cover_picture;
+        }
+        return owner_picture;
+    }
+
+    public String getCover_picture() {
+        return cover_picture;
+    }
+
+    public void setCover_picture(String cover_picture) {
+        this.cover_picture = cover_picture;
+    }
+
+    public int getLocked() {
+        return locked;
+    }
+
+    public void setLocked(int locked) {
+        this.locked = locked;
+    }
+
+    public String getRoom_id() {
+        return room_id;
+    }
+
+    public void setRoom_id(String room_id) {
+        this.room_id = room_id;
+    }
+
+    public String getRoom_name() {
+        return room_name;
+    }
+
+    public void setRoom_name(String room_name) {
+        this.room_name = room_name;
+    }
+
+    public String getRoom_code() {
+        return room_code;
+    }
+
+    public void setRoom_code(String room_code) {
+        this.room_code = room_code;
+    }
+
+    public String getPopularity() {
+        return popularity;
+    }
+
+    public void setPopularity(String popularity) {
+        this.popularity = popularity;
+    }
+
+    public String getLabel_name() {
+        return label_name;
+    }
+
+    public void setLabel_name(String label_name) {
+        this.label_name = label_name;
+    }
+
+    public String getLabel_icon() {
+        return label_icon;
+    }
+
+    public void setLabel_icon(String label_icon) {
+        this.label_icon = label_icon;
+    }
+
+    public String getOwner_picture() {
+        return owner_picture;
+    }
+
+    public void setOwner_picture(String owner_picture) {
+        this.owner_picture = owner_picture;
+    }
+
+    public String getOwner_nickname() {
+        return owner_nickname;
+    }
+
+    public void setOwner_nickname(String owner_nickname) {
+        this.owner_nickname = owner_nickname;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyRoomBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyRoomBean.java
new file mode 100644
index 00000000..37723514
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/MyRoomBean.java
@@ -0,0 +1,117 @@
+package com.qxcm.moduleutil.bean;
+
+public class MyRoomBean {
+
+    /*
+     "room_id": "10184180",
+    "cover_picture": "httpss://osschumeng.oss-cn-beijing.aliyuncs.com/img/e86e2efe3f4412561e9c30326162d946.jpg",
+    "room_name": "钊的房间",
+    "online_num": 0,
+    "label_id": "23",
+    "label_name": "聊天",
+    "label_icon": "",
+    "favorite_count": "0",
+    "come_count": "161",
+    "today_income": 0
+     */
+
+    private String room_name; //房间名称
+    private int room_id; //房间ID
+    private String label_id; //房间类型
+    private String label_name; //房间类型名称
+    private String cover_picture; //房间图片
+    private String label_icon; //房间类型图标
+    private String online_num; //房间在线人数
+    private String favorite_count; //房间收藏数
+    private String come_count; //房间进入数
+    private Double today_income; //今日收益;
+    private int earnings_ratio;//房间收益比例
+
+    public int getEarnings_ratio() {
+        return earnings_ratio;
+    }
+
+    public void setEarnings_ratio(int earnings_ratio) {
+        this.earnings_ratio = earnings_ratio;
+    }
+
+    public String getRoom_name() {
+        return room_name;
+    }
+
+    public void setRoom_name(String room_name) {
+        this.room_name = room_name;
+    }
+
+    public int getRoom_id() {
+        return room_id;
+    }
+
+    public void setRoom_id(int room_id) {
+        this.room_id = room_id;
+    }
+
+    public String getLabel_id() {
+        return label_id;
+    }
+
+    public void setLabel_id(String label_id) {
+        this.label_id = label_id;
+    }
+
+    public String getLabel_name() {
+        return label_name;
+    }
+
+    public void setLabel_name(String label_name) {
+        this.label_name = label_name;
+    }
+
+    public String getCover_picture() {
+        return cover_picture;
+    }
+
+    public void setCover_picture(String cover_picture) {
+        this.cover_picture = cover_picture;
+    }
+
+    public String getLabel_icon() {
+        return label_icon;
+    }
+
+    public void setLabel_icon(String label_icon) {
+        this.label_icon = label_icon;
+    }
+
+    public String getOnline_num() {
+        return online_num;
+    }
+
+    public void setOnline_num(String online_num) {
+        this.online_num = online_num;
+    }
+
+    public String getFavorite_count() {
+        return favorite_count;
+    }
+
+    public void setFavorite_count(String favorite_count) {
+        this.favorite_count = favorite_count;
+    }
+
+    public String getCome_count() {
+        return come_count;
+    }
+
+    public void setCome_count(String come_count) {
+        this.come_count = come_count;
+    }
+
+    public Double getToday_income() {
+        return today_income;
+    }
+
+    public void setToday_income(Double today_income) {
+        this.today_income = today_income;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/PhotoWallResp.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/PhotoWallResp.java
new file mode 100644
index 00000000..487df4af
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/PhotoWallResp.java
@@ -0,0 +1,93 @@
+package com.qxcm.moduleutil.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class PhotoWallResp implements Serializable {
+
+    public String getVedio() {
+        return vedio;
+    }
+
+    public void setVedio(String vedio) {
+        this.vedio = vedio;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getVedio_cover() {
+        return vedio_cover;
+    }
+
+    public void setVedio_cover(String vedio_cover) {
+        this.vedio_cover = vedio_cover;
+    }
+
+    public List<GiftResp> getList() {
+        return list;
+    }
+
+    public void setList(List<GiftResp> list) {
+        this.list = list;
+    }
+
+    private String vedio;
+    private String avatar;
+    private String vedio_cover;
+    private List<GiftResp> list;
+
+    public static class GiftResp implements Serializable {
+        public GiftResp(String id, String url, int width, int height) {
+            this.id = id;
+            this.url = url;
+            this.width = width;
+            this.height = height;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public int getWidth() {
+            return width;
+        }
+
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        public int getHeight() {
+            return height;
+        }
+
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        private String id;
+        private String url;
+        private int width;
+        private int height;
+
+    }
+
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RechargeBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RechargeBean.java
new file mode 100644
index 00000000..b6fafa80
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RechargeBean.java
@@ -0,0 +1,29 @@
+package com.qxcm.moduleutil.bean;
+
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
+import lombok.Data;
+
+/**
+ * ProjectName: isolated-island
+ * Package: com.yutang.xqipao.data
+ * Description: java类作用描述
+ * Author: 姚闻达
+ * CreateDate: 2020/11/1 10:14
+ * UpdateUser: 更新者
+ * UpdateDate: 2020/11/1 10:14
+ * UpdateRemark: 更新说明
+ * Version: 1.0
+ */
+@Data
+public class RechargeBean implements MultiItemEntity {
+    private int itemViewType;
+    private String goldNum;
+    private String money;
+    private boolean isCustom; // 是否为自定义项
+
+    @Override
+    public int getItemType() {
+        return 0;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomDetails.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomDetails.java
new file mode 100644
index 00000000..4c72563c
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomDetails.java
@@ -0,0 +1,212 @@
+package com.qxcm.moduleutil.bean;
+
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
+import java.util.List;
+
+public class RoomDetails {
+    /**
+     * list : [{"total_price":416,"total_earning":83.2,"time":"2025-03-07","list":[{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"用户10137552","get_user_nickname":"用户10137840","gift_name":"退烧药","gift_number":"3","total_price":"297.00","time":"2025-03-07","earning":59.4},{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"用户10137552","get_user_nickname":"用户10137840","gift_name":"征婚帖","gift_number":"1","total_price":"19.00","time":"2025-03-07","earning":3.8},{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"用户10137552","get_user_nickname":"用户10137840","gift_name":"香槟","gift_number":"1","total_price":"99.00","time":"2025-03-07","earning":19.8},{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"钊","get_user_nickname":"用户10137840","gift_name":"小心心","gift_number":"1","total_price":"1.00","time":"2025-03-07","earning":0.2}]}]
+     * total_amount : 416
+     * total_earning : 83.2
+     * room_name : 钊的房间
+     * page : <div>    </div>
+     */
+
+    private double total_amount;
+    private double total_earning;
+    private String room_name;
+    private String page;
+    private List<RoomDetailsList> list;
+
+    public double getTotal_amount() {
+        return total_amount;
+    }
+
+    public void setTotal_amount(double total_amount) {
+        this.total_amount = total_amount;
+    }
+
+    public double getTotal_earning() {
+        return total_earning;
+    }
+
+    public void setTotal_earning(double total_earning) {
+        this.total_earning = total_earning;
+    }
+
+    public String getRoom_name() {
+        return room_name;
+    }
+
+    public void setRoom_name(String room_name) {
+        this.room_name = room_name;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public void setPage(String page) {
+        this.page = page;
+    }
+
+    public List<RoomDetailsList> getList() {
+        return list;
+    }
+
+    public void setList(List<RoomDetailsList> list) {
+        this.list = list;
+    }
+
+    public static class RoomDetailsList implements MultiItemEntity {
+        /**
+         * total_price : 416
+         * total_earning : 83.2
+         * time : 2025-03-07
+         * list : [{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"用户10137552","get_user_nickname":"用户10137840","gift_name":"退烧药","gift_number":"3","total_price":"297.00","time":"2025-03-07","earning":59.4},{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"用户10137552","get_user_nickname":"用户10137840","gift_name":"征婚帖","gift_number":"1","total_price":"19.00","time":"2025-03-07","earning":3.8},{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"用户10137552","get_user_nickname":"用户10137840","gift_name":"香槟","gift_number":"1","total_price":"99.00","time":"2025-03-07","earning":19.8},{"user_head_picture":"https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png","user_nickname":"钊","get_user_nickname":"用户10137840","gift_name":"小心心","gift_number":"1","total_price":"1.00","time":"2025-03-07","earning":0.2}]
+         */
+        private int itemViewType = 1;
+        private double total_price;
+        private double total_earning;
+        private String time;
+        private List<RoomDetail> list;
+
+        public double getTotal_price() {
+            return total_price;
+        }
+
+        public void setTotal_price(double total_price) {
+            this.total_price = total_price;
+        }
+
+        public double getTotal_earning() {
+            return total_earning;
+        }
+
+        public void setTotal_earning(double total_earning) {
+            this.total_earning = total_earning;
+        }
+
+        public String getTime() {
+            return time;
+        }
+
+        public void setTime(String time) {
+            this.time = time;
+        }
+
+        public List<RoomDetail> getList() {
+            return list;
+        }
+
+        public void setList(List<RoomDetail> list) {
+            this.list = list;
+        }
+
+        public void setItemViewType(int itemViewType) {
+            this.itemViewType = itemViewType;
+        }
+
+        @Override
+        public int getItemType() {
+            return itemViewType;
+        }
+
+        public static class RoomDetail implements MultiItemEntity{
+            /**
+             * user_head_picture : https://osschumeng.oss-cn-beijing.aliyuncs.com/admin_images/67932634b1555.png
+             * user_nickname : 用户10137552
+             * get_user_nickname : 用户10137840
+             * gift_name : 退烧药
+             * gift_number : 3
+             * total_price : 297.00
+             * time : 2025-03-07
+             * earning : 59.4
+             */
+            private int itemViewType = 2;
+            private String user_head_picture;
+            private String user_nickname;
+            private String get_user_nickname;
+            private String gift_name;
+            private int gift_number;
+            private double total_price;
+            private String time;
+            private double earning;
+
+
+            public String getUser_head_picture() {
+                return user_head_picture;
+            }
+
+            public void setUser_head_picture(String user_head_picture) {
+                this.user_head_picture = user_head_picture;
+            }
+
+            public String getUser_nickname() {
+                return user_nickname;
+            }
+
+            public void setUser_nickname(String user_nickname) {
+                this.user_nickname = user_nickname;
+            }
+
+            public String getGet_user_nickname() {
+                return get_user_nickname;
+            }
+
+            public void setGet_user_nickname(String get_user_nickname) {
+                this.get_user_nickname = get_user_nickname;
+            }
+
+            public String getGift_name() {
+                return gift_name;
+            }
+
+            public void setGift_name(String gift_name) {
+                this.gift_name = gift_name;
+            }
+
+            public int getGift_number() {
+                return gift_number;
+            }
+
+            public void setGift_number(int gift_number) {
+                this.gift_number = gift_number;
+            }
+
+            public double getTotal_price() {
+                return total_price;
+            }
+
+            public void setTotal_price(double total_price) {
+                this.total_price = total_price;
+            }
+
+            public String getTime() {
+                return time;
+            }
+
+            public void setTime(String time) {
+                this.time = time;
+            }
+
+            public double getEarning() {
+                return earning;
+            }
+
+            public void setEarning(double earning) {
+                this.earning = earning;
+            }
+
+            public void setItemViewType(int itemViewType) {
+                this.itemViewType = itemViewType;
+            }
+
+            @Override
+            public int getItemType() {
+                return itemViewType;
+            }
+        }
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomSubsidy.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomSubsidy.java
new file mode 100644
index 00000000..55d857b3
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomSubsidy.java
@@ -0,0 +1,26 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.Data;
+
+@Data
+public class RoomSubsidy {
+    private String explain;//api/about/showAbout&id=39",//补贴说明  （这是个页面，需要前端拼个域名）
+
+    private LastWeek lastweek;
+    private ThisWeek thisweek;
+
+
+    @Data
+    public static class LastWeek {
+        private double total_transaction;//累计流水
+        private double subsidy_amount; //获得补贴
+        private int status;//发放状态 0未发放，1已发放
+    }
+
+    @Data
+    public static class ThisWeek {
+        private double total_transaction;
+        private double subsidy_amount;
+        private int status;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomSubsidyDetails.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomSubsidyDetails.java
new file mode 100644
index 00000000..c51dde4c
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/RoomSubsidyDetails.java
@@ -0,0 +1,13 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.Data;
+
+@Data
+public class RoomSubsidyDetails {
+    private String room_id;//房间id:214,
+    private String start_time;//开始时间:"2025-04-07",
+    private String end_time;//结束时间:"2025-04-13",
+    private String total_transaction;//: 0,      //累计流水
+    private String subsidy_amount;// 0,        //获得补贴
+    private String status;//: 0                 //0未发放，1已发放
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/SocietyBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/SocietyBean.java
new file mode 100644
index 00000000..bc24e7db
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/SocietyBean.java
@@ -0,0 +1,13 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SocietyBean {
+    private int id;
+    private String name;
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserBean.java
new file mode 100644
index 00000000..da851ceb
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserBean.java
@@ -0,0 +1,33 @@
+package com.qxcm.moduleutil.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class UserBean implements Serializable {
+
+    private int user_id;
+    private int user_code;
+    private String avatar;
+    private String nickname;
+    private String token;
+    private String tencent_im;
+    private String mobile;
+    private int sex;
+
+    private List<MultiUserBean> multi_user;
+
+    @Data
+    private static class MultiUserBean{
+        private String id;
+        private String user_code;
+        private String avatar;
+        private String nickname;
+        private String sex;
+        private String mobile;
+    }
+
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserHomeResp.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserHomeResp.java
new file mode 100644
index 00000000..6809991e
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserHomeResp.java
@@ -0,0 +1,53 @@
+package com.qxcm.moduleutil.bean;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserHomeResp implements Serializable {
+
+    private String user_id;
+    private String user_code;
+    private String head_picture;
+    private String nickname;
+    private String sex;
+    private String signature;
+    private String birthday;
+    private String constellation;
+    private String profession;
+    private String emchat_username;
+    private String nobility_icon;
+    private String nobility_image;
+    private String rank_icon;
+    private String intro_voice;
+    private String intro_voice_time;
+    private String follow;
+    private String follow_count;
+    private String fans_count;
+    private String age;
+    private String city;
+    private String is_online;
+    private String only_friend;
+    private String good_number;
+    private String id_color;
+    private String vedio;
+    private PhotoWallResp user_photo;
+    private String picture;
+    private String charm_icon;
+    private String charm_exp;
+    private String user_title;
+
+    private String room_id_current;//用户当前所在房间ID
+    private HomeRoomInfo room_info;
+
+    private String room_id_owner;//用户自己的房间id 0表示没有创建房间": 0,
+    private String room_name_owner;//用户自己的房间名称
+
+    private int auth_status; // 1:已实名认证 0:未实名认证
+    private SocietyBean society; // 公会信息
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserImgList.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserImgList.java
new file mode 100644
index 00000000..222dfc44
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/UserImgList.java
@@ -0,0 +1,14 @@
+package com.qxcm.moduleutil.bean;
+
+import lombok.Data;
+
+@Data
+public class UserImgList {
+    private String id;
+    private String url;
+
+    public UserImgList(String id, String url) {
+        this.id = id;
+        this.url = url;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/XBannerData.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/XBannerData.java
new file mode 100644
index 00000000..06a820ba
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/XBannerData.java
@@ -0,0 +1,48 @@
+package com.qxcm.moduleutil.bean;
+
+import com.stx.xhb.xbanner.entity.SimpleBannerInfo;
+
+import java.io.Serializable;
+
+public class XBannerData extends SimpleBannerInfo implements Serializable {
+
+
+    private int type;
+    private String url;
+    private String vedioCover;
+
+    public XBannerData(int type, String url, String vedioCover) {
+        this.type = type;
+        this.url = url;
+        this.vedioCover = vedioCover;
+    }
+
+    public String getVedioCover() {
+        return vedioCover;
+    }
+
+    public void setVedioCover(String vedioCover) {
+        this.vedioCover = vedioCover;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public Object getXBannerUrl() {
+        return url;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/BaseMultiItemEntity.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/BaseMultiItemEntity.java
new file mode 100644
index 00000000..459246d6
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/BaseMultiItemEntity.java
@@ -0,0 +1,23 @@
+package com.qxcm.moduleutil.bean.details;
+
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
+public   class BaseMultiItemEntity implements MultiItemEntity {
+    public static final int TYPE_A = 1;
+    public static final int TYPE_B = 2;
+
+    private int itemViewType;
+
+    public BaseMultiItemEntity(int itemViewType) {
+        this.itemViewType = itemViewType;
+    }
+
+    @Override
+    public int getItemType() {
+        return itemViewType;
+    }
+}
+
+// 定义 TypeA 数据模型类
+
+
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/DataModel.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/DataModel.java
new file mode 100644
index 00000000..20726aed
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/DataModel.java
@@ -0,0 +1,25 @@
+package com.qxcm.moduleutil.bean.details;
+
+import java.util.List;
+
+public class DataModel {
+    private RoomDeatailList typeA;
+    private List<RoomDeatil> list;
+
+    // 添加相应的 getter 和 setter 方法
+    public RoomDeatailList getTypeA() {
+        return typeA;
+    }
+
+    public void setTypeA(RoomDeatailList typeA) {
+        this.typeA = typeA;
+    }
+
+    public List<RoomDeatil> getList() {
+        return list;
+    }
+
+    public void setList(List<RoomDeatil> list) {
+        this.list = list;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/RoomDeatailList.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/RoomDeatailList.java
new file mode 100644
index 00000000..34986c4c
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/RoomDeatailList.java
@@ -0,0 +1,37 @@
+package com.qxcm.moduleutil.bean.details;
+
+public class RoomDeatailList extends BaseMultiItemEntity {
+    private double total_price;
+    private double total_earning;
+    private String time;
+    public RoomDeatailList() {
+        super(BaseMultiItemEntity.TYPE_A);
+    }
+
+    public double getTotal_price() {
+        return total_price;
+    }
+
+    public void setTotal_price(double total_price) {
+        this.total_price = total_price;
+    }
+
+    public double getTotal_earning() {
+        return total_earning;
+    }
+
+    public void setTotal_earning(double total_earning) {
+        this.total_earning = total_earning;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+
+}
+
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/RoomDeatil.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/RoomDeatil.java
new file mode 100644
index 00000000..06f3c95c
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/details/RoomDeatil.java
@@ -0,0 +1,81 @@
+package com.qxcm.moduleutil.bean.details;
+
+public class RoomDeatil extends BaseMultiItemEntity {
+    private String user_head_picture;
+    private String user_nickname;
+    private String get_user_nickname;
+    private String gift_name;
+    private int gift_number;
+    private double total_price;
+    private String time;
+    private double earning;
+
+    public RoomDeatil() {
+        super(BaseMultiItemEntity.TYPE_B);
+    }
+
+    // 添加相应的 getter 和 setter 方法
+    public String getUser_head_picture() {
+        return user_head_picture;
+    }
+
+    public void setUser_head_picture(String user_head_picture) {
+        this.user_head_picture = user_head_picture;
+    }
+
+    public String getUser_nickname() {
+        return user_nickname;
+    }
+
+    public void setUser_nickname(String user_nickname) {
+        this.user_nickname = user_nickname;
+    }
+
+    public String getGet_user_nickname() {
+        return get_user_nickname;
+    }
+
+    public void setGet_user_nickname(String get_user_nickname) {
+        this.get_user_nickname = get_user_nickname;
+    }
+
+    public String getGift_name() {
+        return gift_name;
+    }
+
+    public void setGift_name(String gift_name) {
+        this.gift_name = gift_name;
+    }
+
+    public int getGift_number() {
+        return gift_number;
+    }
+
+    public void setGift_number(int gift_number) {
+        this.gift_number = gift_number;
+    }
+
+    public double getTotal_price() {
+        return total_price;
+    }
+
+    public void setTotal_price(double total_price) {
+        this.total_price = total_price;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public double getEarning() {
+        return earning;
+    }
+
+    public void setEarning(double earning) {
+        this.earning = earning;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java
new file mode 100644
index 00000000..ab850804
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java
@@ -0,0 +1,28 @@
+package com.qxcm.moduleutil.bean.zhuangb;
+
+import lombok.Data;
+/**
+ *@author qx
+ *@data 2025/5/16
+ *@description: 装扮数据
+ */
+@Data
+public class ZhuangBanShangChengBean {
+
+    private int did = 0;
+    private String title = "";
+    private String type = "";
+    private String integral = "";
+    private int period = 0;
+    private String base_image = "";
+    private boolean is_select = false;
+
+    public boolean isIs_select() {
+        return is_select;
+    }
+
+    public void setIs_select(boolean is_select) {
+        this.is_select = is_select;
+    }
+}
+
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/DoubleDatePickerDialog.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/DoubleDatePickerDialog.java
new file mode 100644
index 00000000..119243ba
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/DoubleDatePickerDialog.java
@@ -0,0 +1,240 @@
+package com.qxcm.moduleutil.dialog;
+
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.DatePicker;
+
+
+import com.qxcm.moduleutil.R;
+
+import java.lang.reflect.Field;
+
+/**
+ * A simple dialog containing an {@link DatePicker}.
+ *
+ * <p>
+ * See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
+ * guide.
+ * </p>
+ */
+public class DoubleDatePickerDialog extends AlertDialog implements DialogInterface.OnClickListener, DatePicker.OnDateChangedListener {
+
+    private static final String START_YEAR = "start_year";
+    private static final String END_YEAR = "end_year";
+    private static final String START_MONTH = "start_month";
+    private static final String END_MONTH = "end_month";
+    private static final String START_DAY = "start_day";
+    private static final String END_DAY = "end_day";
+
+    private final DatePicker mDatePicker_start;
+    private final DatePicker mDatePicker_end;
+    private final OnDateSetListener mCallBack;
+
+    /**
+     * The callback used to indicate the user is done filling in the date.
+     */
+    public interface OnDateSetListener {
+
+        void onDateSet(DatePicker startDatePicker, int startYear, int startMonthOfYear, int startDayOfMonth,
+                       DatePicker endDatePicker, int endYear, int endMonthOfYear, int endDayOfMonth);
+    }
+
+    /**
+     * @param context
+     *            The context the dialog is to run in.
+     * @param callBack
+     *            How the parent is notified that the date is set.
+     * @param year
+     *            The initial year of the dialog.
+     * @param monthOfYear
+     *            The initial month of the dialog.
+     * @param dayOfMonth
+     *            The initial day of the dialog.
+     */
+    public DoubleDatePickerDialog(Context context, OnDateSetListener callBack, int year, int monthOfYear, int dayOfMonth) {
+        this(context, 0, callBack, year, monthOfYear, dayOfMonth);
+    }
+
+    public DoubleDatePickerDialog(Context context, int theme, OnDateSetListener callBack, int year, int monthOfYear,
+                                  int dayOfMonth) {
+        this(context, 0, callBack, year, monthOfYear, dayOfMonth, true);
+    }
+
+    /**
+     * @param context
+     *            The context the dialog is to run in.
+     * @param theme
+     *            the theme to apply to this dialog
+     * @param callBack
+     *            How the parent is notified that the date is set.
+     * @param year
+     *            The initial year of the dialog.
+     * @param monthOfYear
+     *            The initial month of the dialog.
+     * @param dayOfMonth
+     *            The initial day of the dialog.
+     */
+    public DoubleDatePickerDialog(Context context, int theme, OnDateSetListener callBack, int year, int monthOfYear,
+                                  int dayOfMonth, boolean isDayVisible) {
+        super(context, theme);
+
+        mCallBack = callBack;
+
+        Context themeContext = getContext();
+        setButton(BUTTON_POSITIVE, "确 定", this);
+        setButton(BUTTON_NEGATIVE, "取 消", this);
+        // setButton(BUTTON_POSITIVE,
+        // themeContext.getText(android.R.string.date_time_done), this);
+        setIcon(0);
+
+        LayoutInflater inflater = (LayoutInflater) themeContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View view = inflater.inflate(R.layout.date_picker_dialog, null);
+        setView(view);
+        mDatePicker_start = (DatePicker) view.findViewById(R.id.datePickerStart);
+        mDatePicker_end = (DatePicker) view.findViewById(R.id.datePickerEnd);
+        mDatePicker_start.init(year, monthOfYear, dayOfMonth, this);
+        mDatePicker_end.init(year, monthOfYear, dayOfMonth, this);
+        // updateTitle(year, monthOfYear, dayOfMonth);
+
+        // 如果要隐藏当前日期，则使用下面方法。
+        if (!isDayVisible) {
+            hidDay(mDatePicker_start);
+            hidDay(mDatePicker_end);
+        }
+    }
+
+    /**
+     * 隐藏DatePicker中的日期显示
+     *
+     * @param mDatePicker
+     */
+    private void hidDay(DatePicker mDatePicker) {
+        Field[] datePickerfFields = mDatePicker.getClass().getDeclaredFields();
+        for (Field datePickerField : datePickerfFields) {
+            if ("mDaySpinner".equals(datePickerField.getName())) {
+                datePickerField.setAccessible(true);
+                Object dayPicker = new Object();
+                try {
+                    dayPicker = datePickerField.get(mDatePicker);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                }
+                // datePicker.getCalendarView().setVisibility(View.GONE);
+                ((View) dayPicker).setVisibility(View.GONE);
+            }
+        }
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        // Log.d(this.getClass().getSimpleName(), String.format("which:%d",
+        // which));
+        // 如果是“取 消”按钮，则返回，如果是“确 定”按钮，则往下执行
+        if (which == BUTTON_POSITIVE)
+            tryNotifyDateSet();
+    }
+
+    @Override
+    public void onDateChanged(DatePicker view, int year, int month, int day) {
+        if (view.getId() == R.id.datePickerStart)
+            mDatePicker_start.init(year, month, day, this);
+        if (view.getId() == R.id.datePickerEnd)
+            mDatePicker_end.init(year, month, day, this);
+        // updateTitle(year, month, day);
+    }
+
+    /**
+     * 获得开始日期的DatePicker
+     *
+     * @return The calendar view.
+     */
+    public DatePicker getDatePickerStart() {
+        return mDatePicker_start;
+    }
+
+    /**
+     * 获得结束日期的DatePicker
+     *
+     * @return The calendar view.
+     */
+    public DatePicker getDatePickerEnd() {
+        return mDatePicker_end;
+    }
+
+    /**
+     * Sets the start date.
+     *
+     * @param year
+     *            The date year.
+     * @param monthOfYear
+     *            The date month.
+     * @param dayOfMonth
+     *            The date day of month.
+     */
+    public void updateStartDate(int year, int monthOfYear, int dayOfMonth) {
+        mDatePicker_start.updateDate(year, monthOfYear, dayOfMonth);
+    }
+
+    /**
+     * Sets the end date.
+     *
+     * @param year
+     *            The date year.
+     * @param monthOfYear
+     *            The date month.
+     * @param dayOfMonth
+     *            The date day of month.
+     */
+    public void updateEndDate(int year, int monthOfYear, int dayOfMonth) {
+        mDatePicker_end.updateDate(year, monthOfYear, dayOfMonth);
+    }
+
+    private void tryNotifyDateSet() {
+        if (mCallBack != null) {
+            mDatePicker_start.clearFocus();
+            mDatePicker_end.clearFocus();
+            mCallBack.onDateSet(mDatePicker_start, mDatePicker_start.getYear(), mDatePicker_start.getMonth(),
+                    mDatePicker_start.getDayOfMonth(), mDatePicker_end, mDatePicker_end.getYear(),
+                    mDatePicker_end.getMonth(), mDatePicker_end.getDayOfMonth());
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        // tryNotifyDateSet();
+        super.onStop();
+    }
+
+    @Override
+    public Bundle onSaveInstanceState() {
+        Bundle state = super.onSaveInstanceState();
+        state.putInt(START_YEAR, mDatePicker_start.getYear());
+        state.putInt(START_MONTH, mDatePicker_start.getMonth());
+        state.putInt(START_DAY, mDatePicker_start.getDayOfMonth());
+        state.putInt(END_YEAR, mDatePicker_end.getYear());
+        state.putInt(END_MONTH, mDatePicker_end.getMonth());
+        state.putInt(END_DAY, mDatePicker_end.getDayOfMonth());
+        return state;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        int start_year = savedInstanceState.getInt(START_YEAR);
+        int start_month = savedInstanceState.getInt(START_MONTH);
+        int start_day = savedInstanceState.getInt(START_DAY);
+        mDatePicker_start.init(start_year, start_month, start_day, this);
+
+        int end_year = savedInstanceState.getInt(END_YEAR);
+        int end_month = savedInstanceState.getInt(END_MONTH);
+        int end_day = savedInstanceState.getInt(END_DAY);
+        mDatePicker_end.init(end_year, end_month, end_day, this);
+
+    }
+}
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/AccessTokenInterceptor.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/AccessTokenInterceptor.java
new file mode 100644
index 00000000..cda3cec2
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/AccessTokenInterceptor.java
@@ -0,0 +1,46 @@
+package com.qxcm.moduleutil.http;
+
+
+import com.qxcm.moduleutil.utils.Sha1Util;
+import com.qxcm.moduleutil.utils.SpUtil;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import okhttp3.Headers;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+
+public class AccessTokenInterceptor implements Interceptor {
+
+    private final static String TAG = AccessTokenInterceptor.class.getCanonicalName();
+
+    private static final Map<String, String> mHeaderMap = new ConcurrentHashMap<>();
+
+    public static String token = "";
+
+    public AccessTokenInterceptor(Map<String, String> headers) {
+        mHeaderMap.putAll(headers);
+    }
+
+
+    public Map<String, String> getHeaders() {
+        return mHeaderMap;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        mHeaderMap.put("X-Token", SpUtil.getToken());
+        mHeaderMap.put("token", SpUtil.getToken());
+        long timestamp = System.currentTimeMillis() / 1000;
+        mHeaderMap.put("timestamp", String.valueOf(timestamp));
+        mHeaderMap.put("sign", Sha1Util.shaEncode(timestamp));
+        Request newRequest = request.newBuilder().headers(Headers.of(mHeaderMap)).build();
+        Response response = chain.proceed(newRequest);
+        return response;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java
new file mode 100644
index 00000000..55c2656a
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ApiServer.java
@@ -0,0 +1,282 @@
+package com.qxcm.moduleutil.http;
+
+
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.widget.Constants;
+
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.http.Field;
+import retrofit2.http.FieldMap;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+
+public interface ApiServer {
+
+
+    @FormUrlEncoded  //请求验证码
+    @POST(Constants.SEND_CODE)
+    Observable<BaseModel<Object>> sendCode(@Field("mobile") String mobile,@Field("event")String event);
+
+    @FormUrlEncoded
+    @POST(Constants.LOGIN)
+    Observable<BaseModel<List<UserBean>>> login(@Field("user_login") String user_login, @Field("sms_code") String sms_code);
+
+    @FormUrlEncoded
+    @POST(Constants.USER_LOGIN)
+    Observable<BaseModel<List<UserBean>>> userLogin(@Field("user_login") String user_login, @Field("password") String password);
+
+    @POST(Constants.UPLOAD_NICK_NAME)
+    Observable<BaseModel<String>> upUserNickname();
+
+    @FormUrlEncoded
+    @POST(Constants.UPLOAD_USER_PIC)
+    Observable<BaseModel<String>> upUserPic(@Field("sex") String sex);
+
+    @FormUrlEncoded
+    @POST(Constants.SWITCH_ACCOUNTS)
+    Observable<BaseModel<List<UserBean>>> switchAccounts(@Field("user_login") String user_id);
+
+    @FormUrlEncoded
+    @POST(Constants.USER_UPDATE)
+    Observable<BaseModel<UserBean>> userUpdate(@FieldMap Map<String, String> map);
+
+    @GET(Constants.AUTHORIZATION)
+    Observable<BaseModel<String>> authorization();
+
+    @FormUrlEncoded
+    @POST(Constants.CHANGE_PASSWORD)
+    Call<BaseModel<String>> getPostData(@Field("new_password") String new_password,@Field("mobile") String mobile,@Field("sms_code") String code,@Field("user_id") String userId);
+
+    @FormUrlEncoded
+    @POST(Constants.URL_LOGIN)
+    Observable<BaseModel<List<UserBean>>> oauthLogin(@Field("login_token") String login_token);
+
+    @FormUrlEncoded
+    @POST(Constants.URL_AUTH_CODE)
+    Observable<BaseModel<List<UserBean>>> authCode(@Field("auth_code") String login_token);
+    @FormUrlEncoded
+    @POST(Constants.URL_WX_CODE)
+    Observable<BaseModel<List<UserBean>>> authCode1(@Field("code") String login_token);
+
+
+//    @FormUrlEncoded
+//    @POST(Constant.URL.ADDBANK)
+//    Observable<BaseModel<String>> addBank(@Field("token") String token, @Field("bank_num") String bankNum, @Field("cardholder") String cardholder, @Field("bank_type") int bankType,
+//                                          @Field("bank_name") String bankName, @Field("mobile") String mobile, @Field("bank_zhi") String bankZhi, @Field("card_number") String cardNumber,
+//                                          @Field("code") String code
+//    );
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.SEND_CODE)
+//    Observable<BaseModel<String>> sendCode(@Field("token") String token, @Field("mobile") String mobile, @Field("type") int type);
+//
+//    @FormUrlEncoded
+//    @POST(URLConstants.CHECK_SMS_CODE)
+//    Observable<BaseModel<String>> checkSmsCode(@Field("mobile") String mobile, @Field("code") String code);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.USER_BANK)
+//    Observable<BaseModel<UserBankModel>> getUserBank(@Field("token") String token);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.RECHARGE)
+//    Observable<BaseModel<String>> userRecharge(@Field("token") String token, @Field("money") String money, @Field("type") int type);
+//    @FormUrlEncoded
+//    @POST(Constant.URL.THREE_PARTY_LOGIN)
+//    Observable<BaseModel<BeanPayData>> threePay(@Field("user_id") String userId, @Field("type") int type, @Field("id") String id);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.ALIPAYMENT)
+//    Observable<BaseModel<String>> aliPay(@Field("token") String token, @Field("user_id") String userId, @Field("type") int type, @Field("id") String id);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.WXPAYMENT)
+//    Observable<BaseModel<WxPayModel>> wxPay(@Field("token") String token, @Field("user_id") String userId, @Field("type") int type, @Field("id") String id);
+//
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.EDITBANK)
+//    Observable<BaseModel<String>> editBank(@Field("token") String token, @Field("cardholder") String cardholder, @Field("bank_name") String bank_name,
+//                                           @Field("mobile") String mobile, @Field("card_number") String card_number, @Field("id") String id,
+//                                           @Field("bank_num") String bank_num, @Field("bank_zhi") String bank_zhi, @Field("code") String code);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.USERWITHDRAW)
+//    Observable<BaseModel<String>> userWithdraw(@Field("token") String token, @Field("bank_id") String bank_id, @Field("number") String number, @Field("password") String password);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.LOGIN)
+//    Observable<BaseModel<UserBean>> login(@Field("mobile") String mobile, @Field("password") String password, @Field("code") String code, @Field("type") int type);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.LOGIN)
+//    Observable<BaseModel<UserBean>> oauthLogin(@Field("netease_token") String netease_token, @Field("access_token") String access_token, @Field("type") int type);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.SETUSERSEX)
+//    Observable<BaseModel<String>> setUserSex(@Field("user_id") String user_id, @Field("sex") int sex);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.THIRDPARTYLOGIN)
+//    Observable<BaseModel<UserBean>> thirdPartyLogin(@Field("openid") String openid, @Field("three_party") int three_party, @Field("nickname") String nickname,@Field("openid_old") String oldOpenId, @Field("head_pic") String head_pic);
+//
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.EARNINGS)
+//    Observable<BaseModel<EarningsModel>> getEarnings(@Field("token") String token);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.CONVERTEARNINGS)
+//    Observable<BaseModel<String>> convertEarnings(@Field("token") String token, @Field("number") String number, @Field("password") String password);
+//
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.CASHLOG)
+//    Observable<BaseModel<List<EarningsModel.EarningInfo>>> getCashLog(@Field("token") String token, @Field("p") int p, @Field("change_type") int change_type);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.BALANCE)
+//    Observable<BaseModel<UserMoneyBean>> getBalance(@Field("token") String token, @Field("type") int type);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.FOLLOW)
+//    Observable<BaseModel<String>> follow(@Field("token") String token, @Field("user_id") String userId, @Field("type") int type);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.FRIENDLIST)
+//    Observable<BaseModel<List<FriendModel>>> friendList(@Field("p") int p);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.FOLLOWLIST)
+//    Observable<BaseModel<List<FriendModel>>> followList(@Field("p") int p);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.FANSLIST)
+//    Observable<BaseModel<List<FriendModel>>> fansList(@Field("p") int p);
+//
+//    @POST(Constant.URL.MYINFO)
+//    Observable<BaseModel<UserInfoModel>> userInfo();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.USERINFO)
+//    Observable<BaseModel<UserInfoDataModel>> userInfoData(@Field("user_id") String userId, @Field("emchat_username") String emchatUsername, @Field("visit") int visit);
+//
+//    @POST(Constant.URL.VIPINFO)
+//    Observable<BaseModel<VipInfo>> vipinfo();
+//
+//    @POST(Constant.URL.SERVICEUSER)
+//    Observable<BaseModel<String>> serviceUser();
+//
+//    @POST(Constant.URL.ARTICLE_CATEGORIES)
+//    Observable<BaseModel<List<HelpTitleModel>>> articleCategories();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.ARTICLE_LIST)
+//    Observable<BaseModel<List<HelpModel>>> articleList(@Field("article_cat_id") String articleCatId);
+//
+//    @POST(Constant.URL.USER_NOBILITYINFO)
+//    Observable<BaseModel<NobilityInfo>> userNobilityInfo();
+//
+//    @POST(Constant.URL.NOBILITY)
+//    Observable<BaseModel<List<NobilityModel>>> nobility();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.BUYNOBILITY)
+//    Observable<BaseModel<String>> buyNobility(@Field("nobility_id") String nobilityId);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.RENEWNOBILITY)
+//    Observable<BaseModel<String>> renewNobility(@Field("day") String day);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.UPDATE_USERINFO)
+//    Observable<BaseModel<String>> updateUserInfo(@Field("signature") String signature, @Field("birthday") String birthday, @Field("constellation") String constellation, @Field("profession") String profession,
+//                                                 @Field("city_id") String city_id, @Field("user_photo") String user_photo, @Field("sex") String sex, @Field("head_picture") String head_picture,
+//                                                 @Field("nickname") String nickname, @Field("province_id") String province_id, @Field("user_no") String userNo, @Field("county_id") String county_id);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.INDEX_LABEL)
+//    Observable<BaseModel<List<LabelModel>>> indexLabel(@Field("category_id") String categoryId, @Field("p") int p);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.ADDLABEL)
+//    Observable<BaseModel<String>> addLabel(@Field("ids") String ids);
+//
+//    @POST(Constant.URL.CASHTYPE)
+//    Observable<BaseModel<List<CashTypeModel>>> cashType();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.COMEUSER)
+//    Observable<BaseModel<List<LatelyVisitInfo>>> comeUser(@Field("token") String token, @Field("p") int p);
+//
+//    @GET(Constant.URL.APPUPDATE)
+//    Observable<BaseModel<AppUpdateModel>> appUpdate();
+//
+//    @GET(Constant.URL.CHECK_UPDATE)
+//    Observable<BaseModel<AppUpdateModel>> checkUpdate();
+//
+//    @POST(Constant.URL.USER_FILES)
+//    Observable<BaseModel<UserBean>> userFiles();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.BIND_MOBILE)
+//    Observable<BaseModel<String>> bindMobile(@Field("mobile") String mobile, @Field("code") String code);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.RESET_PASSWORD)
+//    Observable<BaseModel<String>> resetPassword(@Field("mobile") String mobile, @Field("code") String code, @Field("password") String password);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.MESSAGE_SETTING)
+//    Observable<BaseModel<String>> messageSetting(@Field("broadcast") int broadcast, @Field("fans") int fans, @Field("news_voice") int news_voice, @Field("news_vibrate") int news_vibrate, @Field("only_friend") int only_friend );
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.USER_BLACK_LIST)
+//    Observable<BaseModel<List<BlacListSectionBean>>> userBlackList(@Field("p") int page, @Field("keyword") String keyword);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.ADD_BLACK_USER)
+//    Observable<BaseModel<String>> removeBlackUser(@Field("black_id") String blackId, @Field("type") int type);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.QUIT_ROOM_WITH_USER_ID)
+//    Observable<BaseModel<String>> quitRoomWithUserId(@Field("room_id") String roomId, @Field("user_id") String userId);
+//
+//    @POST(Constant.URL.SIGN_SWITCH)
+//    Observable<BaseModel<SignSwitchModel>> signSwitch();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.SET_SECOND_PASSWORD)
+//    Observable<BaseModel<String>> setSecondPassword(@Field("mobile") String mobile, @Field("password") String password, @Field("code") String code);
+//
+//    @FormUrlEncoded
+//    @POST(URLConstants.NAME_AUTH)
+//    Observable<BaseModel<String>> nameAuth(@Field("userId") String userId, @Field("fullName") String fullName, @Field("idNumber") String idNumber, @Field("idCard") String idCard, @Field("front") String front, @Field("back") String back);
+//
+//    @POST(Constant.URL.USER_PHOTO)
+//    Observable<BaseModel<List<MyPhotoItem>>> userPhotos();
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.DELETE_USER_PHOTO)
+//    Observable<BaseModel<String>> deleteUserPhoto(@Field("id") String ids);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.ADD_USER_PHOTO)
+//    Observable<BaseModel<String>> addUserPhoto(@Field("photo") String photo);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.LOGOUT_REASON)
+//    Observable<BaseModel<String>> logoutReason(@Field("token") String token, @Field("mobile") String mobile,
+//                                               @Field("reason") String reason,@Field("code") String code);
+//
+//    @FormUrlEncoded
+//    @POST(Constant.URL.LOGOUT_STATUS)
+//    Observable<BaseModel<LogoutReasonModel>> getlogoutStatus(@Field("token") String token, @Field("mobile") String mobile);
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseModel.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseModel.java
index 4506e414..ba2b053f 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseModel.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseModel.java
@@ -4,9 +4,9 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 public class BaseModel<T> implements Parcelable {
-    private int status;
+    private int code;
     private T data;
-    private String info;
+    private String msg;
 
     public T getData() {
         return data;
@@ -16,26 +16,28 @@ public class BaseModel<T> implements Parcelable {
         this.data = data;
     }
 
-    public Integer getStatus() {
-        return status;
+    public int getCode() {
+        return code;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setCode(int code) {
+        this.code = code;
     }
 
-    public String getInfo() {
-        return info;
+    public String getMsg() {
+        return msg;
     }
 
-    public void setInfo(String info) {
-        this.info = info;
+    public void setMsg(String msg) {
+        this.msg = msg;
     }
 
     public BaseModel() {
 
     }
-
+    public boolean isSuccess() {
+        return code == 1; // 根据实际业务码判断是否成功
+    }
     @Override
     public int describeContents() {
         return 0;
@@ -43,13 +45,13 @@ public class BaseModel<T> implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(this.status);
-        dest.writeString(this.info);
+        dest.writeInt(this.code);
+        dest.writeString(this.msg);
     }
 
     protected BaseModel(Parcel in) {
-        this.status = in.readInt();
-        this.info = in.readString();
+        this.code = in.readInt();
+        this.msg = in.readString();
     }
 
     public static final Creator<BaseModel> CREATOR = new Creator<BaseModel>() {
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseObserver.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseObserver.java
index cd504ea8..63857117 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseObserver.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/BaseObserver.java
@@ -23,7 +23,7 @@ import io.reactivex.Observer;
  * Created by Administrator on 2017/11/22.
  */
 
-public abstract class BaseObserver<T> implements Observer<T> {
+public abstract class BaseObserver<T> implements Observer<T>  {
 
     private boolean showErrMsg;
 
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/DefaultTransformer.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/DefaultTransformer.java
new file mode 100644
index 00000000..0e845493
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/DefaultTransformer.java
@@ -0,0 +1,17 @@
+package com.qxcm.moduleutil.http;
+
+
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.ObservableTransformer;
+
+public class DefaultTransformer<T extends BaseModel<R>, R>
+        implements ObservableTransformer<T, R> {
+
+    @Override
+    public ObservableSource<R> apply(Observable<T> upstream) {
+        return upstream.compose(SchedulerTransformer.<T>create())
+                .compose(new ErrorCheckerTransformer<T, R>());
+    }
+}
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ErrorCheckerTransformer.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ErrorCheckerTransformer.java
new file mode 100644
index 00000000..a6e840dc
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ErrorCheckerTransformer.java
@@ -0,0 +1,40 @@
+package com.qxcm.moduleutil.http;
+
+
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.ObservableTransformer;
+import io.reactivex.functions.Function;
+
+
+public class ErrorCheckerTransformer<T extends BaseModel<R>, R>
+        implements ObservableTransformer<T, R> {
+
+    @Override
+    public ObservableSource<R> apply(Observable<T> upstream) {
+        return upstream.map(new Function<T, R>() {
+            @Override
+            public R apply(T t) throws Exception {
+                if (t != null) {
+                    int code = t.getCode();
+                    String msg = t.getMsg();
+                    if (code == 1) {//请求成功
+                        return t.getData();
+                    } else if (code == 301) {
+                        throw new APIException(code, msg);
+                    } else {
+                        String message = ErrorMessage.get(code);
+                        if (message != null) {
+                            throw new APIException(code, message);
+                        } else {
+                            throw new APIException(code, t.getMsg());
+                        }
+                    }
+                } else {
+                    return null;
+                }
+            }
+        });
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ErrorMessage.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ErrorMessage.java
new file mode 100644
index 00000000..26a30d3a
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ErrorMessage.java
@@ -0,0 +1,80 @@
+package com.qxcm.moduleutil.http;
+
+/**
+ * 常见错误码对应的错误信息
+ * Created by dmx on 16/12/1.
+ */
+
+public class ErrorMessage {
+
+
+    /**
+     * 根据编码获取对应的错误信息，没有对应编码则返回null
+     *
+     * @param code
+     * @return
+     */
+    public static String get(int code) {
+        switch (code) {
+
+            case 0:
+                return "失败";
+//
+            case 203:
+                return "系统维护中";
+
+            case 301:
+                return "token失效";
+//
+//            case 20:
+//                return "用户不存在";
+//
+//            case 21:
+//                return "用户已经存在";
+//
+//            case 22:
+//                return "用户状态已改变,请刷新重试";
+//
+//            case 100:
+//                return "验证码获取太频繁";
+//
+//            case 101:
+//                return "获取验证码次数限制";
+//
+//            case 102:
+//                return "验证码错误";
+//            case 103:
+//                return "密码错误";
+//            case 104:
+//                return "第一次登录需要设置密码";
+//            case 500:
+//                return "接口不存在";
+//
+//            case 502:
+//                return "已经提交代理申请";
+//
+//            case 504:
+//                return "已经是雇员了";
+////            case 528:
+////                return "不在续保期内,无法续保";
+//            case 661:
+//                return "客户身份证重复";
+//
+//            case 1000:
+//                return "employeeId错误或者缺少";
+//
+//
+//            case 1009:
+//                return "手机号错误";
+//
+//            case 1020:
+//                return "参数pwd错误或者缺失";
+//
+//            case 1022:
+//                return "参数id错误或者缺失";
+            default:
+                return null;
+
+        }
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/MyConverterFactory.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/MyConverterFactory.java
new file mode 100644
index 00000000..61752173
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/MyConverterFactory.java
@@ -0,0 +1,60 @@
+package com.qxcm.moduleutil.http;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.qxcm.moduleutil.utils.GsonUtils;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+
+public class MyConverterFactory extends Converter.Factory {
+
+    /**
+     * Create an instance using a default {@link Gson} instance for conversion. Encoding to JSON and
+     * decoding from JSON (when no charset is specified by a header) will use UTF-8.
+     */
+    public static MyConverterFactory create() {
+        return create(GsonUtils.getGSON());
+    }
+
+    /**
+     * Create an instance using {@code gson} for conversion. Encoding to JSON and
+     * decoding from JSON (when no charset is specified by a header) will use UTF-8.
+     */
+    @SuppressWarnings("ConstantConditions") // Guarding public API nullability.
+    public static MyConverterFactory create(Gson gson) {
+        if (gson == null) {
+            throw new NullPointerException("gson == null");
+        }
+        return new MyConverterFactory(gson);
+    }
+
+    private final Gson gson;
+
+    private MyConverterFactory(Gson gson) {
+        this.gson = gson;
+    }
+
+    @Override
+    public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
+        TypeAdapter<?> adapter = gson.getAdapter(TypeToken.get(type));
+        return new RequestBodyConverter<>(gson, adapter);
+    }
+
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
+        TypeAdapter<?> adapter = gson.getAdapter(TypeToken.get(type));
+        return new ResponseBodyConverter<>(gson, adapter);
+//        return new ResponseBodyConverter<>(gson, TypeToken.get(type));
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RequestBodyConverter.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RequestBodyConverter.java
new file mode 100644
index 00000000..ec752e16
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RequestBodyConverter.java
@@ -0,0 +1,41 @@
+package com.qxcm.moduleutil.http;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.Charset;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.Buffer;
+import retrofit2.Converter;
+
+public class RequestBodyConverter<T> implements Converter<T, RequestBody> {
+
+    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json; charset=UTF-8");
+    private static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    private final Gson gson;
+    private final TypeAdapter<T> adapter;
+
+    RequestBodyConverter(Gson gson, TypeAdapter<T> adapter) {
+        this.gson = gson;
+        this.adapter = adapter;
+    }
+
+    @Override public RequestBody convert(@NonNull T value) throws IOException {
+        Buffer buffer = new Buffer();
+        Writer writer = new OutputStreamWriter(buffer.outputStream(), UTF_8);
+        JsonWriter jsonWriter = gson.newJsonWriter(writer);
+        adapter.write(jsonWriter, value);
+        jsonWriter.close();
+        return RequestBody.create(MEDIA_TYPE, buffer.readByteString());
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ResponseBodyConverter.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ResponseBodyConverter.java
new file mode 100644
index 00000000..754cb428
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/ResponseBodyConverter.java
@@ -0,0 +1,41 @@
+package com.qxcm.moduleutil.http;
+
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.qxcm.moduleutil.utils.GsonUtils;
+
+import java.io.IOException;
+
+import io.reactivex.annotations.NonNull;
+import okhttp3.ResponseBody;
+import retrofit2.Converter;
+
+public class ResponseBodyConverter<T> implements Converter<ResponseBody, T> {
+
+    private final Gson gson;
+    private final TypeAdapter<T> adapter;
+
+    ResponseBodyConverter(Gson gson, TypeAdapter<T> adapter) {
+        this.gson = gson;
+        this.adapter = adapter;
+    }
+
+    @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 {
+                throw new APIException(obj.getCode(), info);
+            }
+        }
+        value.close();
+        return adapter.fromJson(json);
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java
new file mode 100644
index 00000000..4834fe15
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/RetrofitClient.java
@@ -0,0 +1,198 @@
+package com.qxcm.moduleutil.http;
+
+//import com.blankj.utilcode.util.LogUtils;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+import com.franmontiel.persistentcookiejar.ClearableCookieJar;
+import com.franmontiel.persistentcookiejar.PersistentCookieJar;
+import com.franmontiel.persistentcookiejar.cache.SetCookieCache;
+import com.franmontiel.persistentcookiejar.persistence.SharedPrefsCookiePersistor;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+import com.qxcm.moduleutil.utils.SystemUtils;
+import com.qxcm.moduleutil.utils.logger.DataLogger;
+import com.qxcm.moduleutil.utils.logger.DataLoggingInterceptor;
+
+import java.io.File;
+import java.net.Proxy;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import io.reactivex.disposables.Disposable;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+
+public class RetrofitClient {
+
+    private static RetrofitClient INSTANCE;
+    private static ApiServer sApiServer;
+    public static final int DEFAULT_TIME_OUT = 60;
+    private static OkHttpClient client;
+    private final Retrofit mRetrofit;
+
+    public OkHttpClient getHttpClient() {
+        return client;
+    }
+
+    File cacheFile = new File(CommonAppContext.getInstance().getCacheDir(), "cache");
+    Cache cache = new Cache(cacheFile, 1024 * 1024 * 100); // 100MB 的缓存空间
+    boolean isNetworkAvailable = checkNetworkConnection(); // 实现这个方法来检查网络状态
+    String cacheControl = isNetworkAvailable ? "max-age=0" : "only-if-cached, max-stale=86400";
+
+    private boolean checkNetworkConnection() {
+        ConnectivityManager connectivityManager = (ConnectivityManager) CommonAppContext.getInstance().getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+        return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+    }
+
+    private OkHttpClient provideOkHttpClient() {
+        Map<String, String> headers = SystemUtils.getSystemParams();
+        SetCookieCache cookieCache = new SetCookieCache();
+        ClearableCookieJar cookieJar =
+                new PersistentCookieJar(cookieCache, new SharedPrefsCookiePersistor(CommonAppContext.getInstance()));
+        try {
+            X509TrustManager trustAllCert = new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
+                }
+
+                @Override
+                public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
+                }
+
+                @Override
+                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                    return new java.security.cert.X509Certificate[]{};
+                }
+            };
+            SSLContext sslContext = null;
+            sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, new TrustManager[]{trustAllCert}, new SecureRandom());
+
+            final OkHttpClient client = new OkHttpClient.Builder()
+//                .addInterceptor(new LoggerInterceptor("HttpLog", true))
+                    .addInterceptor(new DataLoggingInterceptor(new DataLogger()))
+                    .addInterceptor(new AccessTokenInterceptor(headers))
+                    .proxy(Proxy.NO_PROXY)
+                    .sslSocketFactory(sslContext.getSocketFactory(), trustAllCert)
+                    .hostnameVerifier((hostname, session) -> true)
+                    .cookieJar(cookieJar)
+                    .connectTimeout(DEFAULT_TIME_OUT, TimeUnit.SECONDS)
+                    .readTimeout(DEFAULT_TIME_OUT, TimeUnit.SECONDS)
+                    .writeTimeout(DEFAULT_TIME_OUT, TimeUnit.SECONDS)
+                    .build();
+            RetrofitClient.client = client;
+        } catch (KeyManagementException | NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+        return client;
+    }
+
+    private Retrofit provideRetrofit(OkHttpClient client) {
+        return new Retrofit.Builder()
+                .addConverterFactory(MyConverterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .baseUrl(CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl())
+                .client(client)
+
+                .build();
+    }
+
+//    private static Retrofit mRainRetrofit;
+//
+//    public static Retrofit getRainRetrofit() {
+//        if (mRainRetrofit == null) {
+//            synchronized (RetrofitClient.class) {
+//                mRainRetrofit = new Retrofit.Builder()
+//                        .addConverterFactory(RainConverterFactory.create())
+//                        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+//                        .baseUrl(BuildConfig.RAIN_GAME_BASE_URL)
+//                        .client(client)
+//                        .build();
+//            }
+//        }
+//        return mRainRetrofit;
+//    }
+
+    private RetrofitClient() {
+        mRetrofit = provideRetrofit(provideOkHttpClient());
+        sApiServer = mRetrofit.create(ApiServer.class);
+    }
+
+    public static RetrofitClient getInstance() {
+        if (INSTANCE == null) {
+            synchronized (RetrofitClient.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new RetrofitClient();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public <T> T createApiClient(Class<T> apiClientClass) {
+        return mRetrofit.create(apiClientClass);
+    }
+
+    public void login() {
+//        login("18473492252", "123456");
+//        login("18229732986", "123456");
+    }
+
+
+    public void sendCode(String mobile,String event,BaseObserver<Object> observer) {
+        sApiServer.sendCode(mobile,event).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void login(String mobile, String password, BaseObserver<List<UserBean>> observer) {
+        sApiServer.login(mobile, password).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+    public void userLogin(String mobile, String password, BaseObserver<List<UserBean>> observer) {
+        sApiServer.userLogin(mobile, password).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void upUserNickname(BaseObserver<String> observer){
+        sApiServer.upUserNickname().compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void upUserPic(String sex,BaseObserver<String> observer){
+        sApiServer.upUserPic(sex).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void switchAccounts(String loginId,  BaseObserver<List<UserBean>> observer){
+        sApiServer.switchAccounts(loginId).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void userUpdate(Map<String, String> map, BaseObserver<UserBean> observer) {
+        sApiServer.userUpdate(map).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void authorization(BaseObserver<String> observer){
+        sApiServer.authorization().compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+
+    public void oauthLogin(String netease_token, BaseObserver<List<UserBean>> observer) {
+        sApiServer.oauthLogin(netease_token).compose(new DefaultTransformer<>()).subscribe(observer);
+    }
+    public void authCode(String netease_token,int type, BaseObserver<List<UserBean>> observer) {
+        if (type==1){
+            sApiServer.authCode1(netease_token).compose(new DefaultTransformer<>()).subscribe(observer);
+        }else {
+            sApiServer.authCode(netease_token).compose(new DefaultTransformer<>()).subscribe(observer);
+        }
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/http/SchedulerTransformer.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/SchedulerTransformer.java
new file mode 100644
index 00000000..f49a3573
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/http/SchedulerTransformer.java
@@ -0,0 +1,25 @@
+package com.qxcm.moduleutil.http;
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.ObservableTransformer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * 默认线程调度
+ * Created by dmx on 16/12/1.
+ */
+
+public class SchedulerTransformer<T> implements ObservableTransformer<T, T> {
+
+    public static <T> SchedulerTransformer<T> create() {
+        return new SchedulerTransformer<>();
+    }
+
+    @Override
+    public ObservableSource<T> apply(Observable<T> upstream) {
+        return upstream.subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/presenter/BasePresenter.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/presenter/BasePresenter.java
index 84d1f1aa..9b434d34 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/presenter/BasePresenter.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/presenter/BasePresenter.java
@@ -6,6 +6,7 @@ import android.content.Context;
 
 import com.qxcm.moduleutil.activity.IPresenter;
 import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.http.RetrofitClient;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -15,7 +16,7 @@ import io.reactivex.disposables.Disposable;
 
 public abstract class BasePresenter<V extends IView> implements IPresenter {
     protected CompositeDisposable mDisposables = new CompositeDisposable();
-//    private RemoteDataSource api;
+    protected RetrofitClient api = RetrofitClient.getInstance();
      protected Reference<V> MvpRef;
     protected Context mContext;
 
@@ -40,12 +41,6 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
         return null;
     }
 
-//    protected RemoteDataSource getApi() {
-//        if (api == null) {
-//            api = RemoteDataSource.getInstance();
-//        }
-//        return api;
-//    }
 
     /**
      * 主要用于判断IView的生命周期是否结束，防止出现内存泄露状况
@@ -63,9 +58,9 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
             MvpRef.clear();
             MvpRef = null;
         }
-//        if (api != null) {
-//            api = null;
-//        }
+        if (api != null) {
+            api = null;
+        }
         unBindView();
     }
 
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/ActivityResultCallback.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/ActivityResultCallback.java
new file mode 100644
index 00000000..cf15f392
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/ActivityResultCallback.java
@@ -0,0 +1,19 @@
+package com.qxcm.moduleutil.utils;
+
+import android.content.Intent;
+
+/**
+ * Created by cxf on 2018/9/29.
+ */
+
+public abstract class ActivityResultCallback {
+    public abstract void onSuccess(Intent intent);
+
+    public void onFailure() {
+
+    }
+
+    public void onResult(int resultCode, Intent intent) {
+
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/DeviceUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/DeviceUtils.java
index a09e1d25..862ce437 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/DeviceUtils.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/DeviceUtils.java
@@ -4,7 +4,7 @@ import android.os.Build;
 import android.provider.Settings;
 
 import com.qxcm.moduleutil.widget.CommonAppConfig;
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
 
 
 public class DeviceUtils {
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/GsonUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/GsonUtils.java
new file mode 100644
index 00000000..f3893880
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/GsonUtils.java
@@ -0,0 +1,93 @@
+package com.qxcm.moduleutil.utils;
+
+//import com.blankj.utilcode.util.LogUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+import com.qxcm.moduleutil.utils.logger.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class GsonUtils {
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+    private static final JsonParser PARSER = new JsonParser();
+
+    public static Gson getGSON() {
+        return GSON;
+    }
+
+    /**
+     * Object 转 json
+     *
+     * @param object object
+     * @return object
+     */
+    public static String GsonString(Object object) {
+        return GSON.toJson(object);
+    }
+
+    public static <T> T GsonToBean(String gsonString, Class<T> cls) {
+        return GSON.fromJson(gsonString, cls);
+    }
+
+    /**
+     * 转成map的
+     *
+     * @param gsonString str
+     * @return map
+     */
+    public static Map<String, Object> GsonToMaps(String gsonString) {
+        return GSON.fromJson(gsonString, new TypeToken<Map<String, Object>>() {
+        }.getType());
+    }
+
+    /**
+     * 将json 格式化输出
+     *
+     * @param str str
+     * @return str
+     */
+    public static String GsonToString(String str) {
+        try {
+            return GSON.toJson(PARSER.parse(str));
+        } catch (JsonSyntaxException e) {
+            e.printStackTrace();
+            return str;
+        }
+    }
+
+    /**
+     * json字符串转成list
+     * 解决泛型问题
+     * 备注：
+     * List<T> list=gson.fromJson(gsonString, new TypeToken<List<T>>() {}.getType());
+     * 该方法会报泛型类型擦除问题
+     *
+     * @param gsonString
+     * @param cls
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> GsonToList(String gsonString, Class<T> cls) {
+        List<T> list = new ArrayList<T>();
+        try {
+            if (GSON != null) {
+                JsonArray array = new JsonParser().parse(gsonString).getAsJsonArray();
+                for (final JsonElement elem : array) {
+                    list.add(GSON.fromJson(elem, cls));
+                }
+            }
+        } catch (Exception e) {
+            Logger.e("非法json字符串", e);
+        }
+        return list;
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/LanguageUtil.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/LanguageUtil.java
index e2455855..bad24ac5 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/LanguageUtil.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/LanguageUtil.java
@@ -12,7 +12,7 @@ import androidx.core.os.ConfigurationCompat;
 import androidx.core.os.LocaleListCompat;
 
 
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.widget.Constants;
 
 import java.util.Locale;
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/PermissionCallback.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/PermissionCallback.java
new file mode 100644
index 00000000..52b53a36
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/PermissionCallback.java
@@ -0,0 +1,12 @@
+package com.qxcm.moduleutil.utils;
+
+import java.util.HashMap;
+
+public abstract class PermissionCallback {
+
+    public abstract void onAllGranted();
+
+    public void onResult(HashMap<String, Boolean> resultMap) {
+
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/PermissionUtil.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/PermissionUtil.java
new file mode 100644
index 00000000..4bfe18f9
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/PermissionUtil.java
@@ -0,0 +1,36 @@
+package com.qxcm.moduleutil.utils;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+
+import java.util.List;
+
+/**
+ * 申请权限
+ */
+public class PermissionUtil {
+
+    public static void request(FragmentActivity activity, PermissionCallback callback, String... permission) {
+        ProcessFragment processFragment = null;
+        FragmentManager fragmentManager = activity.getSupportFragmentManager();
+        List<Fragment> list = fragmentManager.getFragments();
+        if (list != null && list.size() > 0) {
+            for (Fragment fragment : list) {
+                if (fragment != null && fragment instanceof ProcessFragment) {
+                    processFragment = (ProcessFragment) fragment;
+                    break;
+                }
+            }
+        }
+        if (processFragment == null) {
+            processFragment = new ProcessFragment();
+            FragmentTransaction tx = fragmentManager.beginTransaction();
+            tx.add(processFragment, "ProcessFragment").commitNow();
+        }
+        processFragment.requestPermissions(callback, permission);
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/ProcessFragment.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/ProcessFragment.java
new file mode 100644
index 00000000..9b30db7a
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/ProcessFragment.java
@@ -0,0 +1,175 @@
+package com.qxcm.moduleutil.utils;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.qxcm.moduleutil.R;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.widget.CommonAppConfig;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Created by cxf on 2018/9/29.
+ * 处理 检查权限和 startActivityForResult 的回调的Fragment
+ */
+
+public class ProcessFragment extends Fragment {
+
+    private Context mContext;
+    private PermissionCallback mPermissionCallback;
+    private ActivityResultCallback mActivityResultCallback;
+    private LinkedHashMap<String, Boolean> mMap;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getActivity();
+    }
+
+    /**
+     * 申请权限
+     */
+    public void requestPermissions(PermissionCallback callback, String... permissions) {
+        if (callback == null || permissions == null || permissions.length == 0) {
+            return;
+        }
+        boolean isAllGranted = true;
+        if (mMap == null) {
+            mMap = new LinkedHashMap<>();
+        } else {
+            mMap.clear();
+        }
+        for (String permission : permissions) {
+            boolean isGranted = ContextCompat.checkSelfPermission(mContext, permission) == PackageManager.PERMISSION_GRANTED;
+            mMap.put(permission, isGranted);
+            if (!isGranted) {
+                isAllGranted = false;
+            }
+        }
+        if (isAllGranted) {
+            callback.onAllGranted();
+            callback.onResult(mMap);
+            mPermissionCallback = null;
+        } else {
+            mPermissionCallback = callback;
+            requestPermissions(permissions, 0);
+        }
+    }
+
+
+    /**
+     * 申请权限结果
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean isAllGranted = true;
+        if (mMap == null) {
+            mMap = new LinkedHashMap<>();
+        } else {
+            mMap.clear();
+        }
+        for (int i = 0, len = grantResults.length; i < len; i++) {
+            boolean isGranted = grantResults[i] == PackageManager.PERMISSION_GRANTED;
+            mMap.put(permissions[i], isGranted);
+            if (!isGranted) {
+                isAllGranted = false;
+            }
+        }
+        if (isAllGranted) {
+            if (mPermissionCallback != null) {
+                mPermissionCallback.onAllGranted();
+            }
+        } else {
+            showTip();
+        }
+        if (mPermissionCallback != null) {
+            mPermissionCallback.onResult(mMap);
+        }
+        mPermissionCallback = null;
+    }
+
+
+    /**
+     * 拒绝某项权限时候的提示
+     */
+    private void showTip() {
+        if (mMap == null && mMap.size() == 0) {
+            return;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, Boolean> entry : mMap.entrySet()) {
+            if (!entry.getValue()) {
+                switch (entry.getKey()) {
+                    case Manifest.permission.READ_EXTERNAL_STORAGE:
+                    case Manifest.permission.WRITE_EXTERNAL_STORAGE:
+                        String permissionStorage = WordUtil.getString(R.string.permission_storage);
+                        if (sb.indexOf(permissionStorage) < 0) {
+                            sb.append(permissionStorage);
+                            sb.append("，");
+                        }
+                        break;
+                    case Manifest.permission.CAMERA:
+                        sb.append(WordUtil.getString(R.string.permission_camera));
+                        sb.append("，");
+                        break;
+                    case Manifest.permission.RECORD_AUDIO:
+                        sb.append(WordUtil.getString(R.string.permission_record_audio));
+                        sb.append("，");
+                        break;
+                    case Manifest.permission.ACCESS_COARSE_LOCATION:
+                        sb.append(WordUtil.getString(R.string.permission_location));
+                        sb.append("，");
+                        CommonAppConfig.getInstance().clearLocationInfo();
+                        break;
+                    case Manifest.permission.READ_PHONE_STATE:
+                        sb.append(WordUtil.getString(R.string.permission_read_phone_state));
+                        sb.append("，");
+                        break;
+                }
+            }
+        }
+        String s = sb.toString();
+        if (!TextUtils.isEmpty(s) && s.length() > 1) {
+            s = s.substring(0, s.length() - 1);
+        }
+        final String tip = String.format(WordUtil.getString(R.string.permission_refused), s);
+        CommonAppContext.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                ToastUtils.showShort(tip);
+            }
+        }, 300);
+    }
+
+
+    public void startActivityForResult(Intent intent, ActivityResultCallback callback) {
+        mActivityResultCallback = callback;
+        super.startActivityForResult(intent, 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (mActivityResultCallback != null) {
+            mActivityResultCallback.onResult(resultCode, data);
+            if (resultCode == -1) {//RESULT_OK
+                mActivityResultCallback.onSuccess(data);
+            } else {
+                mActivityResultCallback.onFailure();
+            }
+        }
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SPConstants.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SPConstants.java
index 2e4ee8f9..859a9436 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SPConstants.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SPConstants.java
@@ -26,4 +26,6 @@ public class SPConstants {
     public static final String SPECIAL_EMOJI_LIST = "specialEmojiList";//房间专属表情列表
 
     public static final String CABIN="cabin";//小黑屋
+
+    public static final String REAL_NAME = "realName";//是否实名认证
 }
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/Sha1Util.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/Sha1Util.java
new file mode 100644
index 00000000..ad95ee54
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/Sha1Util.java
@@ -0,0 +1,40 @@
+package com.qxcm.moduleutil.utils;
+
+
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class Sha1Util {
+
+
+    public static String shaEncode(long timestamp) {
+        String val = "token" + SpUtil.getToken() + "timestamp" + timestamp ;
+//        String val = "token" + SpUtil.getToken() + "timestamp" + timestamp + BuildConfig.SALT;
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("SHA-1");
+            md5.update(val.getBytes());
+            byte[] m = md5.digest();//加密
+            return byteArrayToHex(m).toLowerCase();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    public static String byteArrayToHex(byte[] byteArray) {
+        // 首先初始化一个字符数组，用来存放每个16进制字符
+        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        char[] resultCharArray = new char[byteArray.length * 2];
+        // 遍历字节数组，通过位运算（位运算效率高），转换成字符放到字符数组中去
+        int index = 0;
+        for (byte b : byteArray) {
+            resultCharArray[index++] = hexDigits[b >>> 4 & 0xf];
+            resultCharArray[index++] = hexDigits[b & 0xf];
+        }
+        // 字符数组组合成字符串返回
+        return new String(resultCharArray);
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SpUtil.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SpUtil.java
index 04ffab00..986ccd12 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SpUtil.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SpUtil.java
@@ -7,7 +7,8 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.SPUtils;
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.bean.UserBean;
 
 import java.util.Map;
 
@@ -229,18 +230,21 @@ public class SpUtil {
         return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getString(SPConstants.TOKEN);
     }
 
-    public static String getUserId() {
-        return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getString(SPConstants.USER_ID);
+    public static int getUserId() {
+        return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getInt(SPConstants.USER_ID);
     }
 
-    public static void saveUserId(String userId) {
+    public static void saveUserId(int userId) {
         SPUtils.getInstance(SPConstants.PREFERENCE_NAME).put(SPConstants.USER_ID, userId, true);
     }
 
     public static String getMyRoomId() {
         return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getString("MyRoomId");
     }
-
+    public static void saveUserInfo(UserBean userBean) {
+        String s = JSON.toJSONString(userBean);
+        SPUtils.getInstance(SPConstants.PREFERENCE_NAME).put(SPConstants.USER_INFO, s, true);
+    }
     public static void saveMyRoomId(String roomId) {
         SPUtils.getInstance(SPConstants.PREFERENCE_NAME).put("MyRoomId", roomId, true);
     }
@@ -448,6 +452,26 @@ public class SpUtil {
         return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getString("roomModel", "");
     }
 
+    // TODO: 2025/5/16 设置实名认证
+    public static void setRealName(boolean realName){
+        SPUtils.getInstance(SPConstants.REAL_NAME).put("realName", realName, true);
+    }
+
+    // TODO: 2025/5/16 是否实名认证
+    public static boolean getRealName(){
+        return SPUtils.getInstance(SPConstants.REAL_NAME).getBoolean("realName", false);
+    }
+    public static UserBean getUserInfo() {
+        String s = SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getString(SPConstants.USER_INFO);
+        if (TextUtils.isEmpty(s)) {
+            return new UserBean();
+        }
+        UserBean userBean = JSON.parseObject(s, UserBean.class);
+        if (userBean == null) {
+            return new UserBean();
+        }
+        return userBean;
+    }
     /**
      * 是否同意协议
      *
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SystemUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SystemUtils.java
new file mode 100644
index 00000000..e5cb058c
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/SystemUtils.java
@@ -0,0 +1,139 @@
+package com.qxcm.moduleutil.utils;
+
+import android.content.Context;
+import android.os.Build;
+
+import com.blankj.utilcode.util.AppUtils;
+import com.blankj.utilcode.util.DeviceUtils;
+import com.blankj.utilcode.util.MetaDataUtils;
+import com.chad.library.BuildConfig;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.utils.config.ConfigUtils;
+import com.qxcm.moduleutil.widget.CommonAppConfig;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+public class SystemUtils {
+    /**
+     * 获取当前手机系统语言。
+     *
+     * @return 返回当前系统语言。例如：当前设置的是“中文-中国”，则返回“zh-CN”
+     */
+    public static String getSystemLanguage() {
+        return Locale.getDefault().getLanguage();
+    }
+
+    /**
+     * 获取当前手机系统版本号
+     *
+     * @return 系统版本号
+     */
+    public static String getSystemVersion() {
+        return Build.VERSION.RELEASE;
+    }
+
+    /**
+     * 获取手机型号
+     *
+     * @return 手机型号
+     */
+    public static String getSystemModel() {
+        return Build.MODEL;
+    }
+
+    /**
+     * 获取手机厂商
+     *
+     * @return 手机厂商
+     */
+    public static String getDeviceBrand() {
+        return Build.BRAND;
+    }
+
+    public static String getClientID(String channel) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(channel);
+        sb.append(Build.SERIAL);
+        sb.append(Build.BOARD.length() % 10);
+        sb.append(Build.BRAND.length() % 10);
+        sb.append(Build.CPU_ABI.length() % 10);
+        sb.append(Build.DEVICE.length() % 10);
+        sb.append(Build.DISPLAY.length() % 10);
+        sb.append(Build.HOST.length() % 10);
+        sb.append(Build.ID.length() % 10);
+        sb.append(Build.MANUFACTURER.length() % 10);
+        sb.append(Build.MODEL.length() % 10);
+        sb.append(Build.PRODUCT.length() % 10);
+        sb.append(Build.TAGS.length() % 10);
+        sb.append(Build.TYPE.length() % 10);
+        sb.append(Build.USER.length() % 10);
+
+        return Md5Utils.get(sb.toString());
+    }
+
+
+    public static String getShortClientID(Context context, String channel) {
+        String cid = getClientID(channel);
+        return Md5Utils.get(cid + getUUID(context));
+    }
+
+    public static String getShortClientID(Context context) {
+        String cid = getClientID("xqipaoandroid");
+        return Md5Utils.get(cid + getUUID(context));
+    }
+
+    /**
+     * 得到全局唯一UUID
+     */
+    public static String getUUID(Context context) {
+        String system_uuid_key = "system_uuid";
+        ConfigUtils configUtils = ConfigUtils.getInstance(context);
+        configUtils.setConfigName(system_uuid_key);
+        String system_config_uuid = configUtils.findStringByKey(system_uuid_key);
+        if (system_config_uuid == null) {
+            system_config_uuid = DeviceUtils.getAndroidID();
+            configUtils.addOrUpdateText(system_uuid_key, system_config_uuid);
+        }
+        return system_config_uuid;
+    }
+
+
+    /**
+     * 系统参数
+     *
+     * @return
+     */
+    public static Map<String, String> getSystemParams() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("deviceId", SystemUtils.getShortClientID(CommonAppContext.getInstance()));
+        headers.put("appVersion", BuildConfig.VERSION_NAME + "." + BuildConfig.VERSION_CODE);
+        headers.put("versionName", BuildConfig.VERSION_NAME);
+        headers.put("versionCode", String.valueOf(BuildConfig.VERSION_CODE));
+        headers.put("clientType", "android");
+        headers.put("emulator", CommonAppContext.getInstance().emulator);
+        headers.put("deviceName", SystemUtils.getDeviceBrand() + SystemUtils.getSystemModel() + SystemUtils.getSystemVersion());
+        try {
+            String channelId = MetaDataUtils.getMetaDataInApp("TD_CHANNEL_ID");
+            headers.put("CHANNELID", channelId);
+            headers.put("appName", encodeHeadInfo(AppUtils.getAppName()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return headers;
+    }
+
+    private static String encodeHeadInfo( String headInfo ) {
+        StringBuffer stringBuffer = new StringBuffer();
+        for (int i = 0, length = headInfo.length(); i < length; i++) {
+            char c = headInfo.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                stringBuffer.append( String.format ("\\u%04x", (int)c) );
+            } else {
+                stringBuffer.append(c);
+            }
+        }
+        return stringBuffer.toString();
+    }
+}
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/UtilConfig.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/UtilConfig.java
new file mode 100644
index 00000000..3dba3a2c
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/UtilConfig.java
@@ -0,0 +1,53 @@
+package com.qxcm.moduleutil.utils;
+
+import android.content.Context;
+
+import com.lahm.library.EasyProtectorLib;
+import com.lahm.library.EmulatorCheckCallback;
+
+/**
+ * ProjectName: BubbleVoice
+ * Package: com.lnkj.lib_utils
+ * Description: java类作用描述
+ * Author: 姚闻达
+ * CreateDate: 2020/12/15 17:27
+ * UpdateUser: 更新者
+ * UpdateDate: 2020/12/15 17:27
+ * UpdateRemark: 更新说明
+ * Version: 1.0
+ */
+public class UtilConfig {
+    private static Context context;
+    public static String emulator = "0";
+    public static String salt = "";
+
+    public static void init(Context context) {
+        setContext(context);
+    }
+
+    public static Context getContext() {
+        return context;
+    }
+
+    public static void setContext(Context context) {
+        UtilConfig.context = context;
+//        checkInEmulator();
+    }
+
+    public static void checkInEmulator() {
+        emulator = EasyProtectorLib.checkIsRunningInEmulator(getContext(), new EmulatorCheckCallback() {
+            @Override
+            public void findEmulator(String emulatorInfo) {
+//                Logger.e(emulatorInfo);
+            }
+        }) ? "1" : "0";
+    }
+
+    public static String getSalt() {
+        return salt;
+    }
+
+    public static void setSalt(String salt) {
+        UtilConfig.salt = salt;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/WordUtil.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/WordUtil.java
index e048273b..edf3950a 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/WordUtil.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/WordUtil.java
@@ -6,7 +6,7 @@ import android.os.LocaleList;
 import android.util.DisplayMetrics;
 
 
-import com.qxcm.moduleutil.widget.CommonAppContext;
+import com.qxcm.moduleutil.base.CommonAppContext;
 
 import java.util.Locale;
 
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/ConfigUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/ConfigUtils.java
new file mode 100644
index 00000000..2705daa8
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/ConfigUtils.java
@@ -0,0 +1,163 @@
+package com.qxcm.moduleutil.utils.config;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ConfigUtils {
+
+    private static SharedPreferences sp = null;
+    private static SharedPreferences.Editor edit = null;
+    private static ConfigUtils instance = null;
+    private static Map<String, Object> data_list = null;
+    private static String data_list_name = "config";
+
+
+    public static ConfigUtils getInstance(Context context) {
+        if (instance == null) {
+            sp = context.getSharedPreferences(data_list_name, Context.MODE_PRIVATE);
+            instance = new ConfigUtils();
+            if (data_list == null)
+                data_list = new HashMap<String, Object>();
+        }
+        return instance;
+    }
+
+    //设置配置文件的名称
+    public void setConfigName(String configName) {
+        this.data_list_name = configName;
+    }
+
+    /*
+     * 添加或者更新一个方法
+     */
+    public boolean addOrUpdateText(String key, String content) {
+        if (edit == null) {
+            edit = sp.edit();
+        }
+        data_list.put(key, content);
+        edit.putString(key, content);
+        return edit.commit();
+    }
+
+    public boolean addOrUpdateIntNumber(String key, int content) {
+        if (edit == null) {
+            edit = sp.edit();
+        }
+        data_list.put(key, content);
+        edit.putInt(key, content);
+        return edit.commit();
+    }
+
+    public boolean addOrUpdateFloatNumber(String key, float content) {
+        if (edit == null) {
+            edit = sp.edit();
+        }
+        data_list.put(key, content);
+        edit.putFloat(key, content);
+        return edit.commit();
+    }
+
+    public boolean addOrUpdateBoolean(String key, boolean content) {
+        if (edit == null) {
+            edit = sp.edit();
+        }
+        data_list.put(key, content);
+        edit.putBoolean(key, content);
+        return edit.commit();
+    }
+
+    /*
+     * 查询
+     */
+
+    public String findStringByKey(String key) {
+        if (data_list.containsKey(key))
+            return data_list.get(key).toString();
+        else
+            return sp.getString(key, null);
+    }
+
+
+    public String findStringByKey(String key, String default_value) {
+        if (data_list.containsKey(key)) {
+            return data_list.get(key).toString();
+        } else {
+            return sp.getString(key, default_value);
+        }
+    }
+
+    public boolean findBoolByKey(String key) {
+        if (data_list.containsKey(key)) {
+            return (Boolean) data_list.get(key);
+        } else {
+            return sp.getBoolean(key, false);
+        }
+    }
+
+    public boolean findBoolByKey(String key, boolean default_value) {
+        if (data_list.containsKey(key)) {
+            return (Boolean) data_list.get(key);
+        } else {
+            return sp.getBoolean(key, default_value);
+        }
+    }
+
+    public int findIntByKey(String key) {
+        if (data_list.containsKey(key)) {
+            return (Integer) data_list.get(key);
+        } else {
+            return sp.getInt(key, -1);
+        }
+    }
+
+    public int findIntByKey(String key, int default_value) {
+        if (data_list.containsKey(key)) {
+            return (Integer) data_list.get(key);
+        } else {
+            return sp.getInt(key, default_value);
+        }
+    }
+
+    public float findFloatByKey(String key) {
+        if (data_list.containsKey(key)) {
+            return (Float) data_list.get(key);
+        } else {
+            return sp.getFloat(key, -1);
+        }
+    }
+
+    public float findFloatByKey(String key, float default_value) {
+        if (data_list.containsKey(key)) {
+            return (Float) data_list.get(key);
+        } else {
+            return sp.getFloat(key, default_value);
+        }
+    }
+
+    /*
+     * 删除
+     */
+    public void deleteByKey(String key) {
+        if (edit == null) {
+            edit = sp.edit();
+        }
+        data_list.remove(key);
+        edit.remove(key);
+        edit.commit();
+    }
+
+    /*
+     * 清空
+     */
+    public void clearConfig() {
+        if (edit == null) {
+            edit = sp.edit();
+        }
+        data_list.clear();
+        edit.clear();
+        edit.commit();
+    }
+}
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/EnvironmentEnum.java
index cd501ea9..6a9f155a 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/config/EnvironmentEnum.java
@@ -1,15 +1,48 @@
 package com.qxcm.moduleutil.utils.config;
 
 public enum EnvironmentEnum {
-    PRODUCTION("https://api.production.com", "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc="),
-    TEST("https://api.test.com", "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=");
+    PRODUCTION("http://chat.qxmier.com/",
+            "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
+            "https://oss-cn-hangzhou.aliyuncs.com/",
+            "LTAI5tJ2UYfFNF7K3F4e1siv",
+            "DhpCS82gaigZljYqsWsUWUAZ20dREz",
+            "qx-yusheng",
+            "https://qx-yusheng.oss-cn-hangzhou.aliyuncs.com/",
+            "wx9b6db036ca1073a2"),
+    TEST(
+            "http://chat.qxmier.com/",
+            "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
+            "https://oss-cn-hangzhou.aliyuncs.com/",
+            "LTAI5tJ2UYfFNF7K3F4e1siv",
+            "DhpCS82gaigZljYqsWsUWUAZ20dREz",
+            "qx-yusheng",
+            "https://qx-yusheng.oss-cn-hangzhou.aliyuncs.com/",
+            "wx9b6db036ca1073a2");
 
     private final String serverUrl;
     private final String ALI_AUTH_KEY;//阿里云授权key
 
-    EnvironmentEnum(String serverUrl, String ALI_AUTH_KEY) {
+    private final String ossEndPoint;
+    private final String ossaAcessKeyId;
+    private final String ossAccessKeySecret;
+    private final String ossBucketName;
+    private final String ossBaseUrl;
+
+    private final String wxAppId;
+
+    EnvironmentEnum(String serverUrl, String ALI_AUTH_KEY, String ossEndPoint, String ossaAcessKeyId, String ossAccessKeySecret, String ossBucketName, String ossBaseUrl,String wxAppId) {
         this.serverUrl = serverUrl;
         this.ALI_AUTH_KEY = ALI_AUTH_KEY;
+        this.ossEndPoint = ossEndPoint;
+        this.ossaAcessKeyId = ossaAcessKeyId;
+        this.ossAccessKeySecret = ossAccessKeySecret;
+        this.ossBucketName = ossBucketName;
+        this.ossBaseUrl = ossBaseUrl;
+        this.wxAppId=wxAppId;
+    }
+
+    public String getWxAppId() {
+        return wxAppId;
     }
 
     public String getServerUrl() {
@@ -20,6 +53,23 @@ public enum EnvironmentEnum {
         return ALI_AUTH_KEY;
     }
 
+    public String getOssEndPoint() {
+        return ossEndPoint;
+    }
 
+    public String getOssaAcessKeyId() {
+        return ossaAcessKeyId;
+    }
 
+    public String getOssAccessKeySecret() {
+        return ossAccessKeySecret;
+    }
+
+    public String getOssBucketName() {
+        return ossBucketName;
+    }
+
+    public String getOssBaseUrl() {
+        return ossBaseUrl;
+    }
 }
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/logger/DataLogger.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/logger/DataLogger.java
new file mode 100644
index 00000000..31995964
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/logger/DataLogger.java
@@ -0,0 +1,206 @@
+package com.qxcm.moduleutil.utils.logger;
+
+import androidx.annotation.Nullable;
+
+/**
+ * SCore
+ * Created by ShangChuanliang
+ * on 2017/10/12.
+ */
+public final class DataLogger implements DataLoggingInterceptor.Logger {
+    private final StringBuilder mMessage = new StringBuilder();
+
+    public static class LogAdapter extends com.orhanobut.logger.AndroidLogAdapter {
+        private final boolean mDebuggable;
+
+        public LogAdapter(boolean debuggable) {
+            super();
+            mDebuggable = debuggable;
+        }
+
+        @Override
+        public boolean isLoggable(int priority, @Nullable String tag) {
+//            return super.isLoggable(priority, tag);
+            return mDebuggable;
+        }
+    }
+
+    public static class LogUtil {
+        public static void init(boolean debuggable) {
+            com.orhanobut.logger.Logger.addLogAdapter(new LogAdapter(debuggable));
+        }
+
+        public static void d(String message) {
+            com.orhanobut.logger.Logger.d(message);
+        }
+
+        public static void i(String message) {
+            com.orhanobut.logger.Logger.i(message);
+        }
+
+        public static void w(String message, Throwable e) {
+            String info = e != null ? e.toString() : "null";
+            com.orhanobut.logger.Logger.w(message + "：" + info);
+        }
+
+        public static void e(String message, Throwable e) {
+            com.orhanobut.logger.Logger.e(e, message);
+        }
+
+        public static void json(String json) {
+            com.orhanobut.logger.Logger.json(json);
+        }
+    }
+
+    @Override
+    public void log(String message) {
+        // 请求或者响应开始
+        if (message.startsWith(DataLoggingInterceptor.sLogStartFlag)) {
+            mMessage.setLength(0);
+            return;
+        }
+        // 响应结束，打印整条日志
+        if (message.startsWith(DataLoggingInterceptor.sLogEndFlag)) {
+            LogUtil.d(mMessage.toString());
+            return;
+        }
+
+        // 以{}或者[]形式的说明是响应结果的json数据，需要进行格式化
+        if ((message.startsWith("{") && message.endsWith("}"))
+                || (message.startsWith("[") && message.endsWith("]"))) {
+            message = formatJson(decodeUnicode(message));
+        }
+        // 追加消息
+        try { mMessage.append(message.concat("\n"));
+        } catch (Exception ignored) {}
+    }
+
+    @Override
+    public void reset() {
+        mMessage.setLength(0);
+    }
+
+    private static String formatJson(String jsonStr) {
+        if (null == jsonStr || "".equals(jsonStr)) return "";
+        StringBuilder sb = new StringBuilder();
+        char last = '\0';
+        char current = '\0';
+        int indent = 0;
+        for (int i = 0; i < jsonStr.length(); i++) {
+            last = current;
+            current = jsonStr.charAt(i);
+            //遇到{ [换行，且下一行缩进
+            switch (current) {
+                case '{':
+                case '[':
+                    sb.append(current);
+                    sb.append('\n');
+                    indent++;
+                    addIndentBlank(sb, indent);
+                    break;
+                //遇到} ]换行，当前行缩进
+                case '}':
+                case ']':
+                    sb.append('\n');
+                    indent--;
+                    addIndentBlank(sb, indent);
+                    sb.append(current);
+                    break;
+                //遇到,换行
+                case ',':
+                    sb.append(current);
+                    if (last != '\\') {
+                        sb.append('\n');
+                        addIndentBlank(sb, indent);
+                    }
+                    break;
+                default:
+                    sb.append(current);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 添加space
+     *
+     * @param sb
+     * @param indent
+     */
+    private static void addIndentBlank(StringBuilder sb, int indent) {
+        for (int i = 0; i < indent; i++) {
+            sb.append('\t');
+        }
+    }
+
+    /**
+     * http 请求数据返回 json 中中文字符为 unicode 编码转汉字转码
+     *
+     * @param theString
+     * @return 转化后的结果.
+     */
+    private static String decodeUnicode(String theString) {
+        char aChar;
+        int len = theString.length();
+        StringBuilder outBuffer = new StringBuilder(len);
+        for (int x = 0; x < len; ) {
+            aChar = theString.charAt(x++);
+            if (aChar == '\\') {
+                aChar = theString.charAt(x++);
+                if (aChar == 'u') {
+                    int value = 0;
+                    for (int i = 0; i < 4; i++) {
+                        aChar = theString.charAt(x++);
+                        switch (aChar) {
+                            case '0':
+                            case '1':
+                            case '2':
+                            case '3':
+                            case '4':
+                            case '5':
+                            case '6':
+                            case '7':
+                            case '8':
+                            case '9':
+                                value = (value << 4) + aChar - '0';
+                                break;
+                            case 'a':
+                            case 'b':
+                            case 'c':
+                            case 'd':
+                            case 'e':
+                            case 'f':
+                                value = (value << 4) + 10 + aChar - 'a';
+                                break;
+                            case 'A':
+                            case 'B':
+                            case 'C':
+                            case 'D':
+                            case 'E':
+                            case 'F':
+                                value = (value << 4) + 10 + aChar - 'A';
+                                break;
+                            default:
+                                throw new IllegalArgumentException(
+                                        "Malformed   \\uxxxx   encoding.");
+                        }
+
+                    }
+                    outBuffer.append((char) value);
+                } else {
+                    if (aChar == 't')
+                        aChar = '\t';
+                    else if (aChar == 'r')
+                        aChar = '\r';
+                    else if (aChar == 'n')
+                        aChar = '\n';
+                    else if (aChar == 'f')
+                        aChar = '\f';
+                    outBuffer.append(aChar);
+                }
+            } else
+                outBuffer.append(aChar);
+        }
+        return outBuffer.toString();
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/logger/DataLoggingInterceptor.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/logger/DataLoggingInterceptor.java
new file mode 100644
index 00000000..081ce143
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/logger/DataLoggingInterceptor.java
@@ -0,0 +1,215 @@
+package com.qxcm.moduleutil.utils.logger;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.Connection;
+import okhttp3.Headers;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okhttp3.internal.http.HttpHeaders;
+import okio.Buffer;
+import okio.BufferedSource;
+
+/**
+ * SCore
+ * Created by ShangChuanliang
+ * on 2017/12/21.
+ */
+public class DataLoggingInterceptor implements Interceptor {
+    private static final String sFormatLine =
+      "===========================================================================================";
+    public static final String sLogStartFlag = "==scliang==log==start==";
+    public static final String sLogEndFlag = "==scliang==log==end==";
+    private static final Charset UTF8 = StandardCharsets.UTF_8;
+
+    public interface Logger {
+        void reset();
+        void log(String message);
+    }
+
+    public DataLoggingInterceptor(Logger logger) {
+        this.logger = logger;
+    }
+
+    private final Logger logger;
+
+    @NotNull
+    @Override public Response intercept(@NonNull Chain chain) throws IOException {
+        Request request = chain.request();
+
+        logger.reset();
+        logger.log(sLogStartFlag);
+        logger.log(sFormatLine);
+
+        RequestBody requestBody = request.body();
+        boolean hasRequestBody = requestBody != null;
+
+        Connection connection = chain.connection();
+        Protocol protocol = connection != null ? connection.protocol() : Protocol.HTTP_1_1;
+        String requestStartMessage = request.method() + " " + request.url() + " " + protocol;
+        logger.log(requestStartMessage);
+
+        if (hasRequestBody) {
+            // Request body headers are only present when installed as a network interceptor. Force
+            // them to be included (when available) so there values are known.
+            if (requestBody.contentType() != null) {
+                logger.log("Content-Type: " + requestBody.contentType());
+            }
+            if (requestBody.contentLength() != -1) {
+                logger.log("Content-Length: " + requestBody.contentLength());
+            }
+        }
+
+        Headers rHeaders = request.headers();
+        for (int i = 0, count = rHeaders.size(); i < count; i++) {
+            String name = rHeaders.name(i);
+            // Skip headers from the request body as they are explicitly logged above.
+            if (!"Content-Type".equalsIgnoreCase(name) && !"Content-Length".equalsIgnoreCase(name)) {
+                logger.log(name + ": " + rHeaders.value(i));
+            }
+        }
+
+        if (!hasRequestBody) {
+            logger.log("END " + request.method());
+        } else if (bodyEncoded(request.headers())) {
+            logger.log("END " + request.method() + " (encoded body omitted)");
+        } else {
+            Buffer buffer = new Buffer();
+            requestBody.writeTo(buffer);
+
+            Charset charset = UTF8;
+            MediaType contentType = requestBody.contentType();
+            if (contentType != null) {
+                charset = contentType.charset(UTF8);
+            }
+
+            if (charset != null) {
+                logger.log(sFormatLine);
+                if (isPlaintext(buffer)) {
+                    try {
+                        String requestStr = URLDecoder.decode(buffer.readString(charset), "UTF-8");
+                        String[] strs = requestStr.split("&");
+                        for (String str : strs) {
+                            logger.log(str);
+                        }
+                    } catch (Exception e) {
+                        logger.log(buffer.readString(charset));
+                    }
+                    logger.log("END " + request.method()
+                      + " (" + requestBody.contentLength() + "-byte body)");
+                } else {
+                    logger.log("END " + request.method() + " (binary "
+                      + requestBody.contentLength() + "-byte body omitted)");
+                }
+            }
+        }
+
+        logger.log(sFormatLine);
+
+        long startNs = System.nanoTime();
+        Response response;
+        try {
+            response = chain.proceed(request);
+        } catch (Exception e) {
+            logger.log("HTTP FAILED: " + e);
+            logger.log(sLogEndFlag);
+            throw e;
+        }
+
+        long tookMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
+        ResponseBody responseBody = response.body();
+        if (responseBody != null) {
+            long contentLength = responseBody.contentLength();
+            String bodySize = contentLength != -1 ? contentLength + "-byte" : "unknown-length";
+            logger.log(response.code() + " " + response.message() + " "
+              + response.request().url() + " (" + tookMs + "ms)");
+
+            Headers headers = response.headers();
+            for (int i = 0, count = headers.size(); i < count; i++) {
+                logger.log(headers.name(i) + ": " + headers.value(i));
+            }
+
+            if (!HttpHeaders.hasBody(response)) {
+                logger.log("END HTTP");
+            } else if (bodyEncoded(response.headers())) {
+                logger.log("END HTTP (encoded body omitted)");
+            } else {
+                BufferedSource source = responseBody.source();
+                if (source.isOpen()) {
+                    source.request(Long.MAX_VALUE); // Buffer the entire body.
+                    Buffer buffer = source.buffer();
+
+                    Charset charset = UTF8;
+                    MediaType contentType = responseBody.contentType();
+                    if (contentType != null) {
+                        charset = contentType.charset(UTF8);
+                    }
+
+                    if (!isPlaintext(buffer)) {
+                        logger.log("END HTTP (binary " + buffer.size() + "-byte body omitted)");
+                        logger.log(sFormatLine);
+                        logger.log(sLogEndFlag);
+                        return response;
+                    }
+
+                    if (contentLength != 0 && charset != null) {
+                        logger.log(sFormatLine);
+                        logger.log(buffer.clone().readString(charset));
+                    }
+
+                    logger.log("END HTTP (" + buffer.size() + "-byte body)");
+                } else {
+                    logger.log("END HTTP");
+                }
+            }
+        }
+
+        logger.log(sFormatLine);
+        logger.log(sLogEndFlag);
+
+        return response;
+    }
+
+    /**
+     * Returns true if the body in question probably contains human readable text. Uses a small sample
+     * of code points to detect unicode control characters commonly used in binary file signatures.
+     */
+    private static boolean isPlaintext(Buffer buffer) {
+        try {
+            Buffer prefix = new Buffer();
+            long byteCount = buffer.size() < 64 ? buffer.size() : 64;
+            buffer.copyTo(prefix, 0, byteCount);
+            for (int i = 0; i < 16; i++) {
+                if (prefix.exhausted()) {
+                    break;
+                }
+                int codePoint = prefix.readUtf8CodePoint();
+                if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
+                    return false;
+                }
+            }
+            return true;
+        } catch (EOFException e) {
+            return false; // Truncated UTF-8 sequence.
+        }
+    }
+
+    private boolean bodyEncoded(Headers headers) {
+        String contentEncoding = headers.get("Content-Encoding");
+        return contentEncoding != null && !contentEncoding.equalsIgnoreCase("identity");
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/oss/OSSOperUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/oss/OSSOperUtils.java
new file mode 100644
index 00000000..792a5c79
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/oss/OSSOperUtils.java
@@ -0,0 +1,312 @@
+package com.qxcm.moduleutil.utils.oss;
+
+import com.alibaba.sdk.android.oss.ClientConfiguration;
+import com.alibaba.sdk.android.oss.ClientException;
+import com.alibaba.sdk.android.oss.OSS;
+import com.alibaba.sdk.android.oss.OSSClient;
+import com.alibaba.sdk.android.oss.ServiceException;
+import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
+import com.alibaba.sdk.android.oss.callback.OSSProgressCallback;
+import com.alibaba.sdk.android.oss.common.OSSLog;
+import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
+import com.alibaba.sdk.android.oss.common.auth.OSSPlainTextAKSKCredentialProvider;
+import com.alibaba.sdk.android.oss.internal.OSSAsyncTask;
+import com.alibaba.sdk.android.oss.model.PutObjectRequest;
+import com.alibaba.sdk.android.oss.model.PutObjectResult;
+import com.blankj.utilcode.util.FileUtils;
+import com.blankj.utilcode.util.ThreadUtils;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.utils.Md5Utils;
+import com.qxcm.moduleutil.utils.logger.Logger;
+
+import java.io.File;
+
+
+/**
+ * Created by zjh on 2016/2/22.
+ */
+public class OSSOperUtils {
+    private static OSS oss;
+    private static OSSOperUtils utils;
+
+    /**
+     * GetObjectRequest get = new GetObjectRequest("duia-log", name);
+     * <p>
+     * String endpoint = "https://oss-cn-beijing.aliyuncs.com";
+     * <p>
+     * // 明文设置secret的方式建议只在测试时使用，更多鉴权模式请参考后面的`访问控制`章节
+     * OSSCredentialProvider credentialProvider = new OSSPlainTextAKSKCredentialProvider("qgR150FXSbdnCi5e", "wi4jUJvFgKZXkPp63vCY8nA849GpLT");
+     * <p>
+     * OSS
+     * Access Key ID:    LTAIdLLZpWaeXb6j
+     * Access Key Secret:   rBUwiyKNk8ddRaJMDYBucrTrxIidgr
+     * AliYunOSSURLFile: zholiao.oss-cn-shenzhen.aliyuncs.com
+     */
+
+
+    // 运行sample前需要配置以下字段为有效的值
+    private static final String endpoint = CommonAppContext.getInstance().getCurrentEnvironment().getOssEndPoint();
+    private static final String accessKeyId = CommonAppContext.getInstance().getCurrentEnvironment().getOssaAcessKeyId();
+    private static final String accessKeySecret = CommonAppContext.getInstance().getCurrentEnvironment().getOssAccessKeySecret();
+    private static final String bucketName = CommonAppContext.getInstance().getCurrentEnvironment().getOssBucketName();
+    public static final String AliYunOSSURLFile = CommonAppContext.getInstance().getCurrentEnvironment().getOssBaseUrl();
+    public static final String img = "img/";
+    public static final String video = "video/";
+    public static final String audio = "audio/";
+
+
+    /**
+     * 文件
+     *
+     * @param file
+     * @param type 0 图片    1音频    2视频
+     * @return
+     */
+    public static String getPath(File file, int type) {
+        String fileMD5 = Md5Utils.getFileMD5(file);
+        String suffix = "";
+        if (file.getName().contains(".")) {
+            suffix = file.getName().substring(file.getName().lastIndexOf("."));
+        }
+        if (type == 0) {
+            return img + fileMD5 + suffix;
+        } else if (type == 1) {
+            return audio + fileMD5 + suffix;
+        } else {
+            return video + fileMD5 + suffix;
+        }
+    }
+
+    public static OSSOperUtils newInstance() {
+        if (null == utils) {
+            utils = new OSSOperUtils();
+        }
+        if (null == oss) {
+            OSSCredentialProvider credentialProvider = new OSSPlainTextAKSKCredentialProvider(accessKeyId, accessKeySecret);
+            ClientConfiguration conf = new ClientConfiguration();
+            conf.setConnectionTimeout(150 * 1000); // 连接超时，默认15秒
+            conf.setSocketTimeout(150 * 1000); // socket超时，默认15秒
+            conf.setMaxConcurrentRequest(5); // 最大并发请求书，默认5个
+            conf.setMaxErrorRetry(2); // 失败后最大重试次数，默认2次
+            OSSLog.enableLog();
+            oss = new OSSClient(CommonAppContext.getInstance(), endpoint, credentialProvider, conf);
+        }
+        return utils;
+    }
+
+    //上传
+    public OSSAsyncTask putObjectMethod(String uploadObject, String uploadFilePath, OssCallback ossCallback) {
+        PutObjectSamples put = new PutObjectSamples(oss, bucketName, uploadObject, uploadFilePath);
+        return put.asyncPutObjectFromLocalFile(new OSSProgressCallback<PutObjectRequest>() {
+            @Override
+            public void onProgress(PutObjectRequest request, long currentSize, long totalSize) {
+
+            }
+        }, new OSSCompletedCallback<PutObjectRequest, PutObjectResult>() {
+            @Override
+            public void onSuccess(PutObjectRequest request, PutObjectResult result) {
+                ThreadUtils.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (ossCallback != null) {
+                            ossCallback.onSuccess();
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onFailure(PutObjectRequest request, ClientException clientException, ServiceException serviceException) {
+                ThreadUtils.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (ossCallback != null) {
+                            ossCallback.onFail();
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+
+    //上传
+    public OSSAsyncTask putObjectMethod(String uploadObject, String uploadFilePath, OSSProgressCallback mossProgressCallback, OSSCompletedCallback mcompletedCallback) {
+        PutObjectSamples put = new PutObjectSamples(oss, bucketName, uploadObject, uploadFilePath);
+        return put.asyncPutObjectFromLocalFile(mossProgressCallback, mcompletedCallback);
+    }
+
+    //判断文件是否存在
+    public String fileExist(String fileName) {
+        try {
+            boolean exist = oss.doesObjectExist(bucketName, fileName);
+            Logger.e(bucketName, fileName, exist);
+            if (exist) {
+                //加个参数去缓存
+                return String.format("%s/%s?v=1", AliYunOSSURLFile, fileName);
+            }
+        } catch (ClientException e) {
+            e.printStackTrace();
+        } catch (ServiceException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public interface OssCallback {
+        void onSuccess();
+
+        void onFail();
+    }
+
+
+    /**
+     * 发布动态上传图片或者视频
+     *
+     * @param file
+     * @param type 0 img 1 audio 2 video
+     */
+    public void uploadImageOrVideo(File file, int type, UploadCallback uploadCallback) {
+        uploadCallback.startUpload();
+        String objectKey = getPath(file, type);
+        long size;
+        size = FileUtils.getFileLength(file.getPath());
+        if (-1 == size) {    //文件不存在
+            uploadCallback.uploadFailed();
+            return;
+        }
+        boolean exist;
+        try {
+            exist = oss.doesObjectExist(bucketName, objectKey);
+            String format = String.format("%s%s", AliYunOSSURLFile, objectKey);
+
+            if (false) {  //Oss服务器文件存在
+                uploadCallback.onProgress(size, size);
+                uploadCallback.uploadEnd(format);
+            } else { //文件不存在
+                PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectKey, file.getAbsolutePath());
+                putObjectRequest.setProgressCallback((request, currentSize, totalSize) -> {
+                    ThreadUtils.runOnUiThread(() -> uploadCallback.onProgress(currentSize, totalSize));
+                });
+                oss.asyncPutObject(putObjectRequest, new OSSCompletedCallback<PutObjectRequest, PutObjectResult>() {
+                    @Override
+                    public void onSuccess(PutObjectRequest request, PutObjectResult result) {
+                        ThreadUtils.runOnUiThread(() -> uploadCallback.uploadEnd(format));
+                    }
+
+                    @Override
+                    public void onFailure(PutObjectRequest request, ClientException clientException, ServiceException serviceException) {
+                        ThreadUtils.runOnUiThread(uploadCallback::uploadFailed);
+                        clientException.printStackTrace();
+                        serviceException.printStackTrace();
+                    }
+                });
+            }
+        } catch (ClientException | ServiceException e) {
+            e.printStackTrace();
+            uploadCallback.uploadFailed();
+        }
+    }
+
+    /**
+     * 发布动态上传图片或者视频
+     *
+     * @param file
+     * @param type 0 img 1 audio 2 video
+     */
+    public String uploadImageOrVideo(File file, int type) {
+        String objectKey = getPath(file, type);
+        long size;
+        size = FileUtils.getFileLength(file.getPath());
+        if (-1 == size) {
+            return null;
+        }
+        try {
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectKey, file.getAbsolutePath());
+            putObjectRequest.setProgressCallback((request, currentSize, totalSize) -> {});
+            oss.putObject(putObjectRequest);
+            return String.format("%s%s", AliYunOSSURLFile, objectKey);
+        } catch (ClientException | ServiceException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 发布动态上传封面用
+     *
+     * @param bytes
+     * @param uploadCallback
+     */
+    public void uploadBitmap(byte[] bytes, UploadCallback uploadCallback) {
+        uploadCallback.startUpload();
+        int size = bytes.length;
+        String md5 = Md5Utils.getMD5String(bytes);
+        String objectKey = img + md5 + ".jpg";
+        boolean exist;
+        try {
+            exist = oss.doesObjectExist(bucketName, objectKey);
+            String format = String.format("%s%s", AliYunOSSURLFile, objectKey);
+
+            if (false) {  //Oss服务器文件存在
+                uploadCallback.onProgress(size, size);
+                uploadCallback.uploadEnd(format);
+            } else { //文件不存在
+                PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectKey, bytes);
+                putObjectRequest.setProgressCallback((request, currentSize, totalSize) -> {
+                    ThreadUtils.runOnUiThread(() -> uploadCallback.onProgress(currentSize, totalSize));
+                });
+                oss.asyncPutObject(putObjectRequest, new OSSCompletedCallback<PutObjectRequest, PutObjectResult>() {
+                    @Override
+                    public void onSuccess(PutObjectRequest request, PutObjectResult result) {
+                        ThreadUtils.runOnUiThread(() -> uploadCallback.uploadEnd(format));
+                    }
+
+                    @Override
+                    public void onFailure(PutObjectRequest request, ClientException clientException, ServiceException serviceException) {
+                        ThreadUtils.runOnUiThread(uploadCallback::uploadFailed);
+                        clientException.printStackTrace();
+                        serviceException.printStackTrace();
+                    }
+                });
+            }
+        } catch (ClientException | ServiceException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 发布动态上传封面用
+     *
+     * @param bytes
+     */
+    public String uploadBitmap(byte[] bytes) {
+        String md5 = Md5Utils.getMD5String(bytes);
+        String objectKey = img + md5 + ".jpg";
+        try {
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectKey, bytes);
+            putObjectRequest.setProgressCallback((request, currentSize, totalSize) -> {
+            });
+            oss.putObject(putObjectRequest);
+            return String.format("%s%s", AliYunOSSURLFile, objectKey);
+        } catch (ClientException | ServiceException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 上传进度条回调
+     */
+    public interface UploadCallback {
+
+        void startUpload();
+
+        void onProgress(long currentSize, long totalSize);
+
+        void uploadEnd(String url);
+
+        void uploadFailed();
+    }
+
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/oss/PutObjectSamples.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/oss/PutObjectSamples.java
new file mode 100644
index 00000000..66462147
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/oss/PutObjectSamples.java
@@ -0,0 +1,67 @@
+package com.qxcm.moduleutil.utils.oss;
+
+import com.alibaba.sdk.android.oss.ClientException;
+import com.alibaba.sdk.android.oss.OSS;
+import com.alibaba.sdk.android.oss.ServiceException;
+import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
+import com.alibaba.sdk.android.oss.callback.OSSProgressCallback;
+import com.alibaba.sdk.android.oss.internal.OSSAsyncTask;
+import com.alibaba.sdk.android.oss.model.PutObjectRequest;
+import com.alibaba.sdk.android.oss.model.PutObjectResult;
+
+/**
+ * Created by zhouzhuo on 12/3/15.
+ */
+public class PutObjectSamples {
+
+    private OSS oss;
+    private String testBucket;
+    private String testObject;
+    private String uploadFilePath;
+
+
+    public PutObjectSamples(OSS client, String testBucket, String testObject, String uploadFilePath) {
+        this.oss = client;
+        this.testBucket = testBucket;
+        this.testObject = testObject;
+        this.uploadFilePath = uploadFilePath;
+    }
+
+    // 从本地文件上传，使用非阻塞的异步接口
+    public OSSAsyncTask asyncPutObjectFromLocalFile(final OSSProgressCallback<PutObjectRequest> mossProgressCallback, final OSSCompletedCallback<PutObjectRequest, PutObjectResult> mcompletedCallback) {
+        // 构造上传请求
+        PutObjectRequest put = new PutObjectRequest(testBucket, testObject, uploadFilePath);
+
+        // 异步上传时可以设置进度回调
+        put.setProgressCallback(new OSSProgressCallback<PutObjectRequest>() {
+            @Override
+            public void onProgress(PutObjectRequest request, long currentSize, long totalSize) {
+                if (mossProgressCallback != null) {
+                    mossProgressCallback.onProgress(request, currentSize, totalSize);
+                }
+            }
+        });
+
+        OSSAsyncTask task = oss.asyncPutObject(put, new OSSCompletedCallback<PutObjectRequest, PutObjectResult>() {
+            @Override
+            public void onSuccess(PutObjectRequest request, PutObjectResult result) {
+                if (mcompletedCallback != null) {
+                    mcompletedCallback.onSuccess(request, result);
+                }
+            }
+
+            @Override
+            public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
+                // 请求异常
+                if (clientExcepion != null) {
+                    // 本地异常如网络异常等
+                    clientExcepion.printStackTrace();
+                }
+                if (mcompletedCallback != null) {
+                    mcompletedCallback.onFailure(request, clientExcepion, serviceException);
+                }
+            }
+        });
+        return task;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/PermissionUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/PermissionUtils.java
new file mode 100644
index 00000000..33664f0b
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/PermissionUtils.java
@@ -0,0 +1,172 @@
+package com.qxcm.moduleutil.utils.permission;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Binder;
+import android.os.Build;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.AppOpsManagerCompat;
+import androidx.core.content.ContextCompat;
+
+import com.blankj.utilcode.util.AppUtils;
+import com.qxcm.moduleutil.utils.permission.rom.HuaweiUtils;
+import com.qxcm.moduleutil.utils.permission.rom.MeizuUtils;
+import com.qxcm.moduleutil.utils.permission.rom.MiuiUtils;
+import com.qxcm.moduleutil.utils.permission.rom.OppoUtils;
+import com.qxcm.moduleutil.utils.permission.rom.QikuUtils;
+import com.qxcm.moduleutil.utils.permission.rom.RomUtils;
+import com.qxcm.moduleutil.widget.dialog.CommonDialog;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by liyong on 2018/9/21.
+ */
+public class PermissionUtils {
+
+    public static final String TAG = "PermissionUtils";
+
+    public static void showDenied(Context context, String msg, CommonDialog.OnClickListener listener) {
+        CommonDialog commonDialog = new CommonDialog(context);
+        commonDialog.setContent(msg);
+        commonDialog.setmOnClickListener(listener);
+        commonDialog.show();
+    }
+
+    public static void showDenied(Context context, String msg) {
+        CommonDialog commonDialog = new CommonDialog(context);
+        commonDialog.setContent(msg);
+        commonDialog.setmOnClickListener(new CommonDialog.OnClickListener() {
+            @Override
+            public void onLeftClick() {
+
+            }
+
+            @Override
+            public void onRightClick() {
+                AppUtils.launchAppDetailsSettings();
+            }
+        });
+        commonDialog.show();
+    }
+
+    /**
+     * 检查悬浮窗权限
+     *
+     * @param context
+     * @return
+     */
+    public boolean checkFloatWindowPermission(Context context) {
+        //6.0 版本之后由于 google 增加了对悬浮窗权限的管理，所以方式就统一了
+        if (Build.VERSION.SDK_INT < 23) {
+            if (RomUtils.checkIsMiuiRom()) {
+                return MiuiUtils.checkFloatWindowPermission(context);
+            } else if (RomUtils.checkIsMeizuRom()) {
+                return MeizuUtils.checkFloatWindowPermission(context);
+            } else if (RomUtils.checkIsHuaweiRom()) {
+                return HuaweiUtils.checkFloatWindowPermission(context);
+            } else if (RomUtils.checkIs360Rom()) {
+                return QikuUtils.checkFloatWindowPermission(context);
+            } else if (RomUtils.checkIsOppoRom()) {
+                return OppoUtils.checkFloatWindowPermission(context);
+            }
+        }
+        return commonROMPermissionCheck(context);
+    }
+
+    public static boolean hasPermission(@NonNull Context context, @NonNull String permission) {
+        List<String> permisstions = new ArrayList<>();
+        permisstions.add(permission);
+        return hasPermission(context, permisstions);
+    }
+
+    /**
+     * 系统层的权限判断
+     *
+     * @param context     上下文
+     * @param permissions 申请的权限 Manifest.permission.READ_CONTACTS
+     * @return 是否有权限 ：其中有一个获取不了就是失败了
+     */
+    public static boolean hasPermission(@NonNull Context context, @NonNull List<String> permissions) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return true;
+        for (String permission : permissions) {
+            try {
+                String op = AppOpsManagerCompat.permissionToOp(permission);
+                if (TextUtils.isEmpty(op)) continue;
+                int result = AppOpsManagerCompat.noteOp(context, op, android.os.Process.myUid(), context.getPackageName());
+                if (result == AppOpsManagerCompat.MODE_IGNORED) return false;
+                AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+                String ops = AppOpsManager.permissionToOp(permission);
+                int locationOp = appOpsManager.checkOp(ops, Binder.getCallingUid(), context.getPackageName());
+                if (locationOp == AppOpsManager.MODE_IGNORED) return false;
+                result = ContextCompat.checkSelfPermission(context, permission);
+                if (result != PackageManager.PERMISSION_GRANTED) return false;
+            } catch (Exception ex) {
+                Log.e(TAG, "[hasPermission] error ", ex);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 跳转到权限设置界面
+     *
+     * @param context
+     */
+    public static void toPermissionSetting(Context context) throws NoSuchFieldException, IllegalAccessException {
+        if (Build.VERSION.SDK_INT < 23) {
+            if (RomUtils.checkIsMiuiRom()) {
+                MiuiUtils.applyMiuiPermission(context);
+            } else if (RomUtils.checkIsMeizuRom()) {
+                MeizuUtils.applyPermission(context);
+            } else if (RomUtils.checkIsHuaweiRom()) {
+                HuaweiUtils.applyPermission(context);
+            } else if (RomUtils.checkIs360Rom()) {
+                QikuUtils.applyPermission(context);
+            } else if (RomUtils.checkIsOppoRom()) {
+                OppoUtils.applyOppoPermission(context);
+            } else {
+                RomUtils.getAppDetailSettingIntent(context);
+            }
+        } else {
+            if (RomUtils.checkIsMeizuRom()) {
+                MeizuUtils.applyPermission(context);
+            } else {
+                if (RomUtils.checkIsOppoRom() || RomUtils.checkIsVivoRom()
+                        || RomUtils.checkIsHuaweiRom() || RomUtils.checkIsSamsunRom()) {
+                    RomUtils.getAppDetailSettingIntent(context);
+                } else if (RomUtils.checkIsMiuiRom()) {
+                    MiuiUtils.toPermisstionSetting(context);
+                } else {
+                    RomUtils.commonROMPermissionApplyInternal(context);
+                }
+            }
+        }
+    }
+
+    private static boolean commonROMPermissionCheck(Context context) {
+        //最新发现魅族6.0的系统这种方式不好用，天杀的，只有你是奇葩，没办法，单独适配一下
+        if (RomUtils.checkIsMeizuRom()) {
+            return MeizuUtils.checkFloatWindowPermission(context);
+        } else {
+            Boolean result = true;
+            if (Build.VERSION.SDK_INT >= 23) {
+                try {
+                    Class clazz = Settings.class;
+                    Method canDrawOverlays = clazz.getDeclaredMethod("canDrawOverlays", Context.class);
+                    result = (Boolean) canDrawOverlays.invoke(null, context);
+                } catch (Exception e) {
+                    Log.e(TAG, Log.getStackTraceString(e));
+                }
+            }
+            return result;
+        }
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/HuaweiUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/HuaweiUtils.java
new file mode 100644
index 00000000..5cf3c86e
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/HuaweiUtils.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2016 Facishare Technology Co., Ltd. All Rights Reserved.
+ */
+package com.qxcm.moduleutil.utils.permission.rom;
+
+import android.annotation.TargetApi;
+import android.app.AppOpsManager;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.Build;
+import android.util.Log;
+import android.widget.Toast;
+
+import java.lang.reflect.Method;
+
+public class HuaweiUtils {
+    private static final String TAG = "HuaweiUtils";
+
+    /**
+     * 检测 Huawei 悬浮窗权限
+     */
+    public static boolean checkFloatWindowPermission(Context context) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            return checkOp(context, 24); //OP_SYSTEM_ALERT_WINDOW = 24;
+        }
+        return true;
+    }
+
+    /**
+     * 去华为权限申请页面
+     */
+    public static void applyPermission(Context context) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//   ComponentName comp = new ComponentName("com.huawei.systemmanager","com.huawei.permissionmanager.ui.MainActivity");//华为权限管理
+//   ComponentName comp = new ComponentName("com.huawei.systemmanager",
+//      "com.huawei.permissionmanager.ui.SingleAppActivity");//华为权限管理，跳转到指定app的权限管理位置需要华为接口权限，未解决
+            ComponentName comp = new ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.addviewmonitor.AddViewMonitorActivity");//悬浮窗管理页面
+            intent.setComponent(comp);
+            if (RomUtils.getEmuiVersion() == 3.1) {
+                //emui 3.1 的适配
+                context.startActivity(intent);
+            } else {
+                //emui 3.0 的适配
+                comp = new ComponentName("com.huawei.systemmanager", "com.huawei.notificationmanager.ui.NotificationManagmentActivity");//悬浮窗管理页面
+                intent.setComponent(comp);
+                context.startActivity(intent);
+            }
+        } catch (SecurityException e) {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//   ComponentName comp = new ComponentName("com.huawei.systemmanager","com.huawei.permissionmanager.ui.MainActivity");//华为权限管理
+            ComponentName comp = new ComponentName("com.huawei.systemmanager",
+                    "com.huawei.permissionmanager.ui.MainActivity");//华为权限管理，跳转到本app的权限管理页面,这个需要华为接口权限，未解决
+//      ComponentName comp = new ComponentName("com.huawei.systemmanager","com.huawei.systemmanager.addviewmonitor.AddViewMonitorActivity");//悬浮窗管理页面
+            intent.setComponent(comp);
+            context.startActivity(intent);
+            Log.e(TAG, Log.getStackTraceString(e));
+        } catch (ActivityNotFoundException e) {
+            /**
+             * 手机管家版本较低 HUAWEI SC-UL10
+             */
+//   Toast.makeText(MainActivity.this, "act找不到", Toast.LENGTH_LONG).show();
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            ComponentName comp = new ComponentName("com.Android.settings", "com.android.settings.permission.TabItem");//权限管理页面 android4.4
+//   ComponentName comp = new ComponentName("com.android.settings","com.android.settings.permission.single_app_activity");//此处可跳转到指定app对应的权限管理页面，但是需要相关权限，未解决
+            intent.setComponent(comp);
+            context.startActivity(intent);
+            Log.e(TAG, Log.getStackTraceString(e));
+        } catch (Exception e) {
+            //抛出异常时提示信息
+            Toast.makeText(context, "进入设置页面失败，请手动设置", Toast.LENGTH_LONG).show();
+            Log.e(TAG, Log.getStackTraceString(e));
+        }
+    }
+
+    //com.android.packageinstaller/.permission.ui.ManagePermissionsActivity
+    public static void toPermisstionSetting(Context context) {
+        Intent intent = new Intent();
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setAction("android.intent.action.MANAGE_APP_PERMISSIONS");
+        ComponentName comp = new ComponentName("com.android.packageinstaller", "com.android.packageinstaller.permission.ui.ManagePermissionsActivity");
+        intent.setComponent(comp);
+        context.startActivity(intent);
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private static boolean checkOp(Context context, int op) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            AppOpsManager manager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+            try {
+                Class clazz = AppOpsManager.class;
+                Method method = clazz.getDeclaredMethod("checkOp", int.class, int.class, String.class);
+                return AppOpsManager.MODE_ALLOWED == (int) method.invoke(manager, op, Binder.getCallingUid(), context.getPackageName());
+            } catch (Exception e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        } else {
+            Log.e(TAG, "Below API 19 cannot invoke!");
+        }
+        return false;
+    }
+}
+
+
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/MeizuUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/MeizuUtils.java
new file mode 100644
index 00000000..a5d8f878
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/MeizuUtils.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 Facishare Technology Co., Ltd. All Rights Reserved.
+ */
+package com.qxcm.moduleutil.utils.permission.rom;
+
+import android.annotation.TargetApi;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.Build;
+import android.util.Log;
+
+import java.lang.reflect.Method;
+
+public class MeizuUtils {
+    private static final String TAG = "MeizuUtils";
+
+    /**
+     * 检测 meizu 悬浮窗权限
+     */
+    public static boolean checkFloatWindowPermission(Context context) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            return checkOp(context, 24); //OP_SYSTEM_ALERT_WINDOW = 24;
+        }
+        return true;
+    }
+
+    /**
+     * 去魅族权限申请页面
+     */
+    public static void applyPermission(Context context) {
+        try {
+            Intent intent = new Intent("com.meizu.safe.security.SHOW_APPSEC");
+//            intent.setClassName("com.meizu.safe", "com.meizu.safe.security.AppSecActivity");//remove this line code for fix flyme6.3
+            intent.putExtra("packageName", context.getPackageName());
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+        } catch (Exception e) {
+            try {
+                Log.e(TAG, "获取悬浮窗权限, 打开AppSecActivity失败, " + Log.getStackTraceString(e));
+                // 最新的魅族flyme 6.2.5 用上述方法获取权限失败, 不过又可以用下述方法获取权限了
+                RomUtils.commonROMPermissionApplyInternal(context);
+            } catch (Exception eFinal) {
+                Log.e(TAG, "获取悬浮窗权限失败, 通用获取方法失败, " + Log.getStackTraceString(eFinal));
+            }
+        }
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private static boolean checkOp(Context context, int op) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            AppOpsManager manager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+            try {
+                Class clazz = AppOpsManager.class;
+                Method method = clazz.getDeclaredMethod("checkOp", int.class, int.class, String.class);
+                return AppOpsManager.MODE_ALLOWED == (int) method.invoke(manager, op, Binder.getCallingUid(), context.getPackageName());
+            } catch (Exception e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        } else {
+            Log.e(TAG, "Below API 19 cannot invoke!");
+        }
+        return false;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/MiuiUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/MiuiUtils.java
new file mode 100644
index 00000000..81f5f15e
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/MiuiUtils.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2016 Facishare Technology Co., Ltd. All Rights Reserved.
+ */
+package com.qxcm.moduleutil.utils.permission.rom;
+
+import android.annotation.TargetApi;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.provider.Settings;
+import android.util.Log;
+
+import java.lang.reflect.Method;
+
+public class MiuiUtils {
+    private static final String TAG = "MiuiUtils";
+
+    /**
+     * 获取小米 rom 版本号，获取失败返回 -1
+     *
+     * @return miui rom version code, if fail , return -1
+     */
+    public static int getMiuiVersion() {
+        String version = RomUtils.getSystemProperty("ro.miui.ui.version.name");
+        if (version != null) {
+            try {
+                return Integer.parseInt(version.substring(1));
+            } catch (Exception e) {
+                Log.e(TAG, "get miui version code error, version : " + version);
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * 检测 miui 悬浮窗权限
+     */
+    public static boolean checkFloatWindowPermission(Context context) {
+        final int version = Build.VERSION.SDK_INT;
+
+        if (version >= 19) {
+            return checkOp(context, 24); //OP_SYSTEM_ALERT_WINDOW = 24;
+        } else {
+//            if ((context.getApplicationInfo().flags & 1 << 27) == 1) {
+//                return true;
+//            } else {
+//                return false;
+//            }
+            return true;
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private static boolean checkOp(Context context, int op) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            AppOpsManager manager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+            try {
+                Class clazz = AppOpsManager.class;
+                Method method = clazz.getDeclaredMethod("checkOp", int.class, int.class, String.class);
+                return AppOpsManager.MODE_ALLOWED == (int) method.invoke(manager, op, Binder.getCallingUid(), context.getPackageName());
+            } catch (Exception e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        } else {
+            Log.e(TAG, "Below API 19 cannot invoke!");
+        }
+        return false;
+    }
+
+    /**
+     * 小米 ROM 权限申请
+     */
+    public static void applyMiuiPermission(Context context) {
+        int versionCode = getMiuiVersion();
+        if (versionCode == 5) {
+            goToMiuiPermissionActivity_V5(context);
+        } else if (versionCode == 6) {
+            goToMiuiPermissionActivity_V6(context);
+        } else if (versionCode == 7) {
+            goToMiuiPermissionActivity_V7(context);
+        } else if (versionCode == 8) {
+            goToMiuiPermissionActivity_V8(context);
+        } else {
+            Log.e(TAG, "this is a special MIUI rom version, its version code " + versionCode);
+        }
+    }
+
+    private static boolean isIntentAvailable(Intent intent, Context context) {
+        if (intent == null) {
+            return false;
+        }
+        return context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
+    }
+
+    /**
+     * 小米 V5 版本 ROM权限申请
+     */
+    public static void goToMiuiPermissionActivity_V5(Context context) {
+        Intent intent = null;
+        String packageName = context.getPackageName();
+        intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        Uri uri = Uri.fromParts("package", packageName, null);
+        intent.setData(uri);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (isIntentAvailable(intent, context)) {
+            context.startActivity(intent);
+        } else {
+            Log.e(TAG, "intent is not available!");
+        }
+
+        //设置页面在应用详情页面
+//        Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+//        PackageInfo pInfo = null;
+//        try {
+//            pInfo = context.getPackageManager().getPackageInfo
+//                    (HostInterfaceManager.getHostInterface().getApp().getPackageName(), 0);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            AVLogger.e(TAG, e.getMessage());
+//        }
+//        intent.setClassName("com.android.settings", "com.miui.securitycenter.permission.AppPermissionsEditor");
+//        intent.putExtra("extra_package_uid", pInfo.applicationInfo.uid);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//        if (isIntentAvailable(intent, context)) {
+//            context.startActivity(intent);
+//        } else {
+//            AVLogger.e(TAG, "Intent is not available!");
+//        }
+    }
+
+    /**
+     * 小米 V6 版本 ROM权限申请
+     */
+    public static void goToMiuiPermissionActivity_V6(Context context) {
+        Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+        intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+        intent.putExtra("extra_pkgname", context.getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        if (isIntentAvailable(intent, context)) {
+            context.startActivity(intent);
+        } else {
+            Log.e(TAG, "Intent is not available!");
+        }
+    }
+
+    /**
+     * 小米 V7 版本 ROM权限申请
+     */
+    public static void goToMiuiPermissionActivity_V7(Context context) {
+        Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+        intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+        intent.putExtra("extra_pkgname", context.getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        if (isIntentAvailable(intent, context)) {
+            context.startActivity(intent);
+        } else {
+            Log.e(TAG, "Intent is not available!");
+        }
+    }
+
+    /**
+     * 小米 V8 版本 ROM权限申请
+     */
+    public static void goToMiuiPermissionActivity_V8(Context context) {
+        Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+        intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity");
+//        intent.setPackage("com.miui.securitycenter");
+        intent.putExtra("extra_pkgname", context.getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        if (isIntentAvailable(intent, context)) {
+            context.startActivity(intent);
+        } else {
+            intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            intent.setPackage("com.miui.securitycenter");
+            intent.putExtra("extra_pkgname", context.getPackageName());
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            if (isIntentAvailable(intent, context)) {
+                context.startActivity(intent);
+            } else {
+                Log.e(TAG, "Intent is not available!");
+            }
+        }
+    }
+
+    public static void toPermisstionSetting(Context context) throws NoSuchFieldException, IllegalAccessException {
+        int rom = getMiuiVersion();
+        Intent intent = null;
+        if (5 == rom) {
+            Uri packageURI = Uri.parse("package:" + context.getApplicationInfo().packageName);
+            intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, packageURI);
+        } else if (rom == 6 || rom == 7) {
+            intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+            intent.putExtra("extra_pkgname", context.getPackageName());
+        } else if (rom == 8 || rom == 9) {
+            intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity");
+            intent.putExtra("extra_pkgname", context.getPackageName());
+        } else {
+            RomUtils.commonROMPermissionApplyInternal(context);
+            return;
+        }
+        context.startActivity(intent);
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/OppoUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/OppoUtils.java
new file mode 100644
index 00000000..324e9c94
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/OppoUtils.java
@@ -0,0 +1,70 @@
+package com.qxcm.moduleutil.utils.permission.rom;
+
+import android.annotation.TargetApi;
+import android.app.AppOpsManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.Build;
+import android.util.Log;
+
+import java.lang.reflect.Method;
+
+/**
+ * Description:
+ *
+ * @author Shawn_Dut
+ * @since 2018-02-01
+ */
+public class OppoUtils {
+
+    private static final String TAG = "OppoUtils";
+
+    /**
+     * 检测 360 悬浮窗权限
+     */
+    public static boolean checkFloatWindowPermission(Context context) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            return checkOp(context, 24); //OP_SYSTEM_ALERT_WINDOW = 24;
+        }
+        return true;
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private static boolean checkOp(Context context, int op) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            AppOpsManager manager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+            try {
+                Class clazz = AppOpsManager.class;
+                Method method = clazz.getDeclaredMethod("checkOp", int.class, int.class, String.class);
+                return AppOpsManager.MODE_ALLOWED == (int) method.invoke(manager, op, Binder.getCallingUid(), context.getPackageName());
+            } catch (Exception e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        } else {
+            Log.e(TAG, "Below API 19 cannot invoke!");
+        }
+        return false;
+    }
+
+    /**
+     * oppo ROM 权限申请
+     */
+    public static void applyOppoPermission(Context context) {
+        //merge request from https://github.com/zhaozepeng/FloatWindowPermission/pull/26
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            //com.coloros.safecenter/.sysfloatwindow.FloatWindowListActivity
+            ComponentName comp = new ComponentName("com.coloros.safecenter", "com.coloros.safecenter.sysfloatwindow.FloatWindowListActivity");//悬浮窗管理页面
+            intent.setComponent(comp);
+            context.startActivity(intent);
+        }
+        catch(Exception e){
+            Log.e(TAG, "",e);
+        }
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/QikuUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/QikuUtils.java
new file mode 100644
index 00000000..72d554df
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/QikuUtils.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2016 Facishare Technology Co., Ltd. All Rights Reserved.
+ */
+package com.qxcm.moduleutil.utils.permission.rom;
+
+import android.annotation.TargetApi;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Binder;
+import android.os.Build;
+import android.util.Log;
+
+import java.lang.reflect.Method;
+
+public class QikuUtils {
+    private static final String TAG = "QikuUtils";
+
+    /**
+     * 检测 360 悬浮窗权限
+     */
+    public static boolean checkFloatWindowPermission(Context context) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            return checkOp(context, 24); //OP_SYSTEM_ALERT_WINDOW = 24;
+        }
+        return true;
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private static boolean checkOp(Context context, int op) {
+        final int version = Build.VERSION.SDK_INT;
+        if (version >= 19) {
+            AppOpsManager manager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+            try {
+                Class clazz = AppOpsManager.class;
+                Method method = clazz.getDeclaredMethod("checkOp", int.class, int.class, String.class);
+                return AppOpsManager.MODE_ALLOWED == (int)method.invoke(manager, op, Binder.getCallingUid(), context.getPackageName());
+            } catch (Exception e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        } else {
+            Log.e("", "Below API 19 cannot invoke!");
+        }
+        return false;
+    }
+
+    /**
+     * 去360权限申请页面
+     */
+    public static void applyPermission(Context context) {
+        Intent intent = new Intent();
+        intent.setClassName("com.android.settings", "com.android.settings.Settings$OverlaySettingsActivity");
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (isIntentAvailable(intent, context)) {
+            context.startActivity(intent);
+        } else {
+            intent.setClassName("com.qihoo360.mobilesafe", "com.qihoo360.mobilesafe.ui.index.AppEnterActivity");
+            if (isIntentAvailable(intent, context)) {
+                context.startActivity(intent);
+            } else {
+                Log.e(TAG, "can't open permission page with particular name, please use " +
+                        "\"adb shell dumpsys activity\" command and tell me the name of the float window permission page");
+            }
+        }
+    }
+
+    private static boolean isIntentAvailable(Intent intent, Context context) {
+        if (intent == null) {
+            return false;
+        }
+        return context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/RomUtils.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/RomUtils.java
new file mode 100644
index 00000000..ad8e419d
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/utils/permission/rom/RomUtils.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2016 Facishare Technology Co., Ltd. All Rights Reserved.
+ */
+package com.qxcm.moduleutil.utils.permission.rom;
+
+import android.annotation.TargetApi;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+
+/**
+ * Description:
+ *
+ * @author zhaozp
+ * @since 2016-05-23
+ */
+public class RomUtils {
+    private static final String TAG = "RomUtils";
+
+    /**
+     * 获取 emui 版本号
+     *
+     * @return
+     */
+    public static double getEmuiVersion() {
+        try {
+            String emuiVersion = getSystemProperty("ro.build.version.emui");
+            String version = emuiVersion.substring(emuiVersion.indexOf("_") + 1);
+            return Double.parseDouble(version);
+        } catch (Exception e) {
+            Log.e(TAG, "", e);
+        }
+        return 4.0;
+    }
+
+    /**
+     * 获取小米 rom 版本号，获取失败返回 -1
+     *
+     * @return miui rom version code, if fail , return -1
+     */
+    public static int getMiuiVersion() {
+        String version = getSystemProperty("ro.miui.ui.version.name");
+        if (version != null) {
+            try {
+                return Integer.parseInt(version.substring(1));
+            } catch (Exception e) {
+                Log.e(TAG, "get miui version code error, version : " + version);
+            }
+        }
+        return -1;
+    }
+
+    public static String getSystemProperty(String propName) {
+        String line;
+        BufferedReader input = null;
+        try {
+            Process p = Runtime.getRuntime().exec("getprop " + propName);
+            input = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024);
+            line = input.readLine();
+            input.close();
+        } catch (IOException ex) {
+            Log.e(TAG, "Unable to read sysprop " + propName, ex);
+            return null;
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Exception while closing InputStream", e);
+                }
+            }
+        }
+        return line;
+    }
+
+    public static boolean checkIsHuaweiRom() {
+        return Build.MANUFACTURER.contains("HUAWEI");
+    }
+
+    /**
+     * check if is miui ROM
+     */
+    public static boolean checkIsMiuiRom() {
+        return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.name"));
+    }
+
+    public static boolean checkIsMeizuRom() {
+        //return Build.MANUFACTURER.contains("Meizu");
+        String meizuFlymeOSFlag = getSystemProperty("ro.build.display.id");
+        if (TextUtils.isEmpty(meizuFlymeOSFlag)) {
+            return false;
+        } else if (meizuFlymeOSFlag.contains("flyme") || meizuFlymeOSFlag.toLowerCase().contains("flyme")) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static boolean checkIs360Rom() {
+        //fix issue https://github.com/zhaozepeng/FloatWindowPermission/issues/9
+        return Build.MANUFACTURER.contains("QiKU")
+                || Build.MANUFACTURER.contains("360");
+    }
+
+    public static boolean checkIsOppoRom() {
+        //https://github.com/zhaozepeng/FloatWindowPermission/pull/26
+        return Build.MANUFACTURER.contains("OPPO") || Build.MANUFACTURER.contains("oppo");
+    }
+
+    public static boolean checkIsVivoRom() {
+        return Build.MANUFACTURER.contains("vivo") || Build.MANUFACTURER.contains("VIVO");
+    }
+
+    public static boolean checkIsSamsunRom() {
+        return Build.MANUFACTURER.contains("samsung");
+    }
+
+    /**
+     * 判断小米MIUI系统中授权管理中对应的权限授取
+     *
+     * @return false 存在核心的未收取的权限   true 核心权限已经全部授权
+     */
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public static boolean hasMiuiPermission(Context context) {
+        AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        int locationOp = appOpsManager.checkOp(AppOpsManager.OPSTR_FINE_LOCATION, Binder.getCallingUid(), context.getPackageName());
+        if (locationOp == AppOpsManager.MODE_IGNORED) {
+            return false;
+        }
+        return true;
+    }
+
+    public static void commonROMPermissionApplyInternal(Context context) throws NoSuchFieldException, IllegalAccessException {
+        Class clazz = Settings.class;
+        Field field = clazz.getDeclaredField("ACTION_MANAGE_OVERLAY_PERMISSION");
+
+        Intent intent = new Intent(field.get(null).toString());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setData(Uri.parse("package:" + context.getPackageName()));
+        context.startActivity(intent);
+    }
+
+    /**
+     * 跳转到权限设置界面
+     */
+    public static void getAppDetailSettingIntent(Context context) {
+
+        // vivo 点击设置图标>加速白名单>我的app
+        //      点击软件管理>软件管理权限>软件>我的app>信任该软件
+        Intent appIntent = context.getPackageManager().getLaunchIntentForPackage("com.iqoo.secure");
+        if (appIntent != null) {
+            context.startActivity(appIntent);
+            return;
+        }
+
+        // oppo 点击设置图标>应用权限管理>按应用程序管理>我的app>我信任该应用
+        //      点击权限隐私>自启动管理>我的app
+        appIntent = context.getPackageManager().getLaunchIntentForPackage("com.oppo.safe");
+        if (appIntent != null) {
+            context.startActivity(appIntent);
+            return;
+        }
+
+        Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (Build.VERSION.SDK_INT >= 9) {
+            intent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS");
+            intent.setData(Uri.fromParts("package", context.getPackageName(), null));
+        } else if (Build.VERSION.SDK_INT <= 8) {
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.setClassName("com.android.settings", "com.android.settings.InstalledAppDetails");
+            intent.putExtra("com.android.settings.ApplicationPkgName", context.getPackageName());
+        }
+        context.startActivity(intent);
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/AppBarStateChangeListener.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/AppBarStateChangeListener.java
new file mode 100644
index 00000000..72e6e3ba
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/AppBarStateChangeListener.java
@@ -0,0 +1,36 @@
+package com.qxcm.moduleutil.widget;
+
+import com.google.android.material.appbar.AppBarLayout;
+
+public abstract class AppBarStateChangeListener implements AppBarLayout.OnOffsetChangedListener {
+
+    public enum State {
+        EXPANDED,
+        COLLAPSED,
+        IDLE
+    }
+
+    private State mCurrentState = State.IDLE;
+
+    @Override
+    public final void onOffsetChanged(AppBarLayout appBarLayout, int i) {
+        if (i == 0) {
+            if (mCurrentState != State.EXPANDED) {
+                onStateChanged(appBarLayout, State.EXPANDED);
+            }
+            mCurrentState = State.EXPANDED;
+        } else if (Math.abs(i) >= appBarLayout.getTotalScrollRange()) {
+            if (mCurrentState != State.COLLAPSED) {
+                onStateChanged(appBarLayout, State.COLLAPSED);
+            }
+            mCurrentState = State.COLLAPSED;
+        } else {
+            if (mCurrentState != State.IDLE) {
+                onStateChanged(appBarLayout, State.IDLE);
+            }
+            mCurrentState = State.IDLE;
+        }
+    }
+
+    public abstract void onStateChanged(AppBarLayout appBarLayout, State state);
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppConfig.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppConfig.java
index e547d00f..d57bbef7 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppConfig.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonAppConfig.java
@@ -8,6 +8,7 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.LogUtils;
+import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.bean.ConfigBean;
 import com.qxcm.moduleutil.interfaces.CommonCallback;
 import com.qxcm.moduleutil.utils.DeviceUtils;
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonEmptyView.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonEmptyView.java
new file mode 100644
index 00000000..9e6c8cc1
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CommonEmptyView.java
@@ -0,0 +1,100 @@
+package com.qxcm.moduleutil.widget;
+
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.qxcm.moduleutil.R;
+
+/**
+ *@author
+ *@data 2025/5/15
+ *@description: 当没有数据时展示的view
+ */
+public class CommonEmptyView extends FrameLayout {
+    private ImageView ivEmpty;
+    private TextView tvEmptyText;
+    private TextView tvOtherOperation;
+    private LinearLayout layoutEmpty;
+    private OtherOpListener otherOpListener;
+
+    public CommonEmptyView(@NonNull Context context) {
+        super(context);
+        initViews();
+    }
+
+    public CommonEmptyView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initViews();
+    }
+
+    public CommonEmptyView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initViews();
+    }
+
+
+    private void initViews() {
+        LayoutInflater.from(getContext()).inflate(R.layout.layout_empty, this);
+        ivEmpty = findViewById(R.id.iv_empty);
+        tvEmptyText = findViewById(R.id.tv_empty_text);
+        tvOtherOperation = findViewById(R.id.tv_other_operation);
+        layoutEmpty = findViewById(R.id.layout_empty);
+        tvOtherOperation.setOnClickListener(v -> otherOpListener.otherClick());
+    }
+
+    /**
+     * 设置提示文字
+     *
+     * @param text
+     */
+    public void setEmptyText(String text) {
+        if (null != tvEmptyText) {
+            tvEmptyText.setText(text);
+        }
+    }
+
+    /**
+     * 设置提示文字的颜色
+     */
+    public void setTextColor(int color) {
+        if (null != tvEmptyText) {
+            tvEmptyText.setTextColor(color);
+        }
+    }
+
+    /**
+     * 设置按钮文字
+     *
+     * @param txt
+     */
+    public void setBtnText(String txt) {
+        if (null != tvOtherOperation) {
+            tvOtherOperation.setText(txt);
+            tvOtherOperation.setVisibility(VISIBLE);
+        }
+    }
+
+    /**
+     * 设置占位图
+     */
+    public void setImg(int res) {
+        ivEmpty.setImageResource(res);
+    }
+
+    public void addOnOtherListener(OtherOpListener otherOpListener) {
+        this.otherOpListener = otherOpListener;
+    }
+
+    public interface OtherOpListener {
+        void otherClick();
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
index 73ea447d..bf4f1364 100644
--- a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/Constants.java
@@ -340,4 +340,25 @@ public class Constants {
 
     public static final String FILE_PATH = "/YuTang";
 
+
+    //接口地址
+    public static final String SEND_CODE = "/api/Sms/send";
+    public static final String LOGIN = "/api/Login/phone_code";
+    public static final String USER_LOGIN = "/api/Login/user_login";
+    //随机昵称
+    public static final String UPLOAD_NICK_NAME = "/api/UserData/random_nickname";
+    public static final String UPLOAD_USER_PIC = "/api/UserData/modify_user_sex_pic";
+
+    public static final String SWITCH_ACCOUNTS = "/api/Login/multi_account_login";
+
+    public static final String USER_UPDATE = "/api/UserData/modify_fist_user_info";
+
+    public static final String CHANGE_PASSWORD = "/api/UserData/modify_password";
+
+    public static final String URL_LOGIN = "/api/Login/one_click_login";//一键登录
+    public static final String URL_AUTH_CODE = "/api/Login/aliLogin";//支付宝登录
+    public static final String URL_WX_CODE = "/api/Login/wechatLogin";//微信登录
+
+    public static final String AUTHORIZATION = "/api/Login/AlipayUserInfo";
+
 }
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CustomEditText.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CustomEditText.java
new file mode 100644
index 00000000..31023738
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/CustomEditText.java
@@ -0,0 +1,104 @@
+package com.qxcm.moduleutil.widget;
+
+import android.content.Context;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.qxcm.moduleutil.R;
+
+/**
+ *@author
+ *@data 2025/5/15
+ *@description: 输入框添加字数文字提示
+ */
+public class CustomEditText  extends LinearLayout {
+
+    private EditText editText;
+    private TextView lengthTextView;
+    private int maxLength = 100; // 默认最大长度
+
+    public CustomEditText(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public CustomEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public CustomEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private void init(Context context) {
+        // 加载布局文件
+        LayoutInflater.from(context).inflate(R.layout.custom_edit_text_layout, this, true);
+
+        // 找到 EditText 和 TextView 的引用
+        editText = findViewById(R.id.edit_text);
+        lengthTextView = findViewById(R.id.length_text_view);
+
+        // 初始化监听器
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                updateLengthDisplay();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {}
+        });
+
+        // 设置默认的最大长度
+        setMaxLength(maxLength);
+    }
+
+    /**
+     * 设置最大长度
+     */
+    public void setMaxLength(int maxLength) {
+        this.maxLength = maxLength;
+        editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
+        updateLengthDisplay(); // 初始化显示
+    }
+
+    /**
+     * 更新显示的字数
+     */
+    private void updateLengthDisplay() {
+        int currentLength = editText.getText().length();
+        lengthTextView.setText(currentLength + "/" + maxLength);
+    }
+
+    /**
+     * 设置提示文本
+     */
+    public void setHint(String hint) {
+        editText.setHint(hint);
+    }
+
+    /**
+     * 获取当前文本
+     */
+    public String getText() {
+        return editText.getText().toString();
+    }
+
+    /**
+     * 设置文本
+     */
+    public void setText(String text) {
+        editText.setText(text);
+    }
+}
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/DecorationHeadView.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/DecorationHeadView.java
new file mode 100644
index 00000000..25a68cf8
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/DecorationHeadView.java
@@ -0,0 +1,76 @@
+package com.qxcm.moduleutil.widget;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.qxcm.moduleutil.R;
+import com.qxcm.moduleutil.utils.ImageUtils;
+import com.qxcm.moduleutil.utils.logger.Logger;
+
+
+/**
+ * 项目名称 qipao-android
+ * 包名：com.yutang.xqipao.utils.view
+ * 创建人 王欧
+ * 创建时间 2020/4/9 12:46 PM
+ * 描述 describe
+ */
+public class DecorationHeadView extends ConstraintLayout {
+    private ImageView mRiv;
+    private ImageView mIvFrame;
+    private ImageView mIvSex;
+    private ImageView mIvOnline;
+
+    public DecorationHeadView(Context context) {
+        this(context, null, 0);
+    }
+
+    public DecorationHeadView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public DecorationHeadView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView(context, attrs, defStyleAttr);
+    }
+
+    private void initView(Context context, AttributeSet attrs, int defStyleAttr) {
+        LayoutInflater.from(context).inflate(R.layout.common_view_decoration_head, this, true);
+        mRiv = findViewById(R.id.riv);
+        mIvFrame = findViewById(R.id.iv_frame);
+        mIvSex = findViewById(R.id.iv_sex);
+        mIvOnline = findViewById(R.id.iv_online);
+    }
+
+    public void setData(String headPicture, String framePicture, String sex) {
+        Logger.e(headPicture, framePicture, sex);
+        if (!TextUtils.isEmpty(headPicture)) {
+            ImageUtils.loadHeadCC(headPicture, mRiv);
+        }
+//        if (TextUtils.isEmpty(framePicture)) {
+//            mIvSex.setVisibility(VISIBLE);
+//            if (!TextUtils.isEmpty(sex)) {
+//                if (UserBean.MALE.equals(sex)) {
+//                    mIvSex.setBackgroundResource(R.mipmap.common_ic_headportriat_boy);
+//                } else {
+//                    mIvSex.setBackgroundResource(R.mipmap.common_ic_headportriat_girl);
+//                }
+//            } else {
+//                mIvSex.setBackgroundResource(R.drawable.common_bg_head_white);
+//            }
+//        } else {
+//            mIvSex.setVisibility(GONE);
+//        }
+        ImageUtils.loadImageView(framePicture, mIvFrame);
+    }
+
+    public void setOnline(boolean isOnline) {
+        mIvOnline.setVisibility(VISIBLE);
+        mIvOnline.setImageResource(isOnline ? R.mipmap.me_online_icon : R.mipmap.me_icon_unchecked);
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/SplitEditText.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/SplitEditText.java
new file mode 100644
index 00000000..beb10e59
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/SplitEditText.java
@@ -0,0 +1,640 @@
+package com.qxcm.moduleutil.widget;
+
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.text.InputFilter;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.InflateException;
+
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.core.content.ContextCompat;
+
+import com.qxcm.moduleutil.R;
+
+
+public class SplitEditText extends AppCompatEditText {
+    //密码显示模式：隐藏密码,显示圆形
+    public static final int CONTENT_SHOW_MODE_PASSWORD = 1;
+    //密码显示模式：显示密码
+    public static final int CONTENT_SHOW_MODE_TEXT = 2;
+    //输入框相连的样式
+    public static final int INPUT_BOX_STYLE_CONNECT = 1;
+    //单个的输入框样式
+    public static final int INPUT_BOX_STYLE_SINGLE = 2;
+    //下划线输入框样式
+    public static final int INPUT_BOX_STYLE_UNDERLINE = 3;
+    //画笔
+    private RectF mRectFConnect;
+    private RectF mRectFSingleBox;
+    private Paint mPaintDivisionLine;
+    private Paint mPaintContent;
+    private Paint mPaintBorder;
+    private Paint mPaintUnderline;
+    //边框大小
+    private Float mBorderSize;
+    //边框颜色
+    private int mBorderColor;
+    //圆角大小
+    private float mCornerSize;
+    //分割线大小
+    private float mDivisionLineSize;
+    //分割线颜色
+    private int mDivisionColor;
+    //圆形密码的半径大小
+    private float mCircleRadius;
+    //密码框长度
+    private int mContentNumber;
+    //密码显示模式
+    private int mContentShowMode;
+    //单框和下划线输入样式下,每个输入框的间距
+    private float mSpaceSize;
+    //输入框样式
+    private int mInputBoxStyle;
+    //字体大小
+    private float mTextSize;
+    //字体颜色
+    private int mTextColor;
+    //每个输入框是否是正方形标识
+    private boolean mInputBoxSquare;
+    private OnInputListener inputListener;
+    private Paint mPaintCursor;
+    private CursorRunnable cursorRunnable;
+
+    private int mCursorColor;//光标颜色
+    private float mCursorWidth;//光标宽度
+    private int mCursorHeight;//光标高度
+    private int mCursorDuration;//光标闪烁时长
+
+    private int mUnderlineFocusColor;//下划线输入样式下,输入框获取焦点时下划线颜色
+    private int mUnderlineNormalColor;//下划线输入样式下,下划线颜色
+
+    public SplitEditText(Context context) {
+        this(context, null);
+    }
+
+    //这里没有写成默认的EditText属性样式android.R.attr.editTextStyle,这样会存在EditText默认的样式
+    public SplitEditText(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+    /*public SplitEditText(Context context, AttributeSet attrs) {
+        super(context, attrs, android.R.attr.editTextStyle);
+        initAttrs(context, attrs);
+    }*/
+
+    public SplitEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initAttrs(context, attrs);
+    }
+
+    private void initAttrs(Context c, AttributeSet attrs) {
+        TypedArray array = c.obtainStyledAttributes(attrs, R.styleable.SplitEditText);
+        mBorderSize = array.getDimension(R.styleable.SplitEditText_borderSize, dp2px(1f));
+        mBorderColor = array.getColor(R.styleable.SplitEditText_borderColor, Color.BLACK);
+        mCornerSize = array.getDimension(R.styleable.SplitEditText_corner_size, 0f);
+        mDivisionLineSize = array.getDimension(R.styleable.SplitEditText_divisionLineSize, dp2px(1f));
+        mDivisionColor = array.getColor(R.styleable.SplitEditText_divisionLineColor, Color.BLACK);
+        mCircleRadius = array.getDimension(R.styleable.SplitEditText_circleRadius, dp2px(5f));
+        mContentNumber = array.getInt(R.styleable.SplitEditText_contentNumber, 6);
+        mContentShowMode = array.getInteger(R.styleable.SplitEditText_contentShowMode, CONTENT_SHOW_MODE_PASSWORD);
+        mInputBoxStyle = array.getInteger(R.styleable.SplitEditText_inputBoxStyle, INPUT_BOX_STYLE_CONNECT);
+        mSpaceSize = array.getDimension(R.styleable.SplitEditText_spaceSize, dp2px(10f));
+        mTextSize = array.getDimension(R.styleable.SplitEditText_android_textSize, sp2px(16f));
+        mTextColor = array.getColor(R.styleable.SplitEditText_android_textColor, Color.BLACK);
+        mInputBoxSquare = array.getBoolean(R.styleable.SplitEditText_inputBoxSquare, true);
+        mCursorColor = array.getColor(R.styleable.SplitEditText_cursorColor, ContextCompat.getColor(c,R.color.colorAccent));
+        mCursorDuration = array.getInt(R.styleable.SplitEditText_cursorDuration, 500);
+        mCursorWidth = array.getDimension(R.styleable.SplitEditText_cursorWidth, dp2px(2f));
+        mCursorHeight = (int) array.getDimension(R.styleable.SplitEditText_cursorHeight, 0);
+        mUnderlineNormalColor = array.getInt(R.styleable.SplitEditText_underlineNormalColor, Color.BLACK);
+        mUnderlineFocusColor = array.getInt(R.styleable.SplitEditText_underlineFocusColor, 0);
+        array.recycle();
+        init();
+    }
+
+    private void init() {
+        mPaintBorder = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaintBorder.setStyle(Paint.Style.FILL_AND_STROKE);
+        mPaintBorder.setStrokeWidth(mBorderSize);
+        mPaintBorder.setColor(mBorderColor);
+
+        mPaintDivisionLine = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaintDivisionLine.setStyle(Paint.Style.STROKE);
+        mPaintDivisionLine.setStrokeWidth(mDivisionLineSize);
+        mPaintDivisionLine.setColor(mDivisionColor);
+
+        mPaintContent = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaintContent.setTextSize(mTextSize);
+
+        mPaintCursor = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaintCursor.setStrokeWidth(mCursorWidth);
+        mPaintCursor.setColor(mCursorColor);
+
+        mPaintUnderline = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaintUnderline.setStrokeWidth(mBorderSize);
+        mPaintUnderline.setColor(mUnderlineNormalColor);
+
+
+        //避免onDraw里面重复创建RectF对象,先初始化RectF对象,在绘制时调用set()方法
+        //单个输入框样式的RectF
+        mRectFSingleBox = new RectF();
+        //绘制Connect样式的矩形框
+        mRectFConnect = new RectF();
+        //设置单行输入
+        setSingleLine();
+
+        //若构造方法中没有写成android.R.attr.editTextStyle的属性,应该需要设置该属性,EditText默认是获取焦点的
+        setFocusableInTouchMode(true);
+
+        //取消默认的光标
+        //这里默认不设置该属性,不然长按粘贴有问题(一开始长按不能粘贴,输入内容就可以长按粘贴)
+        //setCursorVisible(false);
+
+        //设置透明光标,若是直接不显示光标的话,长按粘贴会没效果
+        /*try {
+            Field f = TextView.class.getDeclaredField("mCursorDrawableRes");
+            f.setAccessible(true);
+            f.set(this, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }*/
+        //设置光标的TextSelectHandle
+        //这里判断版本,10.0以及以上直接通过方法调用,以下通过反射设置
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+//            setTextSelectHandle(android.R.color.transparent);
+//        } else {
+//            //通过反射改变光标TextSelectHandle的样式
+//            try {
+//                Field f = TextView.class.getDeclaredField("mTextSelectHandleRes");
+//                f.setAccessible(true);
+//                f.set(this, android.R.color.transparent);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+        //设置InputFilter,设置输入的最大字符长度为设置的长度
+        setFilters(new InputFilter[]{new InputFilter.LengthFilter(mContentNumber)});
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+//        L.e("SplitEditText","onAttachedToWindow------->");
+        super.onAttachedToWindow();
+        if(hasFocus()){
+            startCursor();
+        }
+    }
+
+    private void startCursor(){
+        if(cursorRunnable==null){
+            cursorRunnable = new CursorRunnable();
+        }
+        postDelayed(cursorRunnable, mCursorDuration);
+    }
+
+    private void stopCursor(){
+        if(cursorRunnable!=null){
+            removeCallbacks(cursorRunnable);
+        }
+    }
+
+
+    @Override
+    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+        super.onFocusChanged(focused, direction, previouslyFocusedRect);
+        if(focused){
+            startCursor();
+        }else{
+            stopCursor();
+        }
+        invalidate();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+//        L.e("SplitEditText","onDetachedFromWindow------->");
+        stopCursor();
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        if (mInputBoxSquare) {
+            int width = MeasureSpec.getSize(widthMeasureSpec);
+            //计算view高度,使view高度和每个item的宽度相等,确保每个item是一个正方形
+            float itemWidth = getContentItemWidthOnMeasure(width);
+            switch (mInputBoxStyle) {
+                case INPUT_BOX_STYLE_UNDERLINE:
+                    setMeasuredDimension(width, (int) (itemWidth + mBorderSize));
+                    break;
+                case INPUT_BOX_STYLE_SINGLE:
+                case INPUT_BOX_STYLE_CONNECT:
+                default:
+                    setMeasuredDimension(width, (int) (itemWidth + mBorderSize * 2));
+                    break;
+            }
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        //绘制输入框
+        switch (mInputBoxStyle) {
+            case INPUT_BOX_STYLE_SINGLE:
+                drawSingleStyle(canvas);
+                break;
+            case INPUT_BOX_STYLE_UNDERLINE:
+                drawUnderlineStyle(canvas);
+                break;
+            case INPUT_BOX_STYLE_CONNECT:
+            default:
+                drawConnectStyle(canvas);
+                break;
+        }
+        //绘制输入框内容
+        drawContent(canvas);
+        //绘制光标
+        if(hasFocus()){
+            drawCursor(canvas);
+        }
+    }
+
+    /**
+     * 根据输入内容显示模式,绘制内容是圆心还是明文的text
+     */
+    private void drawContent(Canvas canvas) {
+        int cy = getHeight() / 2;
+        String password = getText().toString().trim();
+        if (mContentShowMode == CONTENT_SHOW_MODE_PASSWORD) {
+            mPaintContent.setColor(Color.BLACK);
+            for (int i = 0; i < password.length(); i++) {
+                float startX = getDrawContentStartX(i);
+                canvas.drawCircle(startX, cy, mCircleRadius, mPaintContent);
+            }
+        } else {
+            mPaintContent.setColor(mTextColor);
+            //计算baseline
+            float baselineText = getTextBaseline(mPaintContent, cy);
+            for (int i = 0; i < password.length(); i++) {
+                float startX = getDrawContentStartX(i);
+                //计算文字宽度
+                String text = String.valueOf(password.charAt(i));
+                float textWidth = mPaintContent.measureText(text);
+                //绘制文字x应该还需要减去文字宽度的一半
+                canvas.drawText(text, startX - textWidth / 2, baselineText, mPaintContent);
+            }
+        }
+    }
+
+    /**
+     * 绘制光标
+     * 光标只有一个,所以不需要根据循环来绘制,只需绘制第N个就行
+     * 即:
+     * 当输入内容长度为0,光标在第0个位置
+     * 当输入内容长度为1,光标应在第1个位置
+     * ...
+     * 所以光标所在位置为输入内容的长度
+     * 这里光标的长度默认就是 height/2
+     */
+    private void drawCursor(Canvas canvas) {
+        if (mCursorHeight > getHeight()) {
+            throw new InflateException("cursor height must smaller than view height");
+        }
+        String content = getText().toString().trim();
+        float startX = getDrawContentStartX(content.length());
+        //如果设置得有光标高度,那么startY = (高度-光标高度)/2+边框宽度
+        if (mCursorHeight == 0) {
+            mCursorHeight = getHeight() / 2;
+        }
+        int sy = (getHeight() - mCursorHeight) / 2;
+        float startY = sy + mBorderSize;
+        float stopY = getHeight() - sy - mBorderSize;
+
+        //此时的绘制光标竖直线,startX = stopX
+        canvas.drawLine(startX, startY, startX, stopY, mPaintCursor);
+    }
+
+    /**
+     * 、
+     * 计算三种输入框样式下绘制圆和文字的x坐标
+     *
+     * @param index 循环里面的下标 i
+     */
+    private float getDrawContentStartX(int index) {
+        switch (mInputBoxStyle) {
+            case INPUT_BOX_STYLE_SINGLE:
+                //单个输入框样式下的startX
+                //即 itemWidth/2 + i*itemWidth + i*每一个间距宽度 + 前面所有的左右边框
+                //   i = 0,左侧1个边框
+                //   i = 1,左侧3个边框(一个完整的item的左右边框+ 一个左侧边框)
+                //   i = ..., (2*i+1)*mBorderSize
+                return getContentItemWidth() / 2 + index * getContentItemWidth() + index * mSpaceSize + (2 * index + 1) * mBorderSize;
+            case INPUT_BOX_STYLE_UNDERLINE:
+                //下划线输入框样式下的startX
+                //即 itemWidth/2 + i*itemWidth + i*每一个间距宽度
+                return getContentItemWidth() / 2 + index * mSpaceSize + index * getContentItemWidth();
+            case INPUT_BOX_STYLE_CONNECT:
+                //矩形输入框样式下的startX
+                //即 itemWidth/2 + i*itemWidth + i*分割线宽度 + 左侧的一个边框宽度
+            default:
+                return getContentItemWidth() / 2 + index * getContentItemWidth() + index * mDivisionLineSize + mBorderSize;
+        }
+    }
+
+
+    /**
+     * 绘制下划线输入框样式
+     * 线条起点startX:每个字符所占宽度itemWidth + 每个字符item之间的间距mSpaceSize
+     * 线条终点stopX:stopX与startX之间就是一个itemWidth的宽度
+     */
+    private void drawUnderlineStyle(Canvas canvas) {
+        String content = getText().toString().trim();
+        for (int i = 0; i < mContentNumber; i++) {
+            //计算绘制下划线的startX
+            float startX = i * getContentItemWidth() + i * mSpaceSize;
+            //stopX
+            float stopX = getContentItemWidth() + startX;
+            //对于下划线这种样式,startY = stopY
+            float startY = getHeight() - mBorderSize / 2;
+            //这里判断是否设置有输入框获取焦点时,下划线的颜色
+            if (mUnderlineFocusColor != 0) {
+                if (content.length() >= i) {
+                    mPaintUnderline.setColor(mUnderlineFocusColor);
+                } else {
+                    mPaintUnderline.setColor(mUnderlineNormalColor);
+                }
+            }
+            canvas.drawLine(startX, startY, stopX, startY, mPaintUnderline);
+        }
+    }
+
+    /**
+     * 绘制单框输入模式
+     * 这里计算left、right时有点饶,
+     * 理解、计算时最好根据图形、参照drawConnectStyle()绘制带边框的矩形
+     * left:绘制带边框的矩形等图形时,去掉边框的一半即 + mBorderSize / 2,同时加上每个字符item的间距 + i*mSpaceSize
+     * 另外,每个字符item的宽度 + i*itemWidth
+     * 最后,绘制时都是以整个view的宽度计算,绘制第N个时,都应该加上以前的边框宽度
+     * 即第一个：i = 0 ,边框的宽度为0
+     * 第二个：i = 1,边框的宽度 2*mBorderSize,左右两个的边框宽度
+     * 以此...最后应该 + i*2*mBorderSize
+     * 同理
+     * right：去掉边框的一半： -mBorderSize/2,还应该加上前面一个item的宽度：+(i+1)*itemWidth
+     * 同样,绘制时都是以整个view的宽度计算,绘制后面的,都应该加上前面的所有宽度
+     * 即 间距：+i*mSpaceSize
+     * 边框：(注意是计算整个view)
+     * 第一个：i = 0,2个边框2*mBorderSize
+     * 第二个：i = 1,4个边框,即 (1+1)*2*mBorderSize
+     * 所以算上边框 +(i+1)*2*mBorderSize
+     */
+    private void drawSingleStyle(Canvas canvas) {
+        for (int i = 0; i < mContentNumber; i++) {
+            mRectFSingleBox.setEmpty();
+            float left = i * getContentItemWidth() + i * mSpaceSize + i * mBorderSize * 2 + mBorderSize / 2;
+            float right = i * mSpaceSize + (i + 1) * getContentItemWidth() + (i + 1) * 2 * mBorderSize - mBorderSize / 2;
+            //为避免在onDraw里面创建RectF对象,这里使用rectF.set()方法
+            mRectFSingleBox.set(left, mBorderSize / 2, right, getHeight() - mBorderSize / 2);
+            canvas.drawRoundRect(mRectFSingleBox, mCornerSize, mCornerSize, mPaintBorder);
+        }
+    }
+
+    /**
+     * 绘制矩形外框
+     * 在绘制圆角矩形的时候,应该减掉边框的宽度
+     * 不然会有所偏差
+     * <p>
+     * 在绘制矩形以及其它图形的时候,矩形(图形)的边界是边框的中心,不是边框的边界
+     * 所以在绘制带边框的图形的时候应该减去边框宽度的一半
+     * https://blog.csdn.net/a512337862/article/details/74161988
+     */
+    private void drawConnectStyle(Canvas canvas) {
+        //每次重新绘制时,先将rectF重置下
+        mRectFConnect.setEmpty();
+        //需要减去边框的一半
+        mRectFConnect.set(
+                mBorderSize / 2,
+                mBorderSize / 2,
+                getWidth() - mBorderSize / 2,
+                getHeight() - mBorderSize / 2
+        );
+        canvas.drawRoundRect(mRectFConnect, mCornerSize, mCornerSize, mPaintBorder);
+        //绘制分割线
+        drawDivisionLine(canvas);
+    }
+
+    /**
+     * 分割线条数为内容框数目-1
+     * 这里startX应该要加上左侧边框的宽度
+     * 应该还需要加上分割线的一半
+     * 至于startY和stopY不是 mBorderSize/2 而是 mBorderSize
+     * startX是计算整个宽度的,需要算上左侧的边框宽度,所以不是+mBorderSize/2 而是+mBorderSize
+     * startY和stopY：分割线是紧挨着边框内部的,所以应该是mBorderSize,而不是mBorderSize/2
+     */
+    private void drawDivisionLine(Canvas canvas) {
+        float stopY = getHeight() - mBorderSize;
+        for (int i = 0; i < mContentNumber - 1; i++) {
+            //对于分割线条,startX = stopX
+            float startX = (i + 1) * getContentItemWidth() + i * mDivisionLineSize + mBorderSize + mDivisionLineSize / 2;
+            canvas.drawLine(startX, mBorderSize, startX, stopY, mPaintDivisionLine);
+        }
+    }
+
+    /**
+     * 计算3种样式下,相应每个字符item的宽度
+     */
+    private float getContentItemWidth() {
+        //计算每个密码字符所占的宽度,每种输入框样式下,每个字符item所占宽度也不一样
+        float tempWidth;
+        switch (mInputBoxStyle) {
+            case INPUT_BOX_STYLE_SINGLE:
+                //单个输入框样式：宽度-间距宽度(字符数-1)*每个间距宽度-每个输入框的左右边框宽度
+                tempWidth = getWidth() - (mContentNumber - 1) * mSpaceSize - 2 * mContentNumber * mBorderSize;
+                break;
+            case INPUT_BOX_STYLE_UNDERLINE:
+                //下划线样式：宽度-间距宽度(字符数-1)*每个间距宽度
+                tempWidth = getWidth() - (mContentNumber - 1) * mSpaceSize;
+                break;
+            case INPUT_BOX_STYLE_CONNECT:
+                //矩形输入框样式：宽度-左右两边框宽度-分割线宽度(字符数-1)*每个分割线宽度
+            default:
+                tempWidth = getWidth() - (mDivisionLineSize * (mContentNumber - 1)) - 2 * mBorderSize;
+                break;
+        }
+        return tempWidth / mContentNumber;
+    }
+
+    /**
+     * 根据view的测量宽度,计算每个item的宽度
+     *
+     * @param measureWidth view的measure
+     * @return onMeasure时的每个item宽度
+     */
+    private float getContentItemWidthOnMeasure(int measureWidth) {
+        //计算每个密码字符所占的宽度,每种输入框样式下,每个字符item所占宽度也不一样
+        float tempWidth;
+        switch (mInputBoxStyle) {
+            case INPUT_BOX_STYLE_SINGLE:
+                //单个输入框样式：宽度-间距宽度(字符数-1)*每个间距宽度-每个输入框的左右边框宽度
+                tempWidth = measureWidth - (mContentNumber - 1) * mSpaceSize - 2 * mContentNumber * mBorderSize;
+                break;
+            case INPUT_BOX_STYLE_UNDERLINE:
+                //下划线样式：宽度-间距宽度(字符数-1)*每个间距宽度
+                tempWidth = measureWidth - (mContentNumber - 1) * mSpaceSize;
+                break;
+            case INPUT_BOX_STYLE_CONNECT:
+                //矩形输入框样式：宽度-左右两边框宽度-分割线宽度(字符数-1)*每个分割线宽度
+            default:
+                tempWidth = measureWidth - (mDivisionLineSize * (mContentNumber - 1)) - 2 * mBorderSize;
+                break;
+        }
+        return tempWidth / mContentNumber;
+    }
+
+    /**
+     * 计算绘制文本的基线
+     *
+     * @param paint      绘制文字的画笔
+     * @param halfHeight 高度的一半
+     */
+    private float getTextBaseline(Paint paint, float halfHeight) {
+        Paint.FontMetrics fontMetrics = paint.getFontMetrics();
+        float dy = (fontMetrics.bottom - fontMetrics.top) / 2 - fontMetrics.bottom;
+        return halfHeight + dy;
+    }
+
+    /**
+     * 设置密码是否可见
+     */
+    public void setContentShowMode(int mode) {
+        if (mode != CONTENT_SHOW_MODE_PASSWORD && mode != CONTENT_SHOW_MODE_TEXT) {
+            throw new IllegalArgumentException(
+                    "the value of the parameter must be one of" +
+                            "{1:EDIT_SHOW_MODE_PASSWORD} or " +
+                            "{2:EDIT_SHOW_MODE_TEXT}"
+            );
+        }
+        mContentShowMode = mode;
+        invalidate();
+    }
+
+    /**
+     * 获取密码显示模式
+     */
+    public int getContentShowMode() {
+        return mContentShowMode;
+    }
+
+    /**
+     * 设置输入框样式
+     */
+    public void setInputBoxStyle(int inputBoxStyle) {
+        if (inputBoxStyle != INPUT_BOX_STYLE_CONNECT
+                && inputBoxStyle != INPUT_BOX_STYLE_SINGLE
+                && inputBoxStyle != INPUT_BOX_STYLE_UNDERLINE
+        ) {
+            throw new IllegalArgumentException(
+                    "the value of the parameter must be one of" +
+                            "{1:INPUT_BOX_STYLE_CONNECT}, " +
+                            "{2:INPUT_BOX_STYLE_SINGLE} or " +
+                            "{3:INPUT_BOX_STYLE_UNDERLINE}"
+            );
+        }
+        mInputBoxStyle = inputBoxStyle;
+        // 这里没有调用invalidate因为会存在问题
+        // invalidate会重绘,但是不会去重新测量,当输入框样式切换的之后,item的宽度其实是有变化的,所以此时需要重新测量
+        // requestLayout,调用onMeasure和onLayout,不一定会调用onDraw,当view的l,t,r,b发生改变时会调用onDraw
+        requestLayout();
+        //invalidate();
+    }
+
+    public void setOnInputListener(OnInputListener listener) {
+        this.inputListener = listener;
+    }
+
+    /**
+     * 通过复写onTextChanged来实现对输入的监听
+     * 如果在onDraw里面监听text的输入长度来实现,会重复的调用该方法,就不妥当
+     */
+    @Override
+    protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        super.onTextChanged(text, start, lengthBefore, lengthAfter);
+        String content = text.toString().trim();
+        if (inputListener != null) {
+            inputListener.onInputChanged(content);
+            if (content.length() == mContentNumber) {
+                inputListener.onInputFinished(content);
+            }
+        }
+    }
+
+    /**
+     * 获取输入框样式
+     */
+    public int getInputBoxStyle() {
+        return mInputBoxStyle;
+    }
+
+    private float dp2px(float dpValue) {
+        return TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                dpValue,
+                Resources.getSystem().getDisplayMetrics()
+        );
+    }
+
+    private float sp2px(float spValue) {
+        return TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP,
+                spValue,
+                Resources.getSystem().getDisplayMetrics()
+        );
+    }
+
+    /**
+     * 光标Runnable
+     * 通过Runnable每500ms执行重绘,每次runnable通过改变画笔的alpha值来使光标产生闪烁的效果
+     */
+    private class CursorRunnable implements Runnable {
+
+        @Override
+        public void run() {
+            //获取光标画笔的alpha值
+            int alpha = mPaintCursor.getAlpha();
+            //设置光标画笔的alpha值
+            mPaintCursor.setAlpha(alpha == 0 ? 255 : 0);
+            invalidate();
+            postDelayed(this, mCursorDuration);
+//            L.e("SplitEditText","CursorRunnable-----run-->");
+        }
+    }
+
+
+    /**
+     * 输入的监听抽象类
+     * 没定义接口的原因是可以在抽象类里面定义空实现的方法,可以让用户根据需求选择性的复写某些方法
+     */
+    public interface OnInputListener {
+
+        /**
+         * 输入完成的抽象方法
+         *
+         * @param content 输入内容
+         */
+        public abstract void onInputFinished(String content);
+
+        /**
+         * 输入的内容
+         */
+        public void onInputChanged(String text) ;
+    }
+
+}
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerConfig.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerConfig.java
new file mode 100644
index 00000000..f8754050
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerConfig.java
@@ -0,0 +1,87 @@
+package com.qxcm.moduleutil.widget.pagerecyclerview;
+
+import android.util.Log;
+
+/**
+ * ProjectName: BubbleVoice
+ * Package: com.qpyy.room.widget.pagerecyclerview
+ * Description: Pager配置
+ * Author: 姚闻达
+ * CreateDate: 2021/1/13 21:00
+ * UpdateUser: 更新者
+ * UpdateDate: 2021/1/13 21:00
+ * UpdateRemark: 更新说明
+ * Version: 1.0
+ */
+public class PagerConfig {
+    private static final String TAG = "PagerGrid";
+    private static boolean sShowLog = false;
+    private static int sFlingThreshold = 1000;          // Fling 阀值，滚动速度超过该阀值才会触发滚动
+    private static float sMillisecondsPreInch = 60f;    // 每一个英寸滚动需要的微秒数，数值越大，速度越慢
+
+    /**
+     * 判断是否输出日志
+     *
+     * @return true 输出，false 不输出
+     */
+    public static boolean isShowLog() {
+        return sShowLog;
+    }
+
+    /**
+     * 设置是否输出日志
+     *
+     * @param showLog 是否输出
+     */
+    public static void setShowLog(boolean showLog) {
+        sShowLog = showLog;
+    }
+
+    /**
+     * 获取当前滚动速度阀值
+     *
+     * @return 当前滚动速度阀值
+     */
+    public static int getFlingThreshold() {
+        return sFlingThreshold;
+    }
+
+    /**
+     * 设置当前滚动速度阀值
+     *
+     * @param flingThreshold 滚动速度阀值
+     */
+    public static void setFlingThreshold(int flingThreshold) {
+        sFlingThreshold = flingThreshold;
+    }
+
+    /**
+     * 获取滚动速度 英寸/微秒
+     *
+     * @return 英寸滚动速度
+     */
+    public static float getMillisecondsPreInch() {
+        return sMillisecondsPreInch;
+    }
+
+    /**
+     * 设置像素滚动速度 英寸/微秒
+     *
+     * @param millisecondsPreInch 英寸滚动速度
+     */
+    public static void setMillisecondsPreInch(float millisecondsPreInch) {
+        sMillisecondsPreInch = millisecondsPreInch;
+    }
+
+    //--- 日志 -------------------------------------------------------------------------------------
+
+    public static void Logi(String msg) {
+        if (!PagerConfig.isShowLog()) return;
+        Log.i(TAG, msg);
+    }
+
+    public static void Loge(String msg) {
+        if (!PagerConfig.isShowLog()) return;
+        Log.e(TAG, msg);
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridLayoutManager.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridLayoutManager.java
new file mode 100644
index 00000000..91b71b60
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridLayoutManager.java
@@ -0,0 +1,892 @@
+package com.qxcm.moduleutil.widget.pagerecyclerview;
+
+import static android.view.View.MeasureSpec.EXACTLY;
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
+import static com.qxcm.moduleutil.widget.pagerecyclerview.PagerConfig.Loge;
+import static com.qxcm.moduleutil.widget.pagerecyclerview.PagerConfig.Logi;
+
+import android.annotation.SuppressLint;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+/**
+ * ProjectName: BubbleVoice
+ * Package: com.qpyy.room.widget.pagerecyclerview
+ * Description: 分页的网格布局管理器
+ * Author: 姚闻达
+ * CreateDate: 2021/1/13 21:03
+ * UpdateUser: 更新者
+ * UpdateDate: 2021/1/13 21:03
+ * UpdateRemark: 更新说明
+ * Version: 1.0
+ */
+public class PagerGridLayoutManager extends RecyclerView.LayoutManager
+        implements RecyclerView.SmoothScroller.ScrollVectorProvider {
+
+    private static final String TAG = PagerGridLayoutManager.class.getSimpleName();
+
+    public static final int VERTICAL = 0;           // 垂直滚动
+    public static final int HORIZONTAL = 1;         // 水平滚动
+
+    @IntDef({VERTICAL, HORIZONTAL})
+    public @interface OrientationType {
+    }            // 滚动类型
+
+    @OrientationType
+    private int mOrientation;                       // 默认水平滚动
+
+    private int mOffsetX = 0;                       // 水平滚动距离(偏移量)
+    private int mOffsetY = 0;                       // 垂直滚动距离(偏移量)
+
+    private int mRows;                              // 行数
+    private int mColumns;                           // 列数
+    private int mOnePageSize;                       // 一页的条目数量
+
+    private SparseArray<Rect> mItemFrames;          // 条目的显示区域
+
+    private int mItemWidth = 0;                     // 条目宽度
+    private int mItemHeight = 0;                    // 条目高度
+
+    private int mWidthUsed = 0;                     // 已经使用空间，用于测量View
+    private int mHeightUsed = 0;                    // 已经使用空间，用于测量View
+
+    private int mMaxScrollX;                        // 最大允许滑动的宽度
+    private int mMaxScrollY;                        // 最大允许滑动的高度
+    private int mScrollState = SCROLL_STATE_IDLE;   // 滚动状态
+
+    private boolean mAllowContinuousScroll = true;  // 是否允许连续滚动
+
+    private RecyclerView mRecyclerView;
+
+    /**
+     * 构造函数
+     *
+     * @param rows        行数
+     * @param columns     列数
+     * @param orientation 方向
+     */
+    public PagerGridLayoutManager(@IntRange(from = 1, to = 100) int rows,
+                                  @IntRange(from = 1, to = 100) int columns,
+                                  @OrientationType int orientation) {
+        mItemFrames = new SparseArray<>();
+        mOrientation = orientation;
+        mRows = rows;
+        mColumns = columns;
+        mOnePageSize = mRows * mColumns;
+    }
+
+    @Override
+    public void onAttachedToWindow(RecyclerView view) {
+        super.onAttachedToWindow(view);
+        mRecyclerView = view;
+    }
+
+    //--- 处理布局 ----------------------------------------------------------------------------------
+
+    /**
+     * 布局子View
+     *
+     * @param recycler Recycler
+     * @param state    State
+     */
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        Logi("Item onLayoutChildren");
+        Logi("Item onLayoutChildren isPreLayout = " + state.isPreLayout());
+        Logi("Item onLayoutChildren isMeasuring = " + state.isMeasuring());
+        Loge("Item onLayoutChildren state = " + state);
+
+        // 如果是 preLayout 则不重新布局
+        if (state.isPreLayout() || !state.didStructureChange()) {
+            return;
+        }
+
+        if (getItemCount() == 0) {
+            removeAndRecycleAllViews(recycler);
+            // 页面变化回调
+            setPageCount(0);
+            setPageIndex(0, false);
+            return;
+        } else {
+            setPageCount(getTotalPageCount());
+            setPageIndex(getPageIndexByOffset(), false);
+        }
+
+        // 计算页面数量
+        int mPageCount = getItemCount() / mOnePageSize;
+        if (getItemCount() % mOnePageSize != 0) {
+            mPageCount++;
+        }
+
+        // 计算可以滚动的最大数值，并对滚动距离进行修正
+        if (canScrollHorizontally()) {
+            mMaxScrollX = (mPageCount - 1) * getUsableWidth();
+            mMaxScrollY = 0;
+            if (mOffsetX > mMaxScrollX) {
+                mOffsetX = mMaxScrollX;
+            }
+        } else {
+            mMaxScrollX = 0;
+            mMaxScrollY = (mPageCount - 1) * getUsableHeight();
+            if (mOffsetY > mMaxScrollY) {
+                mOffsetY = mMaxScrollY;
+            }
+        }
+
+        // 接口回调
+        // setPageCount(mPageCount);
+        // setPageIndex(mCurrentPageIndex, false);
+
+        Logi("count = " + getItemCount());
+
+        if (mItemWidth <= 0) {
+            mItemWidth = getUsableWidth() / mColumns;
+        }
+        if (mItemHeight <= 0) {
+            mItemHeight = getUsableHeight() / mRows;
+        }
+
+        mWidthUsed = getUsableWidth() - mItemWidth;
+        mHeightUsed = getUsableHeight() - mItemHeight;
+
+        // 预存储两页的View显示区域
+        for (int i = 0; i < mOnePageSize * 2; i++) {
+            getItemFrameByPosition(i);
+        }
+
+        if (mOffsetX == 0 && mOffsetY == 0) {
+            // 预存储View
+            for (int i = 0; i < mOnePageSize; i++) {
+                if (i >= getItemCount()) break; // 防止数据过少时导致数组越界异常
+                View view = recycler.getViewForPosition(i);
+                addView(view);
+                measureChildWithMargins(view, mWidthUsed, mHeightUsed);
+            }
+        }
+
+        // 回收和填充布局
+        recycleAndFillItems(recycler, state, true);
+    }
+
+    /**
+     * 布局结束
+     *
+     * @param state State
+     */
+    @Override
+    public void onLayoutCompleted(RecyclerView.State state) {
+        super.onLayoutCompleted(state);
+        if (state.isPreLayout()) return;
+        // 页面状态回调
+        setPageCount(getTotalPageCount());
+        setPageIndex(getPageIndexByOffset(), false);
+    }
+
+    /**
+     * 回收和填充布局
+     *
+     * @param recycler Recycler
+     * @param state    State
+     * @param isStart  是否从头开始，用于控制View遍历方向，true 为从头到尾，false 为从尾到头
+     */
+    @SuppressLint("CheckResult")
+    private void recycleAndFillItems(RecyclerView.Recycler recycler, RecyclerView.State state,
+                                     boolean isStart) {
+        if (state.isPreLayout()) {
+            return;
+        }
+
+        Logi("mOffsetX = " + mOffsetX);
+        Logi("mOffsetY = " + mOffsetY);
+
+        // 计算显示区域区前后多存储一列或则一行
+        Rect displayRect = new Rect(mOffsetX - mItemWidth, mOffsetY - mItemHeight,
+                getUsableWidth() + mOffsetX + mItemWidth, getUsableHeight() + mOffsetY + mItemHeight);
+        // 对显显示区域进行修正(计算当前显示区域和最大显示区域对交集)
+        displayRect.intersect(0, 0, mMaxScrollX + getUsableWidth(), mMaxScrollY + getUsableHeight());
+        Loge("displayRect = " + displayRect.toString());
+
+        int startPos = 0;                  // 获取第一个条目的Pos
+        int pageIndex = getPageIndexByOffset();
+        startPos = pageIndex * mOnePageSize;
+        Logi("startPos = " + startPos);
+        startPos = startPos - mOnePageSize * 2;
+        if (startPos < 0) {
+            startPos = 0;
+        }
+        int stopPos = startPos + mOnePageSize * 4;
+        if (stopPos > getItemCount()) {
+            stopPos = getItemCount();
+        }
+
+        Loge("startPos = " + startPos);
+        Loge("stopPos = " + stopPos);
+
+        detachAndScrapAttachedViews(recycler); // 移除所有View
+
+        if (isStart) {
+            for (int i = startPos; i < stopPos; i++) {
+                addOrRemove(recycler, displayRect, i);
+            }
+        } else {
+            for (int i = stopPos - 1; i >= startPos; i--) {
+                addOrRemove(recycler, displayRect, i);
+            }
+        }
+        Loge("child count = " + getChildCount());
+    }
+
+    /**
+     * 添加或者移除条目
+     *
+     * @param recycler    RecyclerView
+     * @param displayRect 显示区域
+     * @param i           条目下标
+     */
+    private void addOrRemove(RecyclerView.Recycler recycler, Rect displayRect, int i) {
+        View child = recycler.getViewForPosition(i);
+        Rect rect = getItemFrameByPosition(i);
+        if (!Rect.intersects(displayRect, rect)) {
+            removeAndRecycleView(child, recycler);   // 回收入暂存区
+        } else {
+            addView(child);
+            measureChildWithMargins(child, mWidthUsed, mHeightUsed);
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+            layoutDecorated(child,
+                    rect.left - mOffsetX + lp.leftMargin + getPaddingLeft(),
+                    rect.top - mOffsetY + lp.topMargin + getPaddingTop(),
+                    rect.right - mOffsetX - lp.rightMargin + getPaddingLeft(),
+                    rect.bottom - mOffsetY - lp.bottomMargin + getPaddingTop());
+        }
+    }
+
+
+    //--- 处理滚动 ----------------------------------------------------------------------------------
+
+    /**
+     * 水平滚动
+     *
+     * @param dx       滚动距离
+     * @param recycler 回收器
+     * @param state    滚动状态
+     * @return 实际滚动距离
+     */
+    @Override
+    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler, RecyclerView.State
+            state) {
+        int newX = mOffsetX + dx;
+        int result = dx;
+        if (newX > mMaxScrollX) {
+            result = mMaxScrollX - mOffsetX;
+        } else if (newX < 0) {
+            result = 0 - mOffsetX;
+        }
+        mOffsetX += result;
+        setPageIndex(getPageIndexByOffset(), true);
+        offsetChildrenHorizontal(-result);
+        if (result > 0) {
+            recycleAndFillItems(recycler, state, true);
+        } else {
+            recycleAndFillItems(recycler, state, false);
+        }
+        return result;
+    }
+
+    /**
+     * 垂直滚动
+     *
+     * @param dy       滚动距离
+     * @param recycler 回收器
+     * @param state    滚动状态
+     * @return 实际滚动距离
+     */
+    @Override
+    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, RecyclerView.State
+            state) {
+        int newY = mOffsetY + dy;
+        int result = dy;
+        if (newY > mMaxScrollY) {
+            result = mMaxScrollY - mOffsetY;
+        } else if (newY < 0) {
+            result = 0 - mOffsetY;
+        }
+        mOffsetY += result;
+        setPageIndex(getPageIndexByOffset(), true);
+        offsetChildrenVertical(-result);
+        if (result > 0) {
+            recycleAndFillItems(recycler, state, true);
+        } else {
+            recycleAndFillItems(recycler, state, false);
+        }
+        return result;
+    }
+
+    /**
+     * 监听滚动状态，滚动结束后通知当前选中的页面
+     *
+     * @param state 滚动状态
+     */
+    @Override
+    public void onScrollStateChanged(int state) {
+        Logi("onScrollStateChanged = " + state);
+        mScrollState = state;
+        super.onScrollStateChanged(state);
+        if (state == SCROLL_STATE_IDLE) {
+            setPageIndex(getPageIndexByOffset(), false);
+        }
+    }
+
+
+    //--- 私有方法 ----------------------------------------------------------------------------------
+
+    /**
+     * 获取条目显示区域
+     *
+     * @param pos 位置下标
+     * @return 显示区域
+     */
+    private Rect getItemFrameByPosition(int pos) {
+        Rect rect = mItemFrames.get(pos);
+        if (null == rect) {
+            rect = new Rect();
+            // 计算显示区域 Rect
+
+            // 1. 获取当前View所在页数
+            int page = pos / mOnePageSize;
+
+            // 2. 计算当前页数左上角的总偏移量
+            int offsetX = 0;
+            int offsetY = 0;
+            if (canScrollHorizontally()) {
+                offsetX += getUsableWidth() * page;
+            } else {
+                offsetY += getUsableHeight() * page;
+            }
+
+            // 3. 根据在当前页面中的位置确定具体偏移量
+            int pagePos = pos % mOnePageSize;       // 在当前页面中是第几个
+            int row = pagePos / mColumns;           // 获取所在行
+            int col = pagePos - (row * mColumns);   // 获取所在列
+
+            offsetX += col * mItemWidth;
+            offsetY += row * mItemHeight;
+
+            // 状态输出，用于调试
+            Logi("pagePos = " + pagePos);
+            Logi("行 = " + row);
+            Logi("列 = " + col);
+
+            Logi("offsetX = " + offsetX);
+            Logi("offsetY = " + offsetY);
+
+            rect.left = offsetX;
+            rect.top = offsetY;
+            rect.right = offsetX + mItemWidth;
+            rect.bottom = offsetY + mItemHeight;
+
+            // 存储
+            mItemFrames.put(pos, rect);
+        }
+        return rect;
+    }
+
+    /**
+     * 获取可用的宽度
+     *
+     * @return 宽度 - padding
+     */
+    private int getUsableWidth() {
+        return getWidth() - getPaddingLeft() - getPaddingRight();
+    }
+
+    /**
+     * 获取可用的高度
+     *
+     * @return 高度 - padding
+     */
+    private int getUsableHeight() {
+        return getHeight() - getPaddingTop() - getPaddingBottom();
+    }
+
+
+    //--- 页面相关(私有) -----------------------------------------------------------------------------
+
+    /**
+     * 获取总页数
+     */
+    private int getTotalPageCount() {
+        if (getItemCount() <= 0) return 0;
+        int totalCount = getItemCount() / mOnePageSize;
+        if (getItemCount() % mOnePageSize != 0) {
+            totalCount++;
+        }
+        return totalCount;
+    }
+
+    /**
+     * 根据pos，获取该View所在的页面
+     *
+     * @param pos position
+     * @return 页面的页码
+     */
+    private int getPageIndexByPos(int pos) {
+        return pos / mOnePageSize;
+    }
+
+    /**
+     * 根据 offset 获取页面Index
+     *
+     * @return 页面 Index
+     */
+    private int getPageIndexByOffset() {
+        int pageIndex;
+        if (canScrollVertically()) {
+            int pageHeight = getUsableHeight();
+            if (mOffsetY <= 0 || pageHeight <= 0) {
+                pageIndex = 0;
+            } else {
+                pageIndex = mOffsetY / pageHeight;
+                if (mOffsetY % pageHeight > pageHeight / 2) {
+                    pageIndex++;
+                }
+            }
+        } else {
+            int pageWidth = getUsableWidth();
+            if (mOffsetX <= 0 || pageWidth <= 0) {
+                pageIndex = 0;
+            } else {
+                pageIndex = mOffsetX / pageWidth;
+                if (mOffsetX % pageWidth > pageWidth / 2) {
+                    pageIndex++;
+                }
+            }
+        }
+        Logi("getPageIndexByOffset pageIndex = " + pageIndex);
+        return pageIndex;
+    }
+
+
+    //--- 公开方法 ----------------------------------------------------------------------------------
+
+    /**
+     * 创建默认布局参数
+     *
+     * @return 默认布局参数
+     */
+    @Override
+    public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+        return new RecyclerView.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
+    /**
+     * 处理测量逻辑
+     *
+     * @param recycler          RecyclerView
+     * @param state             状态
+     * @param widthMeasureSpec  宽度属性
+     * @param heightMeasureSpec 高估属性
+     */
+    @Override
+    public void onMeasure(RecyclerView.Recycler recycler, RecyclerView.State state, int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(recycler, state, widthMeasureSpec, heightMeasureSpec);
+        int widthsize = View.MeasureSpec.getSize(widthMeasureSpec);      //取出宽度的确切数值
+        int widthmode = View.MeasureSpec.getMode(widthMeasureSpec);      //取出宽度的测量模式
+
+        int heightsize = View.MeasureSpec.getSize(heightMeasureSpec);    //取出高度的确切数值
+        int heightmode = View.MeasureSpec.getMode(heightMeasureSpec);    //取出高度的测量模式
+
+        // 将 wrap_content 转换为 match_parent
+        if (widthmode != EXACTLY && widthsize > 0) {
+            widthmode = EXACTLY;
+        }
+        if (heightmode != EXACTLY && heightsize > 0) {
+            heightmode = EXACTLY;
+        }
+        setMeasuredDimension(View.MeasureSpec.makeMeasureSpec(widthsize, widthmode),
+                View.MeasureSpec.makeMeasureSpec(heightsize, heightmode));
+    }
+
+    /**
+     * 是否可以水平滚动
+     *
+     * @return true 是，false 不是。
+     */
+    @Override
+    public boolean canScrollHorizontally() {
+        return mOrientation == HORIZONTAL;
+    }
+
+    /**
+     * 是否可以垂直滚动
+     *
+     * @return true 是，false 不是。
+     */
+    @Override
+    public boolean canScrollVertically() {
+        return mOrientation == VERTICAL;
+    }
+
+    /**
+     * 找到下一页第一个条目的位置
+     *
+     * @return 第一个搞条目的位置
+     */
+    int findNextPageFirstPos() {
+        int page = mLastPageIndex;
+        page++;
+        if (page >= getTotalPageCount()) {
+            page = getTotalPageCount() - 1;
+        }
+        Loge("computeScrollVectorForPosition next = " + page);
+        return page * mOnePageSize;
+    }
+
+    /**
+     * 找到上一页的第一个条目的位置
+     *
+     * @return 第一个条目的位置
+     */
+    int findPrePageFirstPos() {
+        // 在获取时由于前一页的View预加载出来了，所以获取到的直接就是前一页
+        int page = mLastPageIndex;
+        page--;
+        Loge("computeScrollVectorForPosition pre = " + page);
+        if (page < 0) {
+            page = 0;
+        }
+        Loge("computeScrollVectorForPosition pre = " + page);
+        return page * mOnePageSize;
+    }
+
+    /**
+     * 获取当前 X 轴偏移量
+     *
+     * @return X 轴偏移量
+     */
+    public int getOffsetX() {
+        return mOffsetX;
+    }
+
+    /**
+     * 获取当前 Y 轴偏移量
+     *
+     * @return Y 轴偏移量
+     */
+    public int getOffsetY() {
+        return mOffsetY;
+    }
+
+
+    //--- 页面对齐 ----------------------------------------------------------------------------------
+
+    /**
+     * 计算到目标位置需要滚动的距离{@link RecyclerView.SmoothScroller.ScrollVectorProvider}
+     *
+     * @param targetPosition 目标控件
+     * @return 需要滚动的距离
+     */
+    @Override
+    public PointF computeScrollVectorForPosition(int targetPosition) {
+        PointF vector = new PointF();
+        int[] pos = getSnapOffset(targetPosition);
+        vector.x = pos[0];
+        vector.y = pos[1];
+        return vector;
+    }
+
+    /**
+     * 获取偏移量(为PagerGridSnapHelper准备)
+     * 用于分页滚动，确定需要滚动的距离。
+     * {@link PagerGridSnapHelper}
+     *
+     * @param targetPosition 条目下标
+     */
+    int[] getSnapOffset(int targetPosition) {
+        int[] offset = new int[2];
+        int[] pos = getPageLeftTopByPosition(targetPosition);
+        offset[0] = pos[0] - mOffsetX;
+        offset[1] = pos[1] - mOffsetY;
+        return offset;
+    }
+
+    /**
+     * 根据条目下标获取该条目所在页面的左上角位置
+     *
+     * @param pos 条目下标
+     * @return 左上角位置
+     */
+    private int[] getPageLeftTopByPosition(int pos) {
+        int[] leftTop = new int[2];
+        int page = getPageIndexByPos(pos);
+        if (canScrollHorizontally()) {
+            leftTop[0] = page * getUsableWidth();
+            leftTop[1] = 0;
+        } else {
+            leftTop[0] = 0;
+            leftTop[1] = page * getUsableHeight();
+        }
+        return leftTop;
+    }
+
+    /**
+     * 获取需要对齐的View
+     *
+     * @return 需要对齐的View
+     */
+    public View findSnapView() {
+        if (null != getFocusedChild()) {
+            return getFocusedChild();
+        }
+        if (getChildCount() <= 0) {
+            return null;
+        }
+        int targetPos = getPageIndexByOffset() * mOnePageSize;   // 目标Pos
+        for (int i = 0; i < getChildCount(); i++) {
+            int childPos = getPosition(getChildAt(i));
+            if (childPos == targetPos) {
+                return getChildAt(i);
+            }
+        }
+        return getChildAt(0);
+    }
+
+
+    //--- 处理页码变化 -------------------------------------------------------------------------------
+
+    private boolean mChangeSelectInScrolling = true;    // 是否在滚动过程中对页面变化回调
+    private int mLastPageCount = -1;                    // 上次页面总数
+    private int mLastPageIndex = -1;                    // 上次页面下标
+
+    /**
+     * 设置页面总数
+     *
+     * @param pageCount 页面总数
+     */
+    private void setPageCount(int pageCount) {
+        if (pageCount >= 0) {
+            if (mPageListener != null && pageCount != mLastPageCount) {
+                mPageListener.onPageSizeChanged(pageCount);
+            }
+            mLastPageCount = pageCount;
+        }
+    }
+
+    /**
+     * 设置当前选中页面
+     *
+     * @param pageIndex   页面下标
+     * @param isScrolling 是否处于滚动状态
+     */
+    private void setPageIndex(int pageIndex, boolean isScrolling) {
+        Loge("setPageIndex = " + pageIndex + ":" + isScrolling);
+        if (pageIndex == mLastPageIndex) return;
+        // 如果允许连续滚动，那么在滚动过程中就会更新页码记录
+        if (isAllowContinuousScroll()) {
+            mLastPageIndex = pageIndex;
+        } else {
+            // 否则，只有等滚动停下时才会更新页码记录
+            if (!isScrolling) {
+                mLastPageIndex = pageIndex;
+            }
+        }
+        if (isScrolling && !mChangeSelectInScrolling) return;
+        if (pageIndex >= 0) {
+            if (null != mPageListener) {
+                mPageListener.onPageSelect(pageIndex);
+            }
+        }
+    }
+
+    /**
+     * 设置是否在滚动状态更新选中页码
+     *
+     * @param changeSelectInScrolling true：更新、false：不更新
+     */
+    public void setChangeSelectInScrolling(boolean changeSelectInScrolling) {
+        mChangeSelectInScrolling = changeSelectInScrolling;
+    }
+
+    /**
+     * 设置滚动方向
+     *
+     * @param orientation 滚动方向
+     * @return 最终的滚动方向
+     */
+    @OrientationType
+    public int setOrientationType(@OrientationType int orientation) {
+        if (mOrientation == orientation || mScrollState != SCROLL_STATE_IDLE) return mOrientation;
+        mOrientation = orientation;
+        mItemFrames.clear();
+        int x = mOffsetX;
+        int y = mOffsetY;
+        mOffsetX = y / getUsableHeight() * getUsableWidth();
+        mOffsetY = x / getUsableWidth() * getUsableHeight();
+        int mx = mMaxScrollX;
+        int my = mMaxScrollY;
+        mMaxScrollX = my / getUsableHeight() * getUsableWidth();
+        mMaxScrollY = mx / getUsableWidth() * getUsableHeight();
+        return mOrientation;
+    }
+
+    //--- 滚动到指定位置 -----------------------------------------------------------------------------
+
+    @Override
+    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state, int position) {
+        int targetPageIndex = getPageIndexByPos(position);
+        smoothScrollToPage(targetPageIndex);
+    }
+
+    /**
+     * 平滑滚动到上一页
+     */
+    public void smoothPrePage() {
+        smoothScrollToPage(getPageIndexByOffset() - 1);
+    }
+
+    /**
+     * 平滑滚动到下一页
+     */
+    public void smoothNextPage() {
+        smoothScrollToPage(getPageIndexByOffset() + 1);
+    }
+
+    /**
+     * 平滑滚动到指定页面
+     *
+     * @param pageIndex 页面下标
+     */
+    public void smoothScrollToPage(int pageIndex) {
+        if (pageIndex < 0 || pageIndex >= mLastPageCount) {
+            Log.e(TAG, "pageIndex is outOfIndex, must in [0, " + mLastPageCount + ").");
+            return;
+        }
+        if (null == mRecyclerView) {
+            Log.e(TAG, "RecyclerView Not Found!");
+            return;
+        }
+
+        // 如果滚动到页面之间距离过大，先直接滚动到目标页面到临近页面，在使用 smoothScroll 最终滚动到目标
+        // 否则在滚动距离很大时，会导致滚动耗费的时间非常长
+        int currentPageIndex = getPageIndexByOffset();
+        if (Math.abs(pageIndex - currentPageIndex) > 3) {
+            if (pageIndex > currentPageIndex) {
+                scrollToPage(pageIndex - 3);
+            } else if (pageIndex < currentPageIndex) {
+                scrollToPage(pageIndex + 3);
+            }
+        }
+
+        // 具体执行滚动
+        LinearSmoothScroller smoothScroller = new PagerGridSmoothScroller(mRecyclerView);
+        int position = pageIndex * mOnePageSize;
+        smoothScroller.setTargetPosition(position);
+        startSmoothScroll(smoothScroller);
+    }
+
+    //=== 直接滚动 ===
+
+    @Override
+    public void scrollToPosition(int position) {
+        int pageIndex = getPageIndexByPos(position);
+        scrollToPage(pageIndex);
+    }
+
+    /**
+     * 上一页
+     */
+    public void prePage() {
+        scrollToPage(getPageIndexByOffset() - 1);
+    }
+
+    /**
+     * 下一页
+     */
+    public void nextPage() {
+        scrollToPage(getPageIndexByOffset() + 1);
+    }
+
+    /**
+     * 滚动到指定页面
+     *
+     * @param pageIndex 页面下标
+     */
+    public void scrollToPage(int pageIndex) {
+        if (pageIndex < 0 || pageIndex >= mLastPageCount) {
+            Log.e(TAG, "pageIndex = " + pageIndex + " is out of bounds, mast in [0, " + mLastPageCount + ")");
+            return;
+        }
+
+        if (null == mRecyclerView) {
+            Log.e(TAG, "RecyclerView Not Found!");
+            return;
+        }
+
+        int mTargetOffsetXBy = 0;
+        int mTargetOffsetYBy = 0;
+        if (canScrollVertically()) {
+            mTargetOffsetXBy = 0;
+            mTargetOffsetYBy = pageIndex * getUsableHeight() - mOffsetY;
+        } else {
+            mTargetOffsetXBy = pageIndex * getUsableWidth() - mOffsetX;
+            mTargetOffsetYBy = 0;
+        }
+        Loge("mTargetOffsetXBy = " + mTargetOffsetXBy);
+        Loge("mTargetOffsetYBy = " + mTargetOffsetYBy);
+        mRecyclerView.scrollBy(mTargetOffsetXBy, mTargetOffsetYBy);
+        setPageIndex(pageIndex, false);
+    }
+
+    /**
+     * 是否允许连续滚动，默认为允许
+     *
+     * @return true 允许， false 不允许
+     */
+    public boolean isAllowContinuousScroll() {
+        return mAllowContinuousScroll;
+    }
+
+    /**
+     * 设置是否允许连续滚动
+     *
+     * @param allowContinuousScroll true 允许，false 不允许
+     */
+    public void setAllowContinuousScroll(boolean allowContinuousScroll) {
+        mAllowContinuousScroll = allowContinuousScroll;
+    }
+
+    //--- 对外接口 ----------------------------------------------------------------------------------
+
+    private PageListener mPageListener = null;
+
+    public void setPageListener(PageListener pageListener) {
+        mPageListener = pageListener;
+    }
+
+    public interface PageListener {
+        /**
+         * 页面总数量变化
+         *
+         * @param pageSize 页面总数
+         */
+        void onPageSizeChanged(int pageSize);
+
+        /**
+         * 页面被选中
+         *
+         * @param pageIndex 选中的页面
+         */
+        void onPageSelect(int pageIndex);
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridSmoothScroller.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridSmoothScroller.java
new file mode 100644
index 00000000..4f639948
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridSmoothScroller.java
@@ -0,0 +1,55 @@
+package com.qxcm.moduleutil.widget.pagerecyclerview;
+
+
+import static com.qxcm.moduleutil.widget.pagerecyclerview.PagerConfig.Logi;
+
+import android.util.DisplayMetrics;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * ProjectName: BubbleVoice
+ * Package: com.qpyy.room.widget.pagerecyclerview
+ * Description: 用于处理平滑滚动,用于用户手指抬起后页面对齐或者 Fling 事件
+ * Author: 姚闻达
+ * CreateDate: 2021/1/13 21:08
+ * UpdateUser: 更新者
+ * UpdateDate: 2021/1/13 21:08
+ * UpdateRemark: 更新说明
+ * Version: 1.0
+ */
+public class PagerGridSmoothScroller extends LinearSmoothScroller {
+    private RecyclerView mRecyclerView;
+
+    public PagerGridSmoothScroller(@NonNull RecyclerView recyclerView) {
+        super(recyclerView.getContext());
+        mRecyclerView = recyclerView;
+    }
+
+    @Override
+    protected void onTargetFound(View targetView, RecyclerView.State state, Action action) {
+        RecyclerView.LayoutManager manager = mRecyclerView.getLayoutManager();
+        if (null == manager) return;
+        if (manager instanceof PagerGridLayoutManager) {
+            PagerGridLayoutManager layoutManager = (PagerGridLayoutManager) manager;
+            int pos = mRecyclerView.getChildAdapterPosition(targetView);
+            int[] snapDistances = layoutManager.getSnapOffset(pos);
+            final int dx = snapDistances[0];
+            final int dy = snapDistances[1];
+            Logi("dx = " + dx);
+            Logi("dy = " + dy);
+            final int time = calculateTimeForScrolling(Math.max(Math.abs(dx), Math.abs(dy)));
+            if (time > 0) {
+                action.update(dx, dy, time, mDecelerateInterpolator);
+            }
+        }
+    }
+
+    @Override
+    protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
+        return PagerConfig.getMillisecondsPreInch() / displayMetrics.densityDpi;
+    }
+}
diff --git a/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridSnapHelper.java b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridSnapHelper.java
new file mode 100644
index 00000000..0f4c41aa
--- /dev/null
+++ b/moduleUtil/src/main/java/com/qxcm/moduleutil/widget/pagerecyclerview/PagerGridSnapHelper.java
@@ -0,0 +1,187 @@
+package com.qxcm.moduleutil.widget.pagerecyclerview;
+
+
+import static com.qxcm.moduleutil.widget.pagerecyclerview.PagerConfig.Loge;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
+
+/**
+ * ProjectName: BubbleVoice
+ * Package: com.qpyy.room.widget.pagerecyclerview
+ * Description: 分页居中工具 每次只滚动一个页面
+ * Author: 姚闻达
+ * CreateDate: 2021/1/13 21:10
+ * UpdateUser: 更新者
+ * UpdateDate: 2021/1/13 21:10
+ * UpdateRemark: 更新说明
+ * Version: 1.0
+ */
+public class PagerGridSnapHelper extends SnapHelper {
+    private RecyclerView mRecyclerView;                     // RecyclerView
+
+    /**
+     * 用于将滚动工具和 Recycler 绑定
+     *
+     * @param recyclerView RecyclerView
+     * @throws IllegalStateException 状态异常
+     */
+    @Override
+    public void attachToRecyclerView(@Nullable RecyclerView recyclerView) throws
+            IllegalStateException {
+        super.attachToRecyclerView(recyclerView);
+        mRecyclerView = recyclerView;
+    }
+
+    /**
+     * 计算需要滚动的向量，用于页面自动回滚对齐
+     *
+     * @param layoutManager 布局管理器
+     * @param targetView    目标控件
+     * @return 需要滚动的距离
+     */
+    @Nullable
+    @Override
+    public int[] calculateDistanceToFinalSnap(@NonNull RecyclerView.LayoutManager layoutManager,
+                                              @NonNull View targetView) {
+        int pos = layoutManager.getPosition(targetView);
+        Loge("findTargetSnapPosition, pos = " + pos);
+        int[] offset = new int[2];
+        if (layoutManager instanceof PagerGridLayoutManager) {
+            PagerGridLayoutManager manager = (PagerGridLayoutManager) layoutManager;
+            offset = manager.getSnapOffset(pos);
+        }
+        return offset;
+    }
+
+    /**
+     * 获得需要对齐的View，对于分页布局来说，就是页面第一个
+     *
+     * @param layoutManager 布局管理器
+     * @return 目标控件
+     */
+    @Nullable
+    @Override
+    public View findSnapView(RecyclerView.LayoutManager layoutManager) {
+        if (layoutManager instanceof PagerGridLayoutManager) {
+            PagerGridLayoutManager manager = (PagerGridLayoutManager) layoutManager;
+            return manager.findSnapView();
+        }
+        return null;
+    }
+
+    /**
+     * 获取目标控件的位置下标
+     * (获取滚动后第一个View的下标)
+     *
+     * @param layoutManager 布局管理器
+     * @param velocityX     X 轴滚动速率
+     * @param velocityY     Y 轴滚动速率
+     * @return 目标控件的下标
+     */
+    @Override
+    public int findTargetSnapPosition(RecyclerView.LayoutManager layoutManager,
+                                      int velocityX, int velocityY) {
+        int target = RecyclerView.NO_POSITION;
+        Loge("findTargetSnapPosition, velocityX = " + velocityX + ", velocityY" + velocityY);
+        if (null != layoutManager && layoutManager instanceof PagerGridLayoutManager) {
+            PagerGridLayoutManager manager = (PagerGridLayoutManager) layoutManager;
+            if (manager.canScrollHorizontally()) {
+                if (velocityX > PagerConfig.getFlingThreshold()) {
+                    target = manager.findNextPageFirstPos();
+                } else if (velocityX < -PagerConfig.getFlingThreshold()) {
+                    target = manager.findPrePageFirstPos();
+                }
+            } else if (manager.canScrollVertically()) {
+                if (velocityY > PagerConfig.getFlingThreshold()) {
+                    target = manager.findNextPageFirstPos();
+                } else if (velocityY < -PagerConfig.getFlingThreshold()) {
+                    target = manager.findPrePageFirstPos();
+                }
+            }
+        }
+        Loge("findTargetSnapPosition, target = " + target);
+        return target;
+    }
+
+    /**
+     * 一扔(快速滚动)
+     *
+     * @param velocityX X 轴滚动速率
+     * @param velocityY Y 轴滚动速率
+     * @return 是否消费该事件
+     */
+    @Override
+    public boolean onFling(int velocityX, int velocityY) {
+        RecyclerView.LayoutManager layoutManager = mRecyclerView.getLayoutManager();
+        if (layoutManager == null) {
+            return false;
+        }
+        RecyclerView.Adapter adapter = mRecyclerView.getAdapter();
+        if (adapter == null) {
+            return false;
+        }
+        int minFlingVelocity = PagerConfig.getFlingThreshold();
+        Loge("minFlingVelocity = " + minFlingVelocity);
+        return (Math.abs(velocityY) > minFlingVelocity || Math.abs(velocityX) > minFlingVelocity)
+                && snapFromFling(layoutManager, velocityX, velocityY);
+    }
+
+    /**
+     * 快速滚动的具体处理方案
+     *
+     * @param layoutManager 布局管理器
+     * @param velocityX     X 轴滚动速率
+     * @param velocityY     Y 轴滚动速率
+     * @return 是否消费该事件
+     */
+    private boolean snapFromFling(@NonNull RecyclerView.LayoutManager layoutManager, int velocityX,
+                                  int velocityY) {
+        if (!(layoutManager instanceof RecyclerView.SmoothScroller.ScrollVectorProvider)) {
+            return false;
+        }
+
+        RecyclerView.SmoothScroller smoothScroller = createSnapScroller(layoutManager);
+        if (smoothScroller == null) {
+            return false;
+        }
+
+        int targetPosition = findTargetSnapPosition(layoutManager, velocityX, velocityY);
+        if (targetPosition == RecyclerView.NO_POSITION) {
+            return false;
+        }
+
+        smoothScroller.setTargetPosition(targetPosition);
+        layoutManager.startSmoothScroll(smoothScroller);
+        return true;
+    }
+
+    /**
+     * 通过自定义 LinearSmoothScroller 来控制速度
+     *
+     * @param layoutManager 布局故哪里去
+     * @return 自定义 LinearSmoothScroller
+     */
+    protected LinearSmoothScroller createSnapScroller(RecyclerView.LayoutManager layoutManager) {
+        if (!(layoutManager instanceof RecyclerView.SmoothScroller.ScrollVectorProvider)) {
+            return null;
+        }
+        return new PagerGridSmoothScroller(mRecyclerView);
+    }
+
+    //--- 公开方法 ----------------------------------------------------------------------------------
+
+    /**
+     * 设置滚动阀值
+     *
+     * @param threshold 滚动阀值
+     */
+    public void setFlingThreshold(int threshold) {
+        PagerConfig.setFlingThreshold(threshold);
+    }
+}
diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/detail_icon_go.png b/moduleUtil/src/main/res/drawable-xxxhdpi/detail_icon_go.png
new file mode 100644
index 00000000..1bd70dd7
Binary files /dev/null and b/moduleUtil/src/main/res/drawable-xxxhdpi/detail_icon_go.png differ
diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/detail_icon_go.webp b/moduleUtil/src/main/res/drawable-xxxhdpi/detail_icon_go.webp
deleted file mode 100644
index 0e8b25cc..00000000
Binary files a/moduleUtil/src/main/res/drawable-xxxhdpi/detail_icon_go.webp and /dev/null differ
diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/icon_pay_select.png b/moduleUtil/src/main/res/drawable-xxxhdpi/icon_pay_select.png
new file mode 100644
index 00000000..2a240bd6
Binary files /dev/null and b/moduleUtil/src/main/res/drawable-xxxhdpi/icon_pay_select.png differ
diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/icon_pay_unselect.png b/moduleUtil/src/main/res/drawable-xxxhdpi/icon_pay_unselect.png
new file mode 100644
index 00000000..304a7b4e
Binary files /dev/null and b/moduleUtil/src/main/res/drawable-xxxhdpi/icon_pay_unselect.png differ
diff --git a/moduleUtil/src/main/res/drawable/bg_10_white_sele.xml b/moduleUtil/src/main/res/drawable/bg_10_white_sele.xml
new file mode 100644
index 00000000..cf41429a
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/bg_10_white_sele.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="@dimen/dp_10" />
+
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="@color/black" /> <!-- 黑色边框 -->
+</shape>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/bg_r16_tb_ffffff.xml b/moduleUtil/src/main/res/drawable/bg_r16_tb_ffffff.xml
new file mode 100644
index 00000000..b7ad7b5b
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/bg_r16_tb_ffffff.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="@dimen/dp_15"  android:topRightRadius="@dimen/dp_15" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/bg_r48_ffff.xml b/moduleUtil/src/main/res/drawable/bg_r48_ffff.xml
new file mode 100644
index 00000000..d9274b02
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/bg_r48_ffff.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_48" />
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/bg_r99_trans_stroke_main.xml b/moduleUtil/src/main/res/drawable/bg_r99_trans_stroke_main.xml
new file mode 100644
index 00000000..ac1e8bd9
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/bg_r99_trans_stroke_main.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="99dp" />
+            <solid android:color="@color/color_FF333333"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="2dp"
+        android:left="2dp"
+        android:right="2dp"
+        android:top="2dp">
+        <shape>
+            <solid android:color="@color/color_white" />
+            <corners android:radius="99dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/level_pay.xml b/moduleUtil/src/main/res/drawable/level_pay.xml
new file mode 100644
index 00000000..c721c7cb
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/level_pay.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_pay_unselect"
+        android:maxLevel="0"/>
+    <item android:drawable="@drawable/icon_pay_select"
+        android:maxLevel="1"/>
+</level-list>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/selector_tab_text_zb.xml b/moduleUtil/src/main/res/drawable/selector_tab_text_zb.xml
new file mode 100644
index 00000000..3627f906
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/selector_tab_text_zb.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/color_FF333333" android:state_selected="true"  />
+    <item android:color="@color/color_FF666666" android:state_selected="false" />
+
+</selector>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/xbanner_point_normal.xml b/moduleUtil/src/main/res/drawable/xbanner_point_normal.xml
new file mode 100644
index 00000000..17f2fbc9
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/xbanner_point_normal.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="4dp" android:height="4dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#80ffffff" />
+            <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/drawable/xbanner_point_selected.xml b/moduleUtil/src/main/res/drawable/xbanner_point_selected.xml
new file mode 100644
index 00000000..86de9200
--- /dev/null
+++ b/moduleUtil/src/main/res/drawable/xbanner_point_selected.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="13dp" android:height="4dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffffff" />
+            <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/layout/common_view_decoration_head.xml b/moduleUtil/src/main/res/layout/common_view_decoration_head.xml
new file mode 100644
index 00000000..a85c9757
--- /dev/null
+++ b/moduleUtil/src/main/res/layout/common_view_decoration_head.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.qxcm.moduleutil.widget.GifAvatarOvalView
+        android:id="@+id/riv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@mipmap/default_avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.70154"
+        app:riv_oval="true" />
+
+    <ImageView
+        android:id="@+id/iv_sex"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@mipmap/common_ic_headportriat_boy"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/riv"
+        app:layout_constraintEnd_toEndOf="@id/riv"
+        app:layout_constraintStart_toStartOf="@id/riv"
+        app:layout_constraintTop_toTopOf="@id/riv" />
+
+
+    <ImageView
+        android:id="@+id/iv_frame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:contentDescription="@null"
+        android:scaleType="fitXY"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/iv_online"
+        android:layout_width="@dimen/dp_13"
+        android:layout_height="@dimen/dp_13"
+        android:src="@mipmap/me_online_icon"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/riv"
+        app:layout_constraintEnd_toEndOf="@id/riv"
+        app:layout_constraintHorizontal_bias="0.9"
+        app:layout_constraintStart_toStartOf="@id/riv"
+        app:layout_constraintTop_toTopOf="@id/riv"
+        app:layout_constraintVertical_bias="0.9" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/layout/custom_edit_text_layout.xml b/moduleUtil/src/main/res/layout/custom_edit_text_layout.xml
new file mode 100644
index 00000000..0af64257
--- /dev/null
+++ b/moduleUtil/src/main/res/layout/custom_edit_text_layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <EditText
+        android:id="@+id/edit_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="请输入内容"
+        android:background="@drawable/bg_r100_hui"/>
+
+    <TextView
+        android:id="@+id/length_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="0/100"
+        android:textColor="@color/color_FF999999"
+        android:textSize="14sp"
+        android:layout_gravity="end" />
+</LinearLayout>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/layout/date_picker_dialog.xml b/moduleUtil/src/main/res/layout/date_picker_dialog.xml
new file mode 100644
index 00000000..4416eb5d
--- /dev/null
+++ b/moduleUtil/src/main/res/layout/date_picker_dialog.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingTop="10dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="开始日期" />
+
+        <DatePicker
+            android:id="@+id/datePickerStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:calendarViewShown="false"
+            android:datePickerMode="spinner"
+            android:spinnersShown="true" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="结束日期" />
+
+        <DatePicker
+            android:id="@+id/datePickerEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:calendarViewShown="false"
+            android:datePickerMode="spinner"
+            android:spinnersShown="true"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/modulecircle/src/main/res/layout/item_cirle_list.xml b/moduleUtil/src/main/res/layout/item_cirle_list.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/item_cirle_list.xml
rename to moduleUtil/src/main/res/layout/item_cirle_list.xml
diff --git a/moduleUtil/src/main/res/layout/layout_empty.xml b/moduleUtil/src/main/res/layout/layout_empty.xml
new file mode 100644
index 00000000..750652f3
--- /dev/null
+++ b/moduleUtil/src/main/res/layout/layout_empty.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_empty"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/dp_20"
+    android:visibility="visible">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="centerInside"
+            android:src="@mipmap/common_img_empty" />
+
+        <TextView
+            android:id="@+id/tv_empty_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:text="暂无数据"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14" />
+
+        <TextView
+            android:id="@+id/tv_other_operation"
+            android:layout_width="@dimen/dp_110"
+            android:layout_height="@dimen/dp_35"
+            android:layout_marginTop="@dimen/dp_36"
+            android:background="@drawable/bg_r99_trans_stroke_main"
+            android:gravity="center"
+            android:text="去获取"
+            android:textColor="@color/color_FF333333"
+            android:textSize="15sp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/layout/me_xbanner.xml b/moduleUtil/src/main/res/layout/me_xbanner.xml
new file mode 100644
index 00000000..c740e359
--- /dev/null
+++ b/moduleUtil/src/main/res/layout/me_xbanner.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_195">
+
+    <ImageView
+        android:id="@+id/iv_img"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"></ImageView>
+
+
+    <ImageView
+        android:id="@+id/iv_voice_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@mipmap/default_image"></ImageView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/layout/pay_result.xml b/moduleUtil/src/main/res/layout/pay_result.xml
new file mode 100644
index 00000000..51a5998f
--- /dev/null
+++ b/moduleUtil/src/main/res/layout/pay_result.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/add_img.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/add_img.webp
new file mode 100644
index 00000000..f6be990c
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/add_img.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/cz_bj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/cz_bj.png
new file mode 100644
index 00000000..74033c62
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/cz_bj.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/data1.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/data1.webp
new file mode 100644
index 00000000..70a875df
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/data1.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/data2.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/data2.webp
new file mode 100644
index 00000000..de13282c
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/data2.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/dele_foot.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/dele_foot.webp
new file mode 100644
index 00000000..53c45255
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/dele_foot.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/details_b.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/details_b.webp
new file mode 100644
index 00000000..f963c862
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/details_b.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/footprint.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/footprint.webp
new file mode 100644
index 00000000..05514255
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/footprint.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gz.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gz.png
new file mode 100644
index 00000000..4ca12279
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/gz.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/hg.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/hg.png
new file mode 100644
index 00000000..85f35d25
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/hg.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_closes.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_closes.webp
new file mode 100644
index 00000000..95005070
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_closes.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/im_zs.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/im_zs.png
new file mode 100644
index 00000000..a3bcab34
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/im_zs.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb_tg.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb_tg.png
new file mode 100644
index 00000000..1d6f77ba
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb_tg.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/mony_cz.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/mony_cz.png
new file mode 100644
index 00000000..66c835ed
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/mony_cz.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/mony_tx.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/mony_tx.png
new file mode 100644
index 00000000..fded7019
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/mony_tx.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/my_bag_item.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_bag_item.png
new file mode 100644
index 00000000..5be89215
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_bag_item.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/my_cr_room1.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_cr_room1.webp
new file mode 100644
index 00000000..56f99cc4
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_cr_room1.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/my_croom2.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_croom2.webp
new file mode 100644
index 00000000..8a8e3085
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_croom2.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/my_croom3.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_croom3.webp
new file mode 100644
index 00000000..0ce54dc7
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_croom3.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/no_data.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/no_data.webp
new file mode 100644
index 00000000..aecad858
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/no_data.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/real_q.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/real_q.png
new file mode 100644
index 00000000..2a5f3acb
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/real_q.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/sect_false.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/sect_false.png
new file mode 100644
index 00000000..c4fc9f53
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/sect_false.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/sect_true.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/sect_true.png
new file mode 100644
index 00000000..16688bdb
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/sect_true.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_x.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_x.webp
new file mode 100644
index 00000000..d0126883
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_x.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/trend_icon.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/trend_icon.webp
new file mode 100644
index 00000000..661e027a
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/trend_icon.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/trend_pic_add.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/trend_pic_add.webp
new file mode 100644
index 00000000..3f3c5bd2
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/trend_pic_add.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/voice.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/voice.webp
new file mode 100644
index 00000000..7567e249
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/voice.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/wx_zf.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/wx_zf.png
new file mode 100644
index 00000000..00f2dbd4
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/wx_zf.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/yic.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/yic.png
new file mode 100644
index 00000000..341b67f5
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/yic.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/yigz.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/yigz.png
new file mode 100644
index 00000000..1477a818
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/yigz.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/zs_tb.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/zs_tb.png
new file mode 100644
index 00000000..bdf9c699
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/zs_tb.png differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/zus_tg.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/zus_tg.png
new file mode 100644
index 00000000..ce837b23
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/zus_tg.png differ
diff --git a/moduleUtil/src/main/res/values-en-rUs/strings.xml b/moduleUtil/src/main/res/values-en-rUs/strings.xml
index 4cd21dd1..8e6dc3b9 100644
--- a/moduleUtil/src/main/res/values-en-rUs/strings.xml
+++ b/moduleUtil/src/main/res/values-en-rUs/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
+    <string name="app_name">Vespa</string>
     <string name="recommend_skip">Skip</string>
     <string name="login_title">Verification code login</string>
     <string name="circle_title">circle</string>
@@ -11,7 +11,7 @@
     <string name="shopping">shopping</string>
     <string name="backpack">Me backpack</string>
     <string name="daily">daily task</string>
-
+    <string name="edit_profile">Edit Profile</string>
     <string name="msg_notification">Message Notification</string>
     <string name="minor_mode">Minor Mode</string>
     <string name="blacklist">Blacklist</string>
@@ -37,10 +37,16 @@
     <string name="real_name_authentication_tips">
     According to national laws and regulations, users are required to complete real-name authentication. Please enter your own accurate and valid information. Once authenticated, the information cannot be changed casually. Please fill in carefully. We promise to strictly protect your personal information and will not disclose it to third parties.
 </string>
-    <string name="real_name">Real Name</string>
-    <string name="id_number">ID Number</string>
     <string name="please_enter_real_name">Please enter your real name</string>
     <string name="please_enter_id_number">Please enter your ID number</string>
+    <string name="already_authenticated">You have already completed real-name authentication</string>
+    <string name="real_name">Real Name</string>
+    <string name="id_type">ID Type</string>
+    <string name="id_number">ID Number</string>
+    <string name="update_real_name_info">Update Your Real Name Info</string>
+    <string name="update_real_name_desc">If you have changed your name with the police, tap here to update</string>
+    <string name="correct_real_name">Correct Real Name</string>
+    <string name="correct_real_name_desc">If the real name on the account is not the actual user, tap here to correct it</string>
 
     <string name="room_rank">Room Rank</string>
     <string name="wealth_rank">Wealth Rank</string>
@@ -65,6 +71,31 @@
     <string name="please_confirm_the_new_password_again">Please confirm the new password again</string>
     <string name="new_password">set up a new password</string>
     <string name="verification_phone_number">Please enter the phone number</string>
+    <string name="avatar_change_info">Dear user, you can change your avatar %1$d times this month, remaining: %1$d times. Use avatar card for unlimited changes, remaining cards: %2$d</string>
 
+    <string name="nickname">Nickname</string>
+    <string name="gender">Gender</string>
+    <string name="birthday">Birthday</string>
+    <string name="introduction">Introduction</string>
+    <string name="background_image">Background Image</string>
+    <string name="upload_limit">(Up to 6 images)</string>
+    <string name="permission_storage">File reading and writing</string>
+    <string name="permission_camera">Use camera</string>
+    <string name="permission_record_audio">Use microphone</string>
+    <string name="permission_location">Use location</string>
+    <string name="permission_read_phone_state">Read phone information</string>
+    <string name="permission_refused">You have denied the permission of %1$s, please go to the settings to modify it</string>
+
+    <string name="coin">Coin</string>
+    <string name="diamond">Diamond</string>
+    <string name="my_bill">My Bill</string>
+    <string name="recharge_record">Recharge Record</string>
+    <string name="diamond_income_expense">Diamond Income/Expense</string>
+    <string name="other_functions">Other Functions</string>
+    <string name="diamond_to_coin">Diamond to Coin</string>
+    <string name="recharge">Recharge</string>
+    <string name="payment_method">Payment Method</string>
+    <string name="wechat_payment">WeChat (AllLink)</string>
+    <string name="alipay_payment">Alipay Payment</string>
 
 </resources>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/values/attr.xml b/moduleUtil/src/main/res/values/attr.xml
index 5b408c72..ff9ba43f 100644
--- a/moduleUtil/src/main/res/values/attr.xml
+++ b/moduleUtil/src/main/res/values/attr.xml
@@ -392,6 +392,58 @@
         <attr name="tl_imgShowCateIndicator" format="boolean"/>
 
     </declare-styleable>
-
+    <!-- 密码 验证码输入框-->
+    <declare-styleable name="SplitEditText">
+        <!--边框大小-->
+        <attr name="borderSize" format="dimension" />
+        <!--边框颜色-->
+        <attr name="borderColor" format="color|reference" />
+        <!--圆角大小-->
+        <attr name="corner_size" format="dimension" />
+        <!--分割线大小-->
+        <attr name="divisionLineSize" format="dimension" />
+        <!--分割线颜色-->
+        <attr name="divisionLineColor" format="reference|color" />
+        <!--内容显示为圆的半径-->
+        <attr name="circleRadius" format="dimension" />
+        <!--输入内容数量-->
+        <attr name="contentNumber" format="integer" />
+        <!--输入内容显示样式-->
+        <attr name="contentShowMode" format="enum">
+            <!--显示成密码圆-->
+            <enum name="password" value="1" />
+            <!--显示成文本-->
+            <enum name="text" value="2" />
+        </attr>
+        <!--单个输入框和下划线样式下,每个输入框之间的间距-->
+        <attr name="spaceSize" format="dimension" />
+        <!--输入框样式-->
+        <attr name="inputBoxStyle" format="enum">
+            <!--输入框整体相连的样式-->
+            <enum name="connectBox" value="1" />
+            <!--单个输入框样式-->
+            <enum name="singleBox" value="2" />
+            <!--下划线样式-->
+            <enum name="underline" value="3" />
+        </attr>
+        <!--密码字体颜色-->
+        <attr name="android:textColor" />
+        <!--密码字体大小-->
+        <attr name="android:textSize" />
+        <!--输入框是否是正方形-->
+        <attr name="inputBoxSquare" format="boolean" />
+        <!--光标宽度-->
+        <attr name="cursorWidth" format="dimension" />
+        <!--光标高度-->
+        <attr name="cursorHeight" format="dimension" />
+        <!--光标颜色-->
+        <attr name="cursorColor" format="color|reference" />
+        <!--光标闪烁时长-->
+        <attr name="cursorDuration" format="integer" />
+        <!--下划线输入框样式下,下划线正常的颜色-->
+        <attr name="underlineNormalColor" format="reference|color" />
+        <!--下划线输入框样式下,下划线获取焦点时颜色-->
+        <attr name="underlineFocusColor" format="reference|color" />
+    </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/values/colors.xml b/moduleUtil/src/main/res/values/colors.xml
index 6954c610..332a67bb 100644
--- a/moduleUtil/src/main/res/values/colors.xml
+++ b/moduleUtil/src/main/res/values/colors.xml
@@ -22,6 +22,7 @@
     <color name="color_ff8acc">#FF8ACC</color>
     <color name="color_45d08c">#45D08C</color>
     <color name="color_959595">#959595</color>
+    <color name="color_ff2727">#FF2727</color>
     <!--  透明度60%  -->
     <color name="color_white_percent_60">#66FFFFFF</color>
     <color name="color_black">#000000</color>
diff --git a/moduleUtil/src/main/res/values/strings.xml b/moduleUtil/src/main/res/values/strings.xml
index adb74d00..06c5296f 100644
--- a/moduleUtil/src/main/res/values/strings.xml
+++ b/moduleUtil/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
+    <string name="app_name">羽声</string>
     <string name="recommend_skip">跳过</string>
     <string name="voice_title">羽声</string>
     <string name="circle_title">语圈</string>
@@ -27,9 +28,15 @@
     <string name="account_deactivation">账号注销</string>
     <string name="logout">退出登录</string>
     <string name="feedback">意见反馈</string>
-
+    <string name="edit_profile">编辑资料</string>
     <string name="immediate_authentication">立即认证</string>
     <string name="real_name_authentication_prompt">根据国家相关要求，开启直播需要实名认证，是否进行认证？</string>
+    <string name="already_authenticated">您已实名认证</string>
+    <string name="id_type">证件类型</string>
+    <string name="update_real_name_info">更新本人实名信息</string>
+    <string name="update_real_name_desc">若您在公安机关变更了姓名，可点击此处更新</string>
+    <string name="correct_real_name">更正实名人</string>
+    <string name="correct_real_name_desc">若账号实名人非账号实际使用人，可点击此处进行更正</string>
 
 
     <string name="login_title_password">密码登录</string>
@@ -66,7 +73,33 @@
     <string name="guild_rank">工会榜</string>
     <string name="true_love_rank">真爱榜</string>
 
+    <string name="avatar_change_info">尊敬的用户，每月可修改2次，剩余<font color="#FF0000">%1$d</font>次；使用头像卡不限更换次数，还剩<font color="#FF0000">%2$d</font>张</string>
+    <string name="nickname">昵称</string>
+    <string name="gender">性别</string>
+    <string name="birthday">出生日期</string>
+    <string name="introduction">简介</string>
+    <string name="background_image">背景图片</string>
+    <string name="upload_limit">(最多上传6张)</string>
 
+    <string name="permission_storage">文件读写</string>
+    <string name="permission_camera">使用摄像头</string>
+    <string name="permission_record_audio">使用麦克风</string>
+    <string name="permission_location">使用定位</string>
+    <string name="permission_read_phone_state">读取手机信息</string>
+    <string name="permission_refused">您拒绝了%1$s的权限，请到设置中修改</string>
+
+    <string name="coin">金币</string>
+    <string name="diamond">钻石</string>
+    <string name="my_bill">我的账单</string>
+    <string name="recharge_record">充值记录</string>
+    <string name="diamond_income_expense">钻石收支</string>
+    <string name="other_functions">其他功能</string>
+    <string name="diamond_to_coin">钻石换币</string>
+
+    <string name="recharge">充值</string>
+    <string name="payment_method">支付方式</string>
+    <string name="wechat_payment">微信支付</string>
+    <string name="alipay_payment">支付宝支付</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/xml/network_security_config.xml b/moduleUtil/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..2439f15c
--- /dev/null
+++ b/moduleUtil/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/modulecircle/src/main/AndroidManifest.xml b/modulecircle/src/main/AndroidManifest.xml
index c89d2833..9bd4d8db 100644
--- a/modulecircle/src/main/AndroidManifest.xml
+++ b/modulecircle/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java b/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
index 3cfae43f..fc501400 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
+++ b/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
@@ -1,35 +1,22 @@
 package com.example.modulecircle.fragment;
 
 import android.annotation.SuppressLint;
-import android.graphics.Rect;
-import android.os.Bundle;
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.example.modulecircle.R;
 import com.example.modulecircle.adapter.CirleCategoryBannerAdapter;
-import com.example.modulecircle.adapter.CirleListAdapter;
+import com.qxcm.moduleutil.adapter.CirleListAdapter;
 import com.example.modulecircle.contacts.CircleContacts;
-import com.example.modulecircle.databinding.FragmentCircleBinding;
 import com.example.modulecircle.databinding.FragmentCircleCategoryBinding;
 import com.example.modulecircle.presenter.CirclePresenter;
 import com.hjq.toast.ToastUtils;
-import com.qxcm.moduleutil.adapter.MyFragmentPagerAdapter;
 import com.qxcm.moduleutil.base.BaseMvpFragment;
 import com.qxcm.moduleutil.bean.BaseListData;
 import com.qxcm.moduleutil.bean.CircleListBean;
 import com.qxcm.moduleutil.bean.HeatedBean;
-import com.qxcm.moduleutil.bean.RoomTypeModel;
-import com.zhpan.bannerview.constants.PageStyle;
 import com.zhpan.bannerview.indicator.DrawableIndicator;
 import com.zhpan.indicator.base.IIndicator;
 import com.zhpan.indicator.enums.IndicatorSlideMode;
diff --git a/modulecircle/src/main/res/values/strings.xml b/modulecircle/src/main/res/values/strings.xml
index 97edd3d9..e5f8fdc2 100644
--- a/modulecircle/src/main/res/values/strings.xml
+++ b/modulecircle/src/main/res/values/strings.xml
@@ -1,5 +1,2 @@
 <resources>
-    <string name="app_name">modulecircle</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml
index b1760c59..1b81ad25 100644
--- a/modulemain/src/main/AndroidManifest.xml
+++ b/modulemain/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/modulemain/src/main/res/values-zh-rCN/strings.xml b/modulemain/src/main/res/values-zh-rCN/strings.xml
index 5d2dfdee..5c69e2f6 100644
--- a/modulemain/src/main/res/values-zh-rCN/strings.xml
+++ b/modulemain/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">moduleMain</string>
     <string name="main_tab1">声播</string>
     <string name="main_tab2">语圈</string>
     <string name="main_tab3">音信</string>
diff --git a/modulemain/src/main/res/values/strings.xml b/modulemain/src/main/res/values/strings.xml
index de0f619e..5c69e2f6 100644
--- a/modulemain/src/main/res/values/strings.xml
+++ b/modulemain/src/main/res/values/strings.xml
@@ -1,12 +1,6 @@
 <resources>
-    <string name="app_name">moduleMain</string>
     <string name="main_tab1">声播</string>
     <string name="main_tab2">语圈</string>
     <string name="main_tab3">音信</string>
     <string name="main_tab4">音域</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="title_activity_ranking_list">RankingListActivity</string>
-    <string name="tab_text_1">Tab 1</string>
-    <string name="tab_text_2">Tab 2</string>
 </resources>
\ No newline at end of file
diff --git a/modulevocal/build.gradle b/modulevocal/build.gradle
index 9db9016c..35cf5727 100644
--- a/modulevocal/build.gradle
+++ b/modulevocal/build.gradle
@@ -42,4 +42,5 @@ dependencies {
     androidTestImplementation libs.espresso.core
 
     implementation(project(':moduleUtil'))
+    implementation(project(':moduletablayout'))
 }
\ No newline at end of file
diff --git a/modulevocal/src/main/AndroidManifest.xml b/modulevocal/src/main/AndroidManifest.xml
index 634cd41a..e314a39f 100644
--- a/modulevocal/src/main/AndroidManifest.xml
+++ b/modulevocal/src/main/AndroidManifest.xml
@@ -4,10 +4,63 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/BaseAppTheme">
+        <activity
+            android:name=".activity.UserHomepageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.MyBagActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.BriefIntroductionActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.ChangeNicknameActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.CurrencyExchangeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.WithdrawalActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.RechargeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.MyMoneyActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.EditUserInfoActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.EditUserActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.ChangPassActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.PersonalityActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.RealDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.RoomAllowanceDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.RoomAllowanceActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.RoomDetailsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.CreatedRoomActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.MyRoomActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.RealNameActivity"
             android:exported="false" />
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
index 66e8d8fc..a73a230f 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
@@ -7,10 +7,17 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.BlackAdapter;
 import com.example.modulevocal.databinding.ActivityBlacklistBinding;
 import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+import com.qxcm.moduleutil.bean.BlackUserBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  *@author
  *@data
@@ -18,15 +25,52 @@ import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
  */
 public class BlacklistActivity extends BaseAppCompatActivity<ActivityBlacklistBinding> {
 
+    private static final String TAG = "BlacklistActivity";
+    private int type;//关注--黑名单--粉丝
+    BlackAdapter blackAdapter;
+    private String[] mTitles = new String[]{"关注", "黑名单", "粉丝"};
+    List<BlackUserBean> blackUserBeans;
 
     @Override
     protected void initData() {
-
+        blackUserBeans=new ArrayList<>();
+        for (int i = 0; i < 10; i++){
+            BlackUserBean bean=new BlackUserBean();
+            bean.setUserName("用户"+i);
+            bean.setUserId(i+"");
+            bean.setUserAvatar("");
+            bean.setType(type);
+            blackUserBeans.add(bean);
+        }
+        blackAdapter.setNewData(blackUserBeans);
     }
 
     @Override
     protected void initView() {
-        mBinding.topBar.setTitle("黑名单");
+        type=getIntent().getIntExtra("type", 0);
+        mBinding.topBar.setTitle(mTitles[type]);
+
+        blackAdapter = new BlackAdapter();
+        mBinding.rvBlacklist.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+        mBinding.rvBlacklist.setAdapter(blackAdapter);
+        blackAdapter.setOnItemClickListener(item -> {
+            int position = blackAdapter.getData().indexOf(item);
+            if (position == -1) return;
+
+            if (item.getType() == 0 || item.getType() == 2) {
+                // 类型为 关注 或 粉丝：切换 status
+                item.setStatus(item.getStatus() == 0 ? 1 : 0);
+                blackAdapter.notifyItemChanged(position);
+//                updateStatusOnServer(item); // 调用网络请求更新服务器
+            } else if (item.getType() == 1) {
+                // 类型为 黑名单：移除当前项
+                blackAdapter.getData().remove(position);
+                blackAdapter.notifyItemRemoved(position);
+                blackAdapter.notifyItemRangeChanged(position, blackAdapter.getItemCount());
+//                removeItemFromServer(item); // 调用网络请求删除
+            }
+        });
+
     }
 
     @Override
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/BriefIntroductionActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/BriefIntroductionActivity.java
new file mode 100644
index 00000000..bc1b9422
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/BriefIntroductionActivity.java
@@ -0,0 +1,71 @@
+package com.example.modulevocal.activity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.BriefIntroductionConacts;
+import com.example.modulevocal.databinding.ActivityBriefIntroductionBinding;
+import com.example.modulevocal.presenter.BriefIntroductionPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *@author qx
+ *@data 2025/5/22
+ *@description: 简介
+ */
+public class BriefIntroductionActivity extends BaseMvpActivity<BriefIntroductionPresenter, ActivityBriefIntroductionBinding> implements BriefIntroductionConacts.View{
+
+    private BaseQuickAdapter<String, BaseViewHolder> adapter;
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle("修改简介");
+        mBinding.topBar.setRightTxtVisible(true);
+        mBinding.topBar.setRightText("保存");
+        mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
+        mBinding.topBar.getTvRight().setOnClickListener(v -> {
+            finish();
+        });
+
+        List<String> list = new ArrayList<>();
+        list.add("可盐可甜");
+        list.add("小甜甜");
+        list.add("可盐可甜");
+        list.add("小甜甜");
+        list.add("可盐可甜");
+        list.add("小甜甜");
+        mBinding.recycleView.setLayoutManager(new GridLayoutManager(this, 4));
+
+        adapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_brief_introduction, list) {
+            @Override
+            protected void convert(BaseViewHolder helper, String item) {
+                helper.setText(R.id.tv, item);
+            }
+        };
+        mBinding.recycleView.setAdapter(adapter);
+        adapter.setNewData(list);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_brief_introduction;
+    }
+
+    @Override
+    protected BriefIntroductionPresenter bindPresenter() {
+        return new BriefIntroductionPresenter(this, this);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangPassActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/ChangPassActivity.java
new file mode 100644
index 00000000..3ef63b61
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/ChangPassActivity.java
@@ -0,0 +1,114 @@
+package com.example.modulevocal.activity;
+
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.view.View;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.ChangePasswordConactos;
+import com.example.modulevocal.databinding.ActivityChangePasswordBinding;
+import com.example.modulevocal.presenter.ChangePasswordPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.utils.SpUtil;
+
+public class ChangPassActivity extends BaseMvpActivity<ChangePasswordPresenter, ActivityChangePasswordBinding> implements ChangePasswordConactos.View {
+    private UserBean userBean;
+    private CountDownTimer mTimer;
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle(getResources().getString(com.qxcm.moduleutil.R.string.set_password));
+        userBean = SpUtil.getUserInfo();
+        mBinding.tvPhoin.setText(userBean.getMobile());
+        mBinding.tvSendCode.setOnClickListener(this::onClick);
+        mBinding.btnSubmit.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        if (view.getId() == R.id.tv_send_code) {
+            sendCodeSuccess2(userBean.getMobile());
+            if (MvpPre != null) {
+                MvpPre.sendCode(userBean.getMobile(), "4");
+            }
+        }else if (view.getId() == R.id.btnSubmit) {
+
+            if (mBinding.editTextNewPassword.getText().toString().isEmpty()) {
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入新密码");
+                return;
+            }
+            if (mBinding.editTextConfirmPassword.getText().toString().isEmpty()) {
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入确认密码");
+                return;
+            }
+            if (!mBinding.editTextNewPassword.getText().toString().equals(mBinding.editTextConfirmPassword.getText().toString())) {
+                com.blankj.utilcode.util.ToastUtils.showShort("两次密码不一致");
+                return;
+            }
+            if (mBinding.edPassword.getText().toString().isEmpty()) {
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
+                return;
+            }
+            if (MvpPre != null) {
+                MvpPre.changePassword(mBinding.editTextNewPassword.getText().toString(),  userBean.getMobile(), mBinding.edPassword.getText().toString(),String.valueOf(userBean.getUser_id()));
+            }
+        }
+    }
+    public void sendCodeSuccess2(String phoneNumber) {
+        com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
+        mBinding.tvSendCode.setEnabled(false);
+        mBinding.tvSendCode.setAlpha(0.5f);
+        releaseTimer();
+        if (mTimer != null) {
+            mTimer.cancel();
+        }
+        mTimer = new CountDownTimer(60000L, 1000L) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+                if (mBinding.tvSendCode != null) {
+                    mBinding.tvSendCode.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
+                }
+            }
+
+            @Override
+            public void onFinish() {
+                mBinding.tvSendCode.setAlpha(1f);
+                mBinding.tvSendCode.setEnabled(true);
+                mBinding.tvSendCode.setText("重新发送");
+            }
+        };
+        mTimer.start();
+    }
+
+    private void releaseTimer() {
+        if (mTimer != null) {
+            mTimer.cancel();
+            mTimer = null;
+        }
+    }
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_change_password;
+    }
+
+    @Override
+    protected ChangePasswordPresenter bindPresenter() {
+        return new ChangePasswordPresenter(this, this);
+    }
+
+    @Override
+    public void sendCodeSuccess1(String phoneNumber) {
+
+    }
+
+    @Override
+    public void sendCodeSuccess(String s) {
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangeNicknameActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/ChangeNicknameActivity.java
new file mode 100644
index 00000000..53c2fb4a
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/ChangeNicknameActivity.java
@@ -0,0 +1,47 @@
+package com.example.modulevocal.activity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.ChangeNicknameConacts;
+import com.example.modulevocal.databinding.ActivityChangeNicknameBinding;
+import com.example.modulevocal.presenter.ChangeNicknamePresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+/**
+ *@author qx
+ *@data 2025/5/21
+ *@description: 修改昵称
+ */
+public class ChangeNicknameActivity extends BaseMvpActivity<ChangeNicknamePresenter, ActivityChangeNicknameBinding> implements ChangeNicknameConacts.View {
+
+
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle("修改昵称");
+        mBinding.topBar.setRightTxtVisible(true);
+        mBinding.topBar.setRightText("保存");
+        mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
+        mBinding.topBar.getTvRight().setOnClickListener(v -> {
+          finish();
+        });
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_change_nickname;
+    }
+
+    @Override
+    protected ChangeNicknamePresenter bindPresenter() {
+        return new ChangeNicknamePresenter(this, this);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangePasswordActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/ChangePasswordActivity.java
deleted file mode 100644
index a36e4e53..00000000
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangePasswordActivity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.example.modulevocal.activity;
-
-import android.os.Bundle;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-import com.example.modulevocal.R;
-import com.example.modulevocal.databinding.ActivityChangePasswordBinding;
-import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
-
-public class ChangePasswordActivity extends BaseAppCompatActivity<ActivityChangePasswordBinding> {
-
-
-    @Override
-    protected void initData() {
-
-    }
-
-    @Override
-    protected void initView() {
-        mBinding.topBar.setTitle("设置密码");
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_change_password;
-    }
-}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java
new file mode 100644
index 00000000..1624cde1
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java
@@ -0,0 +1,256 @@
+package com.example.modulevocal.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.bumptech.glide.Glide;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.CreatedRoomConactos;
+import com.example.modulevocal.databinding.ActivityCreatedRoomBinding;
+import com.example.modulevocal.presenter.CreatedRoomPresenter;
+import com.example.zhouwei.library.CustomPopWindow;
+import com.hjq.toast.ToastUtils;
+import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.CheckTxtResp;
+import com.qxcm.moduleutil.utils.GlideEngine;
+import com.qxcm.moduleutil.utils.MyPictureParameterStyle;
+import com.qxcm.moduleutil.widget.Constants;
+
+import java.io.File;
+import java.util.List;
+/**
+ *@author
+ *@data 2025/5/15
+ *@description: 创建房间
+ */
+public class CreatedRoomActivity extends BaseMvpActivity<CreatedRoomPresenter, ActivityCreatedRoomBinding> implements CreatedRoomConactos.View {
+
+
+    private String roomName;
+
+    public String from;
+
+    private String roomUrl;
+    final int maxNum = 120;
+    CustomPopWindow popupWindow;
+
+    private Handler handler = new Handler(Looper.getMainLooper());
+    private boolean isShowing = false;
+    private Runnable showPopupRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (isShowing) {
+                // 隐藏 PopupWindow
+                if (popupWindow != null ) {
+                    popupWindow.dissmiss();
+                }
+                isShowing = false;
+            } else {
+                // 显示 PopupWindow
+                if (popupWindow != null) {
+                    // 设置动画（可选）
+                    // 显示在 ivTrendContent 上方
+                    popupWindow.showAtLocation(mBinding.tvSave, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 220);
+                }
+                isShowing = true;
+            }
+
+            // 循环执行
+            handler.postDelayed(this, 2000); // 每隔 3 秒切换一次
+        }
+    };
+
+    @Override
+    protected CreatedRoomPresenter bindPresenter() {
+        return new CreatedRoomPresenter(this, this);
+    }
+
+    @Override
+    protected void initData() {
+//        List<RoomTypeInfo> roomTypeInfos = new ArrayList<>();
+//        roomTypeInfos.add(new RoomTypeInfo("聊天", 23));
+//        roomTypeInfos.add(new RoomTypeInfo("K歌", 21));
+//        mRoomTypeAdapter.setNewData(roomTypeInfos);
+
+        MvpPre.roomLabel("create");
+        handler.post(showPopupRunnable);
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        mBinding.topBar.setTitle("创建房间");
+        mBinding.tvSave.setOnClickListener(this::onClick);
+        mBinding.ivTrendContent.setOnClickListener(this::onClick);
+        mBinding.tvSz.setText("0/"+maxNum);
+        mBinding.etG.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length()==maxNum){
+                    mBinding.tvSz.setText("您输入的字数已超过限制");
+                }else {
+                    mBinding.tvSz.setText((maxNum - s.length())+"/"+maxNum);
+                }
+            }
+        });
+        popupWindow = new CustomPopWindow.PopupWindowBuilder(this)
+                .setView(R.layout.pop_layout1)//显示的布局
+                .create();//创建PopupWindow
+        mBinding.tvSave.post(() -> {
+            if (!isFinishing() && !isDestroyed()) {
+                popupWindow.showAsDropDown(mBinding.tvSave);
+            }
+        });
+
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        handler.removeCallbacks(showPopupRunnable);
+        if (popupWindow != null) {
+            popupWindow.dissmiss();
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_created_room;
+    }
+
+
+    private long lastSaveClickTime=0;
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.tv_save) {
+            if (roomUrl==null || roomUrl.isEmpty()){
+                ToastUtils.show("请选择封面");
+                return;
+            }
+            long l = System.currentTimeMillis();
+            if(l-lastSaveClickTime>500){
+                lastSaveClickTime=l;
+                roomName = mBinding.edNickName.getText().toString().trim();
+                if (TextUtils.isEmpty(roomName)) {
+                    ToastUtils.show("请输入房间名");
+                    return;
+                }
+                MvpPre.checkTxt(roomName);
+            }
+        }else if (id == R.id.iv_trend_content) {
+            startChoosePhoto(PictureMimeType.ofImage(), PictureConfig.CHOOSE_REQUEST);
+        }
+    }
+    private void startChoosePhoto(int mimeType, int requestCode) {
+
+        PictureSelector.create(this)
+                .openGallery(mimeType)
+                .isGif(false)
+                .imageEngine(GlideEngine.createGlideEngine())
+                .maxSelectNum(1)
+                .isPreviewImage(true)
+                .isCamera(true)
+                .setOutputCameraPath(Constants.FILE_PATH)
+                .isCompress(true)
+                .setPictureStyle(MyPictureParameterStyle.Companion.selectPicture())
+                .forResult(requestCode); //结果回调onActivityResult code
+
+//        PictureSelector.create(this)
+//                .openGallery(mimeType)
+//                .selectionMode(PictureConfig.SINGLE)
+//                .maxSelectNum(1)//最大选择数量
+//                .minSelectNum(1)//最小选择数量
+//                .previewImage(false)//是否预览图片
+//                .isCamera(true)//是否允许使用相机
+//                .imageEngine(GlideEngine.createGlideEngine())
+//                .sizeMultiplier(0.5f)//大小倍数
+//                .setOutputCameraPath(Constants.FILE_PATH)//设置拍照照片存储路径
+//                .compress(true)//是否开启压缩
+//                .withAspectRatio(1, 1)
+//                .cropCompressQuality(Constants.CROP_COMPRESS_SIZE)// 裁剪压缩质量 默认90 int
+//                .minimumCompressSize(Constants.COMPRESS_INGNORE)// 小于100kb的图片不压缩
+//                .compressSavePath(ImageUtils.getImagePath())//压缩图保存路径
+//                .setPictureStyle(MyPictureParameterStyle.Companion.selectPicture())
+//                .isDragFrame(true)//是否允许拖动窗体
+//                .forResult(requestCode);//结果回调onActivityResult code
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK && data != null) {
+            switch (requestCode) {
+                case PictureConfig.CHOOSE_REQUEST:
+                    List<LocalMedia> localMedia = PictureSelector.obtainMultipleResult(data);
+                    if (localMedia != null && localMedia.size() != 0) {
+                        LocalMedia imgMedia = localMedia.get(0);
+                        String url;
+                        if (imgMedia.isCompressed()) {
+                            url = imgMedia.getCompressPath();
+                        } else {
+                            url = imgMedia.getRealPath();
+                        }
+                        MvpPre.uploadFile(new File(url), 0);
+                    }
+                    break;
+            }
+        }
+    }
+
+
+    @Override
+    public void checkTxtSuccess(CheckTxtResp result) {
+        if (result.getResult() == 0) {
+//            RoomTypeInfo roomTypeInfo = mRoomTypeAdapter.getSelect();
+//            MvpPre.addUserRoom(roomName, String.valueOf(roomTypeInfo.getId()),roomUrl);
+        } else {
+            ToastUtils.show("房间名称包含敏感词汇请重新输入");
+        }
+    }
+
+    @Override
+    public void addUserRoomSuccess(String roomId) {
+//        ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "创建房间").withString("roomId", roomId).navigation();
+        finish();
+    }
+
+
+    @Override
+    public void upLoadSuccess(String url, int type) {
+        if (type == 0) {
+            roomUrl=url;
+            Glide.with(this).load(roomUrl).into(mBinding.ivTrendContent);
+        }
+    }
+
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/CurrencyExchangeActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/CurrencyExchangeActivity.java
new file mode 100644
index 00000000..eb0884f1
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/CurrencyExchangeActivity.java
@@ -0,0 +1,38 @@
+package com.example.modulevocal.activity;
+
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.CurrencyExchangeConacts;
+import com.example.modulevocal.databinding.ActivityCurrencyExchangeBinding;
+import com.example.modulevocal.presenter.CurrencyExchangePresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+/**
+ *@author qx
+ *@data 2025/5/21
+ *@description: 钻石兑换
+ */
+public class CurrencyExchangeActivity extends BaseMvpActivity<CurrencyExchangePresenter, ActivityCurrencyExchangeBinding> implements CurrencyExchangeConacts.View{
+
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle("钻石兑换");
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_currency_exchange;
+    }
+
+    @Override
+    protected CurrencyExchangePresenter bindPresenter() {
+        return new CurrencyExchangePresenter(this, this);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java
new file mode 100644
index 00000000..16aede4f
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java
@@ -0,0 +1,198 @@
+package com.example.modulevocal.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Html;
+import android.view.View;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.UserPhotoWallAdapter;
+import com.example.modulevocal.conacts.EditUserConactos;
+import com.example.modulevocal.databinding.ActivityEditUserBinding;
+import com.example.modulevocal.presenter.EditUserPresenter;
+import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.UserImgList;
+import com.qxcm.moduleutil.utils.DateSelectDialog;
+import com.qxcm.moduleutil.utils.GlideEngine;
+import com.qxcm.moduleutil.utils.ImageUtils;
+import com.qxcm.moduleutil.utils.MyPictureParameterStyle;
+import com.qxcm.moduleutil.widget.Constants;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author qx
+ * @data 2025/5/21
+ * @description: 编辑资料
+ */
+public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, ActivityEditUserBinding> implements EditUserConactos.View
+        , DateSelectDialog.OnSelectDate {
+    UserPhotoWallAdapter mUserPhotoWallAdapter;
+    List<UserImgList> list;
+    private DateSelectDialog mDateSelectDialog;
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle(getResources().getString(com.qxcm.moduleutil.R.string.edit_profile));
+
+
+        int changeCount = 2; // 每月剩余修改次数
+        int cardCount = 0;   // 头像卡数量
+
+// 获取字符串资源并替换参数
+        String infoText = String.format(getResources().getString(com.qxcm.moduleutil.R.string.avatar_change_info), changeCount, cardCount);
+        mBinding.tv1.setText(Html.fromHtml(infoText));
+
+
+        mBinding.rvPhotoWall.setLayoutManager(new GridLayoutManager(this, 3));
+        mBinding.rvPhotoWall.setAdapter(mUserPhotoWallAdapter = new UserPhotoWallAdapter());
+        mUserPhotoWallAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                int id = view.getId();
+                UserImgList item = mUserPhotoWallAdapter.getItem(position);
+                if (id == R.id.iv_close) {
+//                    MvpPre.deletePhoto(item.getId(), position);
+                } else {
+                    if ("0".equals(item.getId())) {
+                        startChoosePhoto(PictureMimeType.ofImage(), PictureConfig.REQUEST_CAMERA, true, 6);
+                    }
+                }
+            }
+        });
+        mUserPhotoWallAdapter.setOnItemChildLongClickListener(new BaseQuickAdapter.OnItemChildLongClickListener() {
+            @Override
+            public boolean onItemChildLongClick(BaseQuickAdapter adapter, View view, int position) {
+                mUserPhotoWallAdapter.setLongClickPos(position);
+                return true;
+            }
+        });
+        list = new ArrayList<>();
+        UserImgList userImgList = new UserImgList("0", "");
+        list.add(userImgList);
+        mUserPhotoWallAdapter.setNewData(list);
+        mUserPhotoWallAdapter.setDelete(true);
+
+        mBinding.rl1.setOnClickListener(this::onClick);
+        mBinding.rl3.setOnClickListener(this::onClick);
+        mBinding.rl4.setOnClickListener(this::onClick);
+        mBinding.rvUserHead.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        if (view.getId() == R.id.rv_user_head) {
+            startChoosePhoto(PictureMimeType.ofImage(), PictureConfig.CHOOSE_REQUEST, true, 1);
+        } else if (view.getId() == R.id.rl_1) {
+            startActivity(new Intent(this, ChangeNicknameActivity.class));
+        } else if (view.getId() == R.id.rl_3) {
+            if (mDateSelectDialog == null) {
+                mDateSelectDialog = new DateSelectDialog(this);
+                mDateSelectDialog.setmOnSelectDate(this);
+            }
+            mDateSelectDialog.show();
+        } else if (view.getId() == R.id.rl_4) {
+            startActivity(new Intent(this, BriefIntroductionActivity.class));
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_edit_user;
+    }
+
+    @Override
+    protected EditUserPresenter bindPresenter() {
+        return new EditUserPresenter(this, this);
+    }
+
+    private void startChoosePhoto(int mimeType, int requestCode, boolean isVideo, int type) {
+
+        PictureSelector.create(this)
+                .openGallery(mimeType)
+                .isGif(isVideo)
+                .imageEngine(GlideEngine.createGlideEngine())
+                .maxSelectNum(type)
+                .isPreviewImage(true)
+                .isCamera(true)
+                .setOutputCameraPath(Constants.FILE_PATH)
+                .isCompress(true)
+                .setPictureStyle(MyPictureParameterStyle.Companion.selectPicture())
+                .forResult(requestCode); //结果回调onActivityResult code
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK && data != null) {
+            switch (requestCode) {
+                case PictureConfig.CHOOSE_REQUEST:
+                    List<LocalMedia> localMedia = PictureSelector.obtainMultipleResult(data);
+                    if (localMedia != null && localMedia.size() != 0) {
+                        LocalMedia imgMedia = localMedia.get(0);
+                        String url;
+                        if (imgMedia.isCompressed()) {
+                            url = imgMedia.getCompressPath();
+                        } else {
+                            url = imgMedia.getRealPath();
+                        }
+                        MvpPre.uploadFile(new File(url), 0);
+                    }
+                    break;
+                case PictureConfig.REQUEST_CAMERA:
+                    List<LocalMedia> localMedia1 = PictureSelector.obtainMultipleResult(data);
+                    if (localMedia1 != null && localMedia1.size() != 0) {
+                        LocalMedia imgMedia = localMedia1.get(0);
+                        MvpPre.uploadFile(new File(imgMedia.getRealPath()), 3);
+                    }
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void upLoadSuccess(String url, int type) {
+//        if (uploadType == 1) {
+//            MvpPre.addPhoto(url);
+//        } else {
+//            if (type == 0) {
+//                MvpPre.updateAvatar(url);
+//            } else if (type == 1) {
+//                Map<String, String> map = new HashMap<>();
+//                map.put("intro_voice", url);
+//                map.put("intro_voice_time", String.valueOf(mLength));
+//                MvpPre.upDateUserInfo(map);
+//            } else {
+//                MvpPre.updateShortsVideo(url);
+//            }
+//        }
+        if (type == 1) {
+            ImageUtils.loadHeadCC(url, mBinding.rvUserHead);
+        } else {
+            list.add(new UserImgList("1", url));
+            mUserPhotoWallAdapter.setNewData(list);
+        }
+    }
+
+    @Override
+    public void selectDate(String year, String month, String day) {
+        mBinding.tvSr.setText(year + "-" + month + "-" + day);
+      /*  map.put("birthday", year + "-" + month + "-" + day);*/
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MyBagActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/MyBagActivity.java
new file mode 100644
index 00000000..364a5122
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/MyBagActivity.java
@@ -0,0 +1,93 @@
+package com.example.modulevocal.activity;
+
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.MyBagConacts;
+import com.example.modulevocal.databinding.ActivityMyBagBinding;
+import com.example.modulevocal.fragment.mybag.MyBagFragment;
+import com.example.modulevocal.fragment.mybag.MyBagListFragment;
+import com.example.modulevocal.presenter.MyBagPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.MyBagBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *@author qx
+ *@data 2025/5/22
+ *@description: 我的背包
+ */
+public class MyBagActivity extends BaseMvpActivity<MyBagPresenter, ActivityMyBagBinding> implements MyBagConacts.View {
+
+    private List<MyBagBean> list;
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle("我的背包");
+
+        list=new ArrayList<>();
+        list.add(new MyBagBean("背包道具", "1"));
+        list.add(new MyBagBean("背包收入", "2"));
+        list.add(new MyBagBean("背包支出", "3"));
+
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getSupportFragmentManager(), list));
+        mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
+        mBinding.slidingTabLayout.setCurrentTab(0);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_my_bag;
+    }
+
+    @Override
+    protected MyBagPresenter bindPresenter() {
+        return new MyBagPresenter(this, this);
+    }
+
+
+    private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
+
+        private List<MyBagBean> list;
+
+
+        public MyFragmentPagerAdapter(FragmentManager fm, List<MyBagBean> list) {
+            super(fm);
+            this.list = list;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            MyBagBean model = list.get(position);
+            if ("1".equals(model.getMyBagType())){
+                return MyBagFragment.newInstance(model.getMyBagType());
+            }else {
+                return MyBagListFragment.newInstance(model.getMyBagType());
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return list.size();
+        }
+
+        @Nullable
+        @Override
+        public CharSequence getPageTitle(int position) {
+            MyBagBean model = list.get(position);
+            return model.getMyBagTitle();
+        }
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MyMoneyActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/MyMoneyActivity.java
new file mode 100644
index 00000000..4d379fb6
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/MyMoneyActivity.java
@@ -0,0 +1,53 @@
+package com.example.modulevocal.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.MyMoneyConactos;
+import com.example.modulevocal.databinding.ActivityMyMoneyBinding;
+import com.example.modulevocal.presenter.MyMoneyPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+/**
+ *@author qx
+ *@data 2025/5/21
+ *@description: 我的钱包
+ */
+public class MyMoneyActivity extends BaseMvpActivity<MyMoneyPresenter, ActivityMyMoneyBinding> implements MyMoneyConactos.View {
+
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle(getResources().getString(com.qxcm.moduleutil.R.string.wallet));
+        mBinding.tvCz.setOnClickListener(this::onClick);
+        mBinding.tvTx.setOnClickListener(this::onClick);
+        mBinding.r3.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        if (view.getId()==R.id.tv_cz){
+            startActivity(new Intent(this, RechargeActivity.class));
+        }else if (view.getId()==R.id.tv_tx){
+            startActivity(new Intent(this, WithdrawalActivity.class));
+        }else if (view.getId()==R.id.r_3){
+            startActivity(new Intent(this, CurrencyExchangeActivity.class));
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_my_money;
+    }
+
+    @Override
+    protected MyMoneyPresenter bindPresenter() {
+        return new MyMoneyPresenter(this,this);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java
new file mode 100644
index 00000000..adb3a5d5
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java
@@ -0,0 +1,279 @@
+package com.example.modulevocal.activity;
+
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.util.SparseArray;
+import android.view.View;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.example.modulevocal.databinding.RoomActivityMyRoomBinding;
+import com.example.modulevocal.fragment.MyCreateFragment;
+import com.example.modulevocal.fragment.MyFollowFragment;
+import com.example.modulevocal.fragment.MyManageFragment;
+import com.example.modulevocal.fragment.MyRoomListFragment;
+import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.hjq.toast.ToastUtils;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.widget.CustomTopBar;
+
+import java.util.List;
+/**
+ *@author
+ *@data 2025/5/15
+ *@description: 我的房间
+ */
+public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivityMyRoomBinding> implements MyRoomListContacts.View {
+    public String from;
+    public int auth_status;
+    public String roomId;
+
+    @Override
+    protected MyRoomPresenter bindPresenter() {
+        return new MyRoomPresenter(this, this);
+    }
+
+    @Override
+    protected void initData() {
+        mBinding.viewPager.setAdapter(new MyFragmentAdapter(getSupportFragmentManager()));
+        mBinding.viewPager.setOffscreenPageLimit(1);
+        mBinding.tvCharm.setOnClickListener(v -> {
+            resetTab(0);
+        });
+        mBinding.tvWealth.setOnClickListener(v -> {
+            resetTab(1);
+        });
+        mBinding.tvManage.setOnClickListener(v -> {
+            resetTab(2);
+        });
+        mBinding.tvInterest.setOnClickListener(v -> {
+            resetTab(3);
+        });
+
+        mBinding.viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                resetTab(position); // 同步更新 Tab 样式
+            }
+        });
+
+        mBinding.tvCharm.setTextColor(getResources().getColor(R.color.black));
+        mBinding.tvWealth.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+        mBinding.tvManage.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+        mBinding.tvInterest.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+        mBinding.tvCharm.setTextSize(16);
+        mBinding.tvWealth.setTextSize(14);
+        mBinding.tvManage.setTextSize(14);
+        mBinding.tvInterest.setTextSize(14);
+        mBinding.tvCharm.setTypeface(null, Typeface.BOLD);
+        mBinding.tvWealth.setTypeface(null, Typeface.NORMAL);
+        mBinding.tvManage.setTypeface(null, Typeface.NORMAL);
+        mBinding.tvInterest.setTypeface(null, Typeface.NORMAL);
+        mBinding.vLine.setVisibility(View.VISIBLE);
+        mBinding.vLine2.setVisibility(View.GONE);
+        mBinding.vLine3.setVisibility(View.GONE);
+        mBinding.vLine4.setVisibility(View.GONE);
+    }
+
+    private void resetTab(int index) {
+        if (mBinding.viewPager.getCurrentItem() == index) {
+            return; // 已处于目标页面，无需重复操作
+        }
+        if (index == 0) {
+            mBinding.tvCharm.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.black));
+            mBinding.tvWealth.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvManage.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvInterest.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvCharm.setTextSize(16);
+            mBinding.tvWealth.setTextSize(14);
+            mBinding.tvManage.setTextSize(14);
+            mBinding.tvInterest.setTextSize(14);
+            mBinding.tvCharm.setTypeface(null, Typeface.BOLD);
+            mBinding.tvWealth.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvManage.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvInterest.setTypeface(null, Typeface.NORMAL);
+            mBinding.vLine.setVisibility(View.VISIBLE);
+            mBinding.vLine2.setVisibility(View.GONE);
+            mBinding.vLine3.setVisibility(View.GONE);
+            mBinding.vLine4.setVisibility(View.GONE);
+        } else if (index == 1) {
+            mBinding.tvWealth.setTextColor(getResources().getColor(R.color.black));
+            mBinding.tvCharm.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvManage.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvInterest.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvCharm.setTextSize(14);
+            mBinding.tvWealth.setTextSize(16);
+            mBinding.tvManage.setTextSize(14);
+            mBinding.tvInterest.setTextSize(14);
+            mBinding.tvCharm.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvWealth.setTypeface(null, Typeface.BOLD);
+            mBinding.tvManage.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvInterest.setTypeface(null, Typeface.NORMAL);
+            mBinding.vLine.setVisibility(View.GONE);
+            mBinding.vLine2.setVisibility(View.VISIBLE);
+            mBinding.vLine3.setVisibility(View.GONE);
+            mBinding.vLine4.setVisibility(View.GONE);
+        } else if (index == 2) {
+            mBinding.tvWealth.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvCharm.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvManage.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.black));
+            mBinding.tvInterest.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvCharm.setTextSize(14);
+            mBinding.tvWealth.setTextSize(14);
+            mBinding.tvManage.setTextSize(16);
+            mBinding.tvInterest.setTextSize(14);
+            mBinding.tvCharm.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvWealth.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvManage.setTypeface(null, Typeface.BOLD);
+            mBinding.tvInterest.setTypeface(null, Typeface.NORMAL);
+            mBinding.vLine.setVisibility(View.GONE);
+            mBinding.vLine2.setVisibility(View.GONE);
+            mBinding.vLine3.setVisibility(View.VISIBLE);
+            mBinding.vLine4.setVisibility(View.GONE);
+        } else if (index == 3) {
+            mBinding.tvWealth.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvCharm.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvManage.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+            mBinding.tvInterest.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.black));
+            mBinding.tvCharm.setTextSize(14);
+            mBinding.tvWealth.setTextSize(14);
+            mBinding.tvManage.setTextSize(14);
+            mBinding.tvInterest.setTextSize(16);
+            mBinding.tvCharm.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvWealth.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvManage.setTypeface(null, Typeface.NORMAL);
+            mBinding.tvInterest.setTypeface(null, Typeface.BOLD);
+            mBinding.vLine.setVisibility(View.GONE);
+            mBinding.vLine2.setVisibility(View.GONE);
+            mBinding.vLine3.setVisibility(View.GONE);
+            mBinding.vLine4.setVisibility(View.VISIBLE);
+        }
+        mBinding.viewPager.setCurrentItem(index); // 禁用平滑滚动
+    }
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.room_activity_my_room;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        mBinding.topBar.setRightIcon(com.qxcm.moduleutil.R.mipmap.trend_icon);
+        mBinding.topBar.setImgPaddingRight(35);
+        mBinding.topBar.setRightImgVIsible(true);
+        initListener();
+    }
+
+    private void initListener() {
+        mBinding.topBar.addIntentListener(new CustomTopBar.OnCallBackRightIcon() {
+            @Override
+            public void onIntent() {
+//                if ("我的界面".equals(from)) {
+//                    if (auth_status == 0) {
+//                        ToastUtils.show("实名认证后才能创建直播间");
+//                        MvpPre.getNameAuthResult(0);
+//                        return;
+//                    }
+//                    startActivity(new Intent(MyRoomActivity.this,CreatedRoomActivity.class));
+//                }
+                startActivity(new Intent(MyRoomActivity.this,CreatedRoomActivity.class));
+                finish();
+            }
+        });
+    }
+
+    @Override
+    public void setMyInfo(MyRoomBean myRoom) {
+
+    }
+
+    @Override
+    public void setList(List<MyRoomBean> list, int type) {
+
+    }
+
+    @Override
+    public void delfootSuccess() {
+
+    }
+
+    @Override
+    public void setMyFootData(List<MyFootResp> data, int page) {
+
+    }
+
+    @Override
+    public void finishRefresh() {
+
+    }
+
+    @Override
+    public void setManageData(List<ManageRoomResp> data) {
+
+    }
+
+    @Override
+    public void setAttentionListData(List<AttentionResp> attentionResps) {
+
+    }
+
+    private static class MyFragmentAdapter extends FragmentStatePagerAdapter {
+        private SparseArray<Fragment> fragments = new SparseArray<>();
+        private String[] titles = new String[]{"我创建的", "我主持的", "我管理的", "我关注的"};
+
+        private String roomId;
+
+        public MyFragmentAdapter(FragmentManager fm) {
+            super(fm);
+            this.roomId = roomId;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            Fragment fragment = fragments.get(position);
+            if (fragment == null) {
+                if (position == 0) {
+                    fragment = MyCreateFragment.newInstance(MyCreateFragment.TYPE_CREATE);
+                } else if (position == 1) {
+                    fragment = MyRoomListFragment.newInstance(MyRoomListFragment.TYPE_HOST);
+                } else if (position == 2) {
+                    fragment = MyManageFragment.newInstance(MyManageFragment.TYPE_GL);
+                } else if (position == 3) {
+                    fragment = MyFollowFragment.newInstance(MyFollowFragment.TYPE_GZ);
+                }
+                fragments.put(position, fragment);
+            }
+            return fragment;
+        }
+
+        @Override
+        public int getCount() {
+            return titles.length;
+        }
+
+        @Nullable
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return titles[position];
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
new file mode 100644
index 00000000..8a643286
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
@@ -0,0 +1,155 @@
+package com.example.modulevocal.activity;
+
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.databinding.ActivityPersonalityBinding;
+import com.example.modulevocal.fragment.zhuangb.ZhuangBanShangChengFragment;
+import com.google.android.material.tabs.TabLayout;
+import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+import com.qxcm.moduleutil.adapter.MyPagerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author qx
+ * @data 2025/5/16
+ * @description: 个性装扮
+ */
+public class PersonalityActivity extends BaseAppCompatActivity<ActivityPersonalityBinding> {
+    private List<String> titleList = new ArrayList();
+    private List<Fragment> mFragments = new ArrayList();
+
+    private MyPagerAdapter myAdapter;
+
+    @Override
+    protected void initData() {
+        titleList.add("头像框");
+        titleList.add("座驾");
+        titleList.add("气泡");
+        titleList.add("个人靓号");
+        titleList.add("房间靓号");
+        titleList.add("工会靓号");
+
+        mFragments.add(ZhuangBanShangChengFragment.newInstance(1));
+        mFragments.add(ZhuangBanShangChengFragment.newInstance(2));
+        mFragments.add(ZhuangBanShangChengFragment.newInstance(3));
+        mFragments.add(ZhuangBanShangChengFragment.newInstance(4));
+        mFragments.add(ZhuangBanShangChengFragment.newInstance(5));
+        mFragments.add(ZhuangBanShangChengFragment.newInstance(6));
+
+        myAdapter = new MyPagerAdapter(getSupportFragmentManager(), mFragments, titleList);
+        mBinding.viewPager.setAdapter(myAdapter);
+        mBinding.viewPager.setOffscreenPageLimit(mFragments.size());
+        mBinding.tabLayout.setupWithViewPager(mBinding.viewPager);
+        setCustomViews();
+
+        mBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                updateTabView(tab, true);
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+                updateTabView(tab, false);
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                // 可选实现
+            }
+
+            private void updateTabView(TabLayout.Tab tab, boolean isSelected) {
+                if (tab.getCustomView() == null) return;
+
+                TextView text = tab.getCustomView().findViewById(R.id.tv_zbtab);
+                ImageView vView = tab.getCustomView().findViewById(R.id.v_view);
+
+                if (text != null) {
+                    if (isSelected) {
+                        text.setTextColor(Color.parseColor("#333333"));
+                        text.setTextSize(16f);
+                        text.setTypeface(Typeface.DEFAULT_BOLD);
+                    } else {
+                        text.setTextColor(Color.parseColor("#5B5B5B"));
+                        text.setTextSize(14f);
+                        text.setTypeface(Typeface.DEFAULT);
+                    }
+                }
+
+                if (vView != null) {
+                    vView.setVisibility(isSelected ? View.VISIBLE : View.GONE);
+                }
+            }
+        });
+
+//        viewModel.loadUserInfo();
+
+//        try {
+//            Login userBean = UserManager.user;
+//            if (userBean != null) {
+//                mBinding.tvName.setText(userBean.nick_name);
+//                mBinding.tvId.setText(String.valueOf(userBean.uid));
+//                Glide.with(this)
+//                        .load(userBean.head_pic)
+//                        .error(R.mipmap.ic_launcher_app)
+//                        .into(mDataBinding.ivUser);
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.topBar.setRightTxtVisible(true);
+        mBinding.topBar.setRightText(getResources().getString(com.qxcm.moduleutil.R.string.shopping));
+        mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_personality;
+    }
+
+    private void setCustomViews() {
+        int mSelectedTabPosition = mBinding.tabLayout.getSelectedTabPosition();
+        for (int i = 0; i < titleList.size(); i++) {
+            mBinding.tabLayout.getTabAt(i).setCustomView(getTabView(i, mSelectedTabPosition));
+        }
+    }
+
+    private View getTabView(int index, int mSelectedTabPosition) {
+        // 自定义View布局
+        View view = LayoutInflater.from(this).inflate(R.layout.item_tablayout_headerzb, null);
+        TextView title = view.findViewById(R.id.tv_zbtab);
+        ImageView v_view = view.findViewById(R.id.v_view);
+        title.setText(titleList.get(index));
+        title.setSelected(index == mSelectedTabPosition);
+//        v_view.setSelected(index == mSelectedTabPosition);
+        v_view.setVisibility(index == mSelectedTabPosition ? View.VISIBLE : View.GONE);
+        if (index == mSelectedTabPosition) {
+            title.setTextColor(Color.parseColor("#333333"));
+            title.setTextSize(16f);
+            title.setTypeface(Typeface.DEFAULT_BOLD);
+            // title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 17f);
+            // title.setTypeface(Typeface.DEFAULT_BOLD);
+        } else {
+            title.setTextColor(Color.parseColor("#5B5B5B"));
+            title.setTextSize(14f);
+            // title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f);
+            // title.setTypeface(Typeface.DEFAULT);
+        }
+
+        return view;
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RealDetailActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RealDetailActivity.java
new file mode 100644
index 00000000..03bf7310
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RealDetailActivity.java
@@ -0,0 +1,40 @@
+package com.example.modulevocal.activity;
+
+import android.content.Intent;
+import android.view.View;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.databinding.ActivityRealDeatilBinding;
+import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+/**
+ *@author
+ *@data
+ *@description: 已经实名认证后展示的页面
+ */
+public class RealDetailActivity extends BaseAppCompatActivity<ActivityRealDeatilBinding> {
+
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.topBar.setTitle(getResources().getString(com.qxcm.moduleutil.R.string.real_name_authentication));
+        mBinding.ll1.setOnClickListener(this::onClick);
+        mBinding.ll2.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        if (view.getId()==R.id.ll_1||view.getId()==R.id.ll_2){
+            startActivity(new Intent(this, RealNameActivity.class));
+            finish();
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_real_deatil;
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java
index 618eb4cd..02fe2775 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java
@@ -7,6 +7,7 @@ import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
+import android.view.View;
 
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
@@ -17,6 +18,7 @@ import androidx.core.view.WindowInsetsCompat;
 import com.example.modulevocal.R;
 import com.example.modulevocal.databinding.ActivityRealNameBinding;
 import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+import com.qxcm.moduleutil.utils.SpUtil;
 
 public class RealNameActivity extends BaseAppCompatActivity<ActivityRealNameBinding> {
 
@@ -51,6 +53,22 @@ public class RealNameActivity extends BaseAppCompatActivity<ActivityRealNameBind
         }
 
         mBinding.tvAgreeTerms.setText(spannable);
+        mBinding.btnSubmit.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        if (view.getId()==R.id.btnSubmit){
+            if (mBinding.btnSubmit.getText().toString().equals("下一步")){
+                mBinding.stepNum1.setBackground(getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.num_11));
+                mBinding.stepNum2.setBackground(getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.num_2));
+                mBinding.l1.setVisibility(View.GONE);
+                mBinding.l2.setVisibility(View.VISIBLE);
+                mBinding.btnSubmit.setText("立即认证");
+            }else {
+                SpUtil.setRealName(true);
+                finish();
+            }
+        }
     }
 
     @Override
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RechargeActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RechargeActivity.java
new file mode 100644
index 00000000..e9cf633b
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RechargeActivity.java
@@ -0,0 +1,159 @@
+package com.example.modulevocal.activity;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.BalanceRechargeAdapter;
+import com.example.modulevocal.conacts.RechargeConactos;
+import com.example.modulevocal.databinding.ActivityRechargeBinding;
+import com.example.modulevocal.presenter.RechargePresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.RechargeBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *@author qx
+ *@data 2025/5/21
+ *@description: 充值
+ */
+public class RechargeActivity extends BaseMvpActivity<RechargePresenter, ActivityRechargeBinding> implements RechargeConactos.View{
+
+    private BalanceRechargeAdapter rechargeAdapter;
+    private String money = "0";
+    private int type = 1;
+    @Override
+    protected void initData() {
+
+        mBinding.topBar.setTitle(getResources().getString(com.qxcm.moduleutil.R.string.recharge));
+
+        List<RechargeBean> rechargeList = new ArrayList<>();
+        RechargeBean bean1 = new RechargeBean();
+        bean1.setGoldNum("60");
+        bean1.setMoney("6");
+        bean1.setItemViewType(0);
+        rechargeList.add(bean1);
+        RechargeBean bean2 = new RechargeBean();
+        bean2.setGoldNum("100");
+        bean2.setMoney("10");
+        bean2.setItemViewType(0);
+        rechargeList.add(bean2);
+
+        RechargeBean bean3 = new RechargeBean();
+        bean3.setGoldNum("300");
+        bean3.setMoney("30");
+        bean3.setItemViewType(0);
+        rechargeList.add(bean3);
+        RechargeBean bean4 = new RechargeBean();
+        bean4.setGoldNum("500");
+        bean4.setMoney("50");
+        bean4.setItemViewType(0);
+        rechargeList.add(bean4);
+
+        RechargeBean bean5 = new RechargeBean();
+        bean5.setGoldNum("680");
+        bean5.setMoney("68");
+        bean5.setItemViewType(0);
+        rechargeList.add(bean5);
+        RechargeBean bean6 = new RechargeBean();
+        bean6.setGoldNum("1280");
+        bean6.setMoney("128");
+        bean6.setItemViewType(0);
+        rechargeList.add(bean6);
+
+        // 在数据源最后添加一个自定义项
+        RechargeBean customItem = new RechargeBean();
+        customItem.setGoldNum("自定义");
+        customItem.setMoney("");
+        customItem.setItemViewType(1);
+        rechargeList.add(customItem);
+
+        rechargeAdapter = new BalanceRechargeAdapter(rechargeList);
+        rechargeAdapter.setNewData(rechargeList);
+        rechargeAdapter.setListener(new BalanceRechargeAdapter.OnRechargeItemClickListener() {
+            @Override
+            public void onClick(RechargeBean rechargeBean) {
+                money = rechargeBean.getMoney();
+                mBinding.tvPayment.setText(String.format("立即支付（%s元)", money));
+            }
+        });
+        rechargeAdapter.setInputBoxVisibilityListener(new BalanceRechargeAdapter.InputBoxVisibilityListener() {
+            @Override
+            public void onInputBoxVisibilityChanged(boolean isVisible) {
+                // 根据 isVisible 的值来显示或隐藏输入框
+                mBinding.r4.setVisibility(isVisible ? View.VISIBLE : View.GONE);
+            }
+        });
+        mBinding.recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+        mBinding.recyclerView.setAdapter(rechargeAdapter);
+        money = bean1.getMoney();
+        mBinding.tvPayment.setText(String.format("立即支付（%s元)", money));
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        mBinding.ivWeixin.setImageLevel(1);
+        mBinding.tvPayment.setOnClickListener(this::onClick);
+        mBinding.rlWeixinPay.setOnClickListener(this::onClick);
+
+        mBinding.rlThreePay.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        if (view.getId()==R.id.tv_payment){
+            if (money.equals("0")) {
+                ToastUtils.showShort("请选择充值金额");
+                return;
+            }
+            if (Double.valueOf(money) < 6) {
+                ToastUtils.showShort("最低充值6元以上");
+                return;
+            }
+            if (type == 1) {
+//                StatisticsUtils.addEvent(this, Constant.OpenInstall.ALIRECHARGE);
+            } else if (type == 2) {
+//                StatisticsUtils.addEvent(this, Constant.OpenInstall.WXRECHARGE);
+            } else if (type == 3) {
+//                StatisticsUtils.addEvent(this, Constant.OpenInstall.THREERECHARGE);
+            }
+//            StatisticsUtils.addEvent(this, Constant.OpenInstall.TOTALRECHARGE);
+            if (type == 1) {
+//                MvpPre.userRecharge(money, 8);
+            } else if (type == 2) {
+//                MvpPre.userRecharge(money, 8);
+            } else if (type == 3) {
+//                MvpPre.userRecharge(money, 7);
+            }
+        }else if (view.getId()==R.id.rl_weixin_pay){
+            type = 2;
+            mBinding.ivWeixin.setImageLevel(1);
+            mBinding.ivThreePay.setImageLevel(0);
+
+        }else if (view.getId()==R.id.rl_three_pay){
+            type = 1;
+            mBinding.ivWeixin.setImageLevel(0);
+            mBinding.ivThreePay.setImageLevel(1);
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_recharge;
+    }
+
+    @Override
+    protected RechargePresenter bindPresenter() {
+        return new RechargePresenter(this, this);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceActivity.java
new file mode 100644
index 00000000..ee9e0021
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceActivity.java
@@ -0,0 +1,113 @@
+package com.example.modulevocal.activity;
+
+import static android.view.View.GONE;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.RoomAllowanceContacts;
+import com.example.modulevocal.databinding.ActivityRoomAllowanceBinding;
+import com.example.modulevocal.presenter.RoomAllowancePresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.RoomSubsidy;
+import com.qxcm.moduleutil.bean.RoomSubsidyDetails;
+import com.qxcm.moduleutil.widget.CustomTopBar;
+
+import java.util.List;
+
+public class RoomAllowanceActivity extends BaseMvpActivity<RoomAllowancePresenter, ActivityRoomAllowanceBinding> implements RoomAllowanceContacts.DeatilsView {
+    public String roomId;
+
+    @Override
+    protected RoomAllowancePresenter bindPresenter() {
+        return new RoomAllowancePresenter(this, this);
+    }
+
+    @Override
+    protected void initData() {
+        MvpPre.getCharmList(roomId);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_room_allowance;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        initListener();
+    }
+
+    private void initListener() {
+        mBinding.topBar.addIntentListener(new CustomTopBar.OnCallBackRightIcon() {
+            @Override
+            public void onIntent() {
+//                ARouter.getInstance().build(ARouteConstants.MY_ROOM_LIST).withString("from", "我的房间").navigation();
+                finish();
+            }
+        });
+
+        mBinding.topBar.addIntentListener2(new CustomTopBar.OnCallBackRightIcon2() {
+            @Override
+            public void onIntent() {
+//                ARouter.getInstance().build(ARouteConstants.ROOM_ALLOWANCE_DETAIL).withString("from", "我的房间").withString("roomId",roomId).navigation();
+                finish();
+            }
+        });
+
+        mBinding.topBar.setRightText("历史记录");
+        mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
+        mBinding.topBar.setRightTxtVisible(true);
+        mBinding.topBar.setRightSize(12);
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    public void setList(RoomSubsidy list) {
+        mBinding.tvLast.setText("累计流水："+list.getLastweek().getTotal_transaction());
+        mBinding.tvGrant2.setText("获得补贴："+list.getThisweek().getSubsidy_amount());
+        mBinding.tvThis.setText("本周流水："+list.getThisweek().getTotal_transaction());
+        mBinding.tvGrant3.setText("获得补贴："+list.getThisweek().getSubsidy_amount());
+        if (list.getLastweek().getStatus() == 1){
+            mBinding.tvGrant.setText("已发放");
+            mBinding.tvGrant.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+//            mBinding.tvLast.setTextColor(getResources().getColor(R.color.color_FF999999));
+        }else {
+            mBinding.tvGrant.setText("未发放");
+            mBinding.tvGrant.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_45d08c));
+        }
+        if (list.getThisweek().getStatus() == 1){
+            mBinding.tvWeekGrant.setText("已发放");
+            mBinding.tvWeekGrant.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+        }else {
+            mBinding.tvWeekGrant.setText("未发放");
+            mBinding.tvWeekGrant.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_45d08c));
+        }
+        if (list.getExplain() != null&& !list.getExplain().equals("")){
+//            mBinding.ivBg.loadUrl(BuildConfig.BASE_URL+list.getExplain());
+        }else {
+            mBinding.ivBg.setVisibility(GONE);
+        }
+
+    }
+
+    @Override
+    public void setHishoryList(List<RoomSubsidyDetails> list) {
+
+    }
+
+    @Override
+    public void finishRefresh() {
+
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceDetailActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceDetailActivity.java
new file mode 100644
index 00000000..7373d7f5
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceDetailActivity.java
@@ -0,0 +1,102 @@
+package com.example.modulevocal.activity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.RoomAllowanceDetailAdapter;
+import com.example.modulevocal.conacts.RoomAllowanceContacts;
+import com.example.modulevocal.databinding.ActivityRoomAllowanceDetailBinding;
+import com.example.modulevocal.presenter.RoomAllowancePresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.RoomSubsidy;
+import com.qxcm.moduleutil.bean.RoomSubsidyDetails;
+import com.qxcm.moduleutil.widget.CustomTopBar;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+
+import java.util.List;
+/**
+ *@author qx
+ *@data 2025/5/15
+ *@description: 历史记录
+ */
+public class RoomAllowanceDetailActivity extends BaseMvpActivity<RoomAllowancePresenter, ActivityRoomAllowanceDetailBinding> implements RoomAllowanceContacts.DeatilsView {
+    public String roomId;
+    private int currentPage = 1;
+    private RoomAllowanceDetailAdapter adapter;
+    @Override
+    protected RoomAllowancePresenter bindPresenter() {
+        return new RoomAllowancePresenter(this, this);
+    }
+
+    @Override
+    protected void initData() {
+        MvpPre.getDetails(roomId,"1");
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_room_allowance_detail;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        initListener();
+        adapter = new RoomAllowanceDetailAdapter();
+        adapter.openLoadAnimation(BaseQuickAdapter.SCALEIN);
+        mBinding.recycleView.setAdapter(adapter);
+        mBinding.recycleView.setLayoutManager(new LinearLayoutManager(this));
+        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                currentPage++;
+                MvpPre.getDetails(roomId,  currentPage + "");
+            }
+
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                currentPage = 1;
+                MvpPre.getDetails(roomId, currentPage + "");
+            }
+        });
+    }
+
+    private void initListener() {
+        mBinding.topBar.addIntentListener(new CustomTopBar.OnCallBackRightIcon() {
+            @Override
+            public void onIntent() {
+//                ARouter.getInstance().build(ARouteConstants.MY_ROOM_LIST).withString("from", "我的房间").navigation();
+                finish();
+            }
+        });
+
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    public void setList(RoomSubsidy list) {
+
+    }
+
+    @Override
+    public void setHishoryList(List<RoomSubsidyDetails> list) {
+        adapter.setNewData(list);
+    }
+
+    @Override
+    public void finishRefresh() {
+        mBinding.smartRefreshLayout.finishRefresh();
+        mBinding.smartRefreshLayout.finishLoadMore();
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java
new file mode 100644
index 00000000..448f2d11
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java
@@ -0,0 +1,187 @@
+package com.example.modulevocal.activity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.widget.DatePicker;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.RoomDetailsAdapter;
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.example.modulevocal.databinding.ActivityRoomDetailsBinding;
+import com.example.modulevocal.presenter.RoomDetailsPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.bean.RoomDetails;
+import com.qxcm.moduleutil.bean.details.BaseMultiItemEntity;
+import com.qxcm.moduleutil.bean.details.RoomDeatailList;
+import com.qxcm.moduleutil.bean.details.RoomDeatil;
+import com.qxcm.moduleutil.dialog.DoubleDatePickerDialog;
+import com.qxcm.moduleutil.widget.CustomTopBar;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *@author qx
+ *@data 2025/5/15
+ *@description:房间明细
+ */
+public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, ActivityRoomDetailsBinding> implements MyRoomListContacts.DeatilsView {
+
+    public String roomId;
+    private BaseQuickAdapter<RoomDetails.RoomDetailsList.RoomDetail, BaseViewHolder> mAdapter;
+    private int currentPage = 1;
+    private RoomDetailsAdapter adapter;
+    private String stime = "";
+    private String etime = "";
+    Set<String> loadedUserIds = new HashSet<>();
+    public int type;
+
+    @Override
+    protected void initData() {
+        MvpPre.getCharmList(roomId, "", "", "1", type);
+        mBinding.rl3.setOnClickListener(v -> {
+
+            Calendar c = Calendar.getInstance();
+            // 最后一个false表示不显示日期，如果要显示日期，最后参数可以是true或者不用输入
+            new DoubleDatePickerDialog(this, 0, new DoubleDatePickerDialog.OnDateSetListener() {
+
+                @Override
+                public void onDateSet(DatePicker startDatePicker, int startYear, int startMonthOfYear,
+                                      int startDayOfMonth, DatePicker endDatePicker, int endYear, int endMonthOfYear,
+                                      int endDayOfMonth) {
+
+                    stime = String.format("%d-%d-%d", startYear,
+                            startMonthOfYear + 1, startDayOfMonth);
+                    etime = String.format("%d-%d-%d", endYear,
+                            endMonthOfYear + 1, endDayOfMonth);
+                    currentPage = 1;
+                    loadedUserIds = new HashSet<>();
+                    MvpPre.getCharmList(roomId, stime, etime, currentPage + "", type);
+                }
+
+            }, c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DATE), true).show();
+        });
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_room_details;
+    }
+
+    @Override
+    protected RoomDetailsPresenter bindPresenter() {
+        return new RoomDetailsPresenter((MyRoomListContacts.DeatilsView) this, this);
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        initListener();
+        adapter = new RoomDetailsAdapter(null);
+        adapter.openLoadAnimation(BaseQuickAdapter.SCALEIN);
+        mBinding.rv.setAdapter(adapter);
+        mBinding.rv.setLayoutManager(new LinearLayoutManager(this));
+        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                currentPage++;
+                MvpPre.getCharmList(roomId, stime, etime, currentPage + "", type);
+            }
+
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                currentPage = 1;
+                MvpPre.getCharmList(roomId, stime, etime, currentPage + "", type);
+            }
+        });
+
+    }
+
+    private void initListener() {
+        mBinding.topBar.addIntentListener(new CustomTopBar.OnCallBackRightIcon() {
+            @Override
+            public void onIntent() {
+//                ARouter.getInstance().build(ARouteConstants.MY_ROOM_LIST).withString("from", "我的房间").navigation();
+                finish();
+            }
+        });
+
+        mBinding.topBar.addIntentListener2(new CustomTopBar.OnCallBackRightIcon2() {
+            @Override
+            public void onIntent() {
+//                ARouter.getInstance().build(ARouteConstants.ROOM_ALLOWANCE).withString("from", "我的房间").withString("roomId", roomId).navigation();
+                finish();
+            }
+        });
+
+        mBinding.topBar.setRightText("补贴明细");
+        mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
+        mBinding.topBar.setRightTxtVisible(true);
+        mBinding.topBar.setRightSize(12);
+    }
+
+
+    @Override
+    public void setList(RoomDetails list) {
+
+        mBinding.tv3.setText( list.getTotal_earning()+"");
+        mBinding.tv5.setText(list.getTotal_amount()+"");
+        if (list.getList() != null && !list.getList().isEmpty() && list.getList().size() > 0) {
+            List<BaseMultiItemEntity> data = new ArrayList<>();
+            for (int i = 0; i < list.getList().size(); i++) {
+                String time = list.getList().get(i).getTime();
+
+                if (!loadedUserIds.contains(time)) {
+                    RoomDeatailList r = new RoomDeatailList();
+                    r.setTotal_price(list.getList().get(i).getTotal_price());
+                    r.setTotal_earning(list.getList().get(i).getTotal_earning());
+                    r.setTime(list.getList().get(i).getTime());
+                    data.add(r);
+                    loadedUserIds.add(time);
+                }
+                for (int j = 0; j < list.getList().get(i).getList().size(); j++) {
+                    List<RoomDeatil> list1 = new ArrayList<>();
+                    RoomDeatil d = new RoomDeatil();
+                    d.setUser_head_picture(list.getList().get(i).getList().get(j).getUser_head_picture());
+                    d.setUser_nickname(list.getList().get(i).getList().get(j).getUser_nickname());
+                    d.setGet_user_nickname(list.getList().get(i).getList().get(j).getGet_user_nickname());
+                    d.setGift_name(list.getList().get(i).getList().get(j).getGift_name());
+                    d.setGift_number(list.getList().get(i).getList().get(j).getGift_number());
+                    d.setTotal_price(list.getList().get(i).getList().get(j).getTotal_price());
+                    d.setTime(list.getList().get(i).getList().get(j).getTime());
+                    d.setEarning(list.getList().get(i).getList().get(j).getEarning());
+                    list1.add(d);
+                    data.addAll(list1);
+                }
+            }
+            if (currentPage == 1) {
+                adapter.setNewData(data);
+            } else {
+                adapter.addData(data);
+            }
+            adapter.notifyItemInserted(data.size() - 1);
+            mBinding.rv.requestLayout(); // 请求重新布局
+        }
+    }
+
+    @Override
+    public void finishRefresh() {
+        mBinding.smartRefreshLayout.finishRefresh();
+        mBinding.smartRefreshLayout.finishLoadMore();
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
index 56002945..37db9483 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
@@ -1,18 +1,23 @@
 package com.example.modulevocal.activity;
 
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
 import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
+import com.blankj.utilcode.util.FileUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.example.modulevocal.R;
 import com.example.modulevocal.databinding.ActivitySettingBinding;
 import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.dialog.RealNameDialog;
 import com.qxcm.moduleutil.utils.SpUtil;
 import com.qxcm.moduleutil.utils.config.ConfigManager;
@@ -35,6 +40,7 @@ public class SettingActivity extends BaseAppCompatActivity<ActivitySettingBindin
     @Override
     protected void initView() {
         mBinding.topBar.setTitle("设置");
+        mBinding.tvCache.setHint(FileUtils.getSize(getCacheDir()));
         mBinding.llYouth.setOnClickListener(this::onClick);
         mBinding.llNotification.setOnClickListener(this::onClick);
         mBinding.swit.setOnClickListener(this::onClick);
@@ -42,6 +48,8 @@ public class SettingActivity extends BaseAppCompatActivity<ActivitySettingBindin
         mBinding.llSzmm.setOnClickListener(this::onClick);
         mBinding.llShb.setOnClickListener(this::onClick);
         mBinding.llSmrz.setOnClickListener(this::onClick);
+        mBinding.llQhch.setOnClickListener(this::onClick);
+        mBinding.llTcdl.setOnClickListener(this::onClick);
     }
 
     private void onClick(View view) {
@@ -50,18 +58,36 @@ public class SettingActivity extends BaseAppCompatActivity<ActivitySettingBindin
         }else if (view.getId()==R.id.ll_notification){
             startActivity(new Intent(this, NotificationActivity.class));
         }else if (view.getId()==R.id.ll_hmd){
-            startActivity(new Intent(this, BlacklistActivity.class));
+            Intent intent=new Intent(this, BlacklistActivity.class);
+            intent.putExtra("type",1);
+            startActivity(intent);
+//            startActivity(new Intent(this, BlacklistActivity.class));
         }else if (view.getId()==R.id.ll_szmm){
-            startActivity(new Intent(this, ChangePasswordActivity.class));
+            startActivity(new Intent(this, ChangPassActivity.class));
         }else if (view.getId()==R.id.ll_shb){
             startActivity(new Intent(this, PhoneReplacementActivity.class));
-        }else if (view.getId()==R.id.ll_smrz){
-            RealNameDialog realNameDialog = new RealNameDialog(this);
-            realNameDialog.show();
-            realNameDialog.setOnDismissListener(dialog -> {
-                dialog.dismiss();
-                startActivity(new Intent(SettingActivity.this, RealNameActivity.class));
-            });
+        }else if (view.getId()==R.id.ll_smrz){//实名认证
+            if (SpUtil.getRealName()){
+                startActivity(new Intent(this, RealDetailActivity.class));
+            }else {
+                RealNameDialog realNameDialog = new RealNameDialog(this);
+                realNameDialog.show();
+                realNameDialog.setOnDismissListener(dialog -> {
+                    dialog.dismiss();
+                    startActivity(new Intent(SettingActivity.this, RealNameActivity.class));
+                });
+            }
+        }else if (view.getId()==R.id.ll_qhch){
+            new AlertDialog.Builder(this).setMessage("确认清理缓存？").setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    ToastUtils.showShort("开始清理...");
+                    FileUtils.deleteAllInDir(getCacheDir());
+                    FileUtils.deleteAllInDir(getExternalCacheDir());
+                    ToastUtils.showShort("缓存清理成功!");
+                    mBinding.tvCache.setHint(FileUtils.getSize(getCacheDir()));
+                }
+            }).setNegativeButton("取消", null).create().show();
         }
         else if (view.getId()==R.id.swit){
             if (mBinding.swit.isChecked()){
@@ -75,6 +101,20 @@ public class SettingActivity extends BaseAppCompatActivity<ActivitySettingBindin
                 EnvironmentPrefs prefs = new EnvironmentPrefs(this);
                 prefs.setSelectedEnvironment(selectedEnv);
             }
+        }else if (view.getId()==R.id.ll_tcdl){
+            new AlertDialog.Builder(this).setMessage("确定要退出登录吗？")
+                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            try {
+                                CommonAppContext.getInstance().clearLoginInfo();
+                            } catch (ClassNotFoundException e) {
+                                throw new RuntimeException(e);
+                            }
+
+                        }
+                    })
+                    .setNegativeButton("取消", null).create().show();
         }
     }
 
@@ -82,4 +122,6 @@ public class SettingActivity extends BaseAppCompatActivity<ActivitySettingBindin
     protected int getLayoutId() {
         return R.layout.activity_setting;
     }
+
+
 }
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java
new file mode 100644
index 00000000..20ef5907
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java
@@ -0,0 +1,402 @@
+package com.example.modulevocal.activity;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.moduletablayout.listener.CustomTabEntity;
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.UserHomepageConacts;
+import com.example.modulevocal.databinding.ActivityUserHomepageBinding;
+import com.example.modulevocal.fragment.UserGiftWallFragment;
+import com.example.modulevocal.fragment.UserHomepageFragment;
+import com.example.modulevocal.presenter.UserHomepagePresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.adapter.MyFragmentPagerAdapter;
+import com.qxcm.moduleutil.bean.CircleListBean;
+import com.qxcm.moduleutil.bean.PhotoWallResp;
+import com.qxcm.moduleutil.bean.UserHomeResp;
+import com.qxcm.moduleutil.bean.XBannerData;
+import com.qxcm.moduleutil.utils.ImageLoader;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UserHomepageActivity extends BaseMvpActivity<UserHomepagePresenter, ActivityUserHomepageBinding> implements UserHomepageConacts.View{
+    String userId="";
+    public String emchatUsername;
+    public String from;
+
+    private UserHomeResp mUserHomeResp;
+//    private UserDetailsMoreDialog mUserDetailsMoreDialog;
+
+    private String jumpIntentRoomId = "";//跳转的房间id
+//    private UserSkillsFragment skillsFragment;
+    //    private UserFamiliesFragment familiesFragment;
+//    private BaseMVVMFragment trendFragment;
+    private UserGiftWallFragment giftWallFragment;
+    private String followState = "1";//关注状态 1 未关注 2已关注
+    private ArrayList<CustomTabEntity> titles = new ArrayList<>();
+
+    @Override
+    protected void initData() {
+        MvpPre.getUserDetails("0",  "0", true);
+        List<Fragment> fragments = new ArrayList<>();
+        fragments.add(UserHomepageFragment.newInstance(userId));
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(fragments, getSupportFragmentManager()));
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_user_homepage;
+    }
+
+    @Override
+    protected UserHomepagePresenter bindPresenter() {
+        return new UserHomepagePresenter(this, this);
+    }
+
+
+    @Override
+    protected void initView() {
+        super.initView();
+//        titles.add(new HomePageTabBean("动态"));
+//        titles.add(new HomePageTabBean("礼物墙"));
+//        mBinding.meUser.tabLwq.setVisibility(View.GONE);
+//        mBinding.meUser.tabDt.setVisibility(View.VISIBLE);
+//        mBinding.meUser.tabDt.setSelected(true);
+//        initListener();
+//        scrollInteractive();
+////        mBinding.meUser.ivMore.setOnClickListener(this);
+////        mBinding.meUser.ivMoreMin.setOnClickListener(this);
+////        mBinding.tvChart.setOnClickListener(this);
+////        mBinding.meUser.ivEdit.setOnClickListener(this);
+////        mBinding.meUser.headerInfo.tvLivingRoomGo.setOnClickListener(this);
+//        mBinding.meUser.ivBack.setOnClickListener(this::onChock);
+//        mBinding.meUser.ivBackMin.setOnClickListener(this::onChock);
+//        mBinding.meUser.headerInfo.tvNickName.setOnClickListener(this::onChock);
+//        mBinding.meUser.headerInfo.tvUserId.setOnClickListener(this::onChock);
+////        mBinding.clFollow.setOnClickListener(this::onFollow);
+////        mBinding.meUser.headerInfo.tvShoufufen.setOnClickListener(this);
+////        mBinding.meUser.headerInfo.tvMeinfoRenzhengIcon.setOnClickListener(this);
+////        mBinding.meUser.headerInfo.tvMeinfoGonghui.setOnClickListener(this);
+//        mBinding.meUser.headerInfo.rivUserHead.setOnClickListener(this::onChock);
+    }
+//    public void setTab(int type) {
+//        if (titles.size() == 2) {
+//            titles.clear();
+//            titles.add(new HomePageTabBean("动态"));
+//            titles.add(new HomePageTabBean("礼物墙"));
+//            mBinding.meUser.tabLwq.setVisibility(View.VISIBLE);
+//            mBinding.meUser.tabDt.setVisibility(View.VISIBLE);
+//        }
+//
+//        mBinding.meUser.tabDt.setSelected(true);
+//    }
+//
+////    private void onFollow(View view) {
+////        if ("1".equals(followState)) {
+////            MvpPre.follow(userId, "2");
+////        } else {
+////            MvpPre.follow(userId, "1");
+////        }
+////    }
+//
+//    private boolean scrollviewFlag = false;//标记是否是scrollview在滑动
+//
+//    protected void initListener() {
+////        mBinding.meUser.tabZl.setOnClickListener(v->{
+////            mBinding.meUser.abl.setExpanded(true, true);
+////            mBinding.nestScroll.scrollTo(0, 0);
+////        });
+////        mBinding.meUser.tabJn.setOnClickListener(v->{
+////            mBinding.meUser.abl.setExpanded(false, true);
+////            mBinding.nestScroll.scrollTo(0, (int) mBinding.flSkills.getY());
+////        });
+//        mBinding.meUser.tabLwq.setOnClickListener(v->{
+//            mBinding.meUser.abl.setExpanded(false, true);
+//            mBinding.nestScroll.scrollTo(0, (int) mBinding.flGiftWall.getY());
+//        });
+//        mBinding.meUser.tabDt.setOnClickListener(v->{
+//            mBinding.meUser.abl.setExpanded(false, true);
+//            mBinding.nestScroll.scrollTo(0, (int) mBinding.flTrendContainer.getY());
+//        });
+//
+//        mBinding.meUser.abl.addOnOffsetChangedListener(new AppBarStateChangeListener() {
+//            @Override
+//            public void onStateChanged(AppBarLayout appBarLayout, State state) {
+//                Logger.e("onStateChanged", appBarLayout.getTotalScrollRange());
+//                if (state == State.EXPANDED) {
+//                    //展开状态
+//                    mBinding.meUser.rlTopBar.setVisibility(View.VISIBLE);
+//                } else if (state == State.COLLAPSED) {
+//                    //折叠状态
+//                    mBinding.meUser.rlTopBar.setVisibility(View.GONE);
+//                }
+//            }
+//        });
+//
+//
+////        mUserDetailsMoreDialog = new UserDetailsMoreDialog(this);
+////        mUserDetailsMoreDialog.addOnUserDetailsMoreListener(new UserDetailsMoreDialog.OnUserDetailsMoreListener() {
+////            @Override
+////            public void onBlock() {
+////                if (SpUtils.getUserId().equals(userId)) {
+////                    ToastUtils.show("不能拉黑自己");
+////                    return;
+////                }
+////                MvpPre.addBlackUser(userId, 1);
+////            }
+////
+////            @Override
+////            public void onReport() {
+////                if (SpUtils.getUserId().equals(userId)) {
+////                    ToastUtils.show("不能举报自己");
+////                    return;
+////                }
+////                ARouter.getInstance().build(ARouteConstants.CHAT_REPORT).withString("userId", userId).navigation();
+////            }
+////        });
+//
+//
+//        mBinding.meUser.headerInfo.xbanner.setOnItemClickListener((banner, model, view, position) -> {
+//            if (mUserHomeResp != null && mUserHomeResp.getUser_photo() != null && mUserHomeResp.getUser_photo().getList() != null) {
+//                ArrayList<XBannerData> xBannerData = new ArrayList<>(getXBannerData(mUserHomeResp.getUser_photo()));
+////                ARouter.getInstance().build(ARouteConstants.IMAGE_BROWSER).withSerializable("list", xBannerData).withInt("position", position).navigation();
+//            }
+//        });
+//
+//        mBinding.meUser.headerInfo.xbanner.loadImage((banner, model, view, position) -> {
+//            XBannerData xBannerData = (XBannerData) model;
+//            ImageView ivStart = view.findViewById(com.qxcm.moduleutil.R.id.iv_voice_start);
+//            ImageView imageView = view.findViewById(R.id.iv_img);
+//            if (xBannerData.getType() == 1) {
+//                ivStart.setVisibility(View.VISIBLE);
+//                imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+//                ImageLoader.loadImage(getApplicationContext(), imageView, xBannerData.getVedioCover());
+//            } else {
+//                ivStart.setVisibility(View.GONE);
+//                ImageUtils.loadCenterCrop(xBannerData.getUrl(), imageView);
+//            }
+//        });
+//
+//
+//    }
+//
+//    @Override
+    public void setUserDetails(UserHomeResp mUserHomeResp) {
+        List<XBannerData> xBannerData1 = getXBannerData(mUserHomeResp.getUser_photo());
+        mBinding.xbanner.setBannerData(com.qxcm.moduleutil.R.layout.me_xbanner, xBannerData1);
+        mBinding.xbanner.setOnItemClickListener((banner, model, view, position) -> {
+            if (mUserHomeResp != null && mUserHomeResp.getUser_photo() != null && mUserHomeResp.getUser_photo().getList() != null) {
+//                ARouter.getInstance().build(ARouteConstants.IMAGE_BROWSER).withSerializable("list", xBannerData).withInt("position", position).navigation();
+            }
+        });
+
+        mBinding.xbanner.loadImage((banner, model, view, position) -> {
+            XBannerData xBannerData = (XBannerData) model;
+            ImageView ivStart = view.findViewById(com.qxcm.moduleutil.R.id.iv_voice_start);
+            ImageView imageView = view.findViewById(R.id.iv_img);
+            if (xBannerData.getType() == 1) {
+                ivStart.setVisibility(View.VISIBLE);
+                imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                ImageLoader.loadImage(this, imageView, xBannerData.getVedioCover());
+            } else {
+                ivStart.setVisibility(View.GONE);
+                ImageUtils.loadHeadCC(xBannerData.getUrl(), imageView);
+            }
+        });
+    }
+    private List<XBannerData> getXBannerData(PhotoWallResp photoWallResp) {
+        List<XBannerData> xBannerData = new ArrayList<>();
+        if (!TextUtils.isEmpty(photoWallResp.getVedio_cover())) {
+            xBannerData.add(new XBannerData(1, photoWallResp.getVedio(), photoWallResp.getVedio_cover()));
+        }
+        if (!TextUtils.isEmpty(photoWallResp.getAvatar())) {
+            xBannerData.add(new XBannerData(0, photoWallResp.getAvatar(), ""));
+        }
+//        for (PhotoWallResp.GiftResp item : photoWallResp.getList()) {
+//            xBannerData.add(new XBannerData(0, item.getUrl(), ""));
+//        }
+        return xBannerData;
+    }
+    @Override
+    public void setCircleList(List<CircleListBean> list) {
+
+    }
+//
+//    private List<XBannerData> getXBannerData(PhotoWallResp photoWallResp) {
+//        List<XBannerData> xBannerData = new ArrayList<>();
+//        if (!TextUtils.isEmpty(photoWallResp.getVedio_cover())) {
+//            xBannerData.add(new XBannerData(1, photoWallResp.getVedio(), photoWallResp.getVedio_cover()));
+//        }
+//        if (!TextUtils.isEmpty(photoWallResp.getAvatar())) {
+//            xBannerData.add(new XBannerData(0, photoWallResp.getAvatar(), ""));
+//        }
+////        for (PhotoWallResp.GiftResp item : photoWallResp.getList()) {
+////            xBannerData.add(new XBannerData(0, item.getUrl(), ""));
+////        }
+//        return xBannerData;
+//    }
+//
+//
+//
+//    private void setFollowStyle(String type) {
+//        if ("1".equals(type)) {
+////            mBinding.tvFollow.setBackgroundResource(R.mipmap.meinfo_follow_disable);
+//        } else {
+////            mBinding.tvFollow.setBackgroundResource(R.mipmap.meinfo_follow_normal);
+//        }
+//    }
+//
+//
+//    private void onChock(View view) {
+//        if (view.getId() == R.id.iv_back) {
+//            finish();
+//        }
+//        //聊天
+////        if (view.getId() == R.id.tv_chart) {
+////            if (mUserHomeResp != null) {
+////                if ("1".equals(mUserHomeResp.getOnly_friend())) {
+////                    ToastUtils.show("对方只接受来自好友的消息");
+////                } else {
+////                    ARouter.getInstance().build(ARouteConstants.HOME_CHART)
+////                            .withString("userId", mUserHomeResp.getEmchat_username())
+////                            .withString("nickname", mUserHomeResp.getNickname())
+////                            .withString("avatar", mUserHomeResp.getHead_picture())
+////                            .navigation();
+////                }
+////            }
+////        }
+////        //右上角更多
+////        else if (view.getId() == R.id.iv_more) {
+////            if (mUserDetailsMoreDialog == null) {
+////                mUserDetailsMoreDialog = new UserDetailsMoreDialog(this);
+////            }
+////            mUserDetailsMoreDialog.show();
+////
+////        } else if (view.getId() == R.id.iv_more_min) {
+////            if (mUserDetailsMoreDialog == null) {
+////                mUserDetailsMoreDialog = new UserDetailsMoreDialog(this);
+////            }
+////            mUserDetailsMoreDialog.show();
+////        }
+////        //编辑用户信息
+////        else if (view.getId() == R.id.iv_edit) {
+////            ARouter.getInstance().build(ARouteConstants.ME_MY_EDIT_INFO).navigation();
+////        }
+////        //正在语聊中
+////        else if (view.getId() == R.id.tv_living_room_go) {
+////            if (mUserHomeResp != null) {
+////                ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("roomId", jumpIntentRoomId).navigation();
+////            }
+////        }
+//        //返回
+//        else if (view.getId() == R.id.iv_back) {
+//            finish();
+//        } else if (view.getId() == R.id.iv_back_min) {
+//            finish();
+//        }
+//        //复制昵称
+//        else if (view.getId() == R.id.tv_nick_name) {
+//            if (mBinding.meUser.headerInfo.tvUserId.getText().length() > 0) {
+//                ClipboardManager clipboard = (ClipboardManager) this.getSystemService(Context.CLIPBOARD_SERVICE);
+//                clipboard.setPrimaryClip(ClipData.newPlainText("text", mUserHomeResp.getNickname()));
+//                ToastUtils.show("已复制到粘贴板");
+//            }
+//        }
+//        //复制ID
+//        else if (view.getId() == R.id.tv_user_id) {
+//            if (mBinding.meUser.headerInfo.tvUserId.getText().length() > 0) {
+//                ClipboardManager clipboard = (ClipboardManager) this.getSystemService(Context.CLIPBOARD_SERVICE);
+//                clipboard.setPrimaryClip(ClipData.newPlainText("text", mUserHomeResp.getUser_code()));
+//                ToastUtils.show("已复制到粘贴板");
+//            }
+//        }
+//        //守护 // 点击头像
+//        else if ( view.getId() == R.id.riv_user_head) {
+////            DialogFragment dialogFragment = (DialogFragment) ARouter.getInstance().build(ARouteConstants.GUARDIAN_GROUP_DIALOG).withString("userId", userId).navigation();
+////            if (dialogFragment != null) {
+////                dialogFragment.show(getSupportFragmentManager(), "GuardianGroupDialogFragment");
+////            }
+//        }
+//        // 认证
+////        else if (view.getId() == R.id.tv_meinfo_renzheng_icon) {
+////            String id = SpUtils.getUserId();
+////            if (userId.equals(id)) {
+////                //实名认证
+////                //判断用户是否已经注册过手机号
+////                if (TextUtils.isEmpty(com.qpyy.libcommon.utils.SpUtils.getUserInfo().getMobile())) {
+////                    ToastUtils.show("请先绑定手机号");
+////                    return;
+////                }
+////                MvpPre.getNameAuthResult(0);
+////            }
+////        }
+////        // 公会
+////        else if (view.getId() == R.id.tv_meinfo_gonghui) {
+////            String id = SpUtils.getUserId();
+////            if (userId.equals(id)) {
+////                MvpPre.getGuildInfo();
+////            }
+////        }
+//    }
+//    private void scrollInteractive() {
+//        mBinding.nestScroll.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+//            if (scrollviewFlag) {
+//                return;
+//            }
+////            mBinding.meUser.tabJz.setSelected(false);
+//            mBinding.meUser.tabLwq.setSelected(false);
+//            mBinding.meUser.tabDt.setSelected(false);
+//            if (scrollY < mBinding.flSkills.getTop()) {
+//                mBinding.meUser.tabDt.setSelected(true);
+////            } else if (scrollY < mBinding.flFamilies.getTop()) {
+////                mBinding.meUser.tabJn.setSelected(true);
+//            } else {
+//
+//
+////                    mBinding.meUser.tabJz.setSelected(true);
+//                    mBinding.meUser.tabDt.setSelected(true);
+//
+//            }
+//        });
+//    }
+//
+//    @Override
+//    protected void onDestroy() {
+////        EventBus.getDefault().unregister(this);
+//        super.onDestroy();
+//        MediaPlayerUtiles.getInstance().stopAudio();
+//
+//    }
+//
+//    @Override
+//    protected void onResume() {
+//        super.onResume();
+//        MvpPre.getUserDetails(userId, emchatUsername, this.mUserHomeResp == null);
+////        MvpPre.getMemberList(userId, 1);
+//    }
+//
+//    @Override
+//    protected void onCreate(@Nullable Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+////        EventBus.getDefault().register(this);
+//    }
+//
+//
+//    @Override
+//    public void showLoadings() {
+//    }
+//
+//    @Override
+//    public void showLoadings(String content) {
+//    }
+//
+//    @Override
+//    public void disLoadings() {
+//    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
new file mode 100644
index 00000000..bbca916d
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
@@ -0,0 +1,45 @@
+package com.example.modulevocal.activity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.WithdrawalConacts;
+import com.example.modulevocal.databinding.ActivityWithdrawalBinding;
+import com.example.modulevocal.presenter.WithdrawalPresenter;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+/**
+ *@author qx
+ *@data 2025/5/21
+ *@description: 提现
+ */
+public class WithdrawalActivity extends BaseMvpActivity<WithdrawalPresenter, ActivityWithdrawalBinding> implements WithdrawalConacts.View{
+
+
+    @Override
+    protected void initData() {
+        mBinding.topBar.setTitle("提现");
+        mBinding.topBar.setRightTxtVisible(true);
+        mBinding.topBar.setRightText("提现记录");
+        mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
+        mBinding.topBar.getTvRight().setOnClickListener(v -> {
+
+        });
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_withdrawal;
+    }
+
+    @Override
+    protected WithdrawalPresenter bindPresenter() {
+        return new WithdrawalPresenter(this, this);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/BalanceRechargeAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/BalanceRechargeAdapter.java
new file mode 100644
index 00000000..fc168375
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/BalanceRechargeAdapter.java
@@ -0,0 +1,101 @@
+package com.example.modulevocal.adapter;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.RechargeBean;
+
+import java.util.List;
+
+/**
+ * 充值adapter
+ */
+public class BalanceRechargeAdapter extends BaseMultiItemQuickAdapter<RechargeBean, BaseViewHolder> {
+    private int selectedPosition = -1;
+    private OnRechargeItemClickListener listener;
+    private InputBoxVisibilityListener inputBoxVisibilityListener;
+
+    public static final int ITEM_TYPE_NORMAL = 0;
+    public static final int ITEM_TYPE_FOOTER = 1;
+
+    public BalanceRechargeAdapter(@NonNull List<RechargeBean> data) {
+        super(data);
+        // 初始化 item 类型
+        addItemType(ITEM_TYPE_NORMAL, R.layout.rv_item_balance_recharge);
+        addItemType(ITEM_TYPE_FOOTER, R.layout.rv_item_footer);
+
+
+    }
+    @Override
+    public int getItemViewType(int position) {
+        RechargeBean item = getData().get(position);
+        return item.getItemViewType(); // 使用 bean 中的 itemViewType
+    }
+    @Override
+    protected void convert(BaseViewHolder helper, RechargeBean item) {
+        int type = helper.getItemViewType();
+
+        if (type == ITEM_TYPE_NORMAL) {
+            // 正常 item 显示逻辑
+            helper.setText(R.id.tv_gold_num, item.getGoldNum());
+            helper.setText(R.id.tv_money, String.format("¥%s", item.getMoney()));
+            if (selectedPosition == helper.getAdapterPosition()) {
+                helper.setBackgroundRes(R.id.cl_item, com.qxcm.moduleutil.R.drawable.bg_10_white_sele);
+            } else {
+                helper.setBackgroundRes(R.id.cl_item, com.qxcm.moduleutil.R.drawable.bg_r10_white);
+            }
+
+            helper.getView(R.id.cl_item).setOnClickListener(v -> {
+                selectedPosition = helper.getAdapterPosition();
+                if (listener != null) {
+                    listener.onClick(item);
+                }
+                notifyDataSetChanged();
+
+                // 隐藏输入框
+                if (inputBoxVisibilityListener != null) {
+                    inputBoxVisibilityListener.onInputBoxVisibilityChanged(false);
+                }
+            });
+        } else if (type == ITEM_TYPE_FOOTER) {
+            helper.setText(R.id.tv_gold_num, "自定义");
+            helper.getView(R.id.tv_gold_num).setOnClickListener(v -> {
+                clearSelect(); // 清除所有选中状态
+                notifyDataSetChanged();
+
+                // 显示输入框
+                if (inputBoxVisibilityListener != null) {
+                    inputBoxVisibilityListener.onInputBoxVisibilityChanged(true);
+                }
+            });
+        }
+    }
+
+    public interface OnRechargeItemClickListener {
+        void onClick(RechargeBean rechargeBean);
+    }
+
+    public void setListener(OnRechargeItemClickListener listener) {
+        this.listener = listener;
+    }
+
+    public interface InputBoxVisibilityListener {
+        void onInputBoxVisibilityChanged(boolean isVisible);
+    }
+
+    public void setInputBoxVisibilityListener(InputBoxVisibilityListener listener) {
+        this.inputBoxVisibilityListener = listener;
+    }
+
+    /**
+     * 取消所有选中
+     */
+    public void clearSelect() {
+        selectedPosition = -1;
+        notifyDataSetChanged();
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
new file mode 100644
index 00000000..990f6de5
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
@@ -0,0 +1,70 @@
+package com.example.modulevocal.adapter;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.BlackUserBean;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+import java.util.List;
+/**
+ *@author qx
+ *@data 2025/5/19
+ *@description: 黑名单、关注、粉丝列表适配器
+ */
+public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder> {
+
+    // 定义接口用于回调点击事件
+    public interface OnItemClickListener {
+        void onItemClick(BlackUserBean item);
+    }
+
+    private OnItemClickListener onItemClickListener;
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.onItemClickListener = listener;
+    }
+
+    public BlackAdapter() {
+        super(R.layout.item_black);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, BlackUserBean item) {
+        ImageUtils.loadHeadCC(item.getUserAvatar(), helper.getView(R.id.im_user));
+        helper.setText(R.id.tv_nick_name, item.getUserName());
+        ImageView imageView= helper.getView(R.id.im_g);
+        // 根据 type 设置图片资源
+        // 根据 type 和 status 设置图片资源
+        if (item.getType() == 0) { // 关注
+            if (item.getStatus() == 0) {
+                imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.yigz);
+            } else {
+                imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.gz);
+            }
+        } else if (item.getType() == 1) { // 黑名单
+            imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.yic);
+        } else if (item.getType() == 2) { // 粉丝
+            if (item.getStatus() == 0) {
+                imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.hg);
+            } else {
+                imageView.setImageResource(com.qxcm.moduleutil.R.mipmap.yigz);
+            }
+        }
+        // 设置点击事件
+        imageView.setOnClickListener(v -> {
+            if (onItemClickListener != null) {
+                onItemClickListener.onItemClick(item);
+            }
+        });
+
+
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFollowAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFollowAdapter.java
new file mode 100644
index 00000000..c95527fe
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFollowAdapter.java
@@ -0,0 +1,84 @@
+package com.example.modulevocal.adapter;
+
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+import java.util.List;
+
+public class ChatRoomMyFollowAdapter extends BaseQuickAdapter<AttentionResp, BaseViewHolder> {
+
+    private int index = -1;
+
+    public ChatRoomMyFollowAdapter() {
+        super(R.layout.room_index_item_chatroom_my_foot);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, AttentionResp item) {
+//        ImageUtils.loadGift(helper.getView(R.id.iv_hot), ImageUtils.ANIM);
+//        ImageUtils.loadHeadCC(item.getRoomPicture(), helper.getView(com.qpyy.module.index.R.id.riv_user_head));
+//        if (TextUtils.isEmpty(item.getLabel_icon())) {
+//            helper.setGone(com.qpyy.module.index.R.id.iv_room_labe, false);
+//        } else {
+//            helper.setGone(com.qpyy.module.index.R.id.iv_room_labe, true);
+//            ImageUtils.loadImageView(item.getLabel_icon(), helper.getView(com.qpyy.module.index.R.id.iv_room_labe));
+//        }
+//        helper.setText(com.qpyy.module.index.R.id.tv_room_name, item.getRoom_name());
+//        helper.setText(com.qpyy.module.index.R.id.tv_room_id, "ID: " + item.getRoom_code());
+//        helper.setText(com.qpyy.module.index.R.id.tv_popularity, item.getPopularity());
+//        helper.addOnClickListener(com.qpyy.module.index.R.id.tv_clean);
+//        helper.setVisible(com.qpyy.module.index.R.id.rl_lock, item.getLocked() == 1);
+//        if (helper.getAdapterPosition() % 3 == 1) {
+//            helper.setBackgroundRes(com.qpyy.module.index.R.id.iv_follow_bg, index == helper.getAdapterPosition() ? com.qpyy.module.index.R.mipmap.index_follow_bg_tow_select : com.qpyy.module.index.R.mipmap.index_follow_bg_tow_normal);
+//        } else if (helper.getAdapterPosition() % 3 == 2) {
+//            helper.setBackgroundRes(com.qpyy.module.index.R.id.iv_follow_bg,index == helper.getAdapterPosition()? com.qpyy.module.index.R.mipmap.index_follow_bg_three_select: com.qpyy.module.index.R.mipmap.index_follow_bg_three_normal);
+//        } else {
+//            helper.setBackgroundRes(com.qpyy.module.index.R.id.iv_follow_bg, index == helper.getAdapterPosition()? com.qpyy.module.index.R.mipmap.index_follow_bg_one_select : com.qpyy.module.index.R.mipmap.index_follow_bg_one_normal);
+//        }
+//        if (index == helper.getAdapterPosition()) {
+//            helper.getView(com.qpyy.module.index.R.id.tv_clean).setVisibility(View.VISIBLE);
+//        } else {
+//            helper.getView(com.qpyy.module.index.R.id.tv_clean).setVisibility(View.GONE);
+//        }
+
+        ImageUtils.loadHeadCC(item.getRoomPicture(), helper.getView(R.id.iv_follow_bg));
+//        if (TextUtils.isEmpty(item.getLabel_icon())) {
+//            helper.setGone(R.id.iv_room_labe, false);
+//        } else {
+//            helper.setGone(R.id.iv_room_labe, true);
+//            ImageUtils.loadImageView(item.getLabel_icon(), helper.getView(R.id.iv_room_labe));
+//        }
+        if (item.getLabel_id().equals("23")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
+        }else if (item.getLabel_id().equals("108")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
+        }else if (item.getLabel_id().equals("101")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.youxi);
+        }else if (item.getLabel_id().equals("120")){//女神
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nvshen);
+        }else if (item.getLabel_id().equals("121")){//男神
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nans);
+        }
+//        ImageUtils.loadGift(helper.getView(R.id.iv_hot), ImageUtils.ANIM);
+        helper.setText(R.id.tv_name, item.getRoom_name());
+        helper.setText(R.id.tv_id, "ID: " + item.getRoom_id());
+        helper.setText(R.id.tv_num, item.getPopularity());
+
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public void setNewData(@Nullable List<AttentionResp> data) {
+        index = -1;
+        super.setNewData(data);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFootAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFootAdapter.java
new file mode 100644
index 00000000..1f50c272
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFootAdapter.java
@@ -0,0 +1,49 @@
+package com.example.modulevocal.adapter;
+
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+/**
+ * 历史记录
+ */
+public class ChatRoomMyFootAdapter extends BaseQuickAdapter<MyFootResp, BaseViewHolder> {
+
+    public ChatRoomMyFootAdapter() {
+        super(R.layout.room_index_item_chatroom_my_foot);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, MyFootResp item) {
+        ImageUtils.loadHeadCC(item.getRoomPicture(), helper.getView(R.id.iv_follow_bg));
+//        if (TextUtils.isEmpty(item.getLabel_icon())) {
+//            helper.setGone(R.id.iv_room_labe, false);
+//        } else {
+//            helper.setGone(R.id.iv_room_labe, true);
+//            ImageUtils.loadImageView(item.getLabel_icon(), helper.getView(R.id.iv_room_labe));
+//        }
+        if (item.getLabel_id().equals("23")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
+        }else if (item.getLabel_id().equals("108")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.youxi);
+        }else if (item.getLabel_id().equals("101")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.youxi);
+        } else if (item.getLabel_id().equals("120")){//女神
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nvshen);
+        }else if (item.getLabel_id().equals("121")){//男神
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nans);
+        }
+//        ImageUtils.loadGift(helper.getView(R.id.iv_hot), ImageUtils.ANIM);
+        helper.setText(R.id.tv_name, item.getRoom_name());
+//        helper.setText(R.id.tv_id, "ID: " + item.getRoom_id());
+        helper.setText(R.id.tv_num, item.getPopularity());
+        ImageView iv = helper.getView(R.id.iv_play);
+        ImageUtils.loadRes(com.qxcm.moduleutil.R.drawable.voice_play, iv);
+//        helper.setVisible(R.id.rl_lock, item.getLocked() == 1);
+//        helper.setGone(R.id.tv_clean, false);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyManageAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyManageAdapter.java
new file mode 100644
index 00000000..20df0f23
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyManageAdapter.java
@@ -0,0 +1,59 @@
+package com.example.modulevocal.adapter;
+
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+import java.util.List;
+
+public class ChatRoomMyManageAdapter extends BaseQuickAdapter<ManageRoomResp, BaseViewHolder> {
+
+    private int index = -1;
+
+    public ChatRoomMyManageAdapter() {
+        super(R.layout.room_index_item_chatroom_my_foot);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, ManageRoomResp item) {
+        ImageUtils.loadHeadCC(item.getRoomPicture(), helper.getView(R.id.iv_follow_bg));
+//        if (TextUtils.isEmpty(item.getLabel_icon())) {
+//            helper.setGone(R.id.iv_room_labe, false);
+//        } else {
+//            helper.setGone(R.id.iv_room_labe, true);
+//            ImageUtils.loadImageView(item.getLabel_icon(), helper.getView(R.id.iv_room_labe));
+//        }
+        if (item.getLabel_id().equals("23")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
+        }else if (item.getLabel_id().equals("108")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
+        }else if (item.getLabel_id().equals("101")){
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.youxi);
+        }else if (item.getLabel_id().equals("120")){//女神
+            helper.setImageResource(R.id.iv_type,com.qxcm.moduleutil.R.mipmap.nvshen);
+        }else if (item.getLabel_id().equals("121")){//男神
+            helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nans);
+        }
+//        ImageUtils.loadGift(helper.getView(R.id.iv_hot), ImageUtils.ANIM);
+        helper.setText(R.id.tv_name, item.getRoom_name());
+        helper.setText(R.id.tv_id, "ID: " + item.getRoom_id());
+        helper.setText(R.id.tv_num, item.getPopularity());
+
+//        }
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public void setNewData(@Nullable List<ManageRoomResp> data) {
+        index = -1;
+        super.setNewData(data);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomAllowanceDetailAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomAllowanceDetailAdapter.java
new file mode 100644
index 00000000..2e602190
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomAllowanceDetailAdapter.java
@@ -0,0 +1,43 @@
+package com.example.modulevocal.adapter;
+
+
+import static com.qxcm.moduleutil.utils.UtilConfig.getContext;
+
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.RoomSubsidyDetails;
+
+import java.util.List;
+
+public class RoomAllowanceDetailAdapter extends BaseQuickAdapter<RoomSubsidyDetails, BaseViewHolder> {
+    public RoomAllowanceDetailAdapter() {
+        super(R.layout.room_index_item_subsidy);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, RoomSubsidyDetails item) {
+        helper.setText(R.id.tv_data, item.getStart_time() + "-" + item.getEnd_time());
+        helper.setText(R.id.tv_lj, item.getTotal_transaction());
+        helper.setText(R.id.tv_bt, item.getSubsidy_amount());
+        TextView tv_status = helper.getView(R.id.tv_status);
+        if (item.getStatus().equals("1")) {
+            tv_status.setText("已发放");
+            tv_status.setTextColor(getContext().getResources().getColor(com.qxcm.moduleutil.R.color.color_FF999999));
+        } else {
+            tv_status.setText("未发放");
+            tv_status.setTextColor(getContext().getResources().getColor(com.qxcm.moduleutil.R.color.color_45d08c));
+        }
+
+    }
+
+    @Override
+    public void setNewData(@Nullable List<RoomSubsidyDetails> data) {
+        super.setNewData(data);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomDetailsAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomDetailsAdapter.java
new file mode 100644
index 00000000..7038ef99
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomDetailsAdapter.java
@@ -0,0 +1,54 @@
+package com.example.modulevocal.adapter;
+
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.details.BaseMultiItemEntity;
+import com.qxcm.moduleutil.bean.details.RoomDeatailList;
+import com.qxcm.moduleutil.bean.details.RoomDeatil;
+import com.qxcm.moduleutil.utils.ImageUtils;
+import com.qxcm.moduleutil.widget.GifAvatarOvalView;
+
+import java.util.List;
+
+
+public class RoomDetailsAdapter extends BaseMultiItemQuickAdapter<BaseMultiItemEntity, BaseViewHolder> {
+    private static final int TYPE_DATE_HEADER = 1;
+    private static final int TYPE_GIFT_ITEM = 2;
+
+    public RoomDetailsAdapter(List<BaseMultiItemEntity> data) {
+        super(data);
+        addItemType(BaseMultiItemEntity.TYPE_A, R.layout.item_date_header);
+        addItemType(BaseMultiItemEntity.TYPE_B, R.layout.room_details_list);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, BaseMultiItemEntity item) {
+        switch (helper.getItemViewType()) {
+            case TYPE_DATE_HEADER:
+                RoomDeatailList roomDetailList = (RoomDeatailList) item;
+                helper.setText(R.id.tv6, roomDetailList.getTime());
+                helper.setText(R.id.tv8, roomDetailList.getTotal_earning() + "");
+                helper.setText(R.id.tve, roomDetailList.getTotal_price()+"");
+                break;
+            case TYPE_GIFT_ITEM:
+                RoomDeatil item1 = (RoomDeatil) item;
+                GifAvatarOvalView avatarView = helper.getView(R.id.riv);
+                TextView tvName = helper.getView(R.id.tv_name);
+                TextView tv2 = helper.getView(R.id.tv_2);
+                TextView tv3 = helper.getView(R.id.tv_3);
+                TextView tv_go_to_room = helper.getView(R.id.tv_go_to_room);
+                ImageUtils.loadImageView(item1.getUser_head_picture(), avatarView);
+                tvName.setText(item1.getUser_nickname());
+                tv2.setText(item1.getGet_user_nickname());
+                tv3.setText(item1.getGift_name() + "x" + item1.getGift_number());
+                tv_go_to_room.setText(item1.getTotal_price() + "");
+                break;
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
new file mode 100644
index 00000000..71fdf6af
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
@@ -0,0 +1,24 @@
+package com.example.modulevocal.adapter;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.GiftBean;
+import com.qxcm.moduleutil.utils.ImageLoader;
+
+public class UserGiftWallAdapter extends BaseQuickAdapter<GiftBean, BaseViewHolder> {
+
+
+    public UserGiftWallAdapter() {
+        super(R.layout.me_item_user_gift_wall);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, GiftBean item) {
+        ImageLoader.loadImage(mContext, helper.getView(R.id.riv_user_head), item.getPicture());
+        helper.setText(R.id.tv_gift_name, item.getName()).setText(R.id.tv_number, "x"+item.getNumber());
+        helper.setText(R.id.tv_price33, item.getPrice());
+    }
+
+
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserPhotoWallAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/UserPhotoWallAdapter.java
new file mode 100644
index 00000000..f50d47e9
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/UserPhotoWallAdapter.java
@@ -0,0 +1,55 @@
+package com.example.modulevocal.adapter;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.UserImgList;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+public class UserPhotoWallAdapter extends BaseQuickAdapter<UserImgList, BaseViewHolder> {
+    private boolean b = false;
+    private int longClickPos = -1;
+
+    public UserPhotoWallAdapter() {
+        super(R.layout.me_item_user_photo_wall);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, UserImgList item) {
+        if (helper.getAdapterPosition() == 5) {
+            helper.setVisible(R.id.riv_user_head, false);
+            helper.setVisible(R.id.iv_close, false);
+        } else {
+            helper.setVisible(R.id.riv_user_head, true);
+            if (!"0".equals(item.getId())) {
+                ImageUtils.loadCenterCrop(item.getUrl(), helper.getView(R.id.riv_user_head));
+                if (longClickPos == helper.getAdapterPosition()) {
+                    helper.setVisible(R.id.iv_close, true);
+                } else {
+                    helper.setVisible(R.id.iv_close, false);
+                }
+            } else {
+                helper.setImageResource(R.id.riv_user_head, com.qxcm.moduleutil.R.mipmap.add_img);
+                helper.setGone(R.id.iv_close, false);
+            }
+        }
+        helper.addOnClickListener(R.id.iv_close);
+        helper.addOnClickListener(R.id.riv_user_head);
+        helper.addOnLongClickListener(R.id.riv_user_head);
+    }
+
+
+    public void setDelete(boolean b) {
+        this.b = b;
+        notifyDataSetChanged();
+    }
+
+    public void setLongClickPos(int pos) {
+        this.longClickPos = pos;
+        notifyDataSetChanged();
+    }
+
+    public boolean getDelete() {
+        return b;
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/BriefIntroductionConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/BriefIntroductionConacts.java
new file mode 100644
index 00000000..c5910832
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/BriefIntroductionConacts.java
@@ -0,0 +1,14 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class BriefIntroductionConacts {
+    public interface View extends IView<Activity> {
+    }
+
+    public interface IMePre extends IPresenter {
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangeNicknameConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangeNicknameConacts.java
new file mode 100644
index 00000000..9f569cfc
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangeNicknameConacts.java
@@ -0,0 +1,16 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class ChangeNicknameConacts {
+    public interface View extends IView<Activity> {
+
+    }
+
+    public interface IMePre extends IPresenter {
+
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangePasswordConactos.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangePasswordConactos.java
new file mode 100644
index 00000000..56e6c4e9
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangePasswordConactos.java
@@ -0,0 +1,19 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public final class ChangePasswordConactos {
+    public interface View extends IView<Activity> {
+       void sendCodeSuccess1(String phoneNumber);
+        void sendCodeSuccess(String s);
+    }
+
+    public interface ICreatedPre extends IPresenter {
+        void sendCode(String phoneNumber, String type);
+
+        void changePassword(String new_password,String mobile,String code,String userId);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/CreatedRoomConactos.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/CreatedRoomConactos.java
new file mode 100644
index 00000000..2dd0e811
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/CreatedRoomConactos.java
@@ -0,0 +1,35 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.CheckTxtResp;
+
+import java.io.File;
+import java.util.List;
+
+public final class CreatedRoomConactos {
+
+
+    public interface View extends IView<Activity> {
+        void checkTxtSuccess(CheckTxtResp result);
+
+        void addUserRoomSuccess(String roomId);
+
+
+        void upLoadSuccess(String url, int type);
+    }
+
+
+    public interface ICreatedRoomPre extends IPresenter {
+        void checkTxt(String content);
+
+        void addUserRoom(String roomName, String labelId,String cover_picture);
+
+        void roomLabel(String from);
+
+        void uploadFile(File file, int type);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/CurrencyExchangeConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/CurrencyExchangeConacts.java
new file mode 100644
index 00000000..80898357
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/CurrencyExchangeConacts.java
@@ -0,0 +1,16 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class CurrencyExchangeConacts {
+    public interface View extends IView<Activity> {
+
+    }
+
+    public interface IMePre extends IPresenter {
+
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/EditUserConactos.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/EditUserConactos.java
new file mode 100644
index 00000000..74858581
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/EditUserConactos.java
@@ -0,0 +1,19 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+import java.io.File;
+
+public class EditUserConactos {
+
+    public interface View extends IView<Activity> {
+        void upLoadSuccess(String url, int type);
+    }
+
+    public interface IMePre extends IPresenter {
+        void uploadFile(File file, int type);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyBagConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/MyBagConacts.java
new file mode 100644
index 00000000..eb3879a7
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/MyBagConacts.java
@@ -0,0 +1,15 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class MyBagConacts {
+
+    public interface View extends IView<Activity> {
+    }
+
+    public interface IMePre extends IPresenter {
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java
new file mode 100644
index 00000000..601ae4ad
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java
@@ -0,0 +1,16 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+import java.io.File;
+
+public final class MyMoneyConactos {
+    public interface View extends IView<Activity> {
+    }
+
+    public interface IMePre extends IPresenter {
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyRoomListContacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/MyRoomListContacts.java
new file mode 100644
index 00000000..08e76958
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/MyRoomListContacts.java
@@ -0,0 +1,62 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.bean.RoomDetails;
+
+import java.util.List;
+
+public final class MyRoomListContacts {
+
+    public interface View extends IView<Activity> {
+        void setMyInfo(MyRoomBean myRoom);
+
+        void setList(List<MyRoomBean> list, int type);
+
+        void delfootSuccess();
+
+        void setMyFootData(List<MyFootResp> data, int page);
+        void finishRefresh();
+
+        void setManageData(List<ManageRoomResp> data);
+
+        void setAttentionListData(List<AttentionResp> attentionResps);
+    }
+
+    public interface IRankingListPre extends IPresenter {
+        void getCharmList( int type);
+
+        void getWealthList( int type);
+
+        void getRoomList( int type);
+        void getNameAuthResult(int type);
+
+        void delfoot();
+
+        void getMyFoot(int page);
+
+        void getManageLists();
+
+        void getAttentionList();
+    }
+
+    public interface DeatilsView extends IView<Activity> {
+
+        void setList(RoomDetails list);
+        void finishRefresh();
+
+    }
+
+    public interface DeatilsListPre extends IPresenter {
+        void getCharmList(String room_id, String stime, String etime, String p,int type);
+
+    }
+
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RechargeConactos.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/RechargeConactos.java
new file mode 100644
index 00000000..712cc580
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/RechargeConactos.java
@@ -0,0 +1,15 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class RechargeConactos {
+    public interface View extends IView<Activity> {
+
+    }
+
+    public interface IRechargePre extends IPresenter {
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RoomAllowanceContacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/RoomAllowanceContacts.java
new file mode 100644
index 00000000..d702f3f0
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/RoomAllowanceContacts.java
@@ -0,0 +1,26 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.RoomSubsidy;
+import com.qxcm.moduleutil.bean.RoomSubsidyDetails;
+
+import java.util.List;
+
+public class RoomAllowanceContacts {
+
+    public interface DeatilsView extends IView<Activity> {
+        void setList(RoomSubsidy list);
+
+        void setHishoryList(List<RoomSubsidyDetails> list);
+        void finishRefresh();
+    }
+
+    public interface DeatilsListPre extends IPresenter {
+        void getCharmList(String room_id);
+
+        void getDetails(String room_id, String page);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/UserGiftWallConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/UserGiftWallConacts.java
new file mode 100644
index 00000000..2c449219
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/UserGiftWallConacts.java
@@ -0,0 +1,23 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.GiftBean;
+
+import java.util.List;
+
+public final class UserGiftWallConacts {
+
+
+    public interface View extends IView<Activity> {
+        void setGiftWall(List<GiftBean> data);
+    }
+
+
+    public interface IUserGiftWallPre extends IPresenter {
+        void giftWall(String userId);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/UserHomepageConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/UserHomepageConacts.java
new file mode 100644
index 00000000..23003e4c
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/UserHomepageConacts.java
@@ -0,0 +1,25 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+import com.qxcm.moduleutil.bean.CircleListBean;
+import com.qxcm.moduleutil.bean.UserHomeResp;
+
+import java.util.List;
+
+public class UserHomepageConacts {
+
+    public interface View extends IView<Activity> {
+        void setUserDetails(UserHomeResp data);
+        void setCircleList(List<CircleListBean> list);
+    }
+
+    public interface IMePre extends IPresenter {
+
+        void getUserDetails(String userId, String emchatUsername, boolean showLoading);//获取用户数据
+
+        void getCircleList();
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/WithdrawalConacts.java b/modulevocal/src/main/java/com/example/modulevocal/conacts/WithdrawalConacts.java
new file mode 100644
index 00000000..d721d536
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/conacts/WithdrawalConacts.java
@@ -0,0 +1,17 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public final class WithdrawalConacts {
+
+    public interface View extends IView<Activity> {
+
+    }
+
+    public interface IMePre extends IPresenter {
+
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java
new file mode 100644
index 00000000..bad5b507
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java
@@ -0,0 +1,58 @@
+package com.example.modulevocal.fragment;
+
+import android.app.Activity;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.UserHomepageConacts;
+import com.example.modulevocal.databinding.FragmentCirleListBinding;
+import com.example.modulevocal.presenter.UserHomepagePresenter;
+import com.qxcm.moduleutil.adapter.CirleListAdapter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.CircleListBean;
+import com.qxcm.moduleutil.bean.UserHomeResp;
+
+import java.util.List;
+
+
+public class CirleListFragment extends BaseMvpFragment<UserHomepagePresenter, FragmentCirleListBinding> implements UserHomepageConacts.View{
+
+    public static CirleListFragment newInstance() {
+        return new CirleListFragment();
+    }
+
+    private CirleListAdapter cirleListAdapter;
+
+    @Override
+    public void setUserDetails(UserHomeResp data) {
+
+    }
+
+    @Override
+    protected UserHomepagePresenter bindPresenter() {
+        return new UserHomepagePresenter(this,getSelfActivity());
+    }
+
+    @Override
+    protected void initData() {
+        MvpPre.getCircleList();
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        cirleListAdapter = new CirleListAdapter();
+        mBinding.recyclerView.setAdapter(cirleListAdapter);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_cirle_list;
+    }
+
+    @Override
+    public void setCircleList(List<CircleListBean> list) {
+        cirleListAdapter.setNewData(list);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyCreateFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyCreateFragment.java
new file mode 100644
index 00000000..ec842191
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyCreateFragment.java
@@ -0,0 +1,288 @@
+package com.example.modulevocal.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.example.modulevocal.activity.RoomDetailsActivity;
+import com.example.modulevocal.adapter.ChatRoomMyFootAdapter;
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.example.modulevocal.databinding.RoomFragmentMyCreateBinding;
+import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.hjq.toast.ToastUtils;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.utils.ImageUtils;
+import com.qxcm.moduleutil.widget.CommonEmptyView;
+import com.qxcm.moduleutil.widget.dialog.CommonDialog;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.List;
+
+/**
+ *我创建的房间列表和足迹列表
+ */
+public class MyCreateFragment extends BaseMvpFragment<MyRoomPresenter, RoomFragmentMyCreateBinding> implements MyRoomListContacts.View {
+    public static final int TYPE_CREATE = 0;
+    public static final int TYPE_HOST = 1;
+    private int type;
+    private BaseQuickAdapter<MyRoomBean, BaseViewHolder> mAdapter;
+    private int page = 1;
+    private ChatRoomMyFootAdapter mChatRoomMyFootAdapter;
+    public static MyCreateFragment newInstance(int type) {
+        MyCreateFragment fragment = new MyCreateFragment();
+        Bundle args = new Bundle();
+        args.putInt("type", type);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    protected MyRoomPresenter bindPresenter() {
+        return new MyRoomPresenter(this, getContext());
+    }
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        type = arguments.getInt("type", MyCreateFragment.TYPE_CREATE);
+    }
+    @Override
+    protected void initData() {
+        if (type == MyCreateFragment.TYPE_CREATE) {
+            MvpPre.getCharmList(0);//我创建的
+            MvpPre.getMyFoot(page);
+        } else if (type == MyCreateFragment.TYPE_HOST) {
+            MvpPre.getWealthList(1);
+        }
+    }
+    private void showDelFootDialog() {
+        if (isAdded() && getActivity() != null) {
+            CommonDialog commonDialog = new CommonDialog(getActivity());
+            commonDialog.setContent("确认清空您的足迹吗？");
+            commonDialog.setmOnClickListener(new CommonDialog.OnClickListener() {
+                @Override
+                public void onLeftClick() {
+
+                }
+
+                @Override
+                public void onRightClick() {
+                    MvpPre.delfoot();
+                }
+            });
+            commonDialog.show();
+        }
+    }
+    @Override
+    protected void initView() {
+        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                page++;
+                MvpPre.getMyFoot(page);
+            }
+
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+//                EventBus.getDefault().post(new BannerRefreshEvent());
+                page = 1;
+                MvpPre.getMyFoot(page);
+            }
+        });
+        mBinding.ivDeleteFoot.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showDelFootDialog();
+                //A0404点击删除我的足迹
+            }
+        });
+
+        mBinding.recycleViewFoot.setLayoutManager(new GridLayoutManager(getContext(),2));
+        mBinding.recycleViewFoot.setAdapter(mChatRoomMyFootAdapter = new ChatRoomMyFootAdapter());
+        mChatRoomMyFootAdapter.bindToRecyclerView(mBinding.recycleViewFoot);
+        CommonEmptyView commonEmptyView = new CommonEmptyView(getContext());
+        commonEmptyView.setEmptyText("亲亲，你还没去过任何房间哦~赶快动起来吧！");
+        commonEmptyView.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FFBDBDBC));
+        mChatRoomMyFootAdapter.setEmptyView(commonEmptyView);
+
+
+        mChatRoomMyFootAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                MyFootResp item = mChatRoomMyFootAdapter.getItem(position);
+                if (item != null) {
+//                    ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "历史记录列表").withString("roomId", item.getRoom_id()).navigation();
+                }
+            }
+        });
+
+        mBinding.rvMyRoomList.setLayoutManager(new LinearLayoutManager(getContext()));
+        mAdapter = new BaseQuickAdapter<MyRoomBean, BaseViewHolder>(R.layout.room_fragment_my_room_list, null) {
+            @Override
+            protected void convert(BaseViewHolder helper, MyRoomBean item) {
+                if (item.getCover_picture() == null||item.getCover_picture().equals("")) {
+                    helper.setImageResource(R.id.riv, com.qxcm.moduleutil.R.mipmap.default_avatar);
+                } else {
+                    ImageUtils.loadImageView(item.getCover_picture(), helper.getView(R.id.riv));
+                }
+                if (item.getLabel_icon()!=null) {
+                    ImageUtils.loadImageView(item.getLabel_icon(), helper.getView(R.id.iv_play));
+                }
+
+                helper.setText(R.id.tv_name, item.getRoom_name());
+                helper.setText(R.id.tv_sy, item.getToday_income()+"");
+                helper.setText(R.id.tv_user_id, "ID: " + item.getRoom_id());
+                if (type == MyRoomListFragment.TYPE_CREATE) {
+                    helper.setText(R.id.tv_bl, "今日收益");
+                } else if (type == MyRoomListFragment.TYPE_HOST) {
+                    helper.setText(R.id.tv_bl, "收益分成比例: " + item.getEarnings_ratio() + "%");
+                }
+
+                String concernText = "关注:" + item.getFavorite_count();
+                SpannableString spannableString = new SpannableString(concernText);
+                // 设置关注数字部分的颜色为黑色
+                spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), android.R.color.black)), 2, concernText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                helper.setText(R.id.tv_gz, spannableString);
+
+                String concernText1 = "在线:" + item.getOnline_num();
+                SpannableString spannableString1 = new SpannableString(concernText1);
+                // 设置关注数字部分的颜色为黑色
+                spannableString1.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), android.R.color.black)), 2, concernText1.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                helper.setText(R.id.tv_zx, spannableString1);
+
+                String concernText2 = "访问:" + item.getCome_count();
+                SpannableString spannableString2 = new SpannableString(concernText2);
+                // 设置关注数字部分的颜色为黑色
+                spannableString2.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), android.R.color.black)), 2, concernText2.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                helper.setText(R.id.tv_fw, spannableString2);
+
+                helper.getView(R.id.rl_mx).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // TODO: 跳转到房间详情页面
+
+                        startActivity(new Intent(getContext(),RoomDetailsActivity.class));
+//                        ARouter.getInstance().build(ARouteConstants.MY_ROOM_DETAIL).withString("roomId", item.getRoom_id() + "").withInt("type",type ).navigation();
+                    }
+                });
+                helper.getView(R.id.cl_my_room_list).setOnClickListener(new View.OnClickListener() {//跳转房间
+                    @Override
+                    public void onClick(View v) {
+                        // TODO: 跳转到房间
+//                        ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    }
+                });
+                switch (helper.getLayoutPosition() % 3) {
+                    case 0:
+                        helper.getView(R.id.cl_my_room_list).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.my_cr_room1);
+                        break;
+                    case 1:
+                        helper.getView(R.id.cl_my_room_list).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.my_croom2);
+                        break;
+                    case 2:
+                        helper.getView(R.id.cl_my_room_list).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.my_croom3);
+                        break;
+                }
+
+            }
+        };
+        mBinding.rvMyRoomList.setAdapter(mAdapter);
+        mAdapter.bindToRecyclerView(mBinding.rvMyRoomList);
+
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.room_fragment_my_create;
+    }
+
+    @Override
+    public void setMyInfo(MyRoomBean myRoom) {
+
+    }
+
+    @Override
+    public void setList(List<MyRoomBean> list, int type) {
+        // TODO: 刷新列表
+        if (type == MyCreateFragment.TYPE_CREATE) {
+            if (list.isEmpty()) {
+                mBinding.rvMyRoomList.setVisibility(View.GONE);
+                mBinding.tvNoData.setVisibility(View.VISIBLE);
+            } else {
+                mBinding.rvMyRoomList.setVisibility(View.VISIBLE);
+                mBinding.tvNoData.setVisibility(View.GONE);
+                mAdapter.setNewData(list);
+            }
+
+        } else if (type == MyCreateFragment.TYPE_HOST) {
+            if (list.isEmpty()) {
+                mBinding.rvMyRoomList.setVisibility(View.GONE);
+                mBinding.tvNoData.setVisibility(View.VISIBLE);
+            } else {
+                mBinding.rvMyRoomList.setVisibility(View.VISIBLE);
+                mBinding.tvNoData.setVisibility(View.GONE);
+                mAdapter.setNewData(list);
+            }
+
+        }
+    }
+
+    @Override
+    public void delfootSuccess() {
+        page = 1;
+        MvpPre.getMyFoot(page);
+        ToastUtils.show("清空足迹成功");
+    }
+
+    @Override
+    public void setMyFootData(List<MyFootResp> data, int page) {
+//        if (data == null || data.size() == 0) {
+//            mBinding.ivDeleteFoot.setVisibility(View.GONE);
+//        } else {
+//            mBinding.ivDeleteFoot.setVisibility(View.VISIBLE);
+//        }
+        if (page == 1) {
+            mChatRoomMyFootAdapter.setNewData(data);
+        } else {
+            if (data == null || data.size() == 0) {
+                mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData();
+            } else {
+                mChatRoomMyFootAdapter.addData(data);
+            }
+        }
+    }
+
+    @Override
+    public void finishRefresh() {
+        mBinding.smartRefreshLayout.finishRefresh();
+        mBinding.smartRefreshLayout.finishLoadMore();
+    }
+
+    @Override
+    public void setManageData(List<ManageRoomResp> data) {
+
+    }
+
+    @Override
+    public void setAttentionListData(List<AttentionResp> attentionResps) {
+
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java
new file mode 100644
index 00000000..c541d165
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java
@@ -0,0 +1,117 @@
+package com.example.modulevocal.fragment;
+
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.ChatRoomMyFollowAdapter;
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.example.modulevocal.databinding.RoomFragmentMyFollowBinding;
+import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.widget.CommonEmptyView;
+
+import java.util.List;
+
+/**
+ *我的关注房间
+ */
+public class MyFollowFragment extends BaseMvpFragment<MyRoomPresenter, RoomFragmentMyFollowBinding> implements MyRoomListContacts.View {
+    public static final int TYPE_GZ = 3;
+    private int type;
+    private ChatRoomMyFollowAdapter followAdapter;
+
+    public static MyFollowFragment newInstance(int type) {
+        MyFollowFragment fragment = new MyFollowFragment();
+        Bundle args = new Bundle();
+        args.putInt("type", type);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    protected MyRoomPresenter bindPresenter() {
+        return new MyRoomPresenter(this, getActivity());
+    }
+
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        type = arguments.getInt("type", MyFollowFragment.TYPE_GZ);
+    }
+    @Override
+    protected void initData() {
+        if (type == MyFollowFragment.TYPE_GZ) {
+            MvpPre.getAttentionList();
+        }
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.recycleView.setLayoutManager(new GridLayoutManager(getContext(),2));
+        mBinding.recycleView.setAdapter(followAdapter = new ChatRoomMyFollowAdapter());
+        followAdapter.bindToRecyclerView(mBinding.recycleView);
+        CommonEmptyView commonEmptyView = new CommonEmptyView(getContext());
+        commonEmptyView.setEmptyText("亲亲，你还没管理任何房间哦~赶快动起来吧！");
+        commonEmptyView.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FFBDBDBC));
+        followAdapter.setEmptyView(commonEmptyView);
+
+        followAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                AttentionResp item = followAdapter.getItem(position);
+                if (item != null) {
+//                    ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "历史记录列表").withString("roomId", item.getRoom_id()).navigation();
+                }
+            }
+        });
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.room_fragment_my_follow;
+    }
+
+    @Override
+    public void setMyInfo(MyRoomBean myRoom) {
+
+    }
+
+    @Override
+    public void setList(List<MyRoomBean> list, int type) {
+
+    }
+
+    @Override
+    public void delfootSuccess() {
+
+    }
+
+    @Override
+    public void setMyFootData(List<MyFootResp> data, int page) {
+
+    }
+
+    @Override
+    public void finishRefresh() {
+
+    }
+
+    @Override
+    public void setManageData(List<ManageRoomResp> data) {
+
+    }
+
+    @Override
+    public void setAttentionListData(List<AttentionResp> attentionResps) {
+        followAdapter.setNewData(attentionResps);
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java
new file mode 100644
index 00000000..cf891528
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java
@@ -0,0 +1,119 @@
+package com.example.modulevocal.fragment;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.example.modulevocal.R;
+import com.example.modulevocal.adapter.ChatRoomMyManageAdapter;
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.example.modulevocal.databinding.RoomFragmentMyManageBinding;
+import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.widget.CommonEmptyView;
+
+import java.util.List;
+
+/**
+ * 我管理的房间
+ */
+public class MyManageFragment extends BaseMvpFragment<MyRoomPresenter, RoomFragmentMyManageBinding> implements MyRoomListContacts.View {
+
+    public static final int TYPE_GL = 2;
+    public static final int TYPE_GZ = 3;
+    private int type;
+    private ChatRoomMyManageAdapter manageAdapter;
+
+    public static MyManageFragment newInstance(int type) {
+        MyManageFragment fragment = new MyManageFragment();
+        Bundle args = new Bundle();
+        args.putInt("type", type);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    protected MyRoomPresenter bindPresenter() {
+        return new MyRoomPresenter(this, getActivity());
+    }
+
+
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        type = arguments.getInt("type", MyManageFragment.TYPE_GL);
+    }
+
+    @Override
+    protected void initData() {
+        if (type == MyManageFragment.TYPE_GL) {
+            MvpPre.getManageLists();
+        }
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.recycleView.setLayoutManager(new GridLayoutManager(getContext(),2));
+        mBinding.recycleView.setAdapter(manageAdapter = new ChatRoomMyManageAdapter());
+        manageAdapter.bindToRecyclerView(mBinding.recycleView);
+        CommonEmptyView commonEmptyView = new CommonEmptyView(getContext());
+        commonEmptyView.setEmptyText("亲亲，你还没管理任何房间哦~赶快动起来吧！");
+        commonEmptyView.setTextColor(getResources().getColor(com.qxcm.moduleutil.R.color.color_FFBDBDBC));
+        manageAdapter.setEmptyView(commonEmptyView);
+        manageAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                ManageRoomResp item = manageAdapter.getItem(position);
+                if (item != null) {
+//                    ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "历史记录列表").withString("roomId", item.getRoom_id()).navigation();
+                }
+            }
+        });
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.room_fragment_my_manage;
+    }
+
+    @Override
+    public void setMyInfo(MyRoomBean myRoom) {
+
+    }
+
+    @Override
+    public void setList(List<MyRoomBean> list, int type) {
+
+    }
+
+    @Override
+    public void delfootSuccess() {
+
+    }
+
+    @Override
+    public void setMyFootData(List<MyFootResp> data, int page) {
+
+    }
+
+    @Override
+    public void finishRefresh() {
+
+    }
+
+    @Override
+    public void setManageData(List<ManageRoomResp> data) {
+        manageAdapter.setNewData(data);
+    }
+
+    @Override
+    public void setAttentionListData(List<AttentionResp> attentionResps) {
+
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyRoomListFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyRoomListFragment.java
new file mode 100644
index 00000000..52af4ae9
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyRoomListFragment.java
@@ -0,0 +1,220 @@
+package com.example.modulevocal.fragment;
+
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.example.modulevocal.databinding.RoomFragmentMyRoomListListBinding;
+import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.AttentionResp;
+import com.qxcm.moduleutil.bean.ManageRoomResp;
+import com.qxcm.moduleutil.bean.MyFootResp;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+import java.util.List;
+
+/**
+ * A fragment representing a list of Items.
+ * 我主持的房间列表
+ */
+public class MyRoomListFragment extends BaseMvpFragment<MyRoomPresenter, RoomFragmentMyRoomListListBinding> implements MyRoomListContacts.View {
+
+    public static final int TYPE_CREATE = 0;
+    public static final int TYPE_HOST = 1;
+    private int type;
+    private BaseQuickAdapter<MyRoomBean, BaseViewHolder> mAdapter;
+
+    // TODO: Customize parameter initialization
+    @SuppressWarnings("unused")
+    public static MyRoomListFragment newInstance(int type) {
+        MyRoomListFragment fragment = new MyRoomListFragment();
+        Bundle args = new Bundle();
+        args.putInt("type", type);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    protected MyRoomPresenter bindPresenter() {
+        return new MyRoomPresenter(this, getActivity());
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+//        EventBus.getDefault().register(this);
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onDestroyView() {
+//        EventBus.getDefault().unregister(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        type = arguments.getInt("type", MyRoomListFragment.TYPE_CREATE);
+    }
+
+    @Override
+    protected void initData() {
+        if (type == MyRoomListFragment.TYPE_CREATE) {
+            MvpPre.getCharmList(0);//我创建的
+        } else if (type == MyRoomListFragment.TYPE_HOST) {
+            MvpPre.getWealthList(1);
+        }
+    }
+
+    @Override
+    protected void initView() {
+
+        mBinding.rvMyRoomList.setLayoutManager(new LinearLayoutManager(getContext()));
+        mAdapter = new BaseQuickAdapter<MyRoomBean, BaseViewHolder>(R.layout.room_fragment_my_room_list, null) {
+            @Override
+            protected void convert(BaseViewHolder helper, MyRoomBean item) {
+                if (item.getCover_picture() == null||item.getCover_picture().equals("")) {
+                    helper.setImageResource(R.id.riv, com.qxcm.moduleutil.R.mipmap.default_avatar);
+                } else {
+                    ImageUtils.loadImageView(item.getCover_picture(), helper.getView(R.id.riv));
+                }
+                if (item.getLabel_icon()!=null) {
+                    ImageUtils.loadImageView(item.getLabel_icon(), helper.getView(R.id.iv_play));
+                }
+
+                helper.setText(R.id.tv_name, item.getRoom_name());
+                helper.setText(R.id.tv_sy, item.getToday_income()+"");
+                helper.setText(R.id.tv_user_id, "ID: " + item.getRoom_id());
+                if (type == MyRoomListFragment.TYPE_CREATE) {
+                    helper.setText(R.id.tv_bl, "今日收益");
+                } else if (type == MyRoomListFragment.TYPE_HOST) {
+                    helper.setText(R.id.tv_bl, "收益分成比例: " + item.getEarnings_ratio() + "%");
+                }
+
+                String concernText = "关注:" + item.getFavorite_count();
+                SpannableString spannableString = new SpannableString(concernText);
+                // 设置关注数字部分的颜色为黑色
+                spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), android.R.color.black)), 2, concernText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                helper.setText(R.id.tv_gz, spannableString);
+
+                String concernText1 = "在线:" + item.getOnline_num();
+                SpannableString spannableString1 = new SpannableString(concernText1);
+                // 设置关注数字部分的颜色为黑色
+                spannableString1.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), android.R.color.black)), 2, concernText1.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                helper.setText(R.id.tv_zx, spannableString1);
+
+                String concernText2 = "访问:" + item.getCome_count();
+                SpannableString spannableString2 = new SpannableString(concernText2);
+                // 设置关注数字部分的颜色为黑色
+                spannableString2.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), android.R.color.black)), 2, concernText2.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                helper.setText(R.id.tv_fw, spannableString2);
+
+                helper.getView(R.id.rl_mx).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // TODO: 跳转到房间详情页面
+//                        ARouter.getInstance().build(ARouteConstants.MY_ROOM_DETAIL).withString("roomId", item.getRoom_id() + "").withInt("type",type ).navigation();
+                    }
+                });
+                helper.getView(R.id.cl_my_room_list).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                            // TODO: 跳转到房间详情页面
+//                            ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    }
+                });
+                switch (helper.getLayoutPosition() % 3) {
+                    case 0:
+                        helper.getView(R.id.cl_my_room_list).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.my_cr_room1);
+                        break;
+                    case 1:
+                        helper.getView(R.id.cl_my_room_list).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.my_croom2);
+                        break;
+                    case 2:
+                        helper.getView(R.id.cl_my_room_list).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.my_croom3);
+                        break;
+                }
+
+            }
+        };
+        mBinding.rvMyRoomList.setAdapter(mAdapter);
+        mAdapter.bindToRecyclerView(mBinding.rvMyRoomList);
+
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.room_fragment_my_room_list_list;
+    }
+
+    @Override
+    public void setMyInfo(MyRoomBean myRoom) {
+
+    }
+
+    @Override
+    public void setList(List<MyRoomBean> list, int type) {
+        // TODO: 刷新列表
+        if (type == MyRoomListFragment.TYPE_CREATE) {
+            if (list.isEmpty()) {
+                mBinding.rvMyRoomList.setVisibility(View.GONE);
+                mBinding.tvNoData.setVisibility(View.VISIBLE);
+            } else {
+                mBinding.rvMyRoomList.setVisibility(View.VISIBLE);
+                mBinding.tvNoData.setVisibility(View.GONE);
+                mAdapter.setNewData(list);
+            }
+
+        } else if (type == MyRoomListFragment.TYPE_HOST) {
+            if (list.isEmpty()) {
+                mBinding.rvMyRoomList.setVisibility(View.GONE);
+                mBinding.tvNoData.setVisibility(View.VISIBLE);
+            } else {
+                mBinding.rvMyRoomList.setVisibility(View.VISIBLE);
+                mBinding.tvNoData.setVisibility(View.GONE);
+                mAdapter.setNewData(list);
+            }
+
+        }
+    }
+
+    @Override
+    public void delfootSuccess() {
+
+    }
+
+    @Override
+    public void setMyFootData(List<MyFootResp> data, int page) {
+
+    }
+
+    @Override
+    public void finishRefresh() {
+
+    }
+
+    @Override
+    public void setManageData(List<ManageRoomResp> data) {
+
+    }
+
+    @Override
+    public void setAttentionListData(List<AttentionResp> attentionResps) {
+
+    }
+
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
new file mode 100644
index 00000000..24e9ee83
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
@@ -0,0 +1,80 @@
+package com.example.modulevocal.fragment;
+
+import android.os.Bundle;
+import android.view.View;
+
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.activity.UserHomepageActivity;
+import com.example.modulevocal.adapter.UserGiftWallAdapter;
+import com.example.modulevocal.conacts.UserGiftWallConacts;
+import com.example.modulevocal.databinding.MeFagmentUserGiftWallBinding;
+import com.example.modulevocal.presenter.UserGiftWallPresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.GiftBean;
+import com.qxcm.moduleutil.widget.pagerecyclerview.PagerGridLayoutManager;
+import com.qxcm.moduleutil.widget.pagerecyclerview.PagerGridSnapHelper;
+
+import java.util.List;
+
+/**
+ * 礼物墙
+ */
+public class UserGiftWallFragment extends BaseMvpFragment<UserGiftWallPresenter, MeFagmentUserGiftWallBinding> implements UserGiftWallConacts.View {
+
+
+    public String userId;
+
+    private UserGiftWallAdapter mUserGiftWallAdapter;
+    private UserHomepageActivity homePageInfoActivity;
+
+
+    public static UserGiftWallFragment newInstance(String userId) {
+        UserGiftWallFragment fragment = new UserGiftWallFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("userId", userId);
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    protected UserGiftWallPresenter bindPresenter() {
+        return new UserGiftWallPresenter(this, getContext());
+    }
+
+    @Override
+    protected void initData() {
+        userId = getArguments().getString("userId");
+        MvpPre.giftWall(userId);
+    }
+
+    @Override
+    protected void initView() {
+        PagerGridLayoutManager layoutManager = new PagerGridLayoutManager(2, 4, PagerGridLayoutManager.HORIZONTAL);
+        mBinding.recyclerView.setLayoutManager(layoutManager);
+//        mBinding.recyclerView.setOnFlingListener(null);
+        // 设置滚动辅助工具
+        PagerGridSnapHelper pageSnapHelper = new PagerGridSnapHelper();
+        pageSnapHelper.attachToRecyclerView(mBinding.recyclerView);
+        mBinding.recyclerView.setAdapter(mUserGiftWallAdapter = new UserGiftWallAdapter());
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.me_fagment_user_gift_wall;
+    }
+
+
+    @Override
+    public void setGiftWall(List<GiftBean> data) {
+//        if (data != null && data.size() > 0) {
+//            if (homePageInfoActivity != null) {
+//                homePageInfoActivity.setTab(2);
+//            }
+            mUserGiftWallAdapter.setNewData(data);
+            mBinding.slGiftWall.setVisibility(View.VISIBLE);
+//
+//        }
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java
new file mode 100644
index 00000000..e2d373d3
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java
@@ -0,0 +1,110 @@
+package com.example.modulevocal.fragment;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.UserHomepageConacts;
+import com.example.modulevocal.databinding.FragmentUserHompageBinding;
+import com.example.modulevocal.presenter.UserHomepagePresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.CircleListBean;
+import com.qxcm.moduleutil.bean.MyBagBean;
+import com.qxcm.moduleutil.bean.UserHomeResp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter, FragmentUserHompageBinding> implements UserHomepageConacts.View{
+    private List<MyBagBean> list;
+    private String userId;
+    @Override
+    public void setUserDetails(UserHomeResp mUserHomeResp) {
+
+    }
+
+    @Override
+    public void setCircleList(List<CircleListBean> list) {
+
+    }
+
+    public static UserHomepageFragment newInstance(String userId) {
+        UserHomepageFragment fragment = new UserHomepageFragment();
+        Bundle args = new Bundle();
+        args.putString("userId", userId);
+        fragment.setArguments(args);
+        return fragment;
+    }
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        userId = arguments.getString("userId");
+    }
+    @Override
+    protected UserHomepagePresenter bindPresenter() {
+        return new UserHomepagePresenter(this,getSelfActivity());
+    }
+
+    @Override
+    protected void initData() {
+
+        list=new ArrayList<>();
+        list.add(new MyBagBean("动态", "1"));
+        list.add(new MyBagBean("礼物墙", "2"));
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), list,userId));
+        mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
+        mBinding.slidingTabLayout.setCurrentTab(0);
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.constraintLayout.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_user_hompage;
+    }
+
+    private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
+
+        private List<MyBagBean> list;
+        private String userId;
+
+
+        public MyFragmentPagerAdapter(FragmentManager fm, List<MyBagBean> list,String userId) {
+            super(fm);
+            this.list = list;
+            this.userId = userId;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            MyBagBean model = list.get(position);
+            if ("1".equals(model.getMyBagType())){
+                return CirleListFragment.newInstance();
+            }else {
+                return UserGiftWallFragment.newInstance(userId);
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return list.size();
+        }
+
+        @Nullable
+        @Override
+        public CharSequence getPageTitle(int position) {
+            MyBagBean model = list.get(position);
+            return model.getMyBagTitle();
+        }
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
index 091ce350..8232ea37 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
@@ -9,24 +9,24 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 
-import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.example.modulevocal.R;
+import com.example.modulevocal.activity.BlacklistActivity;
+import com.example.modulevocal.activity.EditUserInfoActivity;
+import com.example.modulevocal.activity.MyBagActivity;
+import com.example.modulevocal.activity.MyMoneyActivity;
+import com.example.modulevocal.activity.MyRoomActivity;
+import com.example.modulevocal.activity.PersonalityActivity;
 import com.example.modulevocal.activity.SettingActivity;
+import com.example.modulevocal.activity.UserHomepageActivity;
 import com.example.modulevocal.conacts.MeConacts;
 import com.example.modulevocal.databinding.FragmentVocalRangeBinding;
 import com.example.modulevocal.presenter.MePresenter;
 import com.qxcm.moduleutil.base.BaseMvpFragment;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
+import com.qxcm.moduleutil.bean.UserBean;
+import com.qxcm.moduleutil.utils.SpUtil;
 
 /**
  * 音域--我的
@@ -34,6 +34,7 @@ import java.util.List;
 public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVocalRangeBinding> implements MeConacts.View {
 
 //    private MyInfoResp mMyInfoResp;
+    private UserBean userBean;
 
     public static VocalRangeFragment newInstance() {
         return new VocalRangeFragment();
@@ -56,6 +57,9 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
     @Override
     protected void initData() {
 //        MvpPre.entranceCheckFirstRecharge();
+        userBean= SpUtil.getUserInfo();
+        mBinding.rivUserHead.setData(userBean.getAvatar(), "", String.valueOf(userBean.getSex()));
+
     }
 
 //    private final MeItemAdapter.OnMeItemClickListener onMeItemClickListener = item -> {
@@ -138,6 +142,8 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
         mBinding.beautifulViewCopy.setOnClickListener(this::onClick);
 //        mBinding.meMyShare.setOnClickListener(this::onClick);
         mBinding.tvHome.setOnClickListener(this::onClick);
+        mBinding.meDressUp.setOnClickListener(this::onClick);
+        mBinding.tvMyWallet.setOnClickListener(this::onClick);
 
     }
 
@@ -162,6 +168,9 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
         } else if (id == R.id.ll_follow) {
 //            ARouter.getInstance().build(ARouteConstants.ME_MY_FRIENDS).withInt("type", 1).navigation();
 //            AppLogUtil.reportAppLog(AppLogEvent.C0110);
+            Intent intent=new Intent(getContext(), BlacklistActivity.class);
+            intent.putExtra("type",0);
+            startActivity(intent);
         }
 //        else if (id == R.id.me_my_union) {
 //            if (ProxyCheckerT.isProxySet(getContext())){
@@ -178,8 +187,9 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 //            startActivity(intent);
 //        }
         else if (id == R.id.ll_fans) {
-//            ARouter.getInstance().build(ARouteConstants.ME_MY_FRIENDS).withInt("type", 2).navigation();
-//            AppLogUtil.reportAppLog(AppLogEvent.C0111);
+            Intent intent=new Intent(getContext(), BlacklistActivity.class);
+            intent.putExtra("type",2);
+            startActivity(intent);
         } else if (id == R.id.ll_friends) {
 //            ARouter.getInstance().build(ARouteConstants.ME_MY_FRIENDS).withInt("type", 0).navigation();
 //            AppLogUtil.reportAppLog(AppLogEvent.C0112);
@@ -193,22 +203,15 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 ////            ARouter.getInstance().build(ARouteConstants.ME_PROFIT).withString("from", "我的界面").withBoolean("showExDlg", true).navigation();
 //        }
         else if (id == R.id.me_my_wallets) {
-            //我的钱包
-//            ARouter.getInstance().build(ARouteConstants.ME_WALLETS).withString("from", "我的界面").navigation();
-        } else if (id == R.id.tv_nick_name || id == R.id.riv_user_head || id == R.id.tv_home) {
-            //我的空间
-//            if (mMyInfoResp != null) {
-//                ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", mMyInfoResp.getUser_id()).navigation();
-//            }
-        }
-//        else if (id == R.id.tv_my_room) {
-//            //我的房间
-////            if (mMyInfoResp != null) {
-////
-////                ARouter.getInstance().build(ARouteConstants.MY_ROOM_LIST).withString("from", "我的界面").withString("roomId", mMyInfoResp.getRoom_id()).withInt("auth_status", mMyInfoResp.getAuth_status()).navigation();
-////            }
-//        }
-        else if (id == R.id.tv_my_jw) {
+            //我的房间
+            startActivity(new Intent(getContext(), MyRoomActivity.class));
+        } else if (id == R.id.tv_nick_name ||  id == R.id.tv_home) {//编辑信息
+            startActivity(new Intent(getContext(), EditUserInfoActivity.class));
+        }else if (id == R.id.tv_my_wallet){//钱包
+            startActivity(new Intent(getContext(), MyMoneyActivity.class));
+        }else if (id == R.id.riv_user_head ){//用户主页
+            startActivity(new Intent(getContext(), UserHomepageActivity.class));
+        }else if (id == R.id.tv_my_jw) {
             //我的爵位
 //            ARouter.getInstance().build(ARouteConstants.ME_GRADEACTIVITY).withString("from", "我的界面").withInt("type", 0).navigation();
 
@@ -232,9 +235,13 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 //            //装扮商城
 //            ARouter.getInstance().build(ARouteConstants.ME_SHOP).withString("from", "我的界面").navigation();
 //        }
+        else if (id == R.id.me_dress_up){//个性装扮
+            startActivity(new Intent(getContext(), PersonalityActivity.class));
+        }
         else if (id == R.id.tv_my_bb) {
             //我的背包
 //            ARouter.getInstance().build(ARouteConstants.ME_KNAPSACK).withString("from", "我的界面").navigation();
+            startActivity(new Intent(getContext(), MyBagActivity.class));
         }
 //        else if (id == R.id.me_my_custom) {
 //
@@ -243,7 +250,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 //        } else if (id == R.id.me_my_help) {
 //            ARouter.getInstance().build(ARouteConstants.ME_HELP).navigation();
 //        }
-        else if (id == R.id.iv_sz) {
+        else if (id == R.id.iv_sz) {//设置
             startActivity(new Intent(getContext(), SettingActivity.class));
         }
 //        else if (id == R.id.me_my_certification) {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagAdapter.java
new file mode 100644
index 00000000..339f4b20
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagAdapter.java
@@ -0,0 +1,21 @@
+package com.example.modulevocal.fragment.mybag;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+public class MyBagAdapter extends BaseQuickAdapter<ZhuangBanShangChengBean, BaseViewHolder> {
+    public MyBagAdapter() {
+        super(R.layout.item_my_bag);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, ZhuangBanShangChengBean item) {
+        ImageUtils.loadHeadCC(item.getBase_image(), helper.getView(R.id.iv_img));
+        helper.setText(R.id.integral, item.getIntegral())
+                .setText(R.id.tv_name_period, item.getTitle());
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagFragment.java
new file mode 100644
index 00000000..8ad75e29
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagFragment.java
@@ -0,0 +1,62 @@
+package com.example.modulevocal.fragment.mybag;
+
+import android.os.Bundle;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.MyBagConacts;
+import com.example.modulevocal.databinding.FragmentMyBagBinding;
+import com.example.modulevocal.presenter.MyBagPresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyBagFragment extends BaseMvpFragment<MyBagPresenter, FragmentMyBagBinding> implements MyBagConacts.View{
+    MyBagAdapter mAdapter;
+    private List<ZhuangBanShangChengBean> zhuangBanShangChengBeanList;
+
+    public static MyBagFragment newInstance(String type) {
+
+        Bundle args = new Bundle();
+        args.putString("type", type);
+        MyBagFragment fragment = new MyBagFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+    @Override
+    protected MyBagPresenter bindPresenter() {
+        return new MyBagPresenter(this,getActivity());
+    }
+
+    @Override
+    protected void initData() {
+        zhuangBanShangChengBeanList=new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            ZhuangBanShangChengBean zhuangBanShangChengBean=new ZhuangBanShangChengBean();
+            zhuangBanShangChengBean.setTitle("标题"+i);
+            zhuangBanShangChengBean.setIntegral("积分"+i);
+            zhuangBanShangChengBean.setPeriod(i);
+            zhuangBanShangChengBean.setType("类型"+i);
+            zhuangBanShangChengBean.setBase_image("");
+            zhuangBanShangChengBeanList.add(zhuangBanShangChengBean);
+        }
+
+        mAdapter=new MyBagAdapter();
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 3);
+        mBinding.rvMyBag.setLayoutManager(gridLayoutManager);
+        mBinding.rvMyBag.setAdapter(mAdapter);
+        mAdapter.setNewData(zhuangBanShangChengBeanList);
+    }
+
+    @Override
+    protected void initView() {
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_my_bag;
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListAdapter.java
new file mode 100644
index 00000000..7d64c5c0
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListAdapter.java
@@ -0,0 +1,19 @@
+package com.example.modulevocal.fragment.mybag;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.MyBagDataBean;
+
+public class MyBagListAdapter extends BaseQuickAdapter<MyBagDataBean, BaseViewHolder> {
+    public MyBagListAdapter() {
+        super(R.layout.item_my_bag_data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, MyBagDataBean item) {
+            helper.setText(R.id.tv_title, item.getTitle());
+            helper.setText(R.id.tv_time, item.getTime());
+            helper.setText(R.id.tv_gift_name, item.getGiftName());
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
new file mode 100644
index 00000000..a8489d56
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
@@ -0,0 +1,72 @@
+package com.example.modulevocal.fragment.mybag;
+
+import android.os.Bundle;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.MyBagConacts;
+import com.example.modulevocal.databinding.FragmentMyBagBinding;
+import com.example.modulevocal.databinding.FragmentMyBagListBinding;
+import com.example.modulevocal.fragment.MyRoomListFragment;
+import com.example.modulevocal.presenter.MyBagPresenter;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.MyBagDataBean;
+import com.qxcm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyBagListFragment extends BaseMvpFragment<MyBagPresenter, FragmentMyBagListBinding> implements MyBagConacts.View{
+    MyBagListAdapter mAdapter;
+    private String type;
+    List<MyBagDataBean> myBagDataBeanList;
+
+    public static MyBagListFragment newInstance(String type) {
+
+        Bundle args = new Bundle();
+        args.putString("type", type);
+        MyBagListFragment fragment = new MyBagListFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+    @Override
+    protected MyBagPresenter bindPresenter() {
+        return new MyBagPresenter(this,getActivity());
+    }
+
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        type = arguments.getString("type", "2");
+    }
+
+    @Override
+    protected void initData() {
+        myBagDataBeanList=new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            MyBagDataBean myBagDataBean=new MyBagDataBean();
+            myBagDataBean.setTitle("标题"+i);
+            myBagDataBean.setGiftName("礼物"+i);
+            myBagDataBean.setTime("时间"+i);
+            myBagDataBean.setBase_image("");
+            myBagDataBeanList.add(myBagDataBean);
+        }
+
+        mAdapter=new MyBagListAdapter();
+
+        mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mBinding.recyclerView.setAdapter(mAdapter);
+        mAdapter.setNewData(myBagDataBeanList);
+    }
+
+    @Override
+    protected void initView() {
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_my_bag_list;
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengAdapter.java
new file mode 100644
index 00000000..20bb1ccd
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengAdapter.java
@@ -0,0 +1,41 @@
+package com.example.modulevocal.fragment.zhuangb;
+
+import android.view.View;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.example.modulevocal.R;
+import com.qxcm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
+import com.qxcm.moduleutil.utils.ImageUtils;
+
+public class ZhuangBanShangChengAdapter extends BaseQuickAdapter<ZhuangBanShangChengBean, BaseViewHolder> {
+    public ZhuangBanShangChengAdapter() {
+        super(R.layout.item_zhuangbanschangcheng_list);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, ZhuangBanShangChengBean item) {
+        if (item==null){
+
+        }else {
+            helper.addOnClickListener(R.id.zb_bg_ll);
+            ImageUtils.loadHeadCC(item.getBase_image(), helper.getView(R.id.iv_img));
+
+            helper.setText(R.id.integral, item.getIntegral())
+                    .setText(R.id.tv_name_period, item.getTitle());
+//            .setText(R.id.tv_time, "（有效期${item.period}天）")
+            if (item.isIs_select()) {
+                helper.getView(R.id.zb_bg).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.sect_true);
+                helper.getView(R.id.tv_name_period).setSelected(true);
+                helper.getView(R.id.integral).setSelected(true);
+
+
+            } else {
+                helper.getView(R.id.zb_bg).setBackgroundResource(com.qxcm.moduleutil.R.mipmap.sect_false);
+                helper.getView(R.id.tv_name_period).setSelected(false);
+                helper.getView(R.id.integral).setSelected(false);
+            }
+        }
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java
new file mode 100644
index 00000000..645d6a12
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java
@@ -0,0 +1,17 @@
+package com.example.modulevocal.fragment.zhuangb;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class ZhuangBanShangChengConactos {
+
+    public interface View extends IView<Activity> {
+
+    }
+
+    public interface ICreatedRoomPre extends IPresenter {
+
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java
new file mode 100644
index 00000000..3c5d68d0
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java
@@ -0,0 +1,107 @@
+package com.example.modulevocal.fragment.zhuangb;
+
+import static com.qxcm.moduleutil.utils.ImageLoader.loadImage;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.example.modulevocal.R;
+import com.example.modulevocal.databinding.ZhuangbanRecyclerviewNorefBinding;
+import com.example.modulevocal.fragment.MyRoomListFragment;
+import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.opensource.svgaplayer.SVGAImageView;
+import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangChengPresenter, ZhuangbanRecyclerviewNorefBinding> implements ZhuangBanShangChengConactos.View {
+
+    private int type;
+    private List<ZhuangBanShangChengBean> zhuangBanShangChengBeanList;
+
+    int pSelect = -1;
+    private int did;
+    @Override
+    protected ZhuangBanShangChengPresenter bindPresenter() {
+        return new ZhuangBanShangChengPresenter(this, getActivity());
+    }
+
+    public static ZhuangBanShangChengFragment newInstance(int type) {
+        ZhuangBanShangChengFragment fragment = new ZhuangBanShangChengFragment();
+        Bundle args = new Bundle();
+        args.putInt("type", type);
+        fragment.setArguments(args);
+        return fragment;
+    }
+    @Override
+    public void initArgs(Bundle arguments) {
+        super.initArgs(arguments);
+        type = arguments.getInt("type", MyRoomListFragment.TYPE_CREATE);
+    }
+    @Override
+    protected void initData() {
+        //这里根据传递的type进行数据查询
+        zhuangBanShangChengBeanList=new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            ZhuangBanShangChengBean zhuangBanShangChengBean=new ZhuangBanShangChengBean();
+            zhuangBanShangChengBean.setTitle("标题"+i);
+            zhuangBanShangChengBean.setIntegral("积分"+i);
+            zhuangBanShangChengBean.setPeriod(i);
+            zhuangBanShangChengBean.setType("类型"+i);
+            zhuangBanShangChengBean.setBase_image("");
+            zhuangBanShangChengBeanList.add(zhuangBanShangChengBean);
+        }
+
+        SVGAImageView imageBg = (SVGAImageView) getActivity().findViewById(R.id.image_headPortrait);
+        ZhuangBanShangChengAdapter adapter = new ZhuangBanShangChengAdapter();
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 3);
+        mBinding.recyclerView.setLayoutManager(gridLayoutManager);
+        mBinding.recyclerView.setAdapter(adapter);
+
+
+
+        adapter.setOnItemChildClickListener((adapter1, view, position) -> {
+            List<ZhuangBanShangChengBean> list = (List<ZhuangBanShangChengBean>) adapter1.getData();
+
+            if (pSelect != -1 && pSelect != position) {
+                list.get(pSelect).setIs_select(false);
+                list.get(position).setIs_select(true);
+                pSelect = position;
+                did = list.get(position).getDid();
+                mBinding.ll.setVisibility(View.VISIBLE);
+
+                loadImage(getContext(),imageBg, list.get(position).getBase_image());
+            } else if (pSelect != -1 && pSelect == position) {
+                list.get(position).setIs_select(false);
+                pSelect = -1;
+//        mDataBinding.tvMoney.setText("0");
+                mBinding.ll.setVisibility(View.GONE);
+            } else {
+                list.get(position).setIs_select(true);
+                did = list.get(position).getDid();
+                pSelect = position;
+                mBinding.ll.setVisibility(View.VISIBLE);
+
+                loadImage(getContext(),imageBg, list.get(position).getBase_image());
+            }
+
+            adapter1.setNewData(list);
+            adapter1.notifyDataSetChanged();
+        });
+        adapter.setNewData(zhuangBanShangChengBeanList);
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.zhuangban_recyclerview_noref;
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java
new file mode 100644
index 00000000..58acef9d
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.fragment.zhuangb;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.CreatedRoomConactos;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangChengConactos.View> implements ZhuangBanShangChengConactos.ICreatedRoomPre{
+    public ZhuangBanShangChengPresenter(ZhuangBanShangChengConactos.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/BriefIntroductionPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/BriefIntroductionPresenter.java
new file mode 100644
index 00000000..90b75964
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/BriefIntroductionPresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.BriefIntroductionConacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class BriefIntroductionPresenter extends BasePresenter<BriefIntroductionConacts.View> {
+    public BriefIntroductionPresenter(BriefIntroductionConacts.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangeNicknamePresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangeNicknamePresenter.java
new file mode 100644
index 00000000..12143096
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangeNicknamePresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.ChangeNicknameConacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class ChangeNicknamePresenter extends BasePresenter<ChangeNicknameConacts.View> implements ChangeNicknameConacts.IMePre {
+    public ChangeNicknamePresenter(ChangeNicknameConacts.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangePasswordPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangePasswordPresenter.java
new file mode 100644
index 00000000..309ab902
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangePasswordPresenter.java
@@ -0,0 +1,95 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.example.modulevocal.conacts.ChangePasswordConactos;
+import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.http.ApiServer;
+import com.qxcm.moduleutil.http.BaseModel;
+import com.qxcm.moduleutil.http.BaseObserver;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+import io.reactivex.disposables.Disposable;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class ChangePasswordPresenter extends BasePresenter<ChangePasswordConactos.View> implements ChangePasswordConactos.ICreatedPre{
+    public ChangePasswordPresenter(ChangePasswordConactos.View view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void sendCode(String phoneNumber, String type) {
+        api.sendCode(phoneNumber,type, new BaseObserver<Object>() {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(Object o) {
+                MvpRef.get().sendCodeSuccess1(phoneNumber);
+            }
+
+        });
+    }
+
+    @Override
+    public void changePassword(String new_password, String mobile, String code, String userId) {
+        Retrofit retrofit = new Retrofit.Builder().baseUrl(CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl())
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+
+        Call<BaseModel<String>> call=retrofit.create(ApiServer.class).getPostData(new_password, mobile, code, userId);
+        call.enqueue(new Callback<BaseModel<String>>() {
+            @Override
+            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
+                if (response.code()==200){
+                    BaseModel<String> string=response.body();
+                    if (string!=null){
+                        int code=string.getCode();
+                        if (code==1){
+                            MvpRef.get().sendCodeSuccess("");
+                        }else {
+                            ToastUtils.showShort(string.getMsg());
+                        }
+                    }
+
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
+                ToastUtils.showShort("修改失败");
+            }
+
+        });
+
+
+//        api.changePassword(new_password, mobile, code, userId, new BaseObserver<String>() {
+//
+//            @Override
+//            public void onSuccess(String data) {
+//                if (data == null) {
+//                    MvpRef.get().sendCodeSuccess("");
+//                }
+//            }
+//
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                 addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(String s) {
+//                MvpRef.get().sendCodeSuccess(s);
+//            }
+//        });
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/CreatedRoomPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/CreatedRoomPresenter.java
new file mode 100644
index 00000000..c60d7b36
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/CreatedRoomPresenter.java
@@ -0,0 +1,109 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.CreatedRoomConactos;
+import com.hjq.toast.ToastUtils;
+import com.qxcm.moduleutil.bean.CheckTxtResp;
+import com.qxcm.moduleutil.http.BaseObserver;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.io.File;
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
+
+public class CreatedRoomPresenter extends BasePresenter<CreatedRoomConactos.View> implements CreatedRoomConactos.ICreatedRoomPre {
+
+    public CreatedRoomPresenter(CreatedRoomConactos.View view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void checkTxt(String content) {
+//        MvpRef.get().showLoadings();
+//        api.checkTxt(content,"2", new BaseObserver<CheckTxtResp>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(CheckTxtResp checkTxtResp) {
+//                MvpRef.get().checkTxtSuccess(checkTxtResp);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().disLoadings();
+//            }
+//        });
+    }
+
+    @Override
+    public void addUserRoom(String roomName, String labelId,String cover_picture) {
+//        MvpRef.get().showLoadings();
+//        ApiClient.getInstance().addUserRoom(roomName, labelId, cover_picture,new BaseObserver<String>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(String s) {
+//                MvpRef.get().addUserRoomSuccess(s);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().disLoadings();
+//            }
+//        });
+    }
+
+    @Override
+    public void roomLabel(String from) {
+//        MvpRef.get().showLoadings();
+//        ApiClient.getInstance().roomLabel(from,new BaseObserver<List<RoomTypeInfo>>() {
+//
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<RoomTypeInfo> roomTypeInfos) {
+//                MvpRef.get().roomLabel(roomTypeInfos);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().disLoadings();
+//            }
+//        });
+
+    }
+    @Override
+    public void uploadFile(File file, int type) {
+//        MvpRef.get().showLoadings("上传中...");
+//        String url = OSSOperUtils.getPath(file, type);
+//        OSSOperUtils.newInstance().putObjectMethod(url, file.getPath(), new OSSOperUtils.OssCallback() {
+//            @Override
+//            public void onSuccess() {
+//                if (isViewAttach()) {
+//                    MvpRef.get().disLoadings();
+//                    MvpRef.get().upLoadSuccess(OSSOperUtils.AliYunOSSURLFile + url, type);
+//                }
+//            }
+//
+//            @Override
+//            public void onFail() {
+//                if (isViewAttach()) {
+//                    ToastUtils.show("上传失败");
+//                    MvpRef.get().disLoadings();
+//                }
+//            }
+//        });
+    }
+
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/CurrencyExchangePresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/CurrencyExchangePresenter.java
new file mode 100644
index 00000000..f0bd92ba
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/CurrencyExchangePresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.CurrencyExchangeConacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeConacts.View> implements CurrencyExchangeConacts.IMePre {
+    public CurrencyExchangePresenter(CurrencyExchangeConacts.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/EditUserPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/EditUserPresenter.java
new file mode 100644
index 00000000..ec5651b0
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/EditUserPresenter.java
@@ -0,0 +1,39 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.EditUserConactos;
+import com.hjq.toast.ToastUtils;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+import com.qxcm.moduleutil.utils.oss.OSSOperUtils;
+
+import java.io.File;
+
+public class EditUserPresenter extends BasePresenter<EditUserConactos.View> implements EditUserConactos.IMePre {
+    public EditUserPresenter(EditUserConactos.View view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void uploadFile(File file, int type) {
+        MvpRef.get().showLoadings("上传中...");
+        String url = OSSOperUtils.getPath(file, type);
+        OSSOperUtils.newInstance().putObjectMethod(url, file.getPath(), new OSSOperUtils.OssCallback() {
+            @Override
+            public void onSuccess() {
+                if (isViewAttach()) {
+                    MvpRef.get().disLoadings();
+                    MvpRef.get().upLoadSuccess(OSSOperUtils.AliYunOSSURLFile + url, type);
+                }
+            }
+
+            @Override
+            public void onFail() {
+                if (isViewAttach()) {
+                    ToastUtils.show("上传失败");
+                    MvpRef.get().disLoadings();
+                }
+            }
+        });
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyBagPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/MyBagPresenter.java
new file mode 100644
index 00000000..8395e572
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/MyBagPresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.MyBagConacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class MyBagPresenter extends BasePresenter<MyBagConacts.View> implements MyBagConacts.IMePre {
+    public MyBagPresenter(MyBagConacts.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java
new file mode 100644
index 00000000..4da89630
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.MyMoneyConactos;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class MyMoneyPresenter extends BasePresenter<MyMoneyConactos.View> implements MyMoneyConactos.IMePre {
+    public MyMoneyPresenter(MyMoneyConactos.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyRoomPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/MyRoomPresenter.java
new file mode 100644
index 00000000..6753d64d
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/MyRoomPresenter.java
@@ -0,0 +1,197 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.qxcm.moduleutil.bean.MyRoomBean;
+import com.qxcm.moduleutil.http.BaseObserver;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
+
+public class MyRoomPresenter extends BasePresenter<MyRoomListContacts.View> implements MyRoomListContacts.IRankingListPre {
+    public MyRoomPresenter(MyRoomListContacts.View view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void detachView() {
+
+    }
+
+    @Override
+    public void getCharmList(int type) {
+
+//        MvpRef.get().showLoadings();
+//        ApiClient.getInstance().getMyRoom(new BaseObserver<List<MyRoomBean>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<MyRoomBean> myRoomBeans) {
+//                MvpRef.get().setList(myRoomBeans,type);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().disLoadings();
+//            }
+//        });
+
+    }
+
+    @Override
+    public void getWealthList( int type) {
+//        MvpRef.get().showLoadings();
+//        ApiClient.getInstance().getHostRoom(new BaseObserver<List<MyRoomBean>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<MyRoomBean> myRoomBeans) {
+//                MvpRef.get().setList(myRoomBeans,type);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().disLoadings();
+//            }
+//        });
+
+    }
+
+    @Override
+    public void getRoomList( int type) {
+
+    }
+
+    @Override
+    public void getNameAuthResult(int type) {
+//        NewApi.getInstance().getNameAuthResult(new com.qpyy.libcommon.api.BaseObserver<NameAuthResult>(false) {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(NameAuthResult result) {
+//                if (result.getApp_status() == 2) {
+//                    ARouter.getInstance().build(ARouteConstants.AUTH_RESULT_PAGE).withString("failStr", result.getReason()).withInt("examineType", 1).withInt("returnResult", 3).navigation();
+//                } else if (result.getApp_status() == 0) {
+////                    ToastUtils.show("审核中");
+//                    ARouter.getInstance().build(ARouteConstants.AUTH_RESULT_PAGE).withString("failStr", result.getReason()).withInt("examineType", 1).withInt("returnResult", 1).navigation();
+//                } else if (result.getApp_status() == 1) {
+////                    ToastUtils.show("已认证");
+//                    ARouter.getInstance().build(ARouteConstants.AUTH_RESULT_PAGE).withString("failStr", result.getReason()).withInt("examineType", 1).withInt("returnResult", 2).navigation();
+//                } else if (result.getApp_status() == 3) {
+//                    go2NameAuth(type);
+//                }
+//            }
+//
+//            @Override
+//            public void onErrorCode(int code) {
+//                super.onErrorCode(code);
+//                if (code == ErrorCode.AUTH_NOT_EXIT) {
+//                    go2NameAuth(type);
+//                }
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+    }
+    private void go2NameAuth(int type) {
+//        if (type == 0) {
+//            ARouter.getInstance().build(ARouteConstants.ME_NAME_AUTH).withString("from","我的界面").navigation();
+//        }
+    }
+
+
+    @Override
+    public void delfoot() {
+//       com.qpyy.module.index.api.ApiClient.getInstance().delfoot(new com.qpyy.libcommon.http.BaseObserver<String>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(String s) {
+//                MvpRef.get().delfootSuccess();
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//            }
+//        });
+    }
+
+    // TODO: 2025/4/15 我的足迹
+    @Override
+    public void getMyFoot(int page) {
+//        com.qpyy.module.index.api.ApiClient.getInstance().getMyFoot(new com.qpyy.libcommon.http.BaseObserver<List<MyFootResp>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<MyFootResp> myFootResps) {
+//                MvpRef.get().setMyFootData(myFootResps,page);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().finishRefresh();
+//            }
+//        },page);
+    }
+
+    @Override
+    public void getManageLists() {
+//        com.qpyy.module.index.api.ApiClient.getInstance().manageLists(new com.qpyy.libcommon.http.BaseObserver<List<ManageRoomResp>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<ManageRoomResp> manageRoomResps) {
+//                MvpRef.get().setManageData(manageRoomResps);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//            }
+//        });
+    }
+
+    @Override
+    public void getAttentionList() {
+//        com.qpyy.module.index.api.ApiClient.getInstance().attentionList(new com.qpyy.libcommon.http.BaseObserver<List<AttentionResp>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<AttentionResp> attentionResps) {
+//                MvpRef.get().setAttentionListData(attentionResps);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RechargePresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/RechargePresenter.java
new file mode 100644
index 00000000..7aa10d8f
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/RechargePresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.RechargeConactos;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class RechargePresenter extends BasePresenter<RechargeConactos.View> implements RechargeConactos.IRechargePre{
+    public RechargePresenter(RechargeConactos.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomAllowancePresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomAllowancePresenter.java
new file mode 100644
index 00000000..0b173ff2
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomAllowancePresenter.java
@@ -0,0 +1,64 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+
+import com.example.modulevocal.conacts.RoomAllowanceContacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
+
+
+public class RoomAllowancePresenter extends BasePresenter<RoomAllowanceContacts.DeatilsView> implements RoomAllowanceContacts.DeatilsListPre {
+    public RoomAllowancePresenter(RoomAllowanceContacts.DeatilsView view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void detachView() {
+
+    }
+
+
+    @Override
+    public void getCharmList( String room_id) {
+//        ApiClient.getInstance().getSubsidy(BaseApplication.getInstance().getToken(), room_id, new BaseObserver<RoomSubsidy>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(RoomSubsidy roomSubsidy) {
+//                MvpRef.get().setList(roomSubsidy);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+    }
+
+    @Override
+    public void getDetails(String room_id, String page) {
+//        ApiClient.getInstance().getSubsidyDetail(room_id, page, new BaseObserver<List<RoomSubsidyDetails>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<RoomSubsidyDetails> roomSubsidyDetails) {
+//                MvpRef.get().setHishoryList(roomSubsidyDetails);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().finishRefresh();
+//            }
+//        });
+    }
+}
\ No newline at end of file
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomDetailsPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomDetailsPresenter.java
new file mode 100644
index 00000000..7a9a0945
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomDetailsPresenter.java
@@ -0,0 +1,65 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+
+import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import io.reactivex.disposables.Disposable;
+
+public class RoomDetailsPresenter extends BasePresenter<MyRoomListContacts.DeatilsView> implements MyRoomListContacts.DeatilsListPre {
+    public RoomDetailsPresenter(MyRoomListContacts.DeatilsView view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void detachView() {
+
+    }
+
+    @Override
+    public void getCharmList(String room_id, String stime, String etime, String p, int type) {
+//        if (type == 0) {
+////            MvpRef.get().showLoadings();
+//            ApiClient.getInstance().getRoomUserDetail(BaseApplication.getInstance().getToken(), room_id, stime, etime, p, new BaseObserver<RoomDetails>() {
+//                @Override
+//                public void onSubscribe(Disposable d) {
+//                    addDisposable(d);
+//                }
+//
+//                @Override
+//                public void onNext(RoomDetails roomDetailsBeans) {
+//                    MvpRef.get().setList(roomDetailsBeans);
+//
+//                }
+//
+//                @Override
+//                public void onComplete() {
+////                    MvpRef.get().disLoadings();
+//                    MvpRef.get().finishRefresh();
+//                }
+//            });
+//        } else {
+////            MvpRef.get().showLoadings();
+//            ApiClient.getInstance().getUserHostlDetail(BaseApplication.getInstance().getToken(), room_id, stime, etime, p, new BaseObserver<RoomDetails>() {
+//                @Override
+//                public void onSubscribe(Disposable d) {
+//                    addDisposable(d);
+//                }
+//
+//                @Override
+//                public void onNext(RoomDetails roomDetailsList) {
+//                    MvpRef.get().setList(roomDetailsList);
+//
+//                }
+//
+//                @Override
+//                public void onComplete() {
+////                    MvpRef.get().disLoadings();
+//                    MvpRef.get().finishRefresh();
+//                }
+//            });
+//        }
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/UserGiftWallPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/UserGiftWallPresenter.java
new file mode 100644
index 00000000..f4b98ee1
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/UserGiftWallPresenter.java
@@ -0,0 +1,52 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+
+import com.example.modulevocal.conacts.UserGiftWallConacts;
+import com.qxcm.moduleutil.bean.GiftBean;
+import com.qxcm.moduleutil.http.BaseObserver;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
+
+public class UserGiftWallPresenter extends BasePresenter<UserGiftWallConacts.View> implements UserGiftWallConacts.IUserGiftWallPre {
+
+    public UserGiftWallPresenter(UserGiftWallConacts.View view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void giftWall(String userId) {
+//        ApiClient.getInstance().giftWall(userId, new BaseObserver<List<GiftBean>>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(List<GiftBean> giftBeans) {
+//                MvpRef.get().setGiftWall(giftBeans);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//            }
+//        });
+        List<GiftBean> giftBeans = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            GiftBean giftBean = new GiftBean();
+            giftBean.setGift_id(""+i);
+            giftBean.setName("礼物"+i);
+            giftBean.setPicture("");
+            giftBean.setPrice(""+i);
+            giftBean.setNumber("x"+i);
+            giftBeans.add(giftBean);
+        }
+
+        MvpRef.get().setGiftWall(giftBeans);
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/UserHomepagePresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/UserHomepagePresenter.java
new file mode 100644
index 00000000..1950323f
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/UserHomepagePresenter.java
@@ -0,0 +1,108 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.UserHomepageConacts;
+import com.qxcm.moduleutil.bean.CircleListBean;
+import com.qxcm.moduleutil.bean.PhotoWallResp;
+import com.qxcm.moduleutil.bean.UserHomeResp;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
+
+public class UserHomepagePresenter extends BasePresenter<UserHomepageConacts.View> implements UserHomepageConacts.IMePre {
+    public UserHomepagePresenter(UserHomepageConacts.View view, Context context) {
+        super(view, context);
+    }
+
+    @Override
+    public void getUserDetails(String userId, String emchatUsername, boolean showLoading) {
+//        if (showLoading) {
+//            MvpRef.get().showLoadings();
+//        }
+//        ApiClient.getInstance().userHomePage(userId, emchatUsername, new BaseObserver<UserHomeResp>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+//            }
+//
+//            @Override
+//            public void onNext(UserHomeResp userHomeResp) {
+//                MvpRef.get().setUserDetails(userHomeResp);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//                MvpRef.get().disLoadings();
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                super.onError(e);
+//                MvpRef.get().onFail();
+//            }
+//        });
+
+        UserHomeResp userHomeResp = new UserHomeResp();
+        userHomeResp.setUser_id("1");
+        userHomeResp.setNickname("小明");
+
+        userHomeResp.setHead_picture("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setSex("男");
+        userHomeResp.setSignature("个性签名");
+        userHomeResp.setBirthday("1990-01-01");
+        userHomeResp.setConstellation("摩羯");
+        userHomeResp.setProfession("学生");
+        userHomeResp.setEmchat_username("小明");
+        userHomeResp.setNobility_icon("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setNobility_image("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setRank_icon("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setIntro_voice("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setIntro_voice_time("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setFollow("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setFollow_count("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setFans_count("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setAge("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setCity("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setIs_online("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setOnly_friend("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setPicture("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setSignature("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        userHomeResp.setHead_picture("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+        PhotoWallResp  photoWallResp = new PhotoWallResp();
+        photoWallResp.setAvatar("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3042118352,1578432634&fm=26&gp=0.jpg");
+
+        userHomeResp.setUser_photo(photoWallResp);
+
+        MvpRef.get().setUserDetails(userHomeResp);
+    }
+
+    @Override
+    public void getCircleList() {
+        List<String> images=new ArrayList<>();
+        images.add("https://image.baidu.com/search/detail?ct=503316480&z=0&ipn=false&word=%E7%BE%8E%E5%A5%B3%E5%9B%BE%E7%89%87&hs=0&pn=0&spn=0&di=7490230549689139201&pi=0&rn=1&tn=baiduimagedetail&is=2160705940%2C3901940110&ie=utf-8&oe=utf-8&cl=2&lm=-1&cs=2056927850%2C430353020&os=2160705940%2C3901940110&simid=3513174432%2C352671812&adpicid=0&lpn=0&ln=0&fm=&sme=&cg=girl&bdtype=0&oriquery=&objurl=https%3A%2F%2Fq4.itc.cn%2Fimages01%2F20240627%2Fd30dbf39840a4c0bbeb277a6d773db2f.jpeg&fromurl=ippr_z2C%24qAzdH3FAzdH3Fooo_z%26e3Bf5i7_z%26e3Bv54AzdH3FwAzdH3F0blaabmca_8d8n8lbaa&gsm=&islist=&querylist=");
+        images.add("https://image.baidu.com/search/detail?ct=503316480&z=0&ipn=false&word=%E7%BE%8E%E5%A5%B3%E5%9B%BE%E7%89%87&hs=0&pn=0&spn=0&di=7490230549689139201&pi=0&rn=1&tn=baiduimagedetail&is=2160705940%2C3901940110&ie=utf-8&oe=utf-8&cl=2&lm=-1&cs=2056927850%2C430353020&os=2160705940%2C3901940110&simid=3513174432%2C352671812&adpicid=0&lpn=0&ln=0&fm=&sme=&cg=girl&bdtype=0&oriquery=&objurl=https%3A%2F%2Fq4.itc.cn%2Fimages01%2F20240627%2Fd30dbf39840a4c0bbeb277a6d773db2f.jpeg&fromurl=ippr_z2C%24qAzdH3FAzdH3Fooo_z%26e3Bf5i7_z%26e3Bv54AzdH3FwAzdH3F0blaabmca_8d8n8lbaa&gsm=&islist=&querylist=");
+        images.add("https://image.baidu.com/search/detail?ct=503316480&z=0&ipn=false&word=%E7%BE%8E%E5%A5%B3%E5%9B%BE%E7%89%87&hs=0&pn=0&spn=0&di=7490230549689139201&pi=0&rn=1&tn=baiduimagedetail&is=2160705940%2C3901940110&ie=utf-8&oe=utf-8&cl=2&lm=-1&cs=2056927850%2C430353020&os=2160705940%2C3901940110&simid=3513174432%2C352671812&adpicid=0&lpn=0&ln=0&fm=&sme=&cg=girl&bdtype=0&oriquery=&objurl=https%3A%2F%2Fq4.itc.cn%2Fimages01%2F20240627%2Fd30dbf39840a4c0bbeb277a6d773db2f.jpeg&fromurl=ippr_z2C%24qAzdH3FAzdH3Fooo_z%26e3Bf5i7_z%26e3Bv54AzdH3FwAzdH3F0blaabmca_8d8n8lbaa&gsm=&islist=&querylist=");
+        images.add("https://image.baidu.com/search/detail?ct=503316480&z=0&ipn=false&word=%E7%BE%8E%E5%A5%B3%E5%9B%BE%E7%89%87&hs=0&pn=0&spn=0&di=7490230549689139201&pi=0&rn=1&tn=baiduimagedetail&is=2160705940%2C3901940110&ie=utf-8&oe=utf-8&cl=2&lm=-1&cs=2056927850%2C430353020&os=2160705940%2C3901940110&simid=3513174432%2C352671812&adpicid=0&lpn=0&ln=0&fm=&sme=&cg=girl&bdtype=0&oriquery=&objurl=https%3A%2F%2Fq4.itc.cn%2Fimages01%2F20240627%2Fd30dbf39840a4c0bbeb277a6d773db2f.jpeg&fromurl=ippr_z2C%24qAzdH3FAzdH3Fooo_z%26e3Bf5i7_z%26e3Bv54AzdH3FwAzdH3F0blaabmca_8d8n8lbaa&gsm=&islist=&querylist=");
+        List<CircleListBean> list=new ArrayList<>();
+        for (int i = 0; i < 10; i++){
+            CircleListBean bean=new CircleListBean();
+            bean.setId(""+i);
+            bean.setUserNickName("萌新驾到"+i);
+            bean.setUserAvatar("");
+            bean.setTime("发布于 12:5"+i);
+            bean.setContent("任何关系，都需要谦逊谨慎");
+            bean.setImages(images);
+            bean.setType("1");
+            bean.setComment(""+i);
+            bean.setLike(""+i);
+            bean.setIsShare(""+i);
+            list.add(bean);
+        }
+        MvpRef.get().setCircleList(list);
+
+    }
+}
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/WithdrawalPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/WithdrawalPresenter.java
new file mode 100644
index 00000000..171edd6b
--- /dev/null
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/WithdrawalPresenter.java
@@ -0,0 +1,12 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.WithdrawalConacts;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+public class WithdrawalPresenter extends BasePresenter<WithdrawalConacts.View> implements WithdrawalConacts.IMePre {
+    public WithdrawalPresenter(WithdrawalConacts.View view, Context context) {
+        super(view, context);
+    }
+}
diff --git a/modulevocal/src/main/res/layout/activity_brief_introduction.xml b/modulevocal/src/main/res/layout/activity_brief_introduction.xml
new file mode 100644
index 00000000..5ed84351
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_brief_introduction.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    tools:context=".activity.BriefIntroductionActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <RelativeLayout
+            android:id="@+id/rl_1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_150"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@drawable/bg_r10_white"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginStart="@dimen/dp_16"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar">
+
+            <EditText
+                android:id="@+id/et_g"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_140"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="@android:color/transparent"
+                android:gravity="left|top"
+                android:hint="简介"
+                android:maxLength="120"
+                android:textColor="#333333"
+                android:textColorHint="@color/color_FF666666"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/tv_sz"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:text="0/20"
+                android:textColor="@color/color_FF666666"
+                android:textSize="@dimen/sp_14" />
+        </RelativeLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycle_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintTop_toBottomOf="@+id/rl_1" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_change_nickname.xml b/modulevocal/src/main/res/layout/activity_change_nickname.xml
new file mode 100644
index 00000000..52b487b0
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_change_nickname.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.ChangeNicknameActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_32"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@drawable/bg_r10_white"
+            android:gravity="left|center"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar">
+
+
+            <com.qxcm.moduleutil.widget.ClearEditText
+                android:id="@+id/ed_nick_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:gravity="center|left"
+                android:hint="请输入昵称"
+                android:maxLength="10"
+                android:padding="@dimen/dp_7"
+                android:singleLine="true"
+                android:text=""
+                android:textColor="#333333"
+                android:textSize="@dimen/sp_12"
+                app:layout_constraintStart_toStartOf="parent" />
+        </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_change_password.xml b/modulevocal/src/main/res/layout/activity_change_password.xml
index 4ef34dd1..61e27f00 100644
--- a/modulevocal/src/main/res/layout/activity_change_password.xml
+++ b/modulevocal/src/main/res/layout/activity_change_password.xml
@@ -34,6 +34,7 @@
                 android:textSize="@dimen/sp_16"/>
 
             <TextView
+                android:id="@+id/tv_phoin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="12345678901"
@@ -68,7 +69,7 @@
                 android:layout_toRightOf="@+id/iv_code"
                 android:background="@android:color/transparent"
                 android:hint="@string/login_hint_code"
-                android:inputType="textPassword"
+                android:inputType="text"
                 android:maxLength="20"
                 android:singleLine="true"
                 android:textColor="@color/black"
diff --git a/modulevocal/src/main/res/layout/activity_created_room.xml b/modulevocal/src/main/res/layout/activity_created_room.xml
new file mode 100644
index 00000000..654627a3
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_created_room.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <com.qxcm.moduleutil.widget.CustomTopBar
+                    android:id="@+id/top_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:background="#FFF"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/dp_16"
+                    android:paddingTop="@dimen/dp_20">
+
+
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:id="@+id/iv_trend_content"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:scaleType="centerCrop"
+                        android:src="@mipmap/trend_pic_add"
+                        app:riv_corner_radius="@dimen/dp_10" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="房间封面"
+                        android:textColor="@color/color_FF333333"
+                        android:layout_marginTop="@dimen/dp_12"
+                        android:textSize="@dimen/sp_14" />
+
+
+                </LinearLayout>
+
+                <!--                <ImageView-->
+                <!--                    android:id="@+id/room_img"-->
+                <!--                    android:layout_width="wrap_content"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:layout_marginTop="@dimen/dp_20"-->
+                <!--                    android:layout_gravity="center"-->
+                <!--                    android:src="@mipmap/trend_pic_add" />-->
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#FFF"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/dp_16"
+                    android:paddingTop="@dimen/dp_10">
+
+                    <TextView
+                        android:id="@+id/tv_room_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="房间名"
+                        android:textColor="#333333"
+                        android:textSize="@dimen/sp_14" />
+
+                    <LinearLayout
+                        android:id="@+id/ll"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_40"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:orientation="horizontal">
+
+                        <com.qxcm.moduleutil.widget.ClearEditText
+                            android:id="@+id/ed_nick_name"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:background="@drawable/bg_r100_hui"
+                            android:gravity="center|left"
+                            android:hint="请输入昵称"
+                            android:maxLength="10"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="@dimen/dp_10"
+                            android:singleLine="true"
+                            android:text=""
+                            android:textColor="#333333"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/tv_user_name"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.2"
+                            android:gravity="center"
+                            android:text="随机"
+                            android:textColor="@color/color_FF514FFF"
+                            android:textSize="14sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+
+                    <!--                    <com.qxcm.moduleutil.widget.ClearEditText-->
+                    <!--                        android:id="@+id/ed_room_name"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="@dimen/dp_40"-->
+                    <!--                        android:layout_marginTop="@dimen/dp_10"-->
+                    <!--                        android:layout_marginEnd="@dimen/dp_16"-->
+                    <!--                        android:background="@drawable/bg_r100_hui"-->
+                    <!--                        android:hint="设置房间名"-->
+                    <!--                        android:maxLength="10"-->
+                    <!--                        android:paddingStart="10dp"-->
+                    <!--                        android:paddingEnd="@dimen/dp_10"-->
+                    <!--                        android:singleLine="true"-->
+                    <!--                        android:text=""-->
+                    <!--                        android:textColor="#333333"-->
+                    <!--                        android:textSize="14sp" />-->
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_1"
+                    android:background="#FFF"
+                    android:orientation="vertical"
+                    android:paddingStart="@dimen/dp_16">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:text="房间公告"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/sp_14" />
+
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_150"
+                        android:layout_marginEnd="@dimen/dp_16"
+                        android:background="@drawable/bg_r100_hui">
+
+                        <EditText
+                            android:id="@+id/et_g"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/dp_140"
+                            android:layout_marginStart="@dimen/dp_16"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:layout_marginEnd="@dimen/dp_16"
+                            android:layout_marginBottom="@dimen/dp_10"
+                            android:background="@android:color/transparent"
+                            android:gravity="left|top"
+                            android:hint="设置房间公告"
+                            android:maxLength="120"
+                            android:textColor="#333333"
+                            android:textColorHint="@color/color_FF666666"
+                            android:textSize="@dimen/sp_15" />
+
+                        <TextView
+                            android:id="@+id/tv_sz"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentBottom="true"
+                            android:layout_marginEnd="@dimen/dp_16"
+                            android:text="0/20"
+                            android:textColor="@color/color_FF666666"
+                            android:textSize="@dimen/sp_14" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_save"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_50"
+                android:layout_alignParentBottom="true"
+                android:layout_marginLeft="@dimen/dp_34"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginRight="@dimen/dp_34"
+                android:layout_marginBottom="@dimen/dp_20"
+                android:background="@drawable/cs"
+                android:gravity="center"
+                android:text="提交审核"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_17" />
+
+
+        </RelativeLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_currency_exchange.xml b/modulevocal/src/main/res/layout/activity_currency_exchange.xml
new file mode 100644
index 00000000..ba09f13c
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_currency_exchange.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.CurrencyExchangeActivity">
+
+    <data>
+
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
+        <RelativeLayout
+            android:id="@+id/rl_1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_112"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@mipmap/cz_bj"
+            app:layout_constraintTop_toBottomOf="@id/top_bar">
+
+            <TextView
+                android:id="@+id/t_1"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_24"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_21"
+                android:gravity="left|center_vertical"
+                android:text="钻石余额"
+                android:textColor="@color/color_FF000000"
+                android:textSize="@dimen/sp_16" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/t_1"
+                android:layout_alignParentStart="true"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="@dimen/dp_8">
+
+
+                <ImageView
+                    android:id="@+id/im_1"
+                    android:layout_width="@dimen/dp_28"
+                    android:layout_height="@dimen/dp_28"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:src="@mipmap/zs_tb" />
+
+                <TextView
+                    android:id="@+id/tv_jb"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_38"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_toRightOf="@+id/im_1"
+                    android:gravity="left|center"
+                    android:text="111111000"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_28" />
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/t_2"
+            android:layout_width="@dimen/dp_48"
+            android:layout_height="@dimen/dp_18"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:text="钻石兑换"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintTop_toBottomOf="@id/rl_1"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <RelativeLayout
+            android:id="@+id/r_4"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_27"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintBottom_toTopOf="@+id/v_view"
+            app:layout_constraintTop_toBottomOf="@+id/t_2">
+
+            <TextView
+                android:id="@+id/t_4"
+                android:layout_width="@dimen/dp_18"
+                android:layout_height="@dimen/dp_27"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="￥"
+                android:textStyle="bold"
+                android:textSize="@dimen/sp_18"
+                android:textColor="@color/color_FF000000"
+                />
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_custom_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_18"
+                android:layout_toRightOf="@+id/t_4"
+                android:background="@null"
+                android:layout_centerInParent="true"
+                android:hint="请输入需要兑换的钻石数量"
+                android:textColorHint="@color/color_FF999999"
+                android:inputType="numberDecimal"
+                android:textSize="@dimen/sp_12"/>
+
+            <TextView
+                android:id="@+id/t_5"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_18"
+                android:layout_centerInParent="true"
+                android:layout_alignParentEnd="true"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/dp_4"
+                android:text="全部提现"
+                android:textSize="@dimen/sp_12"
+                android:textColor="#0DFB89"
+                />
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/v_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@color/color_FF999999"
+            app:layout_constraintTop_toBottomOf="@id/r_4" />
+
+        <TextView
+            android:id="@+id/t_3"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_18"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_6"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:text="1钻石=10个金币"
+            android:textColor="@color/color_ff2727"
+            app:layout_constraintTop_toBottomOf="@+id/v_view"
+            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="@dimen/sp_12"
+            />
+
+
+        <TextView
+            android:id="@+id/tv_payment"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
+            android:layout_marginBottom="@dimen/dp_57"
+            android:background="@drawable/cs"
+            android:gravity="center"
+            android:text="确认兑换"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_edit_user.xml b/modulevocal/src/main/res/layout/activity_edit_user.xml
new file mode 100644
index 00000000..72995a55
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_edit_user.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.EditUserActivity">
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_122"
+            android:background="@drawable/bg_r16_fff"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="@dimen/dp_84"
+                android:layout_marginEnd="@dimen/dp_84"
+                android:text="@string/avatar_change_info"
+                android:textColor="@color/color_FF999999"
+                android:textSize="@dimen/sp_12"
+                android:layout_marginTop="@dimen/dp_40"/>
+
+            <RelativeLayout
+                android:id="@+id/rl_1"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_36"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:gravity="center|center_vertical"
+                android:layout_marginTop="@dimen/dp_10">
+
+                <TextView
+                    android:layout_width="@dimen/dp_56"
+                    android:layout_height="@dimen/dp_21"
+                    android:text="@string/nickname"
+                    android:gravity="center|left"
+                    android:layout_centerInParent="true"
+                    android:textSize="@dimen/sp_14"
+                    android:textColor="@color/color_FF999999"
+                    android:layout_alignParentStart="true"
+                   />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_24"
+                    tools:text="姓名"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_16"
+                    android:layout_centerInParent="true"
+                    android:textColor="@color/color_FF333333"
+                    android:layout_centerHorizontal="true"
+                   />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:src="@drawable/detail_icon_go"/>
+
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_36"
+                android:gravity="center|center_vertical"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_10">
+
+                <TextView
+                    android:layout_width="@dimen/dp_56"
+                    android:layout_height="@dimen/dp_21"
+                    android:text="@string/gender"
+                    android:gravity="center|left"
+                    android:layout_centerInParent="true"
+                    android:textSize="@dimen/sp_14"
+                    android:textColor="@color/color_FF999999"
+                    android:layout_alignParentStart="true"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_24"
+                    tools:text="男"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_16"
+                    android:layout_centerInParent="true"
+                    android:textColor="@color/color_FF333333"
+                    android:layout_centerHorizontal="true"
+                    />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:src="@drawable/detail_icon_go"/>
+
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/rl_3"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_36"
+                android:gravity="center|center_vertical"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_10">
+
+                <TextView
+                    android:layout_width="@dimen/dp_56"
+                    android:layout_height="@dimen/dp_21"
+                    android:text="@string/birthday"
+                    android:gravity="center|left"
+                    android:layout_centerInParent="true"
+                    android:textSize="@dimen/sp_14"
+                    android:textColor="@color/color_FF999999"
+                    android:layout_alignParentStart="true"
+                    />
+                <TextView
+                    android:id="@+id/tv_sr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_24"
+                    tools:text="2020-11-09"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_16"
+                    android:layout_centerInParent="true"
+                    android:textColor="@color/color_FF333333"
+                    android:layout_centerHorizontal="true"
+                    />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:src="@drawable/detail_icon_go"/>
+
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/rl_4"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_36"
+                android:gravity="center|center_vertical"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_10">
+
+                <TextView
+                    android:layout_width="@dimen/dp_56"
+                    android:layout_height="@dimen/dp_21"
+                    android:text="@string/introduction"
+                    android:gravity="center|left"
+                    android:layout_centerInParent="true"
+                    android:textSize="@dimen/sp_14"
+                    android:textColor="@color/color_FF999999"
+                    android:layout_alignParentStart="true"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_24"
+                    tools:text="测试数据"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_16"
+                    android:layout_centerInParent="true"
+                    android:textColor="@color/color_FF333333"
+                    android:layout_centerHorizontal="true"
+                    />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:src="@drawable/detail_icon_go"/>
+
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_24"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_12">
+
+                <TextView
+                    android:id="@+id/tv_5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_24"
+                    android:text="@string/background_image"
+                    android:gravity="center"
+                    android:layout_centerInParent="true"
+                    android:textSize="@dimen/sp_16"
+                    android:textColor="@color/color_FF333333"
+                    android:layout_alignParentStart="true"
+
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_24"
+                    android:text="@string/upload_limit"
+                    android:gravity="center"
+                    android:layout_toRightOf="@+id/tv_5"
+                    android:layout_marginStart="@dimen/dp_5"
+                    android:layout_centerInParent="true"
+                    android:textSize="@dimen/sp_12"
+                    android:textColor="@color/color_FF666666"
+                    />
+
+            </RelativeLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_photo_wall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_6"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_16" />
+
+        </LinearLayout>
+
+        <com.qxcm.moduleutil.widget.GifAvatarOvalView
+            android:id="@+id/rv_user_head"
+            android:layout_width="@dimen/dp_74"
+            android:layout_height="@dimen/dp_74"
+            android:layout_gravity="center_horizontal"
+            android:src="@mipmap/me_img_upld_head"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_79"
+            app:riv_oval="true" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_my_bag.xml b/modulevocal/src/main/res/layout/activity_my_bag.xml
new file mode 100644
index 00000000..5e20bf85
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_my_bag.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.MyBagActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+
+<!--        <com.google.android.material.appbar.AppBarLayout-->
+<!--            android:id="@+id/app_bar_layout"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:background="@color/color_transparent"-->
+<!--            app:elevation="0dp"-->
+<!--            app:layout_constraintTop_toTopOf="parent">-->
+
+            <com.qxcm.moduleutil.widget.CustomTopBar
+                android:id="@+id/top_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                 />
+
+            <com.example.moduletablayout.CustomSlidingTabLayout
+                android:id="@+id/sliding_tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/top_bar"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_12"
+                android:layout_marginRight="@dimen/dp_16"
+                app:tl_indicator_corner_radius="@dimen/dp_3"
+                app:tl_indicator_drawable="@drawable/index_bg_indicator"
+                app:tl_indicator_height="@dimen/dp_6"
+                app:tl_indicator_margin_bottom="@dimen/dp_3"
+                app:tl_indicator_width="@dimen/dp_28"
+                app:tl_showCateIndicator="false"
+                app:tl_tab_width="@dimen/dp_70"
+                app:tl_textBold="SELECT"
+                app:tl_textSelectColor="@color/color_2B2823"
+                app:tl_textSelectedSize="@dimen/sp_16"
+                app:tl_textUnselectColor="@color/color_FF999999"
+                app:tl_textsize="@dimen/sp_14" />
+<!--        </com.google.android.material.appbar.AppBarLayout>-->
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            app:layout_constraintTop_toBottomOf="@+id/sliding_tab_layout"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_my_money.xml b/modulevocal/src/main/res/layout/activity_my_money.xml
new file mode 100644
index 00000000..8c126870
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_my_money.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.MyMoneyActivity">
+
+    <data>
+
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <LinearLayout
+            android:id="@+id/l_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar"
+            android:layout_marginTop="@dimen/dp_12">
+
+            <RelativeLayout
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_98"
+                android:layout_weight="1"
+                android:background="@mipmap/jinb_tg"
+                android:layout_marginStart="@dimen/dp_16"
+                android:paddingStart="@dimen/dp_10"
+                android:paddingEnd="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_11"
+                android:paddingTop="@dimen/dp_41">
+
+                <TextView
+                    android:id="@+id/tv_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="51"
+                    android:gravity="left|center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/coin"
+                    android:gravity="left|center"
+                    android:layout_below="@id/tv_1"
+                    android:layout_marginTop="@dimen/dp_4"
+                    android:textColor="@color/color_FF666666"
+                    android:textSize="@dimen/sp_12"/>
+
+                <TextView
+                    android:id="@+id/tv_cz"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center|left"
+                    android:background="@mipmap/mony_cz"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="@dimen/dp_5"
+                    />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="@dimen/dp_98"
+                android:layout_weight="1"
+                android:background="@mipmap/zus_tg"
+                android:layout_marginStart="@dimen/dp_11"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:paddingStart="@dimen/dp_10"
+                android:paddingEnd="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_11"
+                android:paddingTop="@dimen/dp_41">
+
+                <TextView
+                    android:id="@+id/tv_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="51"
+                    android:gravity="left|center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diamond"
+                    android:gravity="left|center"
+                    android:layout_below="@id/tv_2"
+                    android:layout_marginTop="@dimen/dp_4"
+                    android:textColor="@color/color_FF666666"
+                    android:textSize="@dimen/sp_12"/>
+
+                <TextView
+                    android:id="@+id/tv_tx"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center|left"
+                    android:background="@mipmap/mony_tx"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="@dimen/dp_5"
+                    />
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_zd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_12"
+            android:text="@string/my_bill"
+            android:layout_marginStart="@dimen/dp_16"
+            android:textSize="@dimen/sp_16"
+            android:textColor="@color/color_FF000000"
+            app:layout_constraintTop_toBottomOf="@+id/l_1"/>
+
+        <RelativeLayout
+            android:id="@+id/r_1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_38"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@drawable/bg_r9_fffff"
+            app:layout_constraintTop_toBottomOf="@+id/tv_zd">
+
+            <TextView
+                android:layout_width="@dimen/dp_56"
+                android:layout_height="@dimen/dp_21"
+                android:text="@string/recharge_record"
+                android:layout_centerInParent="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="@dimen/dp_12"
+                android:textSize="@dimen/sp_14"
+                android:textColor="@color/color_FF333333"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerInParent="true"
+                android:layout_marginEnd="@dimen/dp_12"
+                android:background="@drawable/detail_icon_go"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/r_2"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_38"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@drawable/bg_r9_fffff"
+            app:layout_constraintTop_toBottomOf="@+id/r_1">
+
+            <TextView
+                android:layout_width="@dimen/dp_56"
+                android:layout_height="@dimen/dp_21"
+                android:text="@string/diamond_income_expense"
+                android:layout_centerInParent="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="@dimen/dp_12"
+                android:textSize="@dimen/sp_14"
+                android:textColor="@color/color_FF333333"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerInParent="true"
+                android:layout_marginEnd="@dimen/dp_12"
+                android:background="@drawable/detail_icon_go"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/tv_qt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_12"
+            android:text="@string/other_functions"
+            android:layout_marginStart="@dimen/dp_16"
+            android:textSize="@dimen/sp_16"
+            android:textColor="@color/color_FF000000"
+            app:layout_constraintTop_toBottomOf="@+id/r_2"/>
+
+        <RelativeLayout
+            android:id="@+id/r_3"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_38"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@drawable/bg_r9_fffff"
+            app:layout_constraintTop_toBottomOf="@+id/tv_qt">
+
+            <TextView
+                android:layout_width="@dimen/dp_56"
+                android:layout_height="@dimen/dp_21"
+                android:text="@string/diamond_to_coin"
+                android:layout_centerInParent="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="@dimen/dp_12"
+                android:textSize="@dimen/sp_14"
+                android:textColor="@color/color_FF333333"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerInParent="true"
+                android:layout_marginEnd="@dimen/dp_12"
+                android:background="@drawable/detail_icon_go"/>
+
+        </RelativeLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_my_room.xml b/modulevocal/src/main/res/layout/activity_my_room.xml
new file mode 100644
index 00000000..0ec62b8e
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_my_room.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.MyRoomActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_personality.xml b/modulevocal/src/main/res/layout/activity_personality.xml
new file mode 100644
index 00000000..259b45d1
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_personality.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.PersonalityActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:TopBarTitle="@string/dressup"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar"
+            app:tabBackground="@android:color/transparent"
+            app:tabIndicatorHeight="0dp"
+            app:tabMode="scrollable"
+            app:tabPaddingBottom="0dp"
+            app:tabPaddingEnd="0dp"
+            app:tabPaddingStart="0dp"
+            app:tabPaddingTop="0dp"
+            app:tabRippleColor="@android:color/transparent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_2"
+            android:layout_width="@dimen/dp_127"
+            android:layout_height="@dimen/dp_127"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dp_12"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tab_layout">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/iv_user"
+                android:layout_width="@dimen/dp_104"
+                android:layout_height="@dimen/dp_104"
+                android:layout_gravity="center_horizontal"
+                android:scaleType="centerCrop"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:riv_border_color="@color/white"
+                app:riv_border_width="1dp"
+                app:riv_oval="true" />
+
+            <com.opensource.svgaplayer.SVGAImageView
+                android:id="@+id/image_headPortrait"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+<!--        <com.example.moduletablayout.CustomSlidingTabLayout-->
+<!--            android:id="@+id/sliding_tab_layout"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginLeft="@dimen/dp_16"-->
+<!--            android:layout_marginTop="@dimen/dp_12"-->
+<!--            android:layout_marginRight="@dimen/dp_16"-->
+<!--            app:layout_constraintTop_toBottomOf="@+id/cl_2"-->
+<!--            app:tl_indicator_corner_radius="@dimen/dp_3"-->
+<!--            app:tl_indicator_drawable="@drawable/index_bg_indicator"-->
+<!--            app:tl_indicator_height="@dimen/dp_6"-->
+<!--            app:tl_indicator_margin_bottom="@dimen/dp_3"-->
+<!--            app:tl_indicator_width="@dimen/dp_28"-->
+<!--            app:tl_showCateIndicator="false"-->
+<!--            app:tl_tab_width="@dimen/dp_50"-->
+<!--            app:tl_textBold="SELECT"-->
+<!--            app:tl_textSelectColor="@color/color_2B2823"-->
+<!--            app:tl_textSelectedSize="@dimen/sp_14"-->
+<!--            app:tl_textUnselectColor="@color/color_FF999999"-->
+<!--            app:tl_textsize="@dimen/sp_12" />-->
+
+        <com.qxcm.moduleutil.widget.ScrollViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_30"
+            app:layout_constraintTop_toBottomOf="@+id/cl_2"
+             />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_60"
+            android:background="@color/color_transparent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_real_deatil.xml b/modulevocal/src/main/res/layout/activity_real_deatil.xml
new file mode 100644
index 00000000..1adee791
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_real_deatil.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.RealDetailActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/im_1"
+            android:layout_width="@dimen/dp_195"
+            android:layout_height="@dimen/dp_195"
+            android:layout_marginTop="@dimen/dp_16"
+            android:src="@mipmap/real_q"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar"
+             />
+
+        <TextView
+            android:id="@+id/tv_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginBottom="@dimen/dp_12"
+            android:text="@string/already_authenticated"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/im_1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_12"
+            android:background="@color/color_FFF8F8F8"
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@+id/tv_1">
+
+            <LinearLayout
+                style="@style/My_Info_Item_LL_Style"
+                android:background="@drawable/bg_r15_white">
+
+                <TextView
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:text="@string/real_name" />
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_gravity="right|center"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    tools:text="@string/real_name" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/My_Info_Item_LL_Style"
+                android:background="@drawable/bg_r15_white">
+
+                <TextView
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:text="@string/id_type" />
+
+                <TextView
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_gravity="right|center"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    tools:text="身份证" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/My_Info_Item_LL_Style"
+                android:background="@drawable/bg_r15_white">
+
+                <TextView
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:text="@string/id_number" />
+
+                <TextView
+                    android:id="@+id/tv_id_number"
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_gravity="right|center"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    tools:text="" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_1"
+                style="@style/My_Info_Item_LL_Style"
+                android:layout_marginTop="@dimen/dp_9"
+                android:background="@drawable/bg_r15_white">
+
+                <LinearLayout
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="@style/My_Info_Item_Title_Style"
+                        android:text="@string/update_real_name_info"
+                        android:textSize="@dimen/sp_14"
+                        />
+
+                    <TextView
+                        style="@style/My_Info_Item_Title_Style"
+                        android:text="@string/update_real_name_desc"
+                        android:textColor="@color/color_FF999999"
+                        android:textSize="@dimen/sp_12"/>
+                </LinearLayout>
+
+                <ImageView style="@style/My_Info_Item_Arrow_Style" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_2"
+                style="@style/My_Info_Item_LL_Style"
+                android:layout_marginTop="@dimen/dp_9"
+                android:background="@drawable/bg_r15_white">
+
+                <LinearLayout
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="@style/My_Info_Item_Title_Style"
+                        android:text="@string/correct_real_name"
+                        android:textSize="@dimen/sp_14"
+                        />
+
+                    <TextView
+                        style="@style/My_Info_Item_Title_Style"
+                        android:text="@string/correct_real_name_desc"
+                        android:textColor="@color/color_FF999999"
+                        android:textSize="@dimen/sp_12"/>
+                </LinearLayout>
+
+                <ImageView style="@style/My_Info_Item_Arrow_Style" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_real_name.xml b/modulevocal/src/main/res/layout/activity_real_name.xml
index 01e7b5e8..dbf4892d 100644
--- a/modulevocal/src/main/res/layout/activity_real_name.xml
+++ b/modulevocal/src/main/res/layout/activity_real_name.xml
@@ -100,7 +100,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="gone">
+           >
 
 
             <TextView
@@ -195,7 +195,8 @@
             android:id="@+id/l_2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/modulevocal/src/main/res/layout/activity_recharge.xml b/modulevocal/src/main/res/layout/activity_recharge.xml
new file mode 100644
index 00000000..ddf70370
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_recharge.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.RechargeActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <RelativeLayout
+            android:id="@+id/rl_1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_112"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@mipmap/cz_bj"
+            app:layout_constraintTop_toBottomOf="@id/top_bar">
+
+            <TextView
+                android:id="@+id/t_1"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_24"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_21"
+                android:gravity="left|center_vertical"
+                android:text="@string/recharge"
+                android:textColor="@color/color_FF000000"
+                android:textSize="@dimen/sp_16" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/t_1"
+                android:layout_alignParentStart="true"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="@dimen/dp_8">
+
+
+                <ImageView
+                    android:id="@+id/im_1"
+                    android:layout_width="@dimen/dp_28"
+                    android:layout_height="@dimen/dp_28"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:src="@mipmap/jinb" />
+
+                <TextView
+                    android:id="@+id/tv_jb"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_38"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_toRightOf="@+id/im_1"
+                    android:gravity="left|center"
+                    android:text="111111000"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_28" />
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintTop_toBottomOf="@id/rl_1" />
+
+        <RelativeLayout
+            android:id="@+id/r_4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintBottom_toTopOf="@+id/v_view"
+            app:layout_constraintTop_toBottomOf="@+id/recycler_view">
+
+            <TextView
+                android:id="@+id/t_4"
+                android:layout_width="@dimen/dp_18"
+                android:layout_height="@dimen/dp_27"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/dp_16"
+                android:text="￥"
+                android:textStyle="bold"
+                android:textSize="@dimen/sp_18"
+                android:textColor="@color/color_FF000000"
+                 />
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_custom_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/t_4"
+                android:background="@null"
+                android:layout_centerInParent="true"
+                android:hint="请输入充值金额(300-50000元)"
+                android:textColorHint="@color/color_FF999999"
+                android:inputType="numberDecimal"
+                android:textSize="@dimen/sp_12"/>
+
+            <TextView
+                android:id="@+id/t_5"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_27"
+                android:layout_centerInParent="true"
+                android:layout_alignParentEnd="true"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/dp_4"
+                android:text="将获得0金币"
+                android:textStyle="bold"
+            />
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/v_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@color/color_FF999999"
+            app:layout_constraintTop_toBottomOf="@id/r_4" />
+
+        <TextView
+            android:id="@+id/t_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:text="@string/payment_method"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintTop_toBottomOf="@id/v_view" />
+
+        <RelativeLayout
+            android:id="@+id/rl_weixin_pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintTop_toBottomOf="@+id/t_2">
+
+            <ImageView
+                android:id="@+id/im_wx"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:src="@mipmap/wx_zf" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/dp_1"
+                android:layout_toRightOf="@+id/im_wx"
+                android:text="@string/wechat_payment"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_14" />
+
+
+            <ImageView
+                android:id="@+id/iv_weixin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/dp_2"
+                android:src="@drawable/level_pay" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_three_pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintTop_toBottomOf="@+id/rl_weixin_pay">
+
+            <ImageView
+                android:id="@+id/im_zfb"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:src="@mipmap/sign_icon_zfb" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/dp_1"
+                android:layout_toRightOf="@+id/im_zfb"
+                android:text="@string/alipay_payment"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_14" />
+
+
+            <ImageView
+                android:id="@+id/iv_three_pay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/dp_2"
+                android:src="@drawable/level_pay" />
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/tv_payment"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
+            android:layout_marginBottom="@dimen/dp_57"
+            android:background="@drawable/cs"
+            android:gravity="center"
+            android:text="确认支付"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_room_allowance.xml b/modulevocal/src/main/res/layout/activity_room_allowance.xml
new file mode 100644
index 00000000..b8341bf7
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_room_allowance.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <!--    <ScrollView-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_height="wrap_content">-->
+
+    <!--        <LinearLayout-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="wrap_content"-->
+    <!--            android:orientation="vertical">-->
+
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:TopBarTitle="房间补贴" />
+
+        <!--        <RelativeLayout-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginTop="100dp"-->
+        <!--            android:background="@drawable/bg_r16_tb_ffffff" />-->
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dp_80"
+            android:background="@drawable/bg_r16_tb_ffffff"
+            android:padding="16dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:orientation="vertical"
+                >
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:gravity="center">
+
+                    <TextView
+                        android:id="@+id/tv_last_week"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_24"
+                        android:layout_alignParentStart="true"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="16sp"
+                        android:text="上周补贴" />
+
+                    <TextView
+                        android:id="@+id/tv_grant"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_21"
+                        android:layout_alignParentEnd="true"
+                        android:textSize="14sp"
+                        android:text="已发放" />
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#ECECEC" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:gravity="center">
+
+                    <TextView
+                        android:id="@+id/tv_last"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_24"
+                        android:layout_alignParentStart="true"
+                        android:gravity="center"
+                        android:textColor="#FF8ACC"
+                        android:textSize="14sp"
+                        tools:text="累计流水：10000" />
+
+                    <TextView
+                        android:id="@+id/tv_grant2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_21"
+                        android:layout_alignParentEnd="true"
+                        android:textColor="#B265FA"
+                        android:textSize="14sp"
+                        tools:text="获得补贴：10" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:gravity="center"
+                    >
+
+                    <TextView
+                        android:id="@+id/tv_this_week"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_24"
+                        android:layout_alignParentStart="true"
+                        android:text="本周补贴"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tv_week_grant"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_21"
+                        android:layout_alignParentEnd="true"
+                        android:textSize="14sp"
+                        android:text="未发放" />
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#ECECEC" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:gravity="center">
+
+                    <TextView
+                        android:id="@+id/tv_this"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_24"
+                        android:layout_alignParentStart="true"
+                        android:gravity="center"
+                        android:text="累计流水：10000"
+                        android:textColor="#FF8ACC"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_grant3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_21"
+                        android:layout_alignParentEnd="true"
+                        android:text="获得补贴：10"
+                        android:textColor="#B265FA"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <!--                <ScrollView-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:layout_marginTop="@dimen/dp_20">-->
+
+
+                <WebView
+                    android:id="@+id/iv_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    />
+                <!--                </ScrollView>-->
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+    <!--        </LinearLayout>-->
+    <!--    </ScrollView>-->
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_room_allowance_detail.xml b/modulevocal/src/main/res/layout/activity_room_allowance_detail.xml
new file mode 100644
index 00000000..c084ea74
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_room_allowance_detail.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.RoomAllowanceDetailActivity">
+
+    <data></data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            app:TopBarTitle="历史记录" />
+
+        <!--        <RelativeLayout-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginTop="100dp"-->
+        <!--            android:background="@drawable/bg_r16_tb_ffffff" />-->
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dp_80"
+            android:background="@drawable/bg_r16_tb_ffffff"
+            android:padding="16dp">
+
+            <LinearLayout
+                android:id="@+id/ll_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/dp_24"
+                    android:layout_weight="2"
+                    android:gravity="center"
+                    android:text="时间"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/dp_24"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="累计流水"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/dp_24"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="获得补贴"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/dp_24"
+                    android:layout_weight="0.7"
+                    android:gravity="center"
+                    android:text="状态"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16" />
+
+            </LinearLayout>
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/smart_refresh_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="@dimen/dp_22"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ll_title"
+                app:srlEnableLoadMore="true"
+                app:srlEnableRefresh="false">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycle_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="12dp" />
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_room_details.xml b/modulevocal/src/main/res/layout/activity_room_details.xml
new file mode 100644
index 00000000..72117dbe
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_room_details.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.RoomDetailsActivity">
+
+    <data>
+
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:TopBarTitle="房间明细"
+            />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="100dp"
+            android:background="@drawable/bg_r16_tb_ffffff">
+
+
+        </RelativeLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dp_60"
+            android:padding="16dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/rl2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:background="@mipmap/details_b">
+
+                    <TextView
+                        android:id="@+id/tv1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginStart="@dimen/dp_14"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:text="累计收益"
+                        android:textColor="@color/color_FF999999"
+                        android:textSize="12sp" />
+
+
+                    <RelativeLayout
+                        android:id="@+id/rl3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_16"
+                        android:gravity="center">
+
+                        <TextView
+                            android:id="@+id/tv2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="开始日期"
+                            android:textColor="@color/color_FF999999"
+                            android:textSize="12sp" />
+
+                        <ImageView
+                            android:id="@+id/iv1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_toEndOf="@+id/tv2"
+                            android:paddingTop="@dimen/dp_3"
+                            android:src="@mipmap/data1" />
+
+                        <TextView
+                            android:id="@+id/tv22"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:layout_toEndOf="@+id/iv1"
+                            android:text="结束日期"
+                            android:textColor="@color/color_FF999999"
+                            android:textSize="12sp" />
+
+                        <ImageView
+                            android:id="@+id/iv2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_toEndOf="@+id/tv22"
+                            android:paddingTop="@dimen/dp_2"
+                            android:src="@mipmap/data2" />
+                    </RelativeLayout>
+
+
+                    <TextView
+                        android:id="@+id/tv3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/tv1"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginStart="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:drawableLeft="@mipmap/im_zs"
+                        android:drawablePadding="@dimen/dp_5"
+                        android:text="10000"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="23sp" />
+
+                    <TextView
+                        android:id="@+id/tv4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/tv3"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginStart="@dimen/dp_14"
+                        android:layout_marginTop="@dimen/dp_5"
+                        android:text="累计流水"
+                        android:textColor="@color/color_FF999999"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/tv5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/tv4"
+                        android:layout_marginStart="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_3"
+                        android:drawableLeft="@mipmap/jinb"
+                        android:text="10000"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="14sp" />
+
+
+                </RelativeLayout>
+
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    android:id="@+id/smart_refresh_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:srlEnableLoadMore="true"
+                    app:srlEnableRefresh="false">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="12dp" />
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+                <!--                <RelativeLayout-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:layout_marginTop="@dimen/dp_10"-->
+                <!--                    tools:ignore="RtlSymmetry">-->
+
+                <!--                    <TextView-->
+                <!--                        android:id="@+id/tv6"-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:layout_alignParentStart="true"-->
+                <!--                        android:text="2025-3-6"-->
+                <!--                        android:textColor="@color/color_FF333333"-->
+                <!--                        android:textSize="12sp" />-->
+
+                <!--                    <RelativeLayout-->
+                <!--                        android:id="@+id/rl1"-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:layout_alignParentEnd="true"-->
+                <!--                        android:layout_marginEnd="@dimen/dp_16"-->
+                <!--                        android:gravity="center">-->
+
+
+                <!--                        <TextView-->
+                <!--                            android:id="@+id/tv7"-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:text="收益"-->
+                <!--                            android:textColor="@color/color_FF333333"-->
+                <!--                            android:textSize="12sp" />-->
+
+                <!--                        <TextView-->
+                <!--                            android:id="@+id/tv8"-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginStart="4dp"-->
+                <!--                            android:layout_toEndOf="@+id/tv7"-->
+                <!--                            android:text="¥10000"-->
+                <!--                            android:textColor="#ffff8acc"-->
+                <!--                            android:textSize="12sp" />-->
+
+                <!--                        <TextView-->
+                <!--                            android:id="@+id/tv9"-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginStart="5dp"-->
+                <!--                            android:layout_toEndOf="@+id/tv8"-->
+                <!--                            android:text="流水"-->
+                <!--                            android:textColor="@color/color_FF333333"-->
+                <!--                            android:textSize="12sp" />-->
+
+                <!--                        <TextView-->
+                <!--                            android:id="@+id/tv10"-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginStart="4dp"-->
+                <!--                            android:layout_toEndOf="@+id/tv9"-->
+                <!--                            android:text="¥10000"-->
+                <!--                            android:textColor="#ffff8acc"-->
+                <!--                            android:textSize="12sp" />-->
+                <!--                    </RelativeLayout>-->
+
+                <!--                    <androidx.recyclerview.widget.RecyclerView-->
+                <!--                        android:id="@+id/rv"-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:layout_below="@+id/rl1"-->
+                <!--                        android:layout_marginTop="12dp"-->
+                <!--                        tools:listitem="@layout/room_details_list"/>-->
+
+                <!--                </RelativeLayout>-->
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    </FrameLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/activity_underage.xml b/modulevocal/src/main/res/layout/activity_underage.xml
index 6f676acb..797eec63 100644
--- a/modulevocal/src/main/res/layout/activity_underage.xml
+++ b/modulevocal/src/main/res/layout/activity_underage.xml
@@ -38,23 +38,39 @@
             android:layout_marginTop="@dimen/dp_30"
            >
 
-            <com.tuo.customview.VerificationCodeView
+            <com.qxcm.moduleutil.widget.SplitEditText
                 android:id="@+id/verificationcodeview"
                 android:layout_width="wrap_content"
+                android:layout_marginEnd="@dimen/dp_66"
+                android:layout_marginStart="@dimen/dp_66"
                 android:layout_height="@dimen/dp_63"
-                android:layout_centerHorizontal="true"
-                android:layout_marginStart="@dimen/dp_36"
-                android:layout_marginEnd="@dimen/dp_36"
-                app:icv_et_bg_focus="@mipmap/bg_verify_view_item_normal"
-                app:icv_et_bg_normal="@mipmap/bg_verify_view_item_normal"
-                app:icv_et_divider_drawable="@drawable/shape_divider_vcode"
-                app:icv_et_number="4"
-                app:icv_et_pwd="false"
-                app:icv_et_pwd_radius="10dp"
-                app:icv_et_text_color="@color/black"
-                app:icv_et_text_size="18sp"
-                app:icv_et_width="@dimen/dp_48"
-                />
+                android:inputType="numberPassword"
+                android:textColor="@color/color_FF333333"
+                app:borderColor="#EFF2F8"
+                app:contentNumber="4"
+                app:contentShowMode="text"
+                app:corner_size="5dp"
+                app:inputBoxSquare="true"
+                app:inputBoxStyle="singleBox"
+                app:spaceSize="7dp" />
+
+<!--            <com.tuo.customview.VerificationCodeView-->
+<!--                android:id="@+id/verificationcodeview"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="@dimen/dp_63"-->
+<!--                android:layout_centerHorizontal="true"-->
+<!--                android:layout_marginStart="@dimen/dp_36"-->
+<!--                android:layout_marginEnd="@dimen/dp_36"-->
+<!--                app:icv_et_bg_focus="@mipmap/bg_verify_view_item_normal"-->
+<!--                app:icv_et_bg_normal="@mipmap/bg_verify_view_item_normal"-->
+<!--                app:icv_et_divider_drawable="@drawable/shape_divider_vcode"-->
+<!--                app:icv_et_number="4"-->
+<!--                app:icv_et_pwd="false"-->
+<!--                app:icv_et_pwd_radius="10dp"-->
+<!--                app:icv_et_text_color="@color/black"-->
+<!--                app:icv_et_text_size="18sp"-->
+<!--                app:icv_et_width="@dimen/dp_48"-->
+<!--                />-->
 
         </RelativeLayout>
 
diff --git a/modulevocal/src/main/res/layout/activity_user_homepage.xml b/modulevocal/src/main/res/layout/activity_user_homepage.xml
new file mode 100644
index 00000000..12a82b84
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_user_homepage.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.UserHomepageActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true">
+
+<!--        <androidx.coordinatorlayout.widget.CoordinatorLayout-->
+<!--            android:id="@+id/coordinator_layout"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="0dp"-->
+<!--            app:layout_constraintTop_toTopOf="parent">-->
+
+<!--            <include-->
+<!--                android:id="@+id/me_user"-->
+<!--                layout="@layout/user_home" />-->
+
+<!--            <com.scwang.smartrefresh.layout.SmartRefreshLayout-->
+<!--                android:id="@+id/smart_refresh_layout"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:background="@color/transparent"-->
+<!--                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"-->
+<!--                app:srlEnableAutoLoadMore="false"-->
+<!--                app:srlEnableLoadMore="false"-->
+<!--                app:srlEnableRefresh="false">-->
+
+<!--                <androidx.core.widget.NestedScrollView-->
+<!--                    android:id="@+id/nest_scroll"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    android:background="@color/transparent"-->
+<!--                    app:layout_constraintTop_toTopOf="parent">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:id="@+id/ll_parent"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:descendantFocusability="blocksDescendants"-->
+<!--                        android:orientation="vertical">-->
+
+<!--                        <FrameLayout-->
+<!--                            android:id="@+id/fl_skills"-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="wrap_content" />-->
+
+<!--                        <FrameLayout-->
+<!--                            android:id="@+id/fl_gift_wall"-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="wrap_content" />-->
+
+<!--                        <FrameLayout-->
+<!--                            android:id="@+id/fl_trend_container"-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="wrap_content" />-->
+
+<!--                        <TextView-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:layout_marginTop="@dimen/dp_15"-->
+<!--                            android:gravity="center"-->
+<!--                            android:paddingBottom="@dimen/dp_10"-->
+<!--                            android:text="人家是有底线的～"-->
+<!--                            android:textColor="@color/black"-->
+<!--                            android:textSize="@dimen/sp_12" />-->
+
+<!--                    </LinearLayout>-->
+
+<!--                </androidx.core.widget.NestedScrollView>-->
+
+<!--            </com.scwang.smartrefresh.layout.SmartRefreshLayout>-->
+
+<!--        </androidx.coordinatorlayout.widget.CoordinatorLayout>-->
+        <RelativeLayout
+            android:id="@+id/rl_head"
+            android:layout_width="match_parent"
+            tools:background="@mipmap/default_avatar"
+            android:layout_height="@dimen/dp_207"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.stx.xhb.xbanner.XBanner
+                android:id="@+id/xbanner"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:isAutoPlay="false"
+                app:pointsVisibility="false"
+                app:pointNormal="@drawable/xbanner_point_normal"
+                app:pointSelect="@drawable/xbanner_point_selected"
+                app:pointTopBottomPadding="@dimen/dp_37" />
+        </RelativeLayout>
+
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <com.qxcm.moduleutil.widget.ScrollViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_80"
+            app:layout_constraintTop_toBottomOf="@+id/top_bar"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/modulevocal/src/main/res/layout/activity_withdrawal.xml b/modulevocal/src/main/res/layout/activity_withdrawal.xml
new file mode 100644
index 00000000..d91443fa
--- /dev/null
+++ b/modulevocal/src/main/res/layout/activity_withdrawal.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activity.WithdrawalActivity">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
+        <RelativeLayout
+            android:id="@+id/rl_1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_112"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@mipmap/cz_bj"
+            app:layout_constraintTop_toBottomOf="@id/top_bar">
+
+            <TextView
+                android:id="@+id/t_1"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_24"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_21"
+                android:gravity="left|center_vertical"
+                android:text="我的钻石"
+                android:textColor="@color/color_FF000000"
+                android:textSize="@dimen/sp_16" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/t_1"
+                android:layout_alignParentStart="true"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="@dimen/dp_8">
+
+
+                <ImageView
+                    android:id="@+id/im_1"
+                    android:layout_width="@dimen/dp_28"
+                    android:layout_height="@dimen/dp_28"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:src="@mipmap/zs_tb" />
+
+                <TextView
+                    android:id="@+id/tv_jb"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_38"
+                    android:layout_centerInParent="true"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_toRightOf="@+id/im_1"
+                    android:gravity="left|center"
+                    android:text="111111000"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_28" />
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/t_2"
+            android:layout_width="@dimen/dp_48"
+            android:layout_height="@dimen/dp_18"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:text="提现金额"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintTop_toBottomOf="@id/rl_1"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <RelativeLayout
+            android:id="@+id/r_4"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_27"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintBottom_toTopOf="@+id/v_view"
+            app:layout_constraintTop_toBottomOf="@+id/t_2">
+
+            <TextView
+                android:id="@+id/t_4"
+                android:layout_width="@dimen/dp_18"
+                android:layout_height="@dimen/dp_27"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="￥"
+                android:textStyle="bold"
+                android:textSize="@dimen/sp_18"
+                android:textColor="@color/color_FF000000"
+                />
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_custom_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_18"
+                android:layout_toRightOf="@+id/t_4"
+                android:background="@null"
+                android:layout_centerInParent="true"
+                android:hint="请输入"
+                android:textColorHint="@color/color_FF999999"
+                android:inputType="numberDecimal"
+                android:textSize="@dimen/sp_12"/>
+
+            <TextView
+                android:id="@+id/t_5"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_18"
+                android:layout_centerInParent="true"
+                android:layout_alignParentEnd="true"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/dp_4"
+                android:text="全部提现"
+                android:textSize="@dimen/sp_12"
+                android:textColor="#0DFB89"
+                />
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/v_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:background="@color/color_FF999999"
+            app:layout_constraintTop_toBottomOf="@id/r_4" />
+
+        <TextView
+            android:id="@+id/t_3"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_18"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_6"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:text="提现扣除服务费：6%"
+            android:textColor="@color/color_ff2727"
+            app:layout_constraintTop_toBottomOf="@+id/v_view"
+            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="@dimen/sp_12"
+        />
+
+        <TextView
+            android:id="@+id/t_6"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_24"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:text="提现方式"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_16"
+            android:textStyle="bold"
+            app:layout_constraintTop_toBottomOf="@id/t_3" />
+
+        <RelativeLayout
+            android:id="@+id/rl_three_pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_16"
+            app:layout_constraintTop_toBottomOf="@+id/t_6">
+
+            <ImageView
+                android:id="@+id/im_zfb"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:src="@mipmap/sign_icon_zfb" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/dp_1"
+                android:layout_toRightOf="@+id/im_zfb"
+                android:text="@string/alipay_payment"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_14" />
+
+
+            <ImageView
+                android:id="@+id/iv_three_pay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/dp_2"
+                android:src="@drawable/level_pay" />
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/tv_payment"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_42"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
+            android:layout_marginBottom="@dimen/dp_57"
+            android:background="@drawable/cs"
+            android:gravity="center"
+            android:text="确认提现"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/fragment_cirle_list.xml b/modulevocal/src/main/res/layout/fragment_cirle_list.xml
new file mode 100644
index 00000000..d777dcc2
--- /dev/null
+++ b/modulevocal/src/main/res/layout/fragment_cirle_list.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/recyclerView"
+            app:layout_constraintTop_toTopOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/fragment_my_bag.xml b/modulevocal/src/main/res/layout/fragment_my_bag.xml
new file mode 100644
index 00000000..465c844f
--- /dev/null
+++ b/modulevocal/src/main/res/layout/fragment_my_bag.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+   >
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/rv_my_bag"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        />
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/fragment_my_bag_list.xml b/modulevocal/src/main/res/layout/fragment_my_bag_list.xml
new file mode 100644
index 00000000..2cf03a86
--- /dev/null
+++ b/modulevocal/src/main/res/layout/fragment_my_bag_list.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/recyclerView"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        android:background="@drawable/bg_r10_white"
+        />
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/fragment_user_hompage.xml b/modulevocal/src/main/res/layout/fragment_user_hompage.xml
new file mode 100644
index 00000000..ec9af0d5
--- /dev/null
+++ b/modulevocal/src/main/res/layout/fragment_user_hompage.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/dp_64">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/color_transparent"
+            app:elevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraint_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/dp_10"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <include
+                    android:id="@+id/header_info"
+                    layout="@layout/user_top"
+                    app:layout_collapseMode="parallax"
+                    app:layout_collapseParallaxMultiplier="0.3" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.example.moduletablayout.CustomSlidingTabLayout
+                android:id="@+id/sliding_tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_12"
+                app:tl_indicator_corner_radius="@dimen/dp_3"
+                app:tl_indicator_drawable="@drawable/index_bg_indicator"
+                app:tl_indicator_height="@dimen/dp_6"
+                app:tl_indicator_margin_bottom="@dimen/dp_3"
+                app:tl_showCateIndicator="false"
+                app:tl_indicator_width="@dimen/dp_28"
+                app:tl_tab_width="@dimen/dp_50"
+                app:tl_textBold="SELECT"
+                app:tl_textSelectColor="@color/color_2B2823"
+                app:tl_textSelectedSize="@dimen/sp_16"
+                app:tl_textUnselectColor="@color/color_FF999999"
+                app:tl_textsize="@dimen/sp_12" />
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginStart="@dimen/dp_14"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/fragment_vocal_range.xml b/modulevocal/src/main/res/layout/fragment_vocal_range.xml
index 98988e8d..bfbdc781 100644
--- a/modulevocal/src/main/res/layout/fragment_vocal_range.xml
+++ b/modulevocal/src/main/res/layout/fragment_vocal_range.xml
@@ -165,8 +165,8 @@
 
                         <ImageView
                             android:id="@+id/tv_home"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_27"
                             android:src="@mipmap/me_edit"
                             android:scaleType="centerCrop"
                              />
diff --git a/modulevocal/src/main/res/layout/item_black.xml b/modulevocal/src/main/res/layout/item_black.xml
new file mode 100644
index 00000000..cf5bb66d
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_black.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:id="@+id/ll_szmm"
+        style="@style/My_Info_Item_LL_Style"
+        android:background="@drawable/bg_r15_white">
+
+        <com.qxcm.moduleutil.widget.GifAvatarOvalView
+            android:id="@+id/im_user"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
+            android:layout_gravity="center"
+            android:layout_marginRight="10dp"
+            android:src="@mipmap/me_img_upld_head" />
+
+        <TextView
+            android:id="@+id/tv_nick_name"
+            style="@style/My_Info_Item_Title_Style"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            tools:text="@string/set_password" />
+
+        <ImageView
+            android:id="@+id/im_g"
+            android:layout_width="@dimen/dp_79"
+            android:layout_height="@dimen/dp_31"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_gravity="center"
+            />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/item_brief_introduction.xml b/modulevocal/src/main/res/layout/item_brief_introduction.xml
new file mode 100644
index 00000000..81e496c1
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_brief_introduction.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dp_12"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/tv"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_24"
+        android:background="@drawable/bg_r48_ffff"
+        android:gravity="center"
+        android:layout_marginStart="@dimen/dp_6"
+        android:layout_marginEnd="@dimen/dp_6"
+        android:textColor="@color/color_FF999999"
+        android:textSize="@dimen/sp_14"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="简介" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/item_date_header.xml b/modulevocal/src/main/res/layout/item_date_header.xml
new file mode 100644
index 00000000..81e44675
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_date_header.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:ignore="ResourceName">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlSymmetry">
+
+        <TextView
+            android:id="@+id/tv6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:text="2025-3-6"
+            android:textColor="@color/color_FF333333"
+            android:textSize="12sp" />
+
+        <RelativeLayout
+            android:id="@+id/rl1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:gravity="center">
+
+
+            <TextView
+                android:id="@+id/tv7"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="收益"
+                android:textColor="@color/color_FF333333"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv8"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_toEndOf="@+id/tv7"
+                android:drawablePadding="5dp"
+                android:gravity="center"
+                android:text="10000"
+                android:textColor="#ffff8acc"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_toEndOf="@+id/tv8"
+                android:text="流水"
+                android:textColor="@color/color_FF333333"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tve"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_toEndOf="@+id/tv9"
+                android:gravity="center"
+                android:drawablePadding="5dp"
+                android:text="10000"
+                android:textColor="#ffff8acc"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/item_my_bag.xml b/modulevocal/src/main/res/layout/item_my_bag.xml
new file mode 100644
index 00000000..9d912db7
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_my_bag.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/zb_bg_ll"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginTop="@dimen/dp_6"
+   >
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/zb_bg"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_116"
+        android:layout_gravity="center"
+        android:background="@mipmap/my_bag_item"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        android:padding="@dimen/dp_6"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_img"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_60"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginEnd="@dimen/dp_10"/>
+
+
+        <TextView
+            android:id="@+id/tv_name_period"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:textColor="@color/color_FF333333"
+            android:textSize="13sp"
+            app:layout_constraintTop_toBottomOf="@+id/iv_img"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="梦幻之翼" />
+
+        <TextView
+            android:id="@+id/integral"
+            android:layout_width="@dimen/dp_35"
+            android:layout_height="@dimen/dp_13"
+            android:layout_gravity="center_horizontal"
+            android:background="@mipmap/text_bj"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:gravity="center"
+            android:text="x30"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_10" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/item_my_bag_data.xml b/modulevocal/src/main/res/layout/item_my_bag_data.xml
new file mode 100644
index 00000000..55607f5c
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_my_bag_data.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/dp_16"
+    android:layout_marginEnd="@dimen/dp_16"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_21"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textSize="@dimen/sp_14"
+        android:layout_marginTop="@dimen/dp_12"
+        android:textColor="@color/color_FF333333"
+        tools:text="初级礼包"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_18"
+        tools:text="2024.12.14 11.12.24"
+        android:textSize="@dimen/sp_14"
+        app:layout_constraintTop_toBottomOf="@id/tv_title"
+        android:textColor="@color/color_FF666666"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <TextView
+        android:id="@+id/tv_gift_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_24"
+        tools:text="x1娃哈哈"
+        android:textSize="@dimen/sp_16"
+        app:layout_constraintTop_toTopOf="@id/tv_title"
+        app:layout_constraintEnd_toStartOf="@+id/im_b"
+        android:textColor="@color/color_FF333333"
+        />
+
+    <ImageView
+        android:id="@+id/im_b"
+        android:layout_width="@dimen/dp_21"
+        android:layout_height="@dimen/dp_21"
+        app:layout_constraintTop_toTopOf="@id/tv_gift_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:srcCompat="@mipmap/jinb"
+       />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_0_5"
+        app:layout_constraintTop_toBottomOf="@id/tv_time"
+        android:layout_marginTop="@dimen/dp_12"
+        android:background="@color/color_FF666666"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/item_tablayout_headerzb.xml b/modulevocal/src/main/res/layout/item_tablayout_headerzb.xml
new file mode 100644
index 00000000..0a942d6a
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_tablayout_headerzb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/dp_26">
+    <ImageView
+        android:id="@+id/v_view"
+        android:layout_marginHorizontal="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_5"
+        android:layout_alignParentBottom="true"
+        android:src="@mipmap/tab_x" />
+    <TextView
+        android:id="@+id/tv_zbtab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textColor="@drawable/selector_tab_text_zb"
+        android:textSize="14sp"
+        tools:text="推荐" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/item_zhuangbanschangcheng_list.xml b/modulevocal/src/main/res/layout/item_zhuangbanschangcheng_list.xml
new file mode 100644
index 00000000..2ec7c019
--- /dev/null
+++ b/modulevocal/src/main/res/layout/item_zhuangbanschangcheng_list.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/zb_bg_ll"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/zb_bg"
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_120"
+        android:layout_gravity="center"
+        android:background="@mipmap/sect_false"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_img"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_12"/>
+
+
+        <TextView
+            android:id="@+id/tv_name_period"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:textColor="@color/color_FF333333"
+            android:textSize="13sp"
+            app:layout_constraintTop_toBottomOf="@+id/iv_img"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="梦幻之翼" />
+
+        <TextView
+            android:id="@+id/integral"
+            android:layout_width="@dimen/dp_35"
+            android:layout_height="@dimen/dp_13"
+            android:layout_gravity="center_horizontal"
+            android:background="@mipmap/text_bj"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:gravity="center"
+            android:text="x30"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_10" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml b/modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml
new file mode 100644
index 00000000..4c3a8c2d
--- /dev/null
+++ b/modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <FrameLayout
+        android:id="@+id/sl_gift_wall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#fff"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dp_20">
+
+
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:nestedScrollingEnabled="false"
+                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                app:layout_constraintTop_toBottomOf="@+id/tv_title"
+                app:spanCount="4"
+                tools:listitem="@layout/me_item_user_gift_wall" />
+
+        </androidx.core.widget.NestedScrollView>
+
+    </FrameLayout>
+
+</layout>
diff --git a/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml b/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
new file mode 100644
index 00000000..976eb087
--- /dev/null
+++ b/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/dp_10"
+    android:layout_marginTop="@dimen/dp_10"
+    android:layout_marginRight="@dimen/dp_10"
+    android:layout_marginBottom="@dimen/dp_10"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/rl_user_head"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:padding="@dimen/dp_2"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/riv_user_head"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:riv_corner_radius="@dimen/dp_13"
+            tools:src="@color/color_FF5872FF" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/tv_gift_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_2"
+        android:text="冲浪少年"
+        android:textColor="@color/color_FF545454"
+        android:textSize="@dimen/sp_11"
+        app:layout_constraintEnd_toEndOf="@+id/rl_user_head"
+        app:layout_constraintStart_toStartOf="@+id/rl_user_head"
+        app:layout_constraintTop_toBottomOf="@+id/rl_user_head" />
+
+    <TextView
+        android:id="@+id/tv_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/text_bj"
+        android:gravity="center"
+        android:paddingLeft="3dp"
+        android:paddingRight="3dp"
+        android:textColor="@color/black"
+        android:textSize="8sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="x100" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="@+id/rl_user_head"
+        app:layout_constraintStart_toStartOf="@+id/rl_user_head"
+        app:layout_constraintTop_toBottomOf="@+id/tv_gift_name">
+        <TextView
+            android:id="@+id/tv_price33"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:text="10000"
+            android:textColor="@color/color_FFFFBC00"
+            android:textSize="11sp"
+            android:drawableStart="@mipmap/jinb"
+           />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="*"
+            android:textColor="#9C9C9C"
+            android:textSize="@dimen/sp_11"
+            android:visibility="gone" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="1"
+            android:textColor="@color/color_FF7185FF"
+            android:textSize="@dimen/sp_11"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/me_item_user_photo_wall.xml b/modulevocal/src/main/res/layout/me_item_user_photo_wall.xml
new file mode 100644
index 00000000..70e1d729
--- /dev/null
+++ b/modulevocal/src/main/res/layout/me_item_user_photo_wall.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dp_5"
+    android:layout_marginBottom="@dimen/dp_5"
+    android:paddingLeft="@dimen/dp_6"
+    android:paddingRight="@dimen/dp_6">
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/riv_user_head"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:scaleType="fitXY"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintTop_toTopOf="parent"
+        app:riv_corner_radius="@dimen/dp_5"
+        tools:src="@mipmap/add_img" />
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/dp_13"
+        android:layout_height="@dimen/dp_13"
+        android:layout_marginTop="@dimen/dp_2"
+        android:layout_marginEnd="@dimen/dp_2"
+        android:src="@mipmap/icon_closes"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@+id/riv_user_head"
+        app:layout_constraintTop_toTopOf="@+id/riv_user_head"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/pop_layout1.xml b/modulevocal/src/main/res/layout/pop_layout1.xml
new file mode 100644
index 00000000..5bc5c62a
--- /dev/null
+++ b/modulevocal/src/main/res/layout/pop_layout1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/color_FF333333"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="@color/white"
+        android:padding="@dimen/dp_5"
+        android:gravity="center"
+        android:textSize="@dimen/sp_11"
+        android:text="创建房间需要后台审核，审核通过后即可开始直播"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_activity_my_room.xml b/modulevocal/src/main/res/layout/room_activity_my_room.xml
new file mode 100644
index 00000000..2afae6c2
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_activity_my_room.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
+
+    <data>
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:TopBarTitle="我的房间"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+
+            />
+
+        <com.example.moduletablayout.CustomSlidingTabLayout
+            android:id="@+id/coustom_sliding_tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            app:tl_indicator_gravity="BOTTOM"
+            app:tl_indicator_margin_top="@dimen/dp_40"
+            app:tl_showCateIndicator="true"
+            app:tl_tab_space_equal="true"
+            app:tl_textBold="BOTH"
+            app:tl_textSelectColor="@color/color_FFFFBB00"
+            app:tl_textSelectedSize="@dimen/sp_16"
+            app:tl_textUnselectColor="@color/color_FF999999"
+            app:tl_textsize="@dimen/sp_16"
+            android:visibility="gone"/>
+
+<!--        <androidx.viewpager.widget.ViewPager-->
+<!--            android:id="@+id/viewpager"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            android:layout_marginTop="@dimen/dp_20" />-->
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_34"
+            android:layout_marginTop="@dimen/dp_12"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+            <LinearLayout
+                android:id="@+id/ll_rank"
+                android:layout_width="match_parent"
+                android:layout_height="29dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="@dimen/dp_17"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_charm"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="我创建的"
+                        android:textColor="#333333 "
+                        android:textSize="@dimen/sp_14" />
+
+                    <View
+                        android:id="@+id/v_line"
+                        android:layout_width="40dp"
+                        android:layout_height="4dp"
+                        android:layout_marginTop="-3dp"
+                        android:background="@mipmap/tab_x" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:layout_marginStart="@dimen/dp_7"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_wealth"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="我主持的"
+                        android:textColor="#999999"
+                        android:textSize="@dimen/sp_14" />
+
+                    <View
+                        android:id="@+id/v_line2"
+                        android:layout_width="40dp"
+                        android:layout_height="4dp"
+                        android:layout_marginTop="-3dp"
+                        android:visibility="gone"
+                        android:background="@mipmap/tab_x" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:layout_marginStart="@dimen/dp_7"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_manage"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="我管理的"
+                        android:textColor="#999999"
+                        android:textSize="@dimen/sp_14" />
+
+                    <View
+                        android:id="@+id/v_line3"
+                        android:layout_width="40dp"
+                        android:layout_height="4dp"
+                        android:layout_marginTop="-3dp"
+                        android:visibility="gone"
+                        android:background="@mipmap/tab_x" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:layout_marginStart="@dimen/dp_7"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/tv_interest"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="我关注的"
+                        android:textColor="#999999"
+                        android:textSize="@dimen/sp_14" />
+
+                    <View
+                        android:id="@+id/v_line4"
+                        android:layout_width="40dp"
+                        android:layout_height="4dp"
+                        android:layout_marginTop="-3dp"
+                        android:visibility="gone"
+                        android:background="@mipmap/tab_x" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.3"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:layout_marginStart="@dimen/dp_20"
+                    android:orientation="vertical">
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </RelativeLayout>
+
+
+        <com.qxcm.moduleutil.widget.ScrollViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_details_list.xml b/modulevocal/src/main/res/layout/room_details_list.xml
new file mode 100644
index 00000000..eff96aae
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_details_list.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/dp_5"
+    android:layout_gravity="center_horizontal"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <com.qxcm.moduleutil.widget.GifAvatarOvalView
+        android:id="@+id/riv"
+        android:layout_width="@dimen/dp_37"
+        android:layout_height="@dimen/dp_37"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:riv_border_color="#E3E3E3"
+        app:riv_border_width="@dimen/dp_1"
+        app:riv_oval="true"
+        tools:src="@mipmap/default_avatar"  />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_10"
+        android:ellipsize="end"
+        android:maxEms="8"
+        android:singleLine="true"
+        android:text="阿斯蒂芬就"
+        android:textColor="@color/color_FF333333"
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintStart_toEndOf="@id/riv"
+        app:layout_constraintTop_toTopOf="@id/riv" />
+    <TextView
+        android:id="@+id/tv_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="赠送"
+        android:textColor="@color/color_FF333333"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintStart_toStartOf="@id/tv_name"
+        app:layout_constraintTop_toBottomOf="@id/tv_name" />
+
+    <TextView
+        android:id="@+id/tv_2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="摸鱼"
+        android:textColor="@color/color_FF333333"
+        android:layout_marginStart="@dimen/dp_5"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintStart_toEndOf="@id/tv_1"
+        app:layout_constraintTop_toBottomOf="@id/tv_name" />
+
+    <TextView
+        android:id="@+id/tv_3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="功夫熊猫*1"
+        android:textColor="@color/color_FF333333"
+        android:layout_marginStart="@dimen/dp_5"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintStart_toEndOf="@id/tv_2"
+        app:layout_constraintTop_toBottomOf="@id/tv_name" />
+
+    <TextView
+        android:id="@+id/tv_go_to_room"
+        android:layout_width="58dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_10"
+        android:gravity="center"
+        android:padding="@dimen/dp_3"
+        android:text="+12.5"
+        android:textColor="@color/_000000"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingConstraints"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="#ffff4444"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="@dimen/dp_15"
+        app:layout_constraintTop_toBottomOf="@id/riv" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_create.xml b/modulevocal/src/main/res/layout/room_fragment_my_create.xml
new file mode 100644
index 00000000..e8cfec30
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_fragment_my_create.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+   <data>
+
+   </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="6dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_my_room_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/common_bg_top_r15_white"
+            android:paddingTop="@dimen/dp_5"
+            android:paddingBottom="@dimen/dp_10"
+            tools:ignore="MissingConstraints"
+            tools:listitem="@layout/room_fragment_my_room_list"
+            tools:visibility="gone" />
+
+        <TextView
+            android:id="@+id/tv_no_data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="@dimen/dp_10"
+            android:text="还没有创建房间"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14"
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rv_my_room_list"
+            tools:ignore="UselessParent"
+            tools:visibility="visible" />
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/smart_refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_103"
+            app:layout_constraintTop_toBottomOf="@+id/rv_my_room_list"
+            app:srlEnableLoadMore="false"
+            app:srlEnableRefresh="true"
+            >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="@dimen/dp_6"
+                >
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_25"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/iv_footprint"
+                        android:layout_width="@dimen/dp_18"
+                        android:layout_height="@dimen/dp_18"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentLeft="true"
+                        android:scaleType="fitXY"
+                        android:src="@mipmap/footprint" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_24"
+                        android:layout_centerVertical="true"
+                        android:layout_alignLeft="@+id/iv_footprint"
+                        android:layout_marginLeft="@dimen/dp_21"
+                        android:text="历史足迹"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/sp_15"
+                        android:textStyle="bold" />
+
+                    <ImageView
+                        android:id="@+id/iv_delete_foot"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="@dimen/dp_16"
+                        android:src="@mipmap/dele_foot" />
+
+                </RelativeLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycle_view_foot"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/dp_9"
+                    android:nestedScrollingEnabled="false" />
+
+            </LinearLayout>
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_follow.xml b/modulevocal/src/main/res/layout/room_fragment_my_follow.xml
new file mode 100644
index 00000000..45a2e2e8
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_fragment_my_follow.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <!-- TODO: Update blank fragment layout -->
+   <data>
+   </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dp">
+
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/smart_refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srlEnableLoadMore="false"
+            app:srlEnableRefresh="false">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycle_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/dp_9"
+                android:nestedScrollingEnabled="false" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_manage.xml b/modulevocal/src/main/res/layout/room_fragment_my_manage.xml
new file mode 100644
index 00000000..1839f48f
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_fragment_my_manage.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/dp_6"
+       >
+
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/smart_refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srlEnableLoadMore="false"
+            app:srlEnableRefresh="false">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycle_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/dp_9"
+                android:nestedScrollingEnabled="false" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml b/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
new file mode 100644
index 00000000..00f17db7
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_91"
+    android:layout_marginBottom="@dimen/dp_8"
+   >
+
+    <com.lihang.ShadowLayout
+        android:id="@+id/shadow_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:hl_cornerRadius="@dimen/dp_15"
+        app:hl_shadowColor="@color/black"
+        app:hl_shadowHidden="true"
+        app:hl_shadowLimit="3dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_my_room_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@mipmap/my_cr_room1"
+                android:paddingStart="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_5"
+                android:paddingBottom="@dimen/dp_5">
+
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/riv"
+                    android:layout_width="@dimen/dp_60"
+                    android:layout_height="@dimen/dp_60"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:riv_corner_radius="@dimen/dp_6"
+                    android:scaleType="fitXY"
+                    tools:src="@mipmap/default_avatar" />
+
+                <ImageView
+                    android:id="@+id/iv_play"
+                    android:layout_width="40dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="@dimen/dp_8"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/voice"
+                    app:layout_constraintEnd_toEndOf="@id/riv"
+                    app:layout_constraintStart_toStartOf="@id/tv_name"
+                    app:layout_constraintTop_toTopOf="@+id/tv_name" />
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="0dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="@dimen/dp_2"
+                    android:paddingTop="@dimen/dp_2"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:gravity="center"
+                    android:text="阿斯蒂芬就"
+                    android:textColor="@color/_000000"
+                    android:textSize="@dimen/sp_12"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@id/iv_play"
+                    app:layout_constraintTop_toTopOf="@id/riv" />
+
+                <TextView
+                    android:id="@+id/tv_sy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="30dp"
+                    android:text="123W"
+                    android:textColor="@color/color_FFF78FCC"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@id/rl_mx"
+                    app:layout_constraintTop_toBottomOf="@id/tv_name"
+                    app:layout_constraintTop_toTopOf="@id/riv" />
+
+                <TextView
+                    android:id="@+id/tv_user_id"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_17"
+                    android:layout_marginTop="@dimen/dp_6"
+                    android:text="ID:123456"
+                    android:textColor="#ff666666"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintStart_toStartOf="@id/iv_play"
+                    app:layout_constraintTop_toBottomOf="@id/iv_play" />
+
+                <TextView
+                    android:id="@+id/tv_bl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="今日收益"
+                    android:textColor="#ff999999"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintEnd_toStartOf="@+id/rl_mx"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_sy"
+                    />
+
+
+                <TextView
+                    android:id="@+id/tv_gz"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:text="关注:12345"
+                    android:textColor="@color/color_FFA5A5A5"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintStart_toStartOf="@id/tv_user_id"
+                    app:layout_constraintTop_toBottomOf="@id/tv_user_id" />
+
+                <TextView
+                    android:id="@+id/tv_zx"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="在线:12345"
+                    android:textColor="@color/color_FFA5A5A5"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintStart_toEndOf="@id/tv_gz"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_user_id" />
+
+
+                <TextView
+                    android:id="@+id/tv_fw"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_18"
+                    android:layout_marginBottom="@dimen/dp_12"
+                    android:text="访问:12345"
+                    android:textColor="@color/color_FFA5A5A5"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintEnd_toStartOf="@id/rl_mx"
+                    app:layout_constraintTop_toBottomOf="@id/tv_user_id" />
+
+                <RelativeLayout
+                    android:id="@+id/rl_mx"
+                    android:layout_width="45dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center|center_vertical"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/riv"
+                    app:layout_constraintBottom_toBottomOf="@id/riv">
+
+
+                    <TextView
+                        android:id="@+id/tv_fjmx"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ems="1"
+                        android:gravity="top|center"
+                        android:drawablePadding="@dimen/dp_2"
+                        android:text="房间明细"
+                        android:includeFontPadding="true"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_9"
+                        />
+                    <ImageView
+                        android:id="@+id/iv_fjmx"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/dp_4"
+                        android:paddingTop="@dimen/dp_4"
+                        android:layout_below="@+id/tv_fjmx"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/detail_icon_go"/>
+                </RelativeLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </FrameLayout>
+    </com.lihang.ShadowLayout>
+
+</FrameLayout>
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_room_list_list.xml b/modulevocal/src/main/res/layout/room_fragment_my_room_list_list.xml
new file mode 100644
index 00000000..f3fae45a
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_fragment_my_room_list_list.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="6dp">
+       <androidx.recyclerview.widget.RecyclerView
+           android:id="@+id/rv_my_room_list"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:background="@drawable/common_bg_top_r15_white"
+           android:paddingTop="@dimen/dp_5"
+           android:paddingBottom="@dimen/dp_10"
+           tools:listitem="@layout/room_fragment_my_room_list"
+           />
+        <TextView
+            android:id="@+id/tv_no_data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="暂无数据"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14"
+            android:gravity="center"
+            android:padding="@dimen/dp_10"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="UselessParent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
+
+
diff --git a/modulevocal/src/main/res/layout/room_index_item_chatroom_my_foot.xml b/modulevocal/src/main/res/layout/room_index_item_chatroom_my_foot.xml
new file mode 100644
index 00000000..93649cb8
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_index_item_chatroom_my_foot.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rl_root"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_150"
+    android:layout_marginLeft="@dimen/dp_1"
+    android:layout_marginTop="@dimen/dp_15"
+    android:layout_marginRight="@dimen/dp_15">
+
+    <RelativeLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/iv_follow_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@mipmap/default_avatar"
+            app:riv_corner_radius="@dimen/dp_11" />
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_r11_with"
+            android:scaleType="fitCenter"
+            app:riv_corner_radius="@dimen/dp_11"
+            />
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/iv_type"
+        android:layout_width="@dimen/dp_66"
+        android:layout_height="@dimen/dp_23"
+        android:src="@mipmap/diang_c"
+        app:layout_constraintEnd_toEndOf="@+id/ll"
+        app:layout_constraintTop_toTopOf="@+id/ll" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_18"
+        android:layout_marginStart="@dimen/dp_12"
+        android:layout_marginEnd="@dimen/dp_12"
+        android:layout_marginBottom="@dimen/dp_34"
+        android:text="烟花易冷"
+        android:textColor="@color/color_FFFFF0F0"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_id"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_18"
+        android:layout_marginTop="@dimen/dp_8"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:text="烟花易冷"
+        android:textColor="@color/color_FFFFF0F0"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/tv_name"
+        android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/iv_play"
+        android:layout_width="@dimen/dp_28"
+        android:layout_height="@dimen/dp_18"
+        android:src="@drawable/phonetic"
+        android:background="@drawable/bg_r45_0000"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/tv_name"
+        android:layout_marginBottom="@dimen/dp_10"
+        />
+
+    <LinearLayout
+        android:id="@+id/view_num_bg"
+        android:layout_width="@dimen/dp_65"
+        android:layout_height="@dimen/dp_22"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/dp_12"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:background="@drawable/bg_r15_4d000000"
+        android:gravity="center|left"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <ImageView
+            android:layout_width="@dimen/dp_16"
+            android:layout_height="@dimen/dp_16"
+            android:layout_marginStart="@dimen/dp_10"
+            android:src="@mipmap/f_h" />
+
+        <TextView
+            android:id="@+id/tv_num"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_18"
+            android:layout_marginStart="@dimen/dp_6"
+            android:text="99"
+            android:textColor="@color/color_FFFFF0F0"
+            android:textSize="@dimen/sp_12" />
+
+    </LinearLayout>
+
+
+    <!--    <LinearLayout-->
+    <!--        android:layout_width="0dp"-->
+    <!--        android:layout_height="@dimen/dp_56"-->
+    <!--        android:layout_centerVertical="true"-->
+    <!--        android:orientation="horizontal"-->
+    <!--        android:visibility="gone"-->
+    <!--        app:layout_constraintBottom_toBottomOf="@id/iv_follow_bg"-->
+    <!--        app:layout_constraintEnd_toEndOf="@id/iv_follow_bg"-->
+    <!--        app:layout_constraintStart_toStartOf="@id/iv_follow_bg"-->
+    <!--        app:layout_constraintTop_toTopOf="@id/iv_follow_bg">-->
+
+    <!--        <FrameLayout-->
+    <!--            android:layout_width="wrap_content"-->
+    <!--            android:layout_height="match_parent"-->
+    <!--            android:paddingLeft="10dp">-->
+
+    <!--            <com.qpyy.libcommon.widget.GifAvatarOvalView-->
+    <!--                android:id="@+id/riv_user_head"-->
+    <!--                android:layout_width="@dimen/dp_56"-->
+    <!--                android:layout_height="match_parent"-->
+    <!--                app:riv_border_color="#E3E3E3"-->
+    <!--                app:riv_border_width="@dimen/dp_1"-->
+    <!--                app:riv_oval="true"-->
+    <!--                tools:src="@mipmap/default_avatar" />-->
+
+    <!--            <RelativeLayout-->
+    <!--                android:id="@+id/rl_lock"-->
+    <!--                android:layout_width="@dimen/dp_56"-->
+    <!--                android:layout_height="@dimen/dp_56"-->
+    <!--                android:visibility="gone"-->
+    <!--                app:layout_constraintBottom_toBottomOf="@id/riv"-->
+    <!--                app:layout_constraintEnd_toEndOf="@id/riv"-->
+    <!--                app:layout_constraintStart_toStartOf="@id/riv"-->
+    <!--                app:layout_constraintTop_toTopOf="@id/riv">-->
+
+    <!--                <ImageView-->
+    <!--                    android:layout_width="wrap_content"-->
+    <!--                    android:layout_height="wrap_content"-->
+    <!--                    android:layout_centerInParent="true"-->
+    <!--                    android:src="@mipmap/index_ic_lock_room_list" />-->
+    <!--            </RelativeLayout>-->
+    <!--        </FrameLayout>-->
+
+    <!--        <RelativeLayout-->
+    <!--            android:layout_width="0dp"-->
+    <!--            android:layout_height="match_parent"-->
+    <!--            android:layout_marginLeft="@dimen/dp_17"-->
+    <!--            android:layout_marginRight="@dimen/dp_17"-->
+    <!--            android:layout_weight="1">-->
+
+    <!--            <RelativeLayout-->
+    <!--                android:layout_width="match_parent"-->
+    <!--                android:layout_height="wrap_content"-->
+    <!--                android:gravity="center_vertical"-->
+    <!--                android:orientation="vertical">-->
+
+    <!--                <com.qpyy.libcommon.widget.MarqueeTextView-->
+    <!--                    android:id="@+id/tv_room_name"-->
+    <!--                    android:layout_width="match_parent"-->
+    <!--                    android:layout_height="wrap_content"-->
+    <!--                    android:layout_toLeftOf="@+id/tv_clean"-->
+    <!--                    android:ellipsize="marquee"-->
+    <!--                    android:paddingRight="@dimen/dp_5"-->
+    <!--                    android:singleLine="true"-->
+    <!--                    android:textColor="@color/color_FF1C1C1C"-->
+    <!--                    android:textSize="@dimen/sp_14"-->
+    <!--                    android:textStyle="bold"-->
+    <!--                    tools:text="从VB长T儿童热污染翁驱蚊器" />-->
+
+    <!--                <ImageView-->
+    <!--                    android:id="@+id/iv_room_labe"-->
+    <!--                    android:layout_width="@dimen/dp_37"-->
+    <!--                    android:layout_height="@dimen/dp_16"-->
+    <!--                    android:layout_below="@+id/tv_room_name"-->
+    <!--                    android:layout_marginTop="@dimen/dp_4"-->
+    <!--                    tools:src="@mipmap/index_more_room_sex" />-->
+
+    <!--                <TextView-->
+    <!--                    android:id="@+id/tv_clean"-->
+    <!--                    android:layout_width="@dimen/dp_53"-->
+    <!--                    android:layout_height="@dimen/dp_20"-->
+    <!--                    android:layout_alignParentEnd="true"-->
+    <!--                    android:background="@drawable/bg_r10_fff"-->
+    <!--                    android:gravity="center"-->
+    <!--                    android:text="取关"-->
+    <!--                    android:textColor="@color/color_FFFFBC00"-->
+    <!--                    android:textSize="12sp"-->
+    <!--                    android:textStyle="bold"-->
+    <!--                    android:visibility="visible"-->
+    <!--                    tools:visibility="visible" />-->
+
+    <!--            </RelativeLayout>-->
+
+    <!--            <TextView-->
+    <!--                android:id="@+id/tv_room_id"-->
+    <!--                android:layout_width="wrap_content"-->
+    <!--                android:layout_height="wrap_content"-->
+    <!--                android:layout_alignParentBottom="true"-->
+    <!--                android:textColor="@color/color_FF797979"-->
+    <!--                android:textSize="@dimen/sp_12"-->
+    <!--                tools:text="ID:3453453" />-->
+
+    <!--            <LinearLayout-->
+    <!--                android:layout_width="match_parent"-->
+    <!--                android:layout_height="wrap_content"-->
+    <!--                android:layout_alignParentBottom="true"-->
+    <!--                android:gravity="center_vertical|end"-->
+    <!--                android:orientation="horizontal">-->
+
+    <!--                <ImageView-->
+    <!--                    android:id="@+id/iv_hot"-->
+    <!--                    android:layout_width="@dimen/dp_14"-->
+    <!--                    android:layout_height="@dimen/dp_14"-->
+    <!--                    android:layout_marginLeft="@dimen/dp_10"-->
+    <!--                    android:src="@mipmap/index_room_pop_user_icon"-->
+    <!--                    android:visibility="gone" />-->
+
+    <!--                <TextView-->
+    <!--                    android:id="@+id/tv_popularity"-->
+    <!--                    android:layout_width="wrap_content"-->
+    <!--                    android:layout_height="wrap_content"-->
+    <!--                    android:layout_marginLeft="@dimen/dp_5"-->
+    <!--                    android:layout_marginTop="@dimen/dp_1"-->
+    <!--                    android:drawableLeft="@mipmap/index_room_pop_user_icon"-->
+    <!--                    android:drawablePadding="@dimen/dp_4"-->
+    <!--                    android:textColor="@color/color_FF1C1C1C"-->
+    <!--                    android:textSize="@dimen/sp_11"-->
+    <!--                    android:textStyle="bold"-->
+    <!--                    tools:text="9453" />-->
+
+
+    <!--            </LinearLayout>-->
+
+    <!--        </RelativeLayout>-->
+
+    <!--    </LinearLayout>-->
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/room_index_item_subsidy.xml b/modulevocal/src/main/res/layout/room_index_item_subsidy.xml
new file mode 100644
index 00000000..8af28c97
--- /dev/null
+++ b/modulevocal/src/main/res/layout/room_index_item_subsidy.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dp_12"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/ll_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_data"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:gravity="center"
+            tools:text="2024.2.12-2014.12.21"
+            android:textColor="@color/color_FF666666"
+            android:textSize="@dimen/sp_12" />
+
+        <TextView
+            android:id="@+id/tv_lj"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            tools:text="1000"
+            android:textColor="@color/color_FF666666"
+            android:textSize="@dimen/sp_12" />
+
+        <TextView
+            android:id="@+id/tv_bt"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            tools:text="10"
+            android:textColor="@color/color_FF666666"
+            android:textSize="@dimen/sp_12" />
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.7"
+            android:gravity="center"
+            tools:text="状态"
+            android:textColor="@color/color_FF666666"
+            android:textSize="@dimen/sp_12" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/rv_item_balance_recharge.xml b/modulevocal/src/main/res/layout/rv_item_balance_recharge.xml
new file mode 100644
index 00000000..faada11f
--- /dev/null
+++ b/modulevocal/src/main/res/layout/rv_item_balance_recharge.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cl_item"
+    android:layout_width="@dimen/dp_106"
+    android:layout_height="@dimen/dp_76"
+    android:layout_marginTop="@dimen/dp_12"
+    android:layout_marginEnd="@dimen/dp_12"
+    android:layout_marginStart="@dimen/dp_12"
+    android:layout_gravity="center"
+    android:background="@drawable/bg_r10_white">
+
+    <ImageView
+        android:id="@+id/iv_gold"
+        android:layout_width="@dimen/dp_20"
+        android:layout_height="@dimen/dp_20"
+        android:src="@mipmap/jinb"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginBottom="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_19"
+        android:layout_marginEnd="@dimen/dp_67"/>
+
+    <TextView
+        android:id="@+id/tv_gold_num"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_20"
+        android:layout_marginLeft="@dimen/dp_5"
+        android:textColor="@color/color_353535"
+        android:textSize="@dimen/sp_18"
+        app:layout_constraintLeft_toRightOf="@+id/iv_gold"
+        app:layout_constraintTop_toTopOf="@+id/iv_gold"
+        tools:text="600" />
+
+    <TextView
+        android:id="@+id/tv_money"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="@dimen/dp_25"
+        android:layout_marginEnd="@dimen/dp_40"
+        android:textColor="@color/color_FF666666"
+        android:textSize="@dimen/sp_14"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_gold"
+        tools:text="￥6" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="tv_money,tv_gold_num,iv_gold" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/rv_item_footer.xml b/modulevocal/src/main/res/layout/rv_item_footer.xml
new file mode 100644
index 00000000..ff29ba2d
--- /dev/null
+++ b/modulevocal/src/main/res/layout/rv_item_footer.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cl_item"
+    android:layout_width="@dimen/dp_106"
+    android:layout_height="@dimen/dp_76"
+    android:layout_marginTop="@dimen/dp_12"
+    android:layout_marginEnd="@dimen/dp_12"
+    android:layout_marginStart="@dimen/dp_12"
+    android:layout_gravity="center"
+    android:background="@drawable/bg_r10_white">
+
+
+    <TextView
+        android:id="@+id/tv_gold_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/color_353535"
+        android:textSize="@dimen/sp_18"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="自定义" />
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/user_home.xml b/modulevocal/src/main/res/layout/user_home.xml
new file mode 100644
index 00000000..f8a14a6d
--- /dev/null
+++ b/modulevocal/src/main/res/layout/user_home.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+    </data>
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/abl"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent"
+        android:orientation="vertical"
+        tools:visibility="visible">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/ctlTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:contentScrim="@color/transparent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:statusBarScrim="@android:color/transparent"
+            app:titleEnabled="false">
+
+            <include
+                android:id="@+id/header_info"
+                layout="@layout/user_top"
+                app:layout_collapseMode="parallax"
+                app:layout_collapseParallaxMultiplier="0.3" />
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_125"
+                android:gravity="center"
+                app:contentInsetLeft="@dimen/dp_0"
+                app:contentInsetStart="@dimen/dp_0"
+                app:layout_collapseMode="pin">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/rl_top_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingTop="@dimen/dp_35"
+                    android:layout_marginTop="@dimen/dp_20"
+                    android:visibility="visible"
+                    >
+
+                    <ImageView
+                        android:id="@+id/iv_back"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:padding="@dimen/dp_5"
+                        android:src="@mipmap/ic_topbar_back_dark"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLength="15"
+                        android:textColor="@color/color_black"
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="@+id/iv_back"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/iv_back" />
+
+<!--                    <ImageView-->
+<!--                        android:id="@+id/iv_more"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:padding="@dimen/dp_10"-->
+<!--                        android:src="@mipmap/icon_more"-->
+<!--                        app:layout_constraintBottom_toBottomOf="@+id/iv_back"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="@+id/iv_back" />-->
+
+
+<!--                    <ImageView-->
+<!--                        android:id="@+id/iv_edit"-->
+<!--                        android:layout_width="@dimen/dp_25"-->
+<!--                        android:layout_height="@dimen/dp_25"-->
+<!--                        android:layout_marginEnd="@dimen/dp_10"-->
+<!--                        android:src="@mipmap/me_icon_edit"-->
+<!--                        android:visibility="visible"-->
+<!--                        app:layout_constraintBottom_toBottomOf="@+id/iv_back"-->
+<!--                        app:layout_constraintEnd_toStartOf="@+id/iv_more"-->
+<!--                        app:layout_constraintTop_toTopOf="@+id/iv_back" />-->
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:paddingTop="@dimen/dp_25">
+
+                    <ImageView
+                        android:id="@+id/iv_back_min"
+                        android:layout_width="@dimen/dp_45"
+                        android:layout_height="@dimen/dp_45"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:padding="@dimen/dp_10"
+                        android:src="@mipmap/ic_topbar_back_dark"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.qxcm.moduleutil.widget.GifAvatarOvalView
+                        android:id="@+id/riv_min"
+                        android:layout_width="@dimen/dp_26"
+                        android:layout_height="@dimen/dp_26"
+                        app:layout_constraintBottom_toBottomOf="@+id/iv_back_min"
+                        app:layout_constraintStart_toEndOf="@+id/iv_back_min"
+                        app:layout_constraintTop_toTopOf="@+id/iv_back_min"
+                        app:riv_oval="true"
+                        tools:src="@mipmap/default_avatar" />
+
+                    <TextView
+                        android:id="@+id/tv_title_min"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="@dimen/dp_5"
+                        android:ellipsize="end"
+                        android:maxLength="15"
+                        tools:text="XXXX"
+                        android:textColor="@color/color_black"
+                        android:textSize="@dimen/sp_14"
+                        app:layout_constraintBottom_toBottomOf="@+id/iv_back_min"
+                        app:layout_constraintStart_toEndOf="@+id/riv_min"
+                        app:layout_constraintTop_toTopOf="@+id/iv_back_min" />
+
+                    <!--                    <LinearLayout-->
+                    <!--                        android:id="@+id/ll_min_living"-->
+                    <!--                        android:layout_width="@dimen/dp_102"-->
+                    <!--                        android:layout_height="@dimen/dp_25"-->
+                    <!--                        android:background="@drawable/me_bg_room_live"-->
+                    <!--                        android:gravity="center_vertical"-->
+                    <!--                        android:orientation="horizontal"-->
+                    <!--                        android:visibility="invisible"-->
+                    <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+                    <!--                        app:layout_constraintTop_toBottomOf="@+id/iv_more_min"-->
+                    <!--                        tools:visibility="visible">-->
+
+                    <!--                        <ImageView-->
+                    <!--                            android:id="@+id/iv_min_yuliao"-->
+                    <!--                            android:layout_width="@dimen/dp_12"-->
+                    <!--                            android:layout_height="@dimen/dp_12"-->
+                    <!--                            android:layout_marginStart="@dimen/dp_5" />-->
+
+
+                    <!--                        <com.qpyy.libcommon.widget.MarqueeTextView-->
+                    <!--                            android:id="@+id/tv_min_living_room_name"-->
+                    <!--                            android:layout_width="wrap_content"-->
+                    <!--                            android:layout_height="wrap_content"-->
+                    <!--                            android:layout_centerInParent="true"-->
+                    <!--                            android:layout_marginLeft="@dimen/dp_5"-->
+                    <!--                            android:text="正在语聊中..."-->
+                    <!--                            android:textColor="#ffffffff"-->
+                    <!--                            android:textSize="@dimen/sp_11" />-->
+
+                    <!--                    </LinearLayout>-->
+
+<!--                    <ImageView-->
+<!--                        android:id="@+id/iv_more_min"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:padding="@dimen/dp_10"-->
+<!--                        android:src="@mipmap/news_icon_more_black"-->
+<!--                        app:layout_constraintBottom_toBottomOf="@+id/iv_back_min"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="@+id/iv_back_min" />-->
+
+                    <LinearLayout
+                        android:id="@+id/ll_tabs"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:paddingLeft="@dimen/dp_10"
+                        android:paddingRight="@dimen/dp_10"
+                        app:layout_constraintTop_toBottomOf="@+id/iv_back_min">
+
+<!--                        <ImageView-->
+<!--                            android:id="@+id/tab_zl"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:scaleType="fitXY"-->
+<!--                            android:src="@drawable/meinfo_selector_zl" />-->
+
+<!--                        <ImageView-->
+<!--                            android:id="@+id/tab_jn"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:scaleType="fitXY"-->
+<!--                            android:src="@drawable/meinfo_selector_jn" />-->
+
+                        <TextView
+                            android:id="@+id/tab_dt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="动态"
+                            />
+
+                        <TextView
+                            android:id="@+id/tab_lwq"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="礼物墙"
+                             />
+
+
+
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.appcompat.widget.Toolbar>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/user_top.xml b/modulevocal/src/main/res/layout/user_top.xml
new file mode 100644
index 00000000..610c33a9
--- /dev/null
+++ b/modulevocal/src/main/res/layout/user_top.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false">
+
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_177"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_60"
+            android:background="@drawable/bg_r16_fff">
+
+            <com.qxcm.moduleutil.widget.DecorationHeadView
+                android:id="@+id/riv_user_head"
+                android:layout_width="@dimen/dp_70"
+                android:layout_height="@dimen/dp_70"
+                android:layout_marginTop="-20dp"
+               />
+
+            <TextView
+                android:id="@+id/tv_nick_name"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_24"
+                android:layout_marginStart="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_below="@+id/riv_user_head"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_16"
+                tools:text="备注名" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_marginStart="@dimen/dp_12"
+                android:gravity="center"
+                android:layout_toEndOf="@id/tv_nick_name"
+                android:layout_alignTop="@+id/tv_nick_name">
+
+                <TextView
+                    android:layout_width="@dimen/dp_20"
+                    android:layout_height="@dimen/dp_20"
+                    android:text="ID:"
+                    android:textColor="@color/color_FF999999"
+                    android:textSize="@dimen/sp_12"
+                     />
+
+                <TextView
+                    android:id="@+id/tv_user_id"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_20"
+                    android:textColor="@color/color_FF999999"
+                    android:textSize="@dimen/sp_12"
+                    tools:text="123131" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_age"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_8"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_below="@id/tv_nick_name"
+                android:text="25岁"
+                android:textColor="@color/color_FF999999"
+                android:textSize="@dimen/sp_12" />
+
+            <androidx.recyclerview.widget.RecyclerView
+
+                android:id="@+id/recycle_view1"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_16"
+                android:layout_toRightOf="@+id/tv_age"
+                android:layout_marginStart="@dimen/dp_8"
+                android:layout_alignTop="@+id/tv_age"/>
+
+        <TextView
+            android:id="@+id/tv_jj"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_22"
+            android:gravity="left|center"
+            android:layout_marginTop="@dimen/dp_8"
+            android:layout_below="@id/tv_age"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/sp_14"
+            android:singleLine="true"
+            android:ellipsize="end"
+            tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好"
+            />
+            <androidx.recyclerview.widget.RecyclerView
+
+                android:id="@+id/recycle_view2"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_24"
+                android:layout_below="@+id/tv_jj"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+               />
+        </RelativeLayout>
+
+
+
+
+
+
+
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/layout/zhuangban_recyclerview_noref.xml b/modulevocal/src/main/res/layout/zhuangban_recyclerview_noref.xml
new file mode 100644
index 00000000..bf8b0470
--- /dev/null
+++ b/modulevocal/src/main/res/layout/zhuangban_recyclerview_noref.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_360"
+                android:layout_gravity="top"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/ll_nodata"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:paddingTop="80dp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/no_data" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:text="这里空空的哦～"
+                    android:textColor="#ff666666"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll"
+                android:layout_width="match_parent"
+                android:layout_height="72dp"
+                android:layout_gravity="bottom"
+                android:gravity="center"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+
+                <TextView
+                    android:id="@+id/zhuangban_buy"
+                    android:layout_width="match_parent"
+                    android:layout_height="47dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/cs"
+                    android:gravity="center"
+                    android:text="确认装扮"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="16sp" />
+            </LinearLayout>
+        </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/values/strings.xml b/modulevocal/src/main/res/values/strings.xml
index 827315fe..73862c41 100644
--- a/modulevocal/src/main/res/values/strings.xml
+++ b/modulevocal/src/main/res/values/strings.xml
@@ -1,6 +1 @@
-<resources>
-    <string name="app_name">modulevocal</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="title_activity_setting">SettingActivity</string>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/modulevoice/src/main/AndroidManifest.xml b/modulevoice/src/main/AndroidManifest.xml
index ba5fe5f5..02ec1e10 100644
--- a/modulevoice/src/main/AndroidManifest.xml
+++ b/modulevoice/src/main/AndroidManifest.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/BaseAppTheme">
diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java
index fc3b9068..7a019f52 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java
+++ b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java
@@ -67,44 +67,44 @@ public class VoiceFragment extends BaseMvpFragment<VoicePresenter, FragmentVoice
             startActivity(new Intent(getContext(), RankingListActivity.class));
         });
 
-        YouthModelDialog youthModelDialog=new YouthModelDialog(getContext(),null);
-        youthModelDialog.show();
-        youthModelDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                //青少年关闭后，弹首充
-               dialog.dismiss();
-            }
-        });
-        InviteDialog inviteDialog=new InviteDialog(getContext());
-        inviteDialog.show();
-        inviteDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                //邀请弹窗关闭后，弹首充
-                dialog.dismiss();
-            }
-        });
-
-        HeavenGiftDialog heavenGiftDialog=new HeavenGiftDialog(getContext());
-        heavenGiftDialog.show();
-        heavenGiftDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                //首充弹窗关闭后，弹首充
-                dialog.dismiss();
-            }
-        });
-
-        FirstChargeDialog firstChargeDialog=new FirstChargeDialog(getContext());
-        firstChargeDialog.show();
-        firstChargeDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                //首充弹窗关闭后，弹首充
-                dialog.dismiss();
-            }
-        });
+//        YouthModelDialog youthModelDialog=new YouthModelDialog(getContext(),null);
+//        youthModelDialog.show();
+//        youthModelDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+//            @Override
+//            public void onDismiss(DialogInterface dialog) {
+//                //青少年关闭后，弹首充
+//               dialog.dismiss();
+//            }
+//        });
+//        InviteDialog inviteDialog=new InviteDialog(getContext());
+//        inviteDialog.show();
+//        inviteDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+//            @Override
+//            public void onDismiss(DialogInterface dialog) {
+//                //邀请弹窗关闭后，弹首充
+//                dialog.dismiss();
+//            }
+//        });
+//
+//        HeavenGiftDialog heavenGiftDialog=new HeavenGiftDialog(getContext());
+//        heavenGiftDialog.show();
+//        heavenGiftDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+//            @Override
+//            public void onDismiss(DialogInterface dialog) {
+//                //首充弹窗关闭后，弹首充
+//                dialog.dismiss();
+//            }
+//        });
+//
+//        FirstChargeDialog firstChargeDialog=new FirstChargeDialog(getContext());
+//        firstChargeDialog.show();
+//        firstChargeDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+//            @Override
+//            public void onDismiss(DialogInterface dialog) {
+//                //首充弹窗关闭后，弹首充
+//                dialog.dismiss();
+//            }
+//        });
 
     }