fix:修复输入密码进入游戏房的房间状态不一致问题

feat：补充日志信息
fix:调整礼物飘窗样式问题
2023-12-04 18:54:11 +08:00 · 2023-12-04 17:42:29 +08:00 · 2023-12-04 17:42:14 +08:00 · 2023-12-04 17:34:47 +08:00 · 2023-12-04 16:58:11 +08:00 · 2023-12-01 16:54:21 +08:00
345 changed files with 11562 additions and 4050 deletions
--- a/android_crop_lib/build.gradle
+++ b/android_crop_lib/build.gradle
@@ -26,7 +26,7 @@ dependencies {
    api 'androidx.annotation:annotation:1.4.0'
    api 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation "androidx.core:core-ktx:1.7.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 repositories {
    mavenCentral()
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.tencent.vasdolly'
 apply from: '../mob.gradle'

@@ -21,20 +20,20 @@ android {
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true

-        ndk {
-            //设置支持的SO库架构
-            if (onlyArm64) {
-                abiFilters "arm64-v8a"
-            } else {
-                abiFilters "armeabi-v7a", "arm64-v8a"
-            }
-        }
-
        flavorDimensions 'default'

        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
    }

+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk true
+        }
+    }
+
    bundle {
        language {
            enableSplit = false
@@ -48,20 +47,29 @@ android {
    }

    //在apk文件后边生成版本号信息
-    android.applicationVariants.all {
-        variant ->
-            variant.outputs.all {
-                def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
-                outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}-${date}.apk"
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
+            def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
+
+            def outputFile = output.outputFile
+            if (outputFile == null || !outputFile.name.endsWith('.apk')) {
+                return
            }
+
+            def abi = output.getFilter(com.android.build.OutputFile.ABI)
+            if (abi == null) {
+                abi = "universal"
+            }
+            outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+        }
    }

-    lintOptions {
+    lint {
        abortOnError false
-        disable 'MissingTranslation'
-        disable 'ExtraTranslation'
+        disable 'MissingTranslation', 'ExtraTranslation', 'ContentDescription', 'SmallSp'
    }

+
    dataBinding {
        enabled = true
    }
@@ -139,20 +147,23 @@ android {
    }

    buildTypes {
+        def server_url_debug = '"http://beta.api.pekolive.com/"'
+        def server_url_release = '"https://api.pekolive.com/"'

        debug {
+            println("minifyEnabled = " + minify_enabled)
+
            ext.enableCrashlytics = false
            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID

-            buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\""
+            buildConfigField "String", "BASE_URL", server_url_debug
            buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
            buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
-            buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
-            minifyEnabled false // 是否混淆
-            // shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
+            buildConfigField "String", "BASE_URL_RELEASE", server_url_release
+            minifyEnabled minify_enabled.toBoolean() // 是否混淆
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            crunchPngs false // 停用 PNG 压缩
            signingConfig signingConfigs.v2
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            gradle.taskGraph.whenReady {
                tasks.each { task ->
                    if (task.name.contains("Test") || task.name.contains("Lint")) {
@@ -170,7 +181,7 @@ android {
                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
            }

-            buildConfigField "String", "BASE_URL", "\"https://api.pekolive.com/\""
+            buildConfigField "String", "BASE_URL", server_url_release
            buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
            buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
            buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -204,6 +215,9 @@ dependencies {
    implementation 'androidx.appcompat:appcompat:1.4.2'
    implementation 'com.google.android.material:material:1.6.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

@@ -289,7 +303,6 @@ dependencies {
    implementation 'com.contrarywind:wheelview:4.1.0'

    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
-
 }

 channel {
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -99,16 +99,18 @@
 -keep class android.support.v7.** { *;}

 #----------------EventBus事件巴士-----------------
-keepclassmembers class ** {
+-keepattributes *Annotation*
+-keepclassmembers class * {
    @org.greenrobot.eventbus.Subscribe <methods>;
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-# Only required if you use AsyncExecutor
-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(Java.lang.Throwable);
+# If using AsyncExecutord, keep required constructor of default event used.
+# Adjust the class name if a custom failure event type is used.
+-keepclassmembers class org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
 }
-
+# Accessed via reflection, avoid renaming or removal
+-keep class org.greenrobot.eventbus.android.AndroidComponentsImpl

 #-------------云信相关的混淆配置------------
 -dontwarn com.netease.**
@@ -234,6 +236,7 @@
 -dontwarn com.yizhuan.xchat_android_core.**
 -keep class com.yizhuan.xchat_android_core.** {*;}
 -keep class com.yizhuan.treasure_box.bean.** {*;}
+-keep class com.yizhuan.erban.avroom.bean.** {*;}


 #百度统计
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -81,7 +81,7 @@
    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <!-- 对于 Android 12.0 及以上设备，还需要添加如下权限： -->
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"  />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />

    <application
        android:name=".application.XChatApplication"
@@ -829,6 +829,10 @@
        <activity
            android:name=".ui.webview.DatingRuleWebViewActivity"
            android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".ui.webview.room_banner.RoomBannerWebDialogActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan"  />
        <activity
            android:name=".ui.webview.TarotPayWebViewActivity"
            android:theme="@style/dialog_web_view_activity" />
@@ -1015,7 +1019,9 @@
            android:name="flutterEmbedding"
            android:value="2" />

-        <meta-data android:name="Mob-Https" android:value="yes"/>
+        <meta-data
+            android:name="Mob-Https"
+            android:value="yes" />

        <provider
            android:name="com.netease.nimlib.ipc.NIMContentProvider"
@@ -1084,6 +1090,8 @@
            </intent-filter>
        </activity>

+        <activity android:name=".avroom.room_album.RoomAlbumActivity" />
+
    </application>

 </manifest>
--- a/app/src/main/assets/vap/test_fairy_anim_epic.mp4
+++ b/app/src/main/assets/vap/test_fairy_anim_epic.mp4
--- a/app/src/main/assets/vap/test_fairy_anim_legend.mp4
+++ b/app/src/main/assets/vap/test_fairy_anim_legend.mp4
--- a/app/src/main/java/com/yizhuan/erban/MainActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java
@@ -410,6 +410,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
        }
        onParseIntent();
        handleNimIntent();
+        InitialModel.get().regionCheck();
    }

    private void onParseIntent() {
@@ -519,6 +520,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onLoadLoginUserInfoEvent(LoadLoginUserInfoEvent event) {
        firstLoadedUserInfo();
+        InitialModel.get().regionCheck();
    }

    public void onLogout() {
--- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
+++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
@@ -16,7 +16,10 @@ import android.util.Log;
 import androidx.multidex.MultiDex;

 import com.bumptech.glide.request.target.ViewTarget;
+import com.chuhai.utils.LanguageUtils;
+import com.chuhai.utils.ServiceTime;
 import com.coorchice.library.utils.LogUtils;
+import com.facebook.stetho.Stetho;
 import com.hjq.toast.ToastUtils;
 import com.mob.MobSDK;
 import com.mob.moblink.MobLink;
@@ -64,6 +67,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
 import com.yizhuan.xchat_android_core.initial.InitialModel;
 import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor;
 import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor;
+import com.yizhuan.xchat_android_core.interceptor.TimeSyncInterceptor;
 import com.yizhuan.xchat_android_core.manager.IMMessageManager;
 import com.yizhuan.xchat_android_core.manager.IMSystemMsgManager;
 import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
@@ -112,6 +116,9 @@ import io.realm.RealmConfiguration;
 public class XChatApplication extends BaseApp {
    public static final String TAG = "XChatApplication";
    public static Application gContext;
+
+    // 接收到退出登录事件（跳转到登录页了）
+    private static long logoutEventTime = 0;
    private static final MessageNotifierCustomization messageNotifierCustomization = new MessageNotifierCustomization() {
        @Override
        public String makeNotifyContent(String nick, IMMessage message) {
@@ -200,10 +207,11 @@ public class XChatApplication extends BaseApp {

        String channel = "";
        channel = ChannelReaderUtil.getChannel(instance);
+        Log.d(TAG, "localChannel:" + channel);
        if (TextUtils.isEmpty(channel)) {
            channel = Constants.GOOGLE;
        }
-
+        Log.d(TAG, "finalChannel:" + channel);
        BasicConfig.INSTANCE.setOriginalChannel(channel);

        BasicConfig.INSTANCE.setChannel(channel);
@@ -242,6 +250,13 @@ public class XChatApplication extends BaseApp {
                        SingleToastUtil.showToast(serviceResult.getMessage());
                        EventBus.getDefault().post(new NeedCompleteInfoEvent());
                        throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
+                    } else if (serviceResult.getCode() == 401) {
+                        if ((ServiceTime.INSTANCE.getTime() - logoutEventTime) > 800) {
+                            logoutEventTime = ServiceTime.INSTANCE.getTime();
+                            SingleToastUtil.showToast(serviceResult.getMessage());
+                            AuthModel.get().cleanLogInfo();
+                        }
+                        throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
                    }
                }
                return null;
@@ -252,6 +267,7 @@ public class XChatApplication extends BaseApp {
            //fixed: Glide Exception:"You must not call setTag() on a view Glide is targeting"
            ViewTarget.setTagId(R.id.tag_glide);

+            initStetho(context);
            init(channel);

            //生命周期监听
@@ -400,11 +416,13 @@ public class XChatApplication extends BaseApp {
        httpParams.put("deviceId", DeviceUuidFactory.getDeviceId(context));
        httpParams.put("androidId", MD5Utils.getMD5String(Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)));
        httpParams.put("channel", AppMetaDataUtil.getChannelID());
+        httpParams.put("lang", LanguageUtils.INSTANCE.getSystemLanguage().toLanguageTag());
        RxNet.init(context)
                .debug(BuildConfig.DEBUG)
                .setBaseUrl(url)
                .addInterceptors(new ParamsInterceptor(httpParams))
                .addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序
+                .addInterceptors(new TimeSyncInterceptor())
                .certificates()
                .build();
        //单例的model 初始化
@@ -543,4 +561,18 @@ public class XChatApplication extends BaseApp {
            unregisterActivityLifecycleCallbacks(lifeCycleHelper);
        }
    }
+
+    /**
+     * 初始化Stetho（网络调试）
+     */
+    private static void initStetho(Context context) {
+        if (Env.isDebug()) {
+            Stetho.initialize(
+                    Stetho.newInitializerBuilder(context)
+                            .enableDumpapp(Stetho.defaultDumperPluginsProvider(context))
+                            .enableWebKitInspector(Stetho.defaultInspectorModulesProvider(context))
+                            .build()
+            );
+        }
+    }
 }
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -16,6 +16,7 @@ import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUS
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;

 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +39,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.viewpager2.widget.ViewPager2;

 import com.alibaba.fastjson.JSON;
@@ -65,7 +67,7 @@ import com.yizhuan.erban.avroom.fragment.HomePartyFragment;
 import com.yizhuan.erban.avroom.fragment.InputPwdDialogFragment;
 import com.yizhuan.erban.avroom.presenter.AvRoomPresenter;
 import com.yizhuan.erban.avroom.presenter.HomePartyPresenter;
-import com.yizhuan.erban.avroom.redpackage.RedPackageOpenDialog;
+import com.yizhuan.erban.avroom.redpackage.RedPackageHandler;
 import com.yizhuan.erban.avroom.view.IAvRoomView;
 import com.yizhuan.erban.avroom.widget.VerticalViewPagerAdapter;
 import com.yizhuan.erban.base.BaseMvpActivity;
@@ -81,10 +83,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
 import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
 import com.yizhuan.erban.ui.widget.NobleOpenNoticeView;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelOneDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelThreeDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelTwoDialog;
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelDialog;
 import com.yizhuan.erban.ui.widget.dialog.MonsterDialog;
 import com.yizhuan.erban.utils.UserUtils;
 import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
@@ -128,7 +127,6 @@ import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
 import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
 import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
 import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;
-import com.yizhuan.xchat_android_core.redpackage.RedPackageModel;
 import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
 import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
@@ -140,6 +138,8 @@ import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent;
 import com.yizhuan.xchat_android_core.room.pk.event.PKStateEvent;
 import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
 import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
+import com.yizhuan.xchat_android_core.support.room.RoomContext;
+import com.yizhuan.xchat_android_core.support.room.RoomView;
 import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo;
@@ -148,7 +148,6 @@ import com.yizhuan.xchat_android_core.utils.LogUtils;
 import com.yizhuan.xchat_android_core.utils.StringUtils;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
 import com.yizhuan.xchat_android_library.rxbus.RxBus;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 import com.yizhuan.xchat_android_library.utils.UIUtils;
@@ -160,10 +159,7 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

@@ -180,7 +176,7 @@ import io.reactivex.disposables.Disposable;
 */
@CreatePresenter(AvRoomPresenter.class)
 public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter>
-        implements View.OnClickListener, IAvRoomView {
+        implements View.OnClickListener, IAvRoomView, RoomView {

    public static final int FROM_TYPE_NORMAL = 0;
    public static final int FROM_TYPE_RECOMMEND = 1;
@@ -218,7 +214,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
    private RoomInfo mRoomInfo;
    private ImageView ivHeadWear;
    private MonsterDialog monsterDialog;
-    private List<RedPackageOpenDialog> openDialogs;
    private ViewPager2 viewpager;
    private VerticalViewPagerAdapter mAdapter;
    /*********************************显示全服礼物***************************************/
@@ -226,10 +221,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
    private GiftBroadcastObserver giftObserver;
    private Dialog giftDialog;
    private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
-    private boolean isResume = true;
    @Nullable
    private SingleRoomTipDialog singleRoomTipDialog;
-
+    // 通过红包进来时，有该参数
+    private RedPackageNotifyInfo redPackageNotifyInfo;
    public static void start(Context context, long roomUid) {
        startForFromType(context, roomUid, FROM_TYPE_NORMAL, null, null);
    }
@@ -413,6 +408,12 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        fromUid = intent.getStringExtra("fromUid");
        giftId = intent.getIntExtra("giftId", 0);
        mRoomInfo = intent.getParcelableExtra(Constants.ROOM_INFO);
+        Object notifyInfo = intent.getSerializableExtra("notifyInfo");
+        if (notifyInfo instanceof RedPackageNotifyInfo) {
+            redPackageNotifyInfo = (RedPackageNotifyInfo) notifyInfo;
+        }else{
+            redPackageNotifyInfo = null;
+        }
        if (mRoomInfo != null) {
            roomUid = mRoomInfo.getRoomUid();
        } else {
@@ -511,8 +512,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        if (giftList != null) {
            giftList.clear();
        }
-        if (!isResume) showRedPackage(AvRoomDataManager.get().mCurrentRoomInfo);
-        isResume = true;
    }

    private void onRoomEventReceive(RoomEvent roomEvent) {
@@ -616,9 +615,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
            case RoomEvent.MY_SELF_KICK_OUT_ROOM_BY_S_ADMIN:
                toBack(true);
                break;
-            case RoomEvent.RECEIVE_RED_PACKAGE:
-                showRedPackage(AvRoomDataManager.get().mCurrentRoomInfo);
-                break;
            default:
        }
    }
@@ -680,6 +676,17 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
            RxBus.get().post(new ShowGiftDialogEvent().setGiftId(giftId));
            giftId = 0;
        }
+
+        /**
+         * TODO 临时方案：后续逐步完善整个房间的RoomContext替换计划
+         * PS:目前房间进入的逻辑有些凌乱，没有明确的生命周期，看代码逻辑，无论是第一次还是再次进入都会走这里，所以在这里绑定View
+         */
+        getRoomContext().onViewAttach(this);
+
+        /**
+         * 每次View重新创建（意味着可能在房间外点了红包），就重新尝试加载红包并展示
+         */
+        tryShowSourceRedPackage();
    }

    private void showLiveFinishView(long uid) {
@@ -716,42 +723,24 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        AvRoomDataManager.get().release();
    }

-    @SuppressLint("CheckResult")
-    private void showRedPackage(RoomInfo roomInfo) {
-        if (roomInfo == null) return;
-        RedPackageNotifyInfo inRoomNotifyInfo = (RedPackageNotifyInfo) getIntent().getSerializableExtra("notifyInfo");
-        Map<String, Long> redMap = DemoCache.readRedPackage();
-        RedPackageModel.INSTANCE.getRedPackage(roomInfo.getUid())
-                .compose(bindToLifecycle())
-                .doFinally(() -> {
-                    if (inRoomNotifyInfo != null && (redMap == null || !redMap.containsKey(inRoomNotifyInfo.getRedEnvelopeId()))) {
-                        showRedPackageOpenDialog(inRoomNotifyInfo);
-                    }
-                })
-                .filter(notifyInfo -> inRoomNotifyInfo == null || !notifyInfo.getRedEnvelopeId().equals(inRoomNotifyInfo.getRedEnvelopeId()))
-                .subscribe(this::showRedPackageOpenDialog);
-    }
-
-    private void showRedPackageOpenDialog(RedPackageNotifyInfo notifyInfo) {
-        if (!isResume) return;
-        if (openDialogs == null) {
-            openDialogs = new ArrayList<>();
-        }
-        RedPackageOpenDialog openDialog = RedPackageOpenDialog.Companion.newInstance(notifyInfo);
-        openDialog.show(this);
-        if (openDialog.getDialog() != null) {
-            openDialog.getDialog().setOnDismissListener(dialog -> openDialogs.remove(openDialog));
-        }
-        openDialogs.add(openDialog);
-        if (openDialogs.size() >= SHOW_RED_DIALOG_MAX) {
-            openDialogs.get(SHOW_RED_DIALOG_MAX - 1).dismissAllowingStateLoss();
+    /**
+     * 尝试展示来源红包（在房间外点击红包入口进入房间时）
+     */
+    private void tryShowSourceRedPackage() {
+        try {
+            if (redPackageNotifyInfo != null) {
+                RedPackageHandler handler = getRoomContext().findAbility(RedPackageHandler.class.getSimpleName());
+                if (handler != null) {
+                    long id = Long.parseLong(redPackageNotifyInfo.getRedEnvelopeId());
+                    handler.tryShowRedPackage(id);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
        }
    }

    private void dismissRedPackageDialog() {
-        if (openDialogs != null) {
-            openDialogs.clear();
-        }
        if (mCurrentFragment != null) {
            mCurrentFragment.dismissSendRedPackageDialog();
        }
@@ -1076,7 +1065,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                DemoCache.readNewUserChargeGift() == 0) {
            DemoCache.saveNewUserChargeGift(1);
        }
-        showRedPackage(AvRoomDataManager.get().mCurrentRoomInfo);
        dismissLoadingDialog();
    }

@@ -1317,7 +1305,9 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter

    private void showGiftDialog() {
        if (giftList.size() == 0) return;
-        giftDialog = generateAllServiceGiftDialog(this, giftList.peekFirst());
+        AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
+        if (data == null) return;
+        giftDialog = generateAllServiceGiftDialog(this, data);
        giftDialog.setOnDismissListener(dialog -> {
            giftList.pollFirst();
            AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
@@ -1332,30 +1322,16 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        giftDialog.show();
    }

-    private AllServiceGiftDialog generateAllServiceGiftDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        switch (JavaUtil.str2int(dataBean.getLevelNum())) {
-            default:
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_1:
-                return new AllServiceGiftLevelOneDialog(context, dataBean);
-
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_2:
-
-                return new AllServiceGiftLevelTwoDialog(context, dataBean);
-
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_3:
-                return new AllServiceGiftLevelThreeDialog(context, dataBean);
-        }
+    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
+        return new AllServiceGiftLevelDialog(context, dataBean);
    }

-
    @Override
    protected void onPause() {
        super.onPause();
        registerGiftBroadcastMessage(false);
-        isResume = false;
    }

-
    private void handlePmExitRoom() {
        EventBus.getDefault().post(new PmDismissAllLimitDialogEvent());
        getMvpPresenter().exitRoom();
@@ -1401,6 +1377,24 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
        getLimitEnterRoomHelper().handleThisContext(this, event.getData(), true, this::handlePmExitRoom);
    }

+    @Nullable
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Nullable
+    @Override
+    public RoomContext getRoomContext() {
+        return RoomContext.Companion.get();
+    }
+
+    @NonNull
+    @Override
+    public LifecycleOwner getLifecycleOwner() {
+        return this;
+    }
+
    private static class GiftBroadcastObserver implements Observer<BroadcastMessage> {
        private WeakReference<AVRoomActivity> mReference;

@@ -1433,5 +1427,4 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
            }
        }
    }
-
 }
--- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt
@@ -39,7 +39,7 @@ class RoomPKBoardView @JvmOverloads constructor(
 ) : DragLayout(context, attrs, defStyleAttr) {

    private val binding = LayoutRoomPkBoardViewBinding.inflate(LayoutInflater.from(context))
-    private val observer = Observer<RoomPkBean> { updateView(it) }
+    private val observer = Observer<RoomPkBean?> { updateView(it) }
    private var disposable: Disposable? = null
    private lateinit var helpPopupWindow: PopupWindow
    private var roomPkBean: RoomPkBean? = null
--- a/app/src/main/java/com/yizhuan/erban/avroom/bean/RoomAlbumPhotoInfo.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/bean/RoomAlbumPhotoInfo.kt
@@ -0,0 +1,14 @@
+package com.yizhuan.erban.avroom.bean
+
+data class RoomAlbumPhotoInfo(
+    val giftId: Int,
+    val giftNum: Int,
+    val giftUrl: String,
+    val id: Int,
+    val photoUrl: String,
+    val roomUid: Int,
+    val status: Int,
+    val totalGoldPrice: Int,
+    val type: Int,
+    val uid: Int
+)
--- a/app/src/main/java/com/yizhuan/erban/avroom/core/AudioRoomContext.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/core/AudioRoomContext.kt
@@ -0,0 +1,19 @@
+package com.yizhuan.erban.avroom.core
+
+import com.yizhuan.erban.avroom.redpackage.RedPackageHandler
+import com.yizhuan.xchat_android_core.support.room.RoomAbility
+import com.yizhuan.xchat_android_core.support.room.RoomContext
+
+/**
+ * Created by Max on 2023/10/26 15:41
+ * Desc:语音房
+ * @param roomId roomUid
+ **/
+class AudioRoomContext(roomId: Long) : RoomContext(roomId) {
+
+    override fun loadAbility(list: MutableMap<String, RoomAbility>) {
+        super.loadAbility(list)
+        // 红包处理器
+        list[RedPackageHandler::class.java.simpleName] = RedPackageHandler()
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
@@ -24,6 +24,7 @@ import com.yizhuan.erban.avroom.activity.CreatePKActivity;
 import com.yizhuan.erban.avroom.activity.RoomSettingActivity;
 import com.yizhuan.erban.avroom.anotherroompk.RoomPKCreateActivity;
 import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper;
+import com.yizhuan.erban.avroom.room_album.RoomAlbumActivity;
 import com.yizhuan.erban.avroom.singleroompk.SingleRoomPKCreateActivity;
 import com.yizhuan.erban.common.util.Utils;
 import com.yizhuan.erban.common.widget.dialog.DialogManager;
@@ -112,6 +113,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
                true));
        rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 5));
        optAdapter = new OptAdapter(context, null);
+        addRoomAlbum(optAdapter);
        addDatingAction(optAdapter);
        addPKAction(optAdapter);
        addRoomPKAction(optAdapter);
@@ -123,7 +125,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
        addRoomSettingAction(optAdapter);
        addGiftEffectAction(optAdapter);
        addOpenOrClosePublicScreenAction(optAdapter);
-        addRedPackageSwitch();
+//        addRedPackageSwitch();
        addCleanScreenAction(optAdapter);
        addRoomLimit(optAdapter);
        addGiftValueAction(optAdapter);
@@ -267,6 +269,14 @@ public class RoomOperationDialog extends BottomSheetDialog {
        }
    }

+    private void addRoomAlbum(OptAdapter optAdapter) {
+        if (AvRoomDataManager.get().isHasRoomAlbum()) {
+            optAdapter.addData(new OptAction(R.drawable.ic_room_operation_album, "房间相册", () -> {
+                RoomAlbumActivity.start(getContext());
+            }));
+        }
+    }
+
    /**
     * 相亲 模式
     *
@@ -331,7 +341,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
     * @param optAdapter
     */
    private void addRedPacketAction(OptAdapter optAdapter) {
-        if (AvRoomDataManager.get().isRedEnvelopeOpen()) {
+        if (AvRoomDataManager.get().getRedEnvelopeType() > 0) {
            RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
            if (roomInfo == null) {
                return;
@@ -342,7 +352,6 @@ public class RoomOperationDialog extends BottomSheetDialog {
                }
            }));
        }
-
    }

    /**
@@ -419,7 +428,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
                        superAdminModel.roomOperate(SuperAdminModel.CLOSE_PUBLIC_SCREEN).subscribe();
                    }
                    AvRoomModel.get().closeScreen(roomInfo.getRoomId(),
-                            !isCloseScreen)
+                                    !isCloseScreen)
                            .compose(RxHelper.bindContext(context))
                            .flatMap(data -> IMNetEaseManager.get().closeOpenScreen(
                                    data.getRoomId(), data))
@@ -639,7 +648,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
        }
        optAdapter.addData(new OptAction(R.drawable.icon_room_shield_report,
                ResUtil.getString(R.string.me_shield_report),
-                () ->{
+                () -> {
                    DialogManager dialogManager = new DialogManager(context);
                    List<ButtonItem> buttonItems = new ArrayList<>();
                    ButtonItem buttonItem1 = new ButtonItem(ResUtil.getString(R.string.me_shield_room), () -> {
--- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt
@@ -18,8 +18,8 @@ import android.widget.TextView
 import androidx.recyclerview.widget.GridLayoutManager
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.SkuDetails
 import com.appsflyer.AFInAppEventParameterName
 import com.appsflyer.AFInAppEventType
 import com.appsflyer.AppsFlyerLib
@@ -123,7 +123,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                ResUtil.getString(R.string.avroom_firstcharge_firstchargedialog_01).toast()
            } else if (channel.equals(Constants.GOOGLE)) {
                goodsList?.get(position)?.let { charge ->
-                    buyProduct(charge.skuDetails)
+                    buyProduct(charge.productDetails)
                }
            } else {
                CommonWebViewActivity.start(
@@ -142,18 +142,23 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                FirstChargeReward.ONE -> {
                    spanSize = 6
                }
+
                FirstChargeReward.TWO_LEFT -> {
                    spanSize = 3
                }
+
                FirstChargeReward.TWO_RIGHT -> {
                    spanSize = 3
                }
+
                FirstChargeReward.THREE -> {
                    spanSize = 2
                }
+
                FirstChargeReward.TWO_LEFT_SMALL -> {
                    spanSize = 3
                }
+
                FirstChargeReward.TWO_RIGHT_SMALL -> {
                    spanSize = 3
                }
@@ -196,11 +201,13 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                binding.rbPlanC.visibility = View.GONE
                binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
            }
+
            2 -> {
                binding.rbPlanC.visibility = View.GONE
                binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
                binding.rbPlanB.text = "$${goodsList[1].chargeMoney}"
            }
+
            3 -> {
                binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
                binding.rbPlanB.text = "$${goodsList[1].chargeMoney}"
@@ -227,20 +234,19 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
        for (bean in goodsList) {
            productKeys.add(bean.chargeProdId)
        }
-        billingManager?.querySkuDetailsAsync(
-            BillingClient.SkuType.INAPP, productKeys
-        ) { billingResult: BillingResult, skuDetailsList: List<SkuDetails>? ->
+        billingManager?.querySkuDetailsAsync(productKeys) { billingResult: BillingResult, productDetails: MutableList<ProductDetails> ->
            if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
                Log.w(
                    TAG,
-                    "Unsuccessful query for type: " + BillingClient.SkuType.INAPP
-                            + ". Error code: " + billingResult.responseCode
+                    "Unsuccessful query for type: " + BillingClient.ProductType.INAPP + ". Error code: " + billingResult.responseCode
                )
-            } else if (skuDetailsList != null && skuDetailsList.isNotEmpty()) {
+                return@querySkuDetailsAsync
+            }
+            if (productDetails.isNotEmpty()) {
                for (chargeBean in goodsList) {
-                    for (skuDetails in skuDetailsList) {
-                        if (skuDetails.sku == chargeBean.chargeProdId) {
-                            chargeBean.skuDetails = skuDetails
+                    for (skuDetails in productDetails) {
+                        if (skuDetails.productId == chargeBean.chargeProdId) {
+                            chargeBean.productDetails = skuDetails
                            break
                        }
                    }
@@ -258,7 +264,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
            ) {
                PayModel.get().verifyOrder(
                    purchase.accountIdentifiers!!.obfuscatedAccountId,
-                    purchase.skus[0],
+                    purchase.products[0],
                    purchase.packageName,
                    purchase.purchaseToken
                )
@@ -267,12 +273,12 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                        { token: String? ->
                            //L.i("token=" + token);
                            billingManager?.consumeAsync(token)
-                            var skuDetails: SkuDetails? = null
+                            var skuDetails: ProductDetails? = null
                            val goodList = goodsList
-                            if (goodList != null && goodList.isNotEmpty()) {
+                            if (!goodList.isNullOrEmpty()) {
                                for (datum in goodList) {
-                                    if (datum.chargeProdId == purchase.skus[0]) {
-                                        skuDetails = datum.skuDetails
+                                    if (datum.chargeProdId == purchase.products[0]) {
+                                        skuDetails = datum.productDetails
                                        break
                                    }
                                }
@@ -282,12 +288,12 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                                    HashMap()
                                eventValue[AFInAppEventParameterName.CONTENT_TYPE] = "Gold"
                                eventValue[AFInAppEventParameterName.QUANTITY] = 1
-                                eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId
+                                eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId!!
                                eventValue[AFInAppEventParameterName.REVENUE] =
-                                    skuDetails.priceAmountMicros / 1000000f
-                                eventValue["Price"] = skuDetails.price
+                                    skuDetails.oneTimePurchaseOfferDetails?.priceAmountMicros!! / 1000000f
+                                eventValue["Price"] = skuDetails.oneTimePurchaseOfferDetails?.formattedPrice!!
                                eventValue[AFInAppEventParameterName.CURRENCY] =
-                                    skuDetails.priceCurrencyCode
+                                    skuDetails.oneTimePurchaseOfferDetails?.priceCurrencyCode!!
                                AppsFlyerLib.getInstance().logEvent(
                                    applicationContext,
                                    AFInAppEventType.PURCHASE,
@@ -315,10 +321,10 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),

    /*购买商品*/
    @SuppressLint("CheckResult")
-    fun buyProduct(skuDetails: SkuDetails?) {
+    fun buyProduct(skuDetails: ProductDetails?) {
        if (skuDetails != null) {
-            Log.d(TAG, "BuyProduct:" + skuDetails.sku)
-            PayModel.get().placeOrder(skuDetails.sku)
+            Log.d(TAG, "BuyProduct:" + skuDetails.productId)
+            PayModel.get().placeOrder(skuDetails.productId)
                .compose(bindToLifecycle())
                .subscribe(
                    { recordId: PayRecordId ->
@@ -372,6 +378,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                        bean.itemType = FirstChargeReward.ONE
                    }
                }
+
                2 -> {
                    for (i in firstChargeRewardList.indices) {
                        if (i == 0) {
@@ -381,11 +388,13 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                        }
                    }
                }
+
                3 -> {
                    for (bean in firstChargeRewardList) {
                        bean.itemType = FirstChargeReward.THREE
                    }
                }
+
                4 -> {
                    for (i in firstChargeRewardList.indices) {
                        if ((i + 1) % 2 != 0) {
@@ -395,6 +404,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
                        }
                    }
                }
+
                else -> {
                    if (firstChargeRewardList.size % 3 == 0) {
                        for (bean in firstChargeRewardList) {
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
@@ -11,6 +11,7 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.text.TextUtils
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewStub
@@ -20,6 +21,9 @@ import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.annotation.CallSuper
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.withResumed
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter.base.BaseQuickAdapter
@@ -45,7 +49,8 @@ import com.yizhuan.erban.avroom.dialog.RoomFreeGiftDialog
 import com.yizhuan.erban.avroom.dialog.RoomOperationDialog
 import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog
 import com.yizhuan.erban.avroom.presenter.BaseRoomPresenter
-import com.yizhuan.erban.avroom.redpackage.RedPackageSendDialog
+import com.yizhuan.erban.avroom.redpackage.send.RedPackageSendDialog
+import com.yizhuan.erban.avroom.room_album.RoomAlbumModel
 import com.yizhuan.erban.avroom.view.IBaseRoomView
 import com.yizhuan.erban.avroom.widget.BottomView
 import com.yizhuan.erban.avroom.widget.MessageView
@@ -82,6 +87,7 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
 import com.yizhuan.xchat_android_core.gift.event.RoomFreeGiftEvent
 import com.yizhuan.xchat_android_core.helper.AtProxy
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2
 import com.yizhuan.xchat_android_core.manager.AudioEngineManager
@@ -102,6 +108,8 @@ import com.yizhuan.xchat_android_core.share.bean.SessionType
 import com.yizhuan.xchat_android_core.super_admin.SaConstant
 import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel
 import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil
+import com.yizhuan.xchat_android_core.support.room.RoomView
+import com.yizhuan.xchat_android_core.support.room.RoomWidget
 import com.yizhuan.xchat_android_core.user.UserModel
 import com.yizhuan.xchat_android_core.user.bean.BaseInfo
 import com.yizhuan.xchat_android_core.user.bean.UserInfo
@@ -114,6 +122,7 @@ import com.yizhuan.xchat_android_library.rxbus.RxBus
 import com.yizhuan.xchat_android_library.utils.*
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -128,7 +137,8 @@ import org.greenrobot.eventbus.ThreadMode
 */
 open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
    BaseMvpFragment<V?, P?>(),
-    View.OnClickListener, OnGiftDialogBtnClickListener, IBaseRoomView, OnMicroItemClickListener {
+    View.OnClickListener, OnGiftDialogBtnClickListener, IBaseRoomView, OnMicroItemClickListener,
+    RoomView {
    private var myUid: Long = 0
    protected lateinit var messageView: MessageView
    protected lateinit var bottomView: BottomView
@@ -177,6 +187,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :

    private var atProxy: AtProxy? = null

+    // 房间小组件
+    private var widgets: HashMap<String, RoomWidget> = HashMap()

    @CallSuper
    override fun onFindViews() {
@@ -184,6 +196,14 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
        bottomView = mView.findViewById(R.id.bottom_view)
        inputLayout = mView.findViewById(R.id.input_layout)
        inputEdit = mView.findViewById(R.id.input_edit)
+        inputEdit.setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) {
+                sendMsg()
+                return@setOnKeyListener true
+            }
+
+            false
+        }
        inputSend = mView.findViewById(R.id.input_send)
        microView = mView.findViewById(R.id.micro_view)
        mVsMusicPlayer = mView.findViewById(R.id.vs_music_player)
@@ -228,6 +248,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
    @SuppressLint("CheckResult")
    @CallSuper
    override fun initiate() {
+        initWidget()
        //如果不需要開麥，並且還沒有權限的情況下，重置狀態為需要去打開麥克風
        myUid = AuthModel.get().currentUid
        isCloseScreen = AvRoomDataManager.get().isCloseScreen
@@ -275,6 +296,16 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :

        //获取免费礼物详情
        mvpPresenter?.queryFreeFlower()
+        initRoomAlbum()
+    }
+
+    @SuppressLint("CheckResult")
+    private fun initRoomAlbum() {
+        RoomAlbumModel.listUnlockRoomPhoto(AvRoomDataManager.get().roomUid)
+            .compose(bindToLifecycle())
+            .subscribe({
+                AvRoomDataManager.get().unlockedRoomAlbumPhotos = it
+            }, { toast(it.message) })
    }

    @CallSuper
@@ -482,9 +513,6 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
            //設置透明度
            rollPagerView.setAnimationDurtion(500)
            bannerAdapter.notifyDataSetChanged()
-            bannerAdapter.setRoomActClickListener { url ->
-                DialogWebViewActivity.start(mContext, url)
-            }

            // 模擬指示器在viewpager底部效果
            val viewPager = rollPagerView.viewPager
@@ -617,6 +645,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
    override fun onDestroyView() {
        super.onDestroyView()
        releaseView()
+        unregisterWidgets()
    }

    override fun onDestroy() {
@@ -724,6 +753,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
            }
            .subscribe { _, throwable ->
                if (throwable != null) {
+                    toast(throwable.message)
                    callback.onFail()
                } else {
                    callback.onSuccess()
@@ -1000,6 +1030,9 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :

    @SuppressLint("CheckResult")
    override fun toUpMicroPhone(micPosition: Int, currentUid: String, b: Boolean) {
+        if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.CREATED)) {
+            return
+        }
        if (AvRoomDataManager.get().isSelfGamePlaying) {
            SingleToastUtil.showToast("遊戲中不可以換麥!")
            return
@@ -1249,10 +1282,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
        }

        override fun onSendMsgBtnClick() {
-            inputLayout.visibility = View.VISIBLE
-            inputEdit.isFocusableInTouchMode = true
-            inputEdit.requestFocus()
-            KeyBoardUtils.showKeyBoard(context, inputEdit)
+            openMessageInput(null)
        }

        override fun onSendGiftBtnClick() {
@@ -1268,7 +1298,10 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
        override fun onMoreBtnClick() {
            val dialog = RoomOperationDialog(mContext)
            dialog.setOnActionListener {
-                redPackageSendDialog = RedPackageSendDialog()
+                redPackageSendDialog = RedPackageSendDialog.newInstance(AvRoomDataManager.get().redEnvelopeType)
+                redPackageSendDialog?.setOnDismissListener {
+                    redPackageSendDialog = null
+                }
                redPackageSendDialog?.show(activity)
            }
            dialog.show()
@@ -1278,4 +1311,55 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
            RoomMsgActivity.start(mContext)
        }
    }
+
+    /**
+     * 注册组件
+     */
+    protected fun registerWidget(name: String, widget: RoomWidget) {
+        widgets.put(name, widget)
+        widget.onStart(this)
+    }
+
+    /**
+     * 取消注册组件
+     */
+    protected fun unregisterWidgets() {
+        widgets.values.forEach {
+            it.onStop()
+        }
+        widgets.clear()
+    }
+
+    override fun getLifecycleOwner(): LifecycleOwner {
+        return this
+    }
+
+    open fun initWidget() {
+
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    open fun onOpenRoomMessageInputEvent(event: OpenRoomMessageInputEvent) {
+        lifecycleScope.launch {
+            lifecycle.withResumed {
+                view?.postDelayed({
+                    openMessageInput(event.text)
+                }, 500)
+            }
+        }
+    }
+
+    /**
+     * 打开公屏输入
+     */
+    fun openMessageInput(text: String?) {
+        inputLayout.visibility = View.VISIBLE
+        if (text != null) {
+            inputEdit.setText(text)
+            inputEdit.setSelection(inputEdit.length())
+        }
+        inputEdit.isFocusableInTouchMode = true
+        inputEdit.requestFocus()
+        KeyBoardUtils.showKeyBoard(context, inputEdit)
+    }
 }
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt
@@ -14,6 +14,7 @@ import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog
 import com.yizhuan.erban.avroom.game.GameDelegate
 import com.yizhuan.erban.avroom.game.OnGameStatusChangeListener
 import com.yizhuan.erban.avroom.presenter.GameRoomPresenter
+import com.yizhuan.erban.avroom.redpackage.RedPackageWidget
 import com.yizhuan.erban.avroom.view.IGameRoomView
 import com.yizhuan.erban.databinding.FragmentGameRoomBinding
 import com.yizhuan.erban.ui.widget.GiftDialog.OnGiftDialogBtnClickListener
@@ -193,4 +194,8 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
        super.onDestroy()
    }

+    override fun initWidget() {
+        super.initWidget()
+        registerWidget(RedPackageWidget::class.java.simpleName, gameBinding.redPackageWidget)
+    }
 }
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
@@ -26,6 +26,7 @@ import com.yizhuan.erban.avroom.dialog.PKScoreBoardDialog;
 import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog;
 import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper;
 import com.yizhuan.erban.avroom.presenter.HomePartyPresenter;
+import com.yizhuan.erban.avroom.redpackage.RedPackageWidget;
 import com.yizhuan.erban.avroom.view.IHomePartyView;
 import com.yizhuan.erban.avroom.widget.PKBoardView;
 import com.yizhuan.erban.base.BaseMvpActivity;
@@ -133,6 +134,12 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
        bottomView.setBottomViewListener(new PartyRoomBottomViewWrapper());
    }

+    @Override
+    public void initWidget() {
+        super.initWidget();
+        registerWidget(RedPackageWidget.class.getSimpleName(), gameBinding.redPackageWidget);
+    }
+
    @SuppressLint("CheckResult")
    @Override
    public void initiate() {
@@ -526,7 +533,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
        }
    }

-
    @Override
    public void onDestroy() {
        if (mDisposable != null) {
@@ -808,7 +814,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                            } else {
                                gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
                                gameBinding.ivTreasureBox.setVisibility(View.VISIBLE);
-
                                GlideApp.with(BasicConfig.INSTANCE.getAppContext())
                                        .load(GoldBoxHelper.getBoxIcon())
                                        .error(R.drawable.icon_room_treasure_box)
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
@@ -16,6 +16,7 @@ import com.yizhuan.erban.avroom.adapter.SingleRoomPKMicroViewAdapter
 import com.yizhuan.erban.avroom.dialog.RequestUpMicDialog
 import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog
 import com.yizhuan.erban.avroom.presenter.SingleRoomPresenter
+import com.yizhuan.erban.avroom.redpackage.RedPackageWidget
 import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkFinishDialog
 import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkForceFinishDialog
 import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkReceivedDialog
@@ -262,4 +263,8 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
        ).openDialog()
    }

+    override fun initWidget() {
+        super.initWidget()
+        registerWidget(RedPackageWidget::class.java.simpleName, gameBinding.redPackageWidget)
+    }
 }
--- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt
@@ -34,7 +34,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
    private val TAG = "GameDelegate"
    private var APP_CODE = ""

-    private val mRoomID = AvRoomDataManager.get().roomUid.toString()
+    private val mRoomID :String get() = AvRoomDataManager.get().roomUid.toString()
    private val mLanguage = "zh-TW" //語言

    //調用遊戲SDK的接口,成功加載遊戲後可用:
@@ -84,7 +84,10 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
    }

    fun updateGame(mgId: Long?) {
-        if (mgId == null || mgId == 0L || mgId == mMGID || iSudFSTAPP == null) return
+        if (mgId == null || mgId == 0L) return
+        if (mgId == mMGID && iSudFSTAPP != null) {
+            return
+        }
        mMGID = mgId
        updateMyMicQueue(GameStatus.STATUS_NOT_JOIN)
        loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage)
@@ -165,7 +168,9 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
    ) {
        iSudFSTAPP?.destroyMG()
        iSudFSTAPP = SudMGP.loadMG(activity, userID, roomID, code, mgID, language, mISudFSMMG)
-        addGameView(iSudFSTAPP!!.gameView)
+        iSudFSTAPP?.apply {
+            addGameView(gameView)
+        }
    }

    /**
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
@@ -20,6 +20,8 @@ import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData;
 import com.netease.nimlib.sdk.util.Entry;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
+import com.yizhuan.erban.avroom.core.AudioRoomContext;
+import com.yizhuan.xchat_android_core.support.room.RoomContext;
 import com.yizhuan.erban.avroom.view.IAvRoomView;
 import com.yizhuan.erban.base.BaseMvpPresenter;
 import com.yizhuan.xchat_android_core.Constants;
@@ -128,6 +130,8 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
                .subscribe(roomQueueInfoSparseArray -> {
                    long uid = AuthModel.get().getCurrentUid();
                    AudioEngineManager.get().startRtcEngine(uid, roomInfo.getAudioSdkType());
+                    // TODO 临时方案：后续逐步完善整个房间的RoomContext替换计划
+                    new AudioRoomContext(roomInfo.getUid()).run();
                    if (getMvpView() != null) {
                        getMvpView().enterRoomSuccess();
                    }
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGiftAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGiftAdapter.kt
@@ -1,20 +0,0 @@
-package com.yizhuan.erban.avroom.redpackage
-
-import android.widget.TextView
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.erban.R
-import com.yizhuan.erban.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeGiftItemVO
-
-class RedPackageGiftAdapter(layoutId: Int = R.layout.item_red_package_gift) :
-        BaseQuickAdapter<RedEnvelopeGiftItemVO, BaseViewHolder>(layoutId) {
-
-    override fun convert(helper: BaseViewHolder, item: RedEnvelopeGiftItemVO) {
-        ImageLoadUtils.loadAvatar(mContext, item.giftVo?.giftUrl, helper.getView(R.id.iv_gift))
-        helper.setText(R.id.tv_gift_num, "x${item.giftNum}")
-        helper.getView<TextView>(R.id.tv_gift_name)?.let {
-            it.text = item.giftVo?.giftName
-        }
-    }
-}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageHandler.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageHandler.kt
@@ -0,0 +1,169 @@
+package com.yizhuan.erban.avroom.redpackage
+
+import android.content.Context
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import com.yizhuan.erban.avroom.activity.AVRoomActivity
+import com.yizhuan.erban.avroom.redpackage.open.RedPackageOpenDialog
+import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment
+import com.yizhuan.xchat_android_core.manager.IMNetEaseManager
+import com.yizhuan.xchat_android_core.manager.RoomEvent
+import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
+import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo
+import com.yizhuan.xchat_android_core.support.room.RoomContext
+import com.yizhuan.xchat_android_core.support.room.RoomHandler
+
+/**
+ * Created by Max on 2023/10/26 11:26
+ * Desc:红包处理器
+ **/
+class RedPackageHandler : RoomHandler() {
+
+    // 入口图标-数据
+    val iconLiveData: MutableLiveData<RedPackageNotifyInfo?> = MutableLiveData()
+
+    /**
+     * 红包相关操作计数；目前的红包操作为：【正在打开当前房间的红包弹窗】。
+     * 展示时+1，销毁时-1，以此来判断是否正在进行红包操作）
+     */
+    private var operationCount: Int = 0
+
+    val inOperation get() = operationCount > 0
+
+    override fun onStart(context: RoomContext) {
+        super.onStart(context)
+        registerSignaling()
+    }
+
+    override fun onStop(context: RoomContext) {
+        super.onStop(context)
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        super.onStateChanged(source, event)
+        if (event == Lifecycle.Event.ON_RESUME) {
+            requestLatestRoomRedPackage()
+        }
+    }
+
+    /**
+     * 尝试展示红包
+     * PS：目前这个方法仅为了解决：通过房间外的红包入口进入房间后，需要查询该红包，展示出来。
+     */
+    fun tryShowRedPackage(redPackageId: Long) {
+        val disposable = RedPackageModel.getRedPackage(redPackageId)
+            .compose(bindToLifecycle())
+            .subscribe({ item ->
+                if (item.state != 3 && item.state != 6 && item.state != 4) {
+                    roomView?.getActivity().let {
+                        RedPackageOpenDialog.newInstance(item).show(it)
+                    }
+                }
+            }, {})
+    }
+
+    /**
+     * 监听房间信令
+     */
+    private fun registerSignaling() {
+        // TODO 临时方案：不应在这里直接监听IM，后续会统一分发出口
+        // 信令来源：新/旧版的厅内红包,非全服红包
+        IMNetEaseManager.get().chatRoomEventObservable
+            .compose<RoomEvent>(bindToLifecycle<RoomEvent>())
+            .filter {
+                it?.event == RoomEvent.RECEIVE_RED_PACKAGE && it?.chatRoomMessage?.attachment is RedPackageAttachment
+            }.map {
+                (it.chatRoomMessage.attachment as RedPackageAttachment).getRedPackageNotifyInfo()
+            }
+            .subscribe { data: RedPackageNotifyInfo ->
+                handleRoomRedPackage(data, true)
+            }
+    }
+
+    /**
+     * 查找最新的厅内红包（新/旧版的厅内红包，非全服红包）
+     */
+    private fun requestLatestRoomRedPackage() {
+        val roomId = roomContext?.roomId ?: return
+        RedPackageModel.getLatestRoomRedPackage(roomId)
+            .compose(bindToLifecycle())
+            .subscribe({ data ->
+                handleRoomRedPackage(data, false)
+            }, {
+                if (it.message == "No RedPackage") {
+                    updateIcon(null)
+                } else {
+                    // 网络等原因的失败，不处理就好
+                }
+            })
+    }
+
+    /**
+     * 处理厅内红包，非全服红包
+     * @param isSignaling 是否来自信令？
+     */
+    private fun handleRoomRedPackage(data: RedPackageNotifyInfo, isSignaling: Boolean) {
+        tryShowOpenDialog(data, isSignaling)
+        updateIcon(data)
+    }
+
+    /**
+     * 更新红包入口图标
+     */
+    private fun updateIcon(data: RedPackageNotifyInfo?) {
+        iconLiveData.postValue(data)
+    }
+
+    /**
+     * 尝试展示红包领取弹窗
+     */
+    private fun tryShowOpenDialog(data: RedPackageNotifyInfo, isSignaling: Boolean) {
+        val activity = roomView?.getActivity() ?: return
+        if (activity.isFinishing) {
+            return
+        }
+        if (!isSignaling) {
+            return
+        }
+        if (data.kind == 0 || (data.kind == 1 && data.validityType == 0)) {
+            //【旧版本-厅内红包：kind=0】、【新版本-厅内无门槛-立即生效红包：kind=1&validityType=0】
+            RedPackageOpenDialog.newInstance(data).show(activity)
+        }
+    }
+
+    /**
+     * 请求刷新Icon（数据已过期）
+     */
+    fun requestRefreshIcon() {
+//        updateIcon(null)
+        requestLatestRoomRedPackage()
+    }
+
+    fun startOperation() {
+        operationCount++
+    }
+
+    fun stopOperation() {
+        operationCount--
+    }
+
+    /**
+     * 全服红包信令（之前是在BaseActivity中处理的；现在为了红包的一个需求，暂且拦截到这里处理）
+     */
+    fun onAllServiceSignaling(context: Context, data: RedPackageNotifyInfo) {
+        if (context is AVRoomActivity) {
+            if (roomContext?.roomId == data.roomUid) {
+                RedPackageOpenDialog.newInstance(data).show(context)
+            } else {
+                if (!inOperation) {
+                    RedPackageGoRoomDialog.newInstance(data).show(context)
+                } else {
+                    // 需求：正在房间中领取红包时，不展示其他房间的全服红包
+                }
+            }
+        } else {
+            RedPackageGoRoomDialog.newInstance(data).show(context)
+        }
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenAdapter.kt
@@ -1,40 +0,0 @@
-package com.yizhuan.erban.avroom.redpackage
-
-import android.graphics.Color
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.erban.R
-import com.yizhuan.erban.ui.utils.ImageLoadUtils
-import com.yizhuan.erban.utils.UserUtils
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeItemVO
-import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import java.text.SimpleDateFormat
-import java.util.*
-
-class RedPackageOpenAdapter : BaseQuickAdapter<RedEnvelopeItemVO, BaseViewHolder>(R.layout.item_red_package_diamond) {
-    private val dateFormat = SimpleDateFormat(ResUtil.getString(R.string.avroom_redpackage_redpackageopenadapter_01), Locale.CHINA)
-    override fun convert(helper: BaseViewHolder, item: RedEnvelopeItemVO) {
-        ImageLoadUtils.loadAvatar(mContext, item.userVO.avatar, helper.getView(R.id.iv_avatar))
-        val isSelf = item.userVO.uid == UserUtils.getUserUid()
-        helper.setText(R.id.tv_nickname, if (isSelf) ResUtil.getString(R.string.avroom_redpackage_redpackageopenadapter_02) else item.userVO.nick.subAndReplaceDot(6))
-                .setTextColor(R.id.tv_nickname, Color.parseColor(if (isSelf) "#FDCD00" else "#FFFFFF"))
-                .setText(R.id.tv_time, dateFormat.format(item.createTime))
-                .setText(R.id.tv_diamond_num, item.amount.substringBefore("."))
-
-        item.redEnvelopeGiftItemVOs?.let {
-            if (it.isNotEmpty()) {
-                helper.setGone(R.id.tv_diamond_num, false)
-                val rvGift = helper.getView<RecyclerView>(R.id.rv_gift)
-                val adapter = RedPackageGiftAdapter()
-                rvGift.visibility = View.VISIBLE
-                rvGift.layoutManager = LinearLayoutManager(mContext, RecyclerView.HORIZONTAL, false)
-                rvGift.adapter = adapter
-                adapter.setNewData(it)
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
@@ -1,188 +0,0 @@
-package com.yizhuan.erban.avroom.redpackage
-
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.graphics.Color
-import android.os.Bundle
-import android.text.style.ForegroundColorSpan
-import android.view.View
-import android.view.WindowManager
-import android.view.animation.AccelerateDecelerateInterpolator
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.yizhuan.erban.R
-import com.yizhuan.erban.avroom.widget.MessageView
-import com.yizhuan.erban.base.BaseDialog
-import com.yizhuan.erban.databinding.DialogRedPackageOpenBinding
-import com.yizhuan.erban.ui.utils.ImageLoadUtils
-import com.yizhuan.erban.utils.UserUtils
-import com.yizhuan.xchat_android_core.DemoCache
-import com.yizhuan.xchat_android_core.auth.AuthModel
-import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent
-import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.pay.PayModel
-import com.yizhuan.xchat_android_core.redpackage.*
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.REMAIN_ZERO
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.SUCCESS
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.TIME_OUT
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.TIME_OUT_BACK
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-import org.greenrobot.eventbus.EventBus
-
-class RedPackageOpenDialog : BaseDialog<DialogRedPackageOpenBinding>() {
-
-    private var mObjectAnimator: ObjectAnimator? = null
-
-    private val redPackageNotifyInfo by lazy { arguments?.getSerializable(KEY_NOTIFY_INFO) as RedPackageNotifyInfo }
-
-    private var isOpened = false
-    private var redPackageInfo: RedPackageInfo? = null
-
-    companion object {
-        private const val KEY_NOTIFY_INFO = "redPackageNotifyInfo"
-        fun newInstance(redPackageNotifyInfo: RedPackageNotifyInfo): RedPackageOpenDialog {
-            return RedPackageOpenDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(KEY_NOTIFY_INFO, redPackageNotifyInfo)
-                }
-            }
-        }
-    }
-
-    override fun onStart() {
-        width = WindowManager.LayoutParams.MATCH_PARENT
-        height = WindowManager.LayoutParams.WRAP_CONTENT
-        super.onStart()
-    }
-
-    override fun init() {
-        dialog?.setCanceledOnTouchOutside(false)
-        binding?.ivClose?.setOnClickListener { dismissAllowingStateLoss() }
-        binding?.ivOpen?.setOnClickListener {
-            startRedPacketAnim(it)
-            it.isEnabled = false
-        }
-        redPackageNotifyInfo.let {
-            ImageLoadUtils.loadAvatar(context, it.sendUserAvatar, binding?.ivAvatar)
-            binding?.tvContent?.text = it.redEnvelopeMessage
-            binding?.tvNickname?.text = it.sendUserNick
-        }
-//        StatUtil.onEvent("openhongbao", ResUtil.getString(R.string.avroom_redpackage_redpackageopendialog_01))
-    }
-
-    @SuppressLint("CheckResult")
-    private fun startRedPacketAnim(v: View) {
-        RedPackageModel.openRedPackage(redPackageNotifyInfo.redEnvelopeId)
-            .subscribe({
-                redPackageInfo = it
-                if (mObjectAnimator?.isRunning == false) {
-                    openRedPackage()
-                }
-            }
-                , {
-                    binding?.ivOpen?.isEnabled = true
-                    mObjectAnimator?.cancel()
-                    SingleToastUtil.showToast(it.message)
-                })
-
-        mObjectAnimator = ObjectAnimator.ofFloat(v, "rotationY", 0f, 360f)
-        mObjectAnimator?.let {
-            it.duration = 1500
-            it.interpolator = AccelerateDecelerateInterpolator()
-            it.addListener(object : AnimatorListenerAdapter() {
-
-                var isCanceled = false
-                override fun onAnimationCancel(animation: Animator) {
-                    isCanceled = true
-                }
-
-                override fun onAnimationEnd(animation: Animator) {
-                    if (!isCanceled) {
-                        openRedPackage()
-                    }
-                }
-            })
-            it.start()
-        }
-//        StatUtil.onEvent("openhongbao_open", ResUtil.getString(R.string.avroom_redpackage_redpackageopendialog_02))
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun openRedPackage() {
-        if (isOpened) return
-        redPackageInfo?.let { packageInfo ->
-            isOpened = true
-            binding?.clOpened?.visibility = View.VISIBLE
-            binding?.clRed?.visibility = View.GONE
-            binding?.tvNicknameOpened?.text = redPackageNotifyInfo.sendUserNick
-            ImageLoadUtils.loadAvatar(context, redPackageNotifyInfo.sendUserAvatar, binding?.ivAvatarOpened)
-            packageInfo.redEnvelopeVO?.apply {
-                binding?.tvContentOpened?.text = message
-                when (packageInfo.redEnvelopeState) {
-                    SUCCESS -> {
-                        packageInfo.redEnvelopeItemVOs?.firstOrNull { item -> item.userVO.uid == UserUtils.getUserUid() }?.let {
-                            it.redEnvelopeGiftItemVOs?.apply {
-                                if (!isEmpty()) {
-                                    val adapter = RedPackageGiftAdapter(R.layout.item_red_package_gift_top)
-                                    binding?.rvGift?.visibility = View.VISIBLE
-                                    binding?.tvDiamondNum?.visibility = View.GONE
-                                    binding?.rvGift?.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
-                                    binding?.rvGift?.adapter = adapter
-                                    adapter.setNewData(this)
-                                    binding?.tvTips?.setTextColor(Color.WHITE)
-                                    binding?.tvTips?.text = MessageView.SpannableBuilder(binding?.tvTips)
-                                        .append(ResUtil.getString(R.string.avroom_redpackage_redpackageopendialog_03))
-                                        .append(it.amount, ForegroundColorSpan(Color.parseColor("#FDCD00")))
-                                        .append(ResUtil.getString(R.string.avroom_redpackage_redpackageopendialog_04))
-                                        .build()
-                                }
-                            }
-                            binding?.tvDiamondNum?.text = it.amount.substringBefore(".")
-                        }
-                        if (!AvRoomDataManager.get().isRoomFans){
-                            AvRoomDataManager.get().roomUid.let {
-                                CollectionRoomModel.get().followRoom("1", it)
-                                    .subscribe { _: String? ->
-                                        AvRoomDataManager.get().isRoomFans = true
-                                        EventBus.getDefault().post(FollowRoomEvent())
-                                    }
-                            }
-                        }
-                    }
-                    TIME_OUT, REMAIN_ZERO, TIME_OUT_BACK -> {
-                        binding?.clOpened?.setBackgroundResource(R.drawable.room_red_package_get_bg)
-                        binding?.tvDiamondNum?.visibility = View.GONE
-                        binding?.tvTips?.visibility = View.GONE
-                        binding?.tvNoGet?.visibility = View.VISIBLE
-                    }
-                }
-                binding?.tvRedNum?.text = "已領取${pickNum}/${totalNum}個"
-                if (type == ALL_GIFT || type == ALL_DIAMOND) {
-                    DemoCache.saveRedPackage(id)
-                }
-            }
-            val adapter = RedPackageOpenAdapter()
-            binding?.rvUsers?.adapter = adapter
-            binding?.rvUsers?.layoutManager = LinearLayoutManager(context)
-            adapter.setNewData(packageInfo.redEnvelopeItemVOs)
-            PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        mObjectAnimator?.cancel()
-        mObjectAnimator = null
-    }
-
-    override fun onPause() {
-        super.onPause()
-        dismissAllowingStateLoss()
-    }
-
-}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
@@ -1,274 +0,0 @@
-package com.yizhuan.erban.avroom.redpackage
-
-
-import android.annotation.SuppressLint
-import android.graphics.Paint
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.View
-import android.view.WindowManager
-import com.yizhuan.erban.R
-import com.yizhuan.erban.base.BaseDialog
-import com.yizhuan.erban.common.widget.dialog.DialogManager
-import com.yizhuan.erban.databinding.DialogRedPackageSendBinding
-import com.yizhuan.erban.pay.password.GiveGoldPassWordFragment
-import com.yizhuan.erban.pay.widget.GridPasswordNoFocusView
-import com.yizhuan.erban.ui.pay.ChargeActivity
-import com.yizhuan.erban.ui.setting.ModifyPwdActivity
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity
-import com.yizhuan.erban.ui.webview.DialogWebViewActivity
-import com.yizhuan.xchat_android_core.Constants
-import com.yizhuan.xchat_android_core.UriProvider
-import com.yizhuan.xchat_android_core.auth.AuthModel
-import com.yizhuan.xchat_android_core.initial.InitialModel
-import com.yizhuan.xchat_android_core.initial.bean.InitInfo
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.pay.PayModel
-import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent
-import com.yizhuan.xchat_android_core.redpackage.*
-import com.yizhuan.xchat_android_core.user.UserModel
-import com.yizhuan.xchat_android_core.utils.toIntOrDef
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
-import com.yizhuan.xchat_android_library.common.util.DeviceUtil
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
-import com.yizhuan.xchat_android_library.utils.CommonUtils
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-
-@ActLayoutRes(R.layout.dialog_red_package_send)
-class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPasswordNoFocusView.OnPasswordChangedListener, TextWatcher {
-
-    private var passWordFragment: GiveGoldPassWordFragment? = null
-    private val dialogManager by lazy { DialogManager(context) }
-    private var isAll = false
-    private var isGift = false
-
-    override fun onStart() {
-        width = WindowManager.LayoutParams.MATCH_PARENT
-        height = WindowManager.LayoutParams.WRAP_CONTENT
-        super.onStart()
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun init() {
-
-        EventBus.getDefault().register(this)
-        PayModel.get().currentWalletInfo?.let {
-            binding?.tvBalanceNum?.text = it.diamondNum.toInt().toString()
-        }
-        if (InitialModel.get().cacheInitInfo == null) {
-            InitialModel.get().init(true)
-            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_redpackage_redpackagesenddialog_01))
-            dismissAllowingStateLoss()
-            return
-        }
-        val initInfo = InitialModel.get().cacheInitInfo ?: InitInfo()
-
-        /**
-         * 廳內
-         */
-        fun changeToNotAll() {
-            isAll = false
-            binding?.tvAllRed?.alpha = 0.5f
-            binding?.tvRoomRed?.alpha = 1f
-            binding?.indicatorAllRed?.visibility = View.GONE
-            binding?.indicatorRoomRed?.visibility = View.VISIBLE
-            binding?.tvGoldNumHint?.text = "紅包總金額不低於${initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount}鉆石，且必須為10的倍數"
-            binding?.editRedNum?.hint = "${initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum}-${initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum}"
-        }
-
-        /**
-         * 全服
-         */
-        fun changeToAll() {
-            isAll = true
-            binding?.tvAllRed?.alpha = 1f
-            binding?.tvRoomRed?.alpha = 0.5f
-            binding?.indicatorAllRed?.visibility = View.VISIBLE
-            binding?.indicatorRoomRed?.visibility = View.GONE
-            binding?.tvGoldNumHint?.text = "紅包總金額不低於${initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount}鉆石，且必須為100的倍數"
-            binding?.editRedNum?.hint = "${initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum}-${initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum}"
-        }
-
-        when (initInfo.redEnvelopedPosition) {
-            2 -> changeToAll()
-            else -> changeToNotAll()
-        }
-        binding?.tvCharge?.paint?.flags = Paint.UNDERLINE_TEXT_FLAG
-        binding?.tvCharge?.paint?.isAntiAlias = true
-        binding?.tvChangeType?.paint?.flags = Paint.UNDERLINE_TEXT_FLAG
-        binding?.tvChangeType?.paint?.isAntiAlias = true
-        binding?.tvChangeType?.setOnClickListener {
-            if (isGift) {
-                isGift = false
-                binding?.tvRedTypeHint?.text = "當前為手氣紅包，"
-                binding?.tvChangeType?.text = "改為禮物紅包"
-            } else {
-                isGift = true
-                binding?.tvRedTypeHint?.text = "當前為禮物紅包，"
-                binding?.tvChangeType?.text = "改為手氣紅包"
-            }
-        }
-        //默認就已經是手氣紅包,如果後臺配置為了禮物紅包就在這裏改下
-        if (initInfo.redEnvelopeType == 2 && !isGift) {
-            binding?.tvChangeType?.callOnClick()
-        }
-
-        binding?.tvCharge?.setOnClickListener {
-            if (!CommonUtils.isFastDoubleClick(800)) {
-                if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) {
-                    ChargeActivity.start(context)
-                } else {
-                    CommonWebViewActivity.start(
-                        context, UriProvider.getOfficialPay(
-                            4,
-                            DeviceUtil.getDeviceId(context)
-                        )
-                    )
-                }
-            }
-        }
-        binding?.ivClose?.setOnClickListener { dismissAllowingStateLoss() }
-        binding?.ivHelp?.setOnClickListener { DialogWebViewActivity.start(context, UriProvider.getRedPacketRule()) }
-        binding?.ivSend?.setOnClickListener {
-            UserModel.get().cacheLoginUserInfo?.let {
-                if (!it.isBindPaymentPwd) {
-                    ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD)
-                    return@setOnClickListener
-                }
-            }
-            val minNum = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum else initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum
-            val maxNum = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum else initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum
-            val minGold = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount else initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount
-            val maxGold = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMaxAmount else initInfo.redEnvelopeConfig.roomRedEnvelopeMaxAmount
-            val rate = if (initInfo.redEnvelopeConfig.exchangeDiamondsRate == 0.0) 0.68 else initInfo.redEnvelopeConfig.exchangeDiamondsRate
-
-            val redNum = binding?.editRedNum?.text.toString().toIntOrDef()
-            if (redNum < minNum || redNum > maxNum) {
-                SingleToastUtil.showToast("紅包數量不能小於${minNum}或大於${maxNum}!")
-                return@setOnClickListener
-            }
-            val goldNum = binding?.editGoldNum?.text.toString().toIntOrDef()
-
-            if (isAll) {
-                if (goldNum % 100 != 0) {
-                    SingleToastUtil.showToast("鉆石數必須為100的倍數!")
-                    return@setOnClickListener
-                }
-            } else {
-                if (goldNum % 10 != 0) {
-                    SingleToastUtil.showToast("鉆石數必須為10的倍數!")
-                    return@setOnClickListener
-                }
-            }
-
-            if (goldNum < minGold || goldNum > maxGold) {
-                SingleToastUtil.showToast("鉆石數量不能小於${minGold}或大於${maxGold}!")
-                return@setOnClickListener
-            }
-            if (isGift && goldNum.toFloat() / redNum < 1) {//單個禮物紅包價值不低於1鉆石
-                SingleToastUtil.showToast("單個紅包金額過低")
-                return@setOnClickListener
-            }
-            if (!isGift && goldNum.toFloat() / redNum * rate < 0.1) {//單個手氣紅包價值不低於0.1水晶
-                SingleToastUtil.showToast("單個紅包金額過低")
-                return@setOnClickListener
-            }
-            GiveGoldPassWordFragment.newInstance(childFragmentManager, binding?.editGoldNum?.text.toString()).apply {
-                setListener(this@RedPackageSendDialog)
-                passWordFragment = this
-            }
-        };
-        binding?.tvAllRed?.setOnClickListener {
-            if (isAll) return@setOnClickListener
-            changeToAll()
-        }
-        binding?.tvRoomRed?.setOnClickListener {
-            if (!isAll) return@setOnClickListener
-            changeToNotAll()
-        }
-        binding?.editRedText?.addTextChangedListener(this)
-
-        binding?.editRedText?.setOnEditorActionListener { _, _, event ->
-            event.keyCode == KeyEvent.KEYCODE_ENTER
-        }
-
-//        StatUtil.onEvent("room_sendhongbao", "進入發紅包頁面")
-    }
-
-    private fun getRedType(): Int {
-        return if (isAll) {
-            if (isGift) ALL_GIFT else ALL_DIAMOND
-        } else {
-            if (isGift) ROOM_GIFT else ROOM_DIAMOND
-        }
-    }
-
-    override fun onDestroyView() {
-        binding?.editRedText?.removeTextChangedListener(this)
-        super.onDestroyView()
-    }
-
-
-    @SuppressLint("CheckResult")
-    override fun onTextChanged(psw: String) {
-        val password = passWordFragment?.password?.password ?: ""
-        if (password.length == 6) {
-            dialogManager.showProgressDialog(context)
-            RedPackageModel.sendRedPackage(binding?.editGoldNum?.text.toString(),
-                binding?.editRedText?.text.toString().ifEmpty { "恭喜發財，大吉大利！" },
-                binding?.editRedNum?.text.toString(),
-                AvRoomDataManager.get().mCurrentRoomInfo?.uid.toString(), getRedType(), DESUtils.DESAndBase64(password))
-                .doOnError {
-                    dialogManager.dismissDialog()
-                    SingleToastUtil.showToast(it.message)
-                    passWordFragment?.password?.clearPassword()
-                }
-                .subscribe { _ ->
-                    PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
-                    dialogManager.dismissDialog()
-                    SingleToastUtil.showToast("發送成功")
-                    passWordFragment?.dismissAllowingStateLoss()
-                    dismissAllowingStateLoss()
-                }
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onWalletInfoUpdate(event: UpdateWalletInfoEvent?) {
-        binding?.tvBalanceNum?.text = PayModel.get().currentWalletInfo?.diamondNum?.toString()
-            ?: "0"
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        EventBus.getDefault().unregister(this)
-    }
-
-    override fun onInputFinish(psw: String) {
-
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun afterTextChanged(s: Editable) {
-        binding?.tvRedTextLimit?.text = "${s.length}/20"
-    }
-
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-    }
-
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-    }
-
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun handleRedPackageDialog(event: RedPackageEvent?) {
-        dismissAllowingStateLoss()
-    }
-
-}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageWidget.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageWidget.kt
@@ -0,0 +1,253 @@
+package com.yizhuan.erban.avroom.redpackage
+
+import android.content.Context
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.LayoutInflater
+import androidx.core.view.isVisible
+import androidx.databinding.DataBindingUtil
+import com.chuhai.utils.ServiceTime
+import com.chuhai.utils.ktx.singleClick
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.redpackage.open.RedPackageOpenDialog
+import com.yizhuan.erban.common.widget.dialog.DialogManager
+import com.yizhuan.erban.databinding.RedPackageWidgetBinding
+import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
+import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo
+import com.yizhuan.xchat_android_core.support.room.FrameLayoutRoomWidget
+import com.yizhuan.xchat_android_core.support.room.RoomContext
+import com.yizhuan.xchat_android_core.support.room.RoomView
+import com.yizhuan.xchat_android_core.support.room.RoomWidget
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+import okhttp3.internal.toLongOrDefault
+import java.text.SimpleDateFormat
+import java.util.TimeZone
+import java.util.concurrent.TimeUnit
+
+/**
+ * Created by Max on 2023/10/24 16:37
+ * Desc:房间内的红包入口
+ **/
+class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
+    private var countDownDisposable: Disposable? = null
+    private var data: RedPackageNotifyInfo? = null
+    private val redPackageHandler: RedPackageHandler?
+        get() = RoomContext.get()
+            ?.findAbility<RedPackageHandler>(RedPackageHandler::class.java.simpleName)
+
+    // 临时这样实现，后续优化进度弹窗
+    private var dialogManager: DialogManager? = null
+
+    // 倒计时格式(分:秒)
+    private val mmssFormat by lazy(LazyThreadSafetyMode.NONE) {
+        SimpleDateFormat("mm:ss").apply {
+            timeZone = TimeZone.getTimeZone("GMT+00:00")
+        }
+    }
+
+    private val binding: RedPackageWidgetBinding =
+        DataBindingUtil.inflate(
+            LayoutInflater.from(
+                context
+            ), R.layout.red_package_widget, this, true
+        )
+
+    private var compositeDisposable: CompositeDisposable? = null
+
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int,
+        defStyleRes: Int
+    ) : super(context, attrs, defStyleAttr, defStyleRes)
+
+    init {
+        // 默认不可见
+        this.isVisible = false
+        this.setBackgroundResource(R.drawable.red_package_widget_bg)
+        singleClick {
+            data?.let {
+                tryShowRedPackage(it)
+            }
+        }
+    }
+
+    /**
+     * 开始倒计时
+     * @param time 开抢时间
+     */
+    private fun startCountDown(time: Long) {
+        val count = time - ServiceTime.time
+        if (count <= 0) {
+            switchUI(false)
+            return
+        }
+        countDownDisposable =
+            Observable.intervalRange(0, count / 1000, 0, 1000L, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext {
+                    val gap = time - ServiceTime.time
+                    if (gap >= 0) {
+                        binding.tvText.text = mmssFormat.format(gap)
+                    }
+                }
+                .doOnComplete {
+                    switchUI(false)
+                }
+                .subscribe()
+    }
+
+    /**
+     * 切换UI
+     * @param isCountDown 是否倒计时模式？否则为可抢红包模式
+     */
+    private fun switchUI(isCountDown: Boolean) {
+        if (isCountDown) {
+            binding.tvText.setBackgroundResource(R.drawable.shape_99292929_8)
+            binding.tvText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10f)
+        } else {
+            binding.tvText.setBackgroundResource(R.drawable.red_package_widget_bg_text)
+            binding.tvText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 9f)
+            binding.tvText.setText(R.string.red_package_widget_get)
+        }
+    }
+
+    override fun onStart(roomView: RoomView) {
+        super.onStart(roomView)
+        roomView.getActivity()?.let {
+            this.dialogManager = DialogManager(it)
+            this.dialogManager?.setCanceledOnClickOutside(false)
+        }
+    }
+
+    override fun onInitialize(roomView: RoomView, roomContext: RoomContext) {
+        super.onInitialize(roomView, roomContext)
+        val lifecycleOwner = roomView.getLifecycleOwner()
+        redPackageHandler?.iconLiveData?.observe(lifecycleOwner) {
+            loadData(it)
+        }
+    }
+
+    /**
+     * 更新数据
+     */
+    private fun loadData(data: RedPackageNotifyInfo?) {
+        this.data = data
+        stopCountDown()
+        if (data != null) {
+            val num = data.redEnvelopeNum
+            if (num > 0) {
+                if (num > 99) {
+                    binding.tvNum.text = "99+"
+                } else {
+                    binding.tvNum.text = num.toString()
+                }
+                binding.tvNum.isVisible = true
+            } else {
+                binding.tvNum.isVisible = false
+            }
+            if (data.validityType == 1) {
+                // 限时生效
+                switchUI(true)
+                startCountDown(data.beginTime)
+            } else {
+                // 立即生效
+                switchUI(false)
+            }
+            this.isVisible = true
+        } else {
+            this.isVisible = false
+        }
+    }
+
+    /**
+     * 尝试展示红包
+     */
+    private fun tryShowRedPackage(data: RedPackageNotifyInfo) {
+        dialogManager?.context?.let {
+            dialogManager?.showProgressDialog(it, false)
+        }
+        val disposable = RedPackageModel.getRedPackage(data.redEnvelopeId.toLongOrDefault(0))
+            .subscribe({ item ->
+                dialogManager?.dismissDialog()
+                when (item.state) {
+                    3 -> {
+                        redPackageHandler?.requestRefreshIcon()
+                        SingleToastUtil.showToast(R.string.red_package_result_empty_tips)
+                    }
+
+                    4 -> {
+                        val newData = item.result?.redEnvelopeVO
+                        if (newData != null && newData.pickNum == newData.totalNum) {
+                            redPackageHandler?.requestRefreshIcon()
+                            SingleToastUtil.showToast(R.string.red_package_result_empty_tips)
+                        } else {
+                            roomView?.getActivity().let {
+                                RedPackageOpenDialog.newInstance(item).show(it)
+                            }
+                        }
+                    }
+
+                    2, 6 -> {
+                        redPackageHandler?.requestRefreshIcon()
+                        SingleToastUtil.showToast(R.string.red_package_disabled_tips)
+                    }
+
+                    else -> {
+                        roomView?.getActivity().let {
+                            RedPackageOpenDialog.newInstance(item).show(it)
+                        }
+                    }
+                }
+            }, {
+                SingleToastUtil.showToast(it.message)
+                dialogManager?.dismissDialog()
+            })
+        getCompositeDisposable().add(disposable)
+    }
+
+    private fun getCompositeDisposable(): CompositeDisposable {
+        var disposable = compositeDisposable
+        if (disposable == null) {
+            disposable = CompositeDisposable()
+            compositeDisposable = disposable
+        }
+        return disposable
+    }
+
+    override fun onStop() {
+        super.onStop()
+        this.dialogManager?.dismissDialog()
+        this.dialogManager = null
+        this.roomView = null
+    }
+
+    override fun onUnbindContext() {
+        super.onUnbindContext()
+        compositeDisposable?.dispose()
+        compositeDisposable = null
+        loadData(null)
+    }
+
+    override fun onBindContext(roomContext: RoomContext) {
+        super.onBindContext(roomContext)
+    }
+
+    private fun stopCountDown() {
+        if (countDownDisposable?.isDisposed == false) {
+            countDownDisposable?.dispose()
+        }
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog.kt
@@ -0,0 +1,557 @@
+package com.yizhuan.erban.avroom.redpackage.open
+
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import android.view.animation.LinearInterpolator
+import androidx.core.view.isVisible
+import com.chuhai.utils.ServiceTime
+import com.chuhai.utils.ktx.getColorById
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.ktx.toStringRes
+import com.chuhai.utils.log.ILog
+import com.chuhai.utils.spannable.spannableBuilder
+import com.trello.rxlifecycle3.android.FragmentEvent
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.redpackage.RedPackageHandler
+import com.yizhuan.erban.base.BaseDialog
+import com.yizhuan.erban.databinding.RedPackageOpenDialogBinding
+import com.yizhuan.erban.ui.utils.loadAvatar
+import com.yizhuan.erban.ui.widget.UserInfoDialog
+import com.yizhuan.xchat_android_core.auth.AuthModel
+import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent
+import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent
+import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent
+import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.pay.PayModel
+import com.yizhuan.xchat_android_core.redpackage.*
+import com.yizhuan.xchat_android_core.support.config.Constants
+import com.yizhuan.xchat_android_core.support.room.RoomContext
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import org.greenrobot.eventbus.EventBus
+import java.text.SimpleDateFormat
+import java.util.TimeZone
+import java.util.concurrent.TimeUnit
+
+/**
+ * Created by Max on 2023/10/24 10:14
+ * Desc:领取红包
+ **/
+@ActLayoutRes(R.layout.red_package_open_dialog)
+class RedPackageOpenDialog : BaseDialog<RedPackageOpenDialogBinding>(), ILog {
+
+    private var btnAnimator: ObjectAnimator? = null
+
+    private var countDownDisposable: Disposable? = null
+
+    // 倒计时格式(分:秒)
+    private val mmssFormat by lazy(LazyThreadSafetyMode.NONE) {
+        SimpleDateFormat("mm:ss").apply {
+            timeZone = TimeZone.getTimeZone("GMT+00:00")
+        }
+    }
+
+    private val data by lazy(LazyThreadSafetyMode.NONE) {
+        arguments?.getSerializable(Constants.KEY_INTENT) as? RedPackageData
+    }
+
+    // 打开红包的结果
+    private var openResultRunnable: (() -> Unit)? = null
+
+    // 按钮动画是否有效（至少转过了一周期）
+    private var isValidOfBtnAnimator: Boolean = false
+
+    // 按钮执行函数
+    private var btnRunnable: (() -> Unit)? = null
+
+    // 打开红包接口请求中
+    private var opening = false
+
+    companion object {
+        /**
+         * 此入口来源仅限：【全服红包信令】、【厅内无门槛-立即生效红包信令】
+         */
+        fun newInstance(data: RedPackageNotifyInfo): RedPackageOpenDialog {
+            /**
+             * 收到这两种信令直接展示即可，无需再次请求接口查询状态，
+             * 但由于信令和接口查询的数据格式不一致，所以这里做下转换，达到逻辑共用
+             */
+            val item = RedPackageData(
+                amount = null,
+                avatar = data.sendUserAvatar,
+                beginTime = data.beginTime,
+                commissionAmount = null,
+                createTime = null,
+                duration = null,
+                endTime = null,
+                finish = true,
+                id = data.redEnvelopeId.toLongOrNull(),
+                kind = data.kind,
+                message = data.redEnvelopeMessage,
+                nick = data.sendUserNick,
+                num = null,
+                originalAmount = null,
+                position = null,
+                roomTitle = null,
+                roomUid = data.roomUid,
+                //红包状态 1 开抢中 2 过时 3 抢光了 4 抢到了 5 将要开始 6 超时已退还
+                state = null,
+                type = null,
+                updateTime = null,
+                userId = null,
+                validityType = data.validityType,
+                result = null
+            )
+            return newInstance(item)
+        }
+
+        fun newInstance(data: RedPackageData): RedPackageOpenDialog {
+            return RedPackageOpenDialog().apply {
+                arguments = Bundle().apply {
+                    putSerializable(Constants.KEY_INTENT, data)
+                }
+            }
+        }
+    }
+
+    override fun onStart() {
+        width = WindowManager.LayoutParams.MATCH_PARENT
+        height = WindowManager.LayoutParams.WRAP_CONTENT
+        super.onStart()
+    }
+
+    override fun init() {
+        val data = this.data
+        if (data == null) {
+            dismissAllowingStateLoss()
+            return
+        }
+        dialog?.setCanceledOnTouchOutside(false)
+
+        binding.ivClose.singleClick {
+            dismissAllowingStateLoss()
+        }
+
+        binding.layoutBtn.singleClick {
+            btnRunnable?.invoke()
+        }
+        loadData(data)
+    }
+
+    /**
+     * 加载红包数据
+     */
+    private fun loadData(data: RedPackageData) {
+        //红包状态 1 开抢中 2 过时 3 抢光了 4 抢到了 5 将要开始 6 超时已退还
+        if (data.state == 4) {
+            loadResult(data.result)
+        } else {
+            // else简单理解为可领取状态，正常情况下在RedPackageWidget点击时有异常状态过滤
+            loadOpen(data)
+        }
+    }
+
+    /**
+     * 加载可领取数据
+     */
+    private fun loadOpen(data: RedPackageData) {
+        switchResultViewVisible(false)
+        switchOpenViewVisible(true)
+        binding.ivSendAvatar.loadAvatar(data.avatar)
+        binding.tvSendName.text = data.nick
+        loadTips(data)
+        loadBtnState(data)
+    }
+
+    /**
+     * 加载红包提示
+     */
+    private fun loadTips(data: RedPackageData) {
+        binding.tvOpenTips.isVisible = false
+        when (data.kind) {
+            0 -> {
+                loadTips(data.message)
+            }
+
+            1 -> {
+                binding.tvOpenTips.setText(R.string.red_package_quick_tips)
+                binding.tvOpenTips.isVisible = true
+            }
+
+            2 -> {
+                if (data.finish == true) {
+                    binding.tvOpenTips.setText(R.string.red_package_complete_tips)
+                } else {
+                    binding.tvOpenTips.spannableBuilder()
+                        .appendText(
+                            text = R.string.red_package_open_tips_follow.toStringRes(),
+                            textColor = getColorById(R.color.color_FFF87A)
+                        )
+                        .appendText(text = R.string.red_package_open_tips_msg_end.toStringRes())
+                        .apply()
+                }
+                binding.tvOpenTips.isVisible = true
+            }
+
+            3 -> {
+                if (data.finish == true) {
+                    binding.tvOpenTips.setText(R.string.red_package_complete_tips)
+                } else {
+                    binding.tvOpenTips.spannableBuilder()
+                        .appendText(
+                            text = R.string.red_package_open_tips_share.toStringRes(),
+                            textColor = getColorById(R.color.color_FFF87A)
+                        )
+                        .appendText(text = R.string.red_package_open_tips_msg_end.toStringRes())
+                        .apply()
+                }
+                binding.tvOpenTips.isVisible = true
+            }
+
+            4 -> {
+                if (data.finish == true) {
+                    binding.tvOpenTips.setText(R.string.red_package_complete_tips)
+                } else {
+                    binding.tvOpenTips.spannableBuilder()
+                        .appendText(text = R.string.red_package_open_tips_msg1.toStringRes())
+                        .appendText(
+                            text = data.message ?: "",
+                            textColor = getColorById(R.color.color_FFF87A)
+                        )
+                        .appendText(text = R.string.red_package_open_tips_msg_end.toStringRes())
+                        .apply()
+                }
+                binding.tvOpenTips.isVisible = true
+            }
+
+            else -> {
+                loadTips(data.message)
+            }
+        }
+    }
+
+    /**
+     * 加载按钮状态
+     */
+    private fun loadBtnState(data: RedPackageData) {
+        binding.groupBtnTime.isVisible = false
+        binding.ivBtnGet.isVisible = false
+        binding.tvBtnMsg.isVisible = false
+        btnRunnable = null
+
+        val gap = (data.beginTime ?: 0) - ServiceTime.time
+        // 开始了？
+        val started = gap < 0
+        if (data.kind == 0) {
+            // 旧厅内红包or全服红包
+            switchToOpenState()
+            return
+        }
+        if (data.kind == 1 || data.finish == true) {
+            if (started) {
+                switchToOpenState()
+            } else {
+                startCountDown(data.beginTime ?: 0)
+            }
+        } else {
+            binding.tvBtnMsg.isVisible = true
+            if (started) {
+                binding.tvBtnMsg.setText(R.string.red_package_open_btn_no)
+                btnRunnable = {
+                    SingleToastUtil.showToast(R.string.red_package_open_no_tips)
+                }
+            } else {
+                when (data.kind) {
+                    2 -> {
+                        binding.tvBtnMsg.setText(R.string.red_package_open_btn_follow)
+                        btnRunnable = {
+                            dismissAllowingStateLoss()
+                            showUserDialog(data.userId)
+                        }
+                    }
+
+                    3 -> {
+                        binding.tvBtnMsg.setText(R.string.red_package_open_btn_share)
+                        btnRunnable = {
+                            dismissAllowingStateLoss()
+                            EventBus.getDefault().post(ShareRoomEvent())
+                        }
+                    }
+
+                    4 -> {
+                        binding.tvBtnMsg.setText(R.string.red_package_open_btn_msg)
+                        btnRunnable = {
+                            dismissAllowingStateLoss()
+                            EventBus.getDefault().post(OpenRoomMessageInputEvent(data.message))
+                        }
+                    }
+
+                    else -> {
+                        binding.tvBtnMsg.text = ""
+                    }
+                }
+                startTimerForUncompletedState(gap)
+            }
+        }
+    }
+
+    /**
+     * 开启定时器：未完成状态更新（倒计时结束时，更新对应View状态）
+     */
+    private fun startTimerForUncompletedState(time: Long) {
+        val d = Observable.timer(time, TimeUnit.MILLISECONDS)
+            .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                binding.tvBtnMsg.setText(R.string.red_package_open_btn_no)
+                btnRunnable = {
+                    SingleToastUtil.showToast(R.string.red_package_open_no_tips)
+                }
+            }
+    }
+
+    /**
+     * 开始倒计时
+     * @param time 开抢时间
+     */
+    private fun startCountDown(time: Long) {
+        stopCountDown()
+        val count = time - ServiceTime.time
+        if (count <= 0) {
+            switchToOpenState()
+            return
+        }
+        binding.groupBtnTime.isVisible = true
+        countDownDisposable =
+            Observable.intervalRange(0, count / 1000, 0, 1000L, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext {
+                    val gap = time - ServiceTime.time
+                    if (gap >= 0) {
+                        binding.tvBtnTime.text = mmssFormat.format(gap)
+                    }
+                }
+                .doOnComplete {
+                    switchToOpenState()
+                }
+                .subscribe()
+    }
+
+
+    private fun stopCountDown() {
+        if (countDownDisposable?.isDisposed == false) {
+            countDownDisposable?.dispose()
+        }
+    }
+
+
+    /**
+     * 切换为可抢状态
+     */
+    private fun switchToOpenState() {
+        binding.tvBtnMsg.isVisible = false
+        binding.groupBtnTime.isVisible = false
+        binding.ivBtnGet.isVisible = true
+        btnRunnable = {
+            if (!opening) {
+                this.data?.let {
+                    openRedPackage(it)
+                }
+            }
+        }
+    }
+
+    private fun loadTips(msg: String?) {
+        if (msg.isNullOrEmpty()) {
+            binding.tvOpenTips.isVisible = false
+        } else {
+            binding.tvOpenTips.text = msg
+            binding.tvOpenTips.isVisible = true
+        }
+    }
+
+    /**
+     * 打开红包
+     */
+    private fun openRedPackage(data: RedPackageData) {
+        opening = true
+        openResultRunnable = null
+        startRedPacketAnim(binding.layoutBtn)
+        val d = RedPackageModel.openRedPackage(data.id ?: 0)
+            .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)).subscribe({
+                if (isValidOfBtnAnimator) {
+                    btnAnimator?.cancel()
+                    onOpenSuccess(it)
+                } else {
+                    openResultRunnable = {
+                        onOpenSuccess(it)
+                    }
+                }
+            }, {
+                if (isValidOfBtnAnimator) {
+                    btnAnimator?.cancel()
+                    onOpenFail(it)
+                } else {
+                    openResultRunnable = {
+                        onOpenFail(it)
+                    }
+                }
+            })
+    }
+
+    /**
+     * 加载结果
+     */
+    private fun loadResult(data: RedPackageInfo?) {
+        binding.layoutContent.setBackgroundResource(R.drawable.red_package_result_bg)
+        switchOpenViewVisible(false)
+        switchResultViewVisible(true)
+        binding.groupResultMoney.isVisible = false
+        binding.tvResultEmptyTips.isVisible = false
+        binding.ivResultSendAvatar.loadAvatar(data?.redEnvelopeVO?.userVO?.avatar)
+        binding.tvResultSendName.text = data?.redEnvelopeVO?.userVO?.nick ?: ""
+        val name = data?.redEnvelopeVO?.userVO?.nick ?: ""
+        if (name.length > 8) {
+            binding.tvResultSendName.text = name?.take(8) + "..的紅包"
+        } else {
+            binding.tvResultSendName.text = name + "的紅包"
+        }
+        binding.tvMessage.text = data?.redEnvelopeVO?.message
+        binding.tvCount.text = R.string.red_package_result_count_format.toStringRes()
+            .format(data?.redEnvelopeVO?.pickNum ?: 0, data?.redEnvelopeVO?.totalNum ?: 0)
+
+        val adapter = RedPackageResultAdapter()
+        binding.recyclerView.adapter = adapter
+        adapter.setNewData(data?.redEnvelopeItemVOs)
+
+        when (data?.redEnvelopeState) {
+            RedEnvelopeState.SUCCESS -> {
+                binding.tvMoney.text = data.currentUserAmount.toString().substringBefore(".")
+                binding.groupResultMoney.isVisible = true
+            }
+
+            RedEnvelopeState.TIME_OUT, RedEnvelopeState.REMAIN_ZERO, RedEnvelopeState.TIME_OUT_BACK -> {
+                binding.tvResultEmptyTips.isVisible = true
+            }
+        }
+    }
+
+    /**
+     * 打开红包响应成功
+     * @param data 结果
+     */
+    private fun onOpenSuccess(data: RedPackageInfo) {
+        loadResult(data)
+        RoomContext.get()
+            ?.findAbility<RedPackageHandler>(RedPackageHandler::class.simpleName)
+            ?.requestRefreshIcon()
+        when (data.redEnvelopeState) {
+            RedEnvelopeState.SUCCESS -> {
+                // 下面这段是延续老代码保留的
+                if (!AvRoomDataManager.get().isRoomFans) {
+                    AvRoomDataManager.get().roomUid.let {
+                        CollectionRoomModel.get().followRoom("1", it)
+                            .subscribe { _: String? ->
+                                AvRoomDataManager.get().isRoomFans = true
+                                EventBus.getDefault().post(FollowRoomEvent())
+                            }
+                    }
+                }
+            }
+        }
+        PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
+        opening = false
+    }
+
+    /**
+     * 打开红包响应失败
+     */
+    private fun onOpenFail(throwable: Throwable) {
+        switchToOpenState()
+        btnAnimator?.cancel()
+        SingleToastUtil.showToast(throwable.message)
+        opening = false
+    }
+
+    @SuppressLint("CheckResult")
+    private fun startRedPacketAnim(v: View) {
+        if (btnAnimator?.isRunning == true) {
+            btnAnimator?.cancel()
+        }
+        isValidOfBtnAnimator = false
+        btnAnimator = ObjectAnimator.ofFloat(v, "rotationY", 0f, 360f)
+        btnAnimator?.let {
+            it.duration = 600
+            it.repeatCount = ValueAnimator.INFINITE
+            it.repeatMode = ValueAnimator.RESTART
+            it.interpolator = LinearInterpolator()
+            it.addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationRepeat(animation: Animator) {
+                    super.onAnimationRepeat(animation)
+                    isValidOfBtnAnimator = true
+                    if (openResultRunnable != null) {
+                        animation.cancel()
+                        openResultRunnable?.invoke()
+                    }
+                }
+            })
+            it.start()
+        }
+    }
+
+    private fun switchResultViewVisible(isVisible: Boolean) {
+        binding.groupResult.isVisible = isVisible
+        binding.groupResultMoney.isVisible = isVisible
+        binding.tvResultEmptyTips.isVisible = isVisible
+    }
+
+    private fun switchOpenViewVisible(isVisible: Boolean) {
+        binding.groupOpen.isVisible = isVisible
+        binding.tvOpenTips.isVisible = isVisible
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        RoomContext.get()
+            ?.findAbility<RedPackageHandler>(RedPackageHandler::class.simpleName)
+            ?.startOperation()
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        btnAnimator?.cancel()
+        btnAnimator = null
+        stopCountDown()
+        RoomContext.get()
+            ?.findAbility<RedPackageHandler>(RedPackageHandler::class.simpleName)
+            ?.stopOperation()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        dismissAllowingStateLoss()
+    }
+
+    private fun showUserDialog(uid: Long?) {
+        if (uid == null) {
+            return
+        }
+        activity?.let {
+            UserInfoDialog.showNewUserInfoDialog(
+                activity,
+                uid
+            )
+        }
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageResultAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageResultAdapter.kt
@@ -0,0 +1,46 @@
+package com.yizhuan.erban.avroom.redpackage.open
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.yizhuan.erban.R
+import com.yizhuan.erban.ui.utils.loadAvatar
+import com.yizhuan.erban.utils.UserUtils
+import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeItemVO
+import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
+import com.yizhuan.xchat_android_library.utils.ResUtil
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+/**
+ * Created by Max on 2023/10/27 20:24
+ * Desc:红包领取结果
+ **/
+class RedPackageResultAdapter :
+    BaseQuickAdapter<RedEnvelopeItemVO, BaseViewHolder>(R.layout.red_package_open_item_result) {
+    private val dateFormat = SimpleDateFormat(
+        ResUtil.getString(R.string.avroom_redpackage_redpackageopenadapter_01),
+        Locale.CHINA
+    )
+
+    override fun convert(helper: BaseViewHolder, item: RedEnvelopeItemVO) {
+        helper.getView<ImageView>(R.id.iv_avatar).loadAvatar(item.userVO.avatar)
+        val isSelf = item.userVO.uid == UserUtils.getUserUid()
+        helper.setText(
+            R.id.tv_name,
+            if (isSelf) ResUtil.getString(R.string.avroom_redpackage_redpackageopenadapter_02) else item.userVO.nick.subAndReplaceDot(
+                6
+            )
+        )
+        helper.setText(R.id.tv_money, item.amount.substringBefore("."))
+        try {
+            helper.setText(R.id.tv_time, dateFormat.format(item.createTime))
+        } catch (e: Exception) {
+            helper.setText(R.id.tv_time, "")
+        }
+        helper.getView<View>(R.id.v_line).isVisible = helper.bindingAdapterPosition != itemCount - 1
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt
@@ -0,0 +1,284 @@
+package com.yizhuan.erban.avroom.redpackage.send
+
+import android.graphics.Color
+import androidx.core.view.isVisible
+import com.chuhai.utils.ktx.addDisableFilter
+import com.chuhai.utils.ktx.getColorById
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.ktx.toStringRes
+import com.chuhai.utils.log.ILog
+import com.yizhuan.erban.R
+import com.yizhuan.erban.base.BaseBindingFragment
+import com.yizhuan.erban.databinding.RedPackagePrivateFragmentBinding
+import com.yizhuan.erban.pay.password.GiveGoldPassWordFragment
+import com.yizhuan.erban.pay.widget.GridPasswordNoFocusView
+import com.yizhuan.erban.ui.setting.ModifyPwdActivity
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil
+import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration
+import com.yizhuan.xchat_android_core.auth.AuthModel
+import com.yizhuan.xchat_android_core.initial.InitialModel
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.pay.PayModel
+import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
+import com.yizhuan.xchat_android_core.user.UserModel
+import com.yizhuan.xchat_android_core.utils.toIntOrDef
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import com.yizhuan.xchat_android_library.utils.codec.DESUtils
+import okhttp3.internal.toLongOrDefault
+import java.math.RoundingMode
+import java.text.NumberFormat
+
+/**
+ * Created by Max on 2023/10/23 12:14
+ * Desc: 厅内红包
+ **/
+@ActLayoutRes(R.layout.red_package_private_fragment)
+class PrivateRedPackageEditorFragment : BaseBindingFragment<RedPackagePrivateFragmentBinding>(),
+    ILog {
+
+    private var passWordFragment: GiveGoldPassWordFragment? = null
+
+    private var typeAdapter: RedPackageTypeItemAdapter? = null
+
+    // 生效时间类型 0 立即生效 1 限时生效
+    private var timeType = 0
+    override fun initiate() {
+        mBinding.etText.addDisableFilter(" ", "\n")
+        initTypeView()
+        updateTimeView(true)
+        initTips()
+    }
+
+    override fun onSetListener() {
+        super.onSetListener()
+        mBinding.tvNow.singleClick {
+            updateTimeView(true)
+        }
+        mBinding.tvDelay.singleClick {
+            updateTimeView(false)
+        }
+        mBinding.tvSend.singleClick {
+            checkSend()
+        }
+    }
+
+    private fun initTips() {
+        val time = InitialModel.get().cacheInitInfo?.redEnvelopeConfig?.endSecond
+        if (time != null) {
+            try {
+                val hour = NumberFormat.getInstance().apply {
+                    maximumFractionDigits = 2
+                    roundingMode = RoundingMode.FLOOR
+                }.format(time / 3600.0)
+                mBinding.tvTips.text = R.string.red_package_tips_format.toStringRes().format(hour)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun initTypeView() {
+        mBinding.recyclerView.addItemDecoration(
+            ColorDecoration(
+                Color.TRANSPARENT, UIUtil.dip2px(context, 6.0), 0, false
+            )
+        )
+        val list = ArrayList<RedPackageTypeItemAdapter.ItemData>()
+        list.add(
+            RedPackageTypeItemAdapter.ItemData(
+                1,
+                R.string.red_package_type_unlimited_name,
+                R.string.red_package_type_unlimited_tips
+            )
+        )
+        list.add(
+            RedPackageTypeItemAdapter.ItemData(
+                2,
+                R.string.red_package_type_follow_name,
+                R.string.red_package_type_follow_tips
+            )
+        )
+        list.add(
+            RedPackageTypeItemAdapter.ItemData(
+                3,
+                R.string.red_package_type_share_name,
+                R.string.red_package_type_share_tips
+            )
+        )
+        list.add(
+            RedPackageTypeItemAdapter.ItemData(
+                4,
+                R.string.red_package_type_msg_name,
+                R.string.red_package_type_msg_tips
+            )
+        )
+        val adapter = RedPackageTypeItemAdapter(list)
+        typeAdapter = adapter
+        adapter.setOnItemClickListener { _, view, position ->
+            adapter.select(position)
+            updateTypeView(adapter.getSelect()?.type)
+        }
+        mBinding.recyclerView.adapter = adapter
+        // 默认选择第一个
+        adapter.select(0)
+        updateTypeView(adapter.getSelect()?.type)
+    }
+
+    /**
+     * 更新红包类型对应的视图
+     */
+    private fun updateTypeView(type: Int?) {
+        when (type) {
+            1 -> {
+                mBinding.tvNow.isVisible = true
+                mBinding.tvDelay.isVisible = true
+                mBinding.etText.isVisible = false
+            }
+
+            4 -> {
+                mBinding.tvNow.isVisible = false
+                mBinding.tvDelay.isVisible = false
+                mBinding.etText.isVisible = true
+            }
+
+            else -> {
+                mBinding.tvNow.isVisible = false
+                mBinding.tvDelay.isVisible = false
+                mBinding.etText.isVisible = false
+            }
+        }
+    }
+
+    /**
+     * 更新时间选项
+     */
+    private fun updateTimeView(nowOrDelay: Boolean) {
+        if (nowOrDelay) {
+            timeType = 0
+            mBinding.tvNow.setBackgroundResource(R.drawable.red_package_bg_type_selected)
+            mBinding.tvDelay.setBackgroundResource(R.drawable.shape_f8f8fa_8)
+            mBinding.tvNow.setTextColor(mBinding.root.context.getColorById(R.color.color_FF285C))
+            mBinding.tvDelay.setTextColor(mBinding.root.context.getColorById(R.color.color_767585))
+        } else {
+            timeType = 1
+            mBinding.tvNow.setBackgroundResource(R.drawable.shape_f8f8fa_8)
+            mBinding.tvDelay.setBackgroundResource(R.drawable.red_package_bg_type_selected)
+            mBinding.tvNow.setTextColor(mBinding.root.context.getColorById(R.color.color_767585))
+            mBinding.tvDelay.setTextColor(mBinding.root.context.getColorById(R.color.color_FF285C))
+        }
+    }
+
+    private fun checkSend() {
+        val initInfo = InitialModel.get().cacheInitInfo
+        if (initInfo == null) {
+            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_redpackage_redpackagesenddialog_01))
+            return
+        }
+        val typeItem = typeAdapter?.getSelect()
+        if (typeItem?.type == 4) {
+            if (mBinding.etText.text.toString().trim().isEmpty()) {
+                toast(R.string.red_package_msg_empty_tips)
+                return
+            }
+        }
+        val minNum = initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum
+        val maxNum = initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum
+        val minGold = initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount
+        val maxGold = initInfo.redEnvelopeConfig.roomRedEnvelopeMaxAmount
+        val rate =
+            if (initInfo.redEnvelopeConfig.exchangeDiamondsRate == 0.0) 0.68 else initInfo.redEnvelopeConfig.exchangeDiamondsRate
+
+        val redNum = mBinding?.etNum?.text.toString().toIntOrDef()
+        if (redNum < minNum || redNum > maxNum) {
+            SingleToastUtil.showToast("紅包數量不能小於${minNum}或大於${maxNum}!")
+            return
+        }
+        val goldNum = mBinding?.etMoney?.text.toString().toIntOrDef()
+        if (goldNum % 10 != 0) {
+            SingleToastUtil.showToast("鉆石數必須為10的倍數!")
+            return
+        }
+
+        if (goldNum < minGold || goldNum > maxGold) {
+            SingleToastUtil.showToast("鉆石數量不能小於${minGold}或大於${maxGold}!")
+            return
+        }
+        if (goldNum.toFloat() / redNum * rate < 0.1) {//單個手氣紅包價值不低於0.1水晶
+            SingleToastUtil.showToast("單個紅包金額過低")
+            return
+        }
+        UserModel.get().cacheLoginUserInfo?.let {
+            if (!it.isBindPaymentPwd) {
+                ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD)
+                return
+            }
+        }
+        GiveGoldPassWordFragment.newInstance(
+            childFragmentManager,
+            mBinding?.etMoney?.text.toString()
+        ).apply {
+            setListener(object : GridPasswordNoFocusView.OnPasswordChangedListener {
+                override fun onTextChanged(psw: String?) {
+                    val password = passWordFragment?.password?.password ?: ""
+                    if (password.length == 6) {
+                        send(password)
+                    }
+                }
+
+                override fun onInputFinish(psw: String?) {
+                }
+            })
+            passWordFragment = this
+        }
+    }
+
+    /**
+     * 密码输入完成
+     */
+    private fun send(password: String) {
+        dialogManager.showProgressDialog(context)
+        val kind = typeAdapter?.getSelect()?.type ?: 1
+        val message = if (kind == 4) {
+            mBinding.etText.text.trim().toString()
+        } else {
+            null
+        }
+        val validityType = if (kind == 1) {
+            timeType
+        } else {
+            // 非无门槛红包 默认限时
+            1
+        }
+        RedPackageModel.sendRedPackage(
+            goldNum = mBinding.etMoney.text.trim().toString().toLongOrDefault(0),
+            message = message,
+            num = mBinding.etNum.text.trim().toString().toLongOrDefault(0),
+            roomUId = AvRoomDataManager.get().mCurrentRoomInfo?.uid.toString(),
+            type = 1,
+            kind = kind,
+            validityType = validityType,
+            password = DESUtils.DESAndBase64(password)
+        )
+            .compose(bindToLifecycle())
+            .doOnError {
+                dialogManager.dismissDialog()
+                SingleToastUtil.showToast(it.message)
+                passWordFragment?.password?.clearPassword()
+            }
+            .subscribe { _ ->
+                PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
+                dialogManager.dismissDialog()
+                SingleToastUtil.showToast("發送成功")
+                passWordFragment?.dismissAllowingStateLoss()
+                (parentFragment as? RedPackageSendDialog)?.dismissAllowingStateLoss()
+            }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        passWordFragment?.dismissAllowingStateLoss()
+        passWordFragment = null
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/PublicRedPackageEditorFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/PublicRedPackageEditorFragment.kt
@@ -0,0 +1,157 @@
+package com.yizhuan.erban.avroom.redpackage.send
+
+import com.chuhai.utils.ktx.addDisableFilter
+import com.chuhai.utils.ktx.setOnInputChangedListener
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.ktx.toStringRes
+import com.yizhuan.erban.R
+import com.yizhuan.erban.base.BaseBindingFragment
+import com.yizhuan.erban.databinding.RedPackagePublicFragmentBinding
+import com.yizhuan.erban.pay.password.GiveGoldPassWordFragment
+import com.yizhuan.erban.pay.widget.GridPasswordNoFocusView
+import com.yizhuan.erban.ui.setting.ModifyPwdActivity
+import com.yizhuan.xchat_android_core.auth.AuthModel
+import com.yizhuan.xchat_android_core.initial.InitialModel
+import com.yizhuan.xchat_android_core.initial.bean.InitInfo
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.pay.PayModel
+import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
+import com.yizhuan.xchat_android_core.user.UserModel
+import com.yizhuan.xchat_android_core.utils.toIntOrDef
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import com.yizhuan.xchat_android_library.utils.codec.DESUtils
+import okhttp3.internal.toLongOrDefault
+import java.math.RoundingMode
+import java.text.NumberFormat
+
+/**
+ * Created by Max on 2023/10/23 12:14
+ * Desc:全服红包
+ **/
+@ActLayoutRes(R.layout.red_package_public_fragment)
+class PublicRedPackageEditorFragment : BaseBindingFragment<RedPackagePublicFragmentBinding>() {
+
+    private var passWordFragment: GiveGoldPassWordFragment? = null
+
+    override fun initiate() {
+        initTips()
+        mBinding.etText.addDisableFilter("\n")
+        mBinding.etText.setOnInputChangedListener {
+            mBinding.tvTextLength.text =
+                R.string.red_package_result_count_format.toStringRes().format(this, 10)
+            true
+        }
+
+        mBinding.tvSend.singleClick {
+            checkSend()
+        }
+    }
+
+    private fun initTips() {
+        val time = InitialModel.get().cacheInitInfo?.redEnvelopeConfig?.endSecond
+        if (time != null) {
+            try {
+                val hour = NumberFormat.getInstance().apply {
+                    maximumFractionDigits = 2
+                    roundingMode = RoundingMode.FLOOR
+                }.format(time / 3600.0)
+                mBinding.tvTips.text = R.string.red_package_tips_format.toStringRes().format(hour)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun checkSend() {
+        val initInfo = InitialModel.get().cacheInitInfo ?: InitInfo()
+        val minNum = initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum
+        val maxNum = initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum
+        val minGold = initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount
+        val maxGold = initInfo.redEnvelopeConfig.serverRedEnvelopeMaxAmount
+        val rate =
+            if (initInfo.redEnvelopeConfig.exchangeDiamondsRate == 0.0) 0.68 else initInfo.redEnvelopeConfig.exchangeDiamondsRate
+
+        val redNum = mBinding?.etNum?.text.toString().toIntOrDef()
+        if (redNum < minNum || redNum > maxNum) {
+            SingleToastUtil.showToast("紅包數量不能小於${minNum}或大於${maxNum}!")
+            return
+        }
+        val goldNum = mBinding?.etMoney?.text.toString().toIntOrDef()
+        if (goldNum % 100 != 0) {
+            SingleToastUtil.showToast("鉆石數必須為100的倍數!")
+            return
+        }
+        if (goldNum < minGold || goldNum > maxGold) {
+            SingleToastUtil.showToast("鉆石數量不能小於${minGold}或大於${maxGold}!")
+            return
+        }
+        if (goldNum.toFloat() / redNum * rate < 0.1) {//單個手氣紅包價值不低於0.1水晶
+            SingleToastUtil.showToast("單個紅包金額過低")
+            return
+        }
+        UserModel.get().cacheLoginUserInfo?.let {
+            if (!it.isBindPaymentPwd) {
+                ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD)
+                return
+            }
+        }
+        GiveGoldPassWordFragment.newInstance(
+            childFragmentManager,
+            mBinding?.etMoney?.text.toString()
+        ).apply {
+            setListener(object : GridPasswordNoFocusView.OnPasswordChangedListener {
+                override fun onTextChanged(psw: String?) {
+                    val password = passWordFragment?.password?.password ?: ""
+                    if (password.length == 6) {
+                        send(password)
+                    }
+                }
+
+                override fun onInputFinish(psw: String?) {
+                }
+            })
+            passWordFragment = this
+        }
+    }
+
+    /**
+     * 密码输入完成
+     */
+    private fun send(password: String) {
+        dialogManager.showProgressDialog(context)
+        var message = mBinding.etText.text.trim().toString()
+        if (message.isEmpty()) {
+            message = R.string.red_package_msg_def.toStringRes()
+        }
+        RedPackageModel.sendRedPackage(
+            goldNum = mBinding.etMoney.text.trim().toString().toLongOrDefault(0),
+            message = message,
+            num = mBinding.etNum.text.trim().toString().toLongOrDefault(0),
+            roomUId = AvRoomDataManager.get().mCurrentRoomInfo?.uid.toString(),
+            type = 2,
+            kind = 0,
+            validityType = 0,
+            password = DESUtils.DESAndBase64(password)
+        )
+            .compose(bindToLifecycle())
+            .doOnError {
+                dialogManager.dismissDialog()
+                SingleToastUtil.showToast(it.message)
+                passWordFragment?.password?.clearPassword()
+            }
+            .subscribe { _ ->
+                PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
+                dialogManager.dismissDialog()
+                SingleToastUtil.showToast("發送成功")
+                passWordFragment?.dismissAllowingStateLoss()
+                (parentFragment as? RedPackageSendDialog)?.dismissAllowingStateLoss()
+            }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        passWordFragment?.dismissAllowingStateLoss()
+        passWordFragment = null
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/RedPackageSendDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/RedPackageSendDialog.kt
@@ -0,0 +1,172 @@
+package com.yizhuan.erban.avroom.redpackage.send
+
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.Gravity
+import android.view.WindowManager
+import androidx.fragment.app.Fragment
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.ktx.toStringRes
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.redpackage.RedPackageEvent
+import com.yizhuan.erban.base.BaseDialog
+import com.yizhuan.erban.common.ViewPagerAdapter
+import com.yizhuan.erban.databinding.RedPackageSendDialogBinding
+import com.yizhuan.erban.ui.pay.ChargeActivity
+import com.yizhuan.erban.ui.webview.CommonWebViewActivity
+import com.yizhuan.erban.ui.webview.DialogWebViewActivity
+import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
+import com.yizhuan.xchat_android_core.Constants
+import com.yizhuan.xchat_android_core.UriProvider
+import com.yizhuan.xchat_android_core.initial.InitialModel
+import com.yizhuan.xchat_android_core.pay.PayModel
+import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent
+import com.yizhuan.xchat_android_core.redpackage.*
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.common.util.DeviceUtil
+import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
+import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+/**
+ * Created by Max on 2023/10/23 12:14
+ * Desc:发红包
+ **/
+@ActLayoutRes(R.layout.red_package_send_dialog)
+class RedPackageSendDialog : BaseDialog<RedPackageSendDialogBinding>() {
+
+    private val permissionType: Int
+        get() = arguments?.getInt(com.yizhuan.xchat_android_core.support.config.Constants.KEY_INTENT)
+            ?: 0
+
+    /**
+     * 是否有厅内红包权限
+     */
+    private val haveRoomRedPackagePermission get() = (permissionType and 1) != 0
+
+    /**
+     * 是否有全服红包权限
+     */
+    private val haveAllServicePackagePermission get() = (permissionType and 2) != 0
+
+    companion object {
+        /**
+         * 红包权限类型
+         */
+        fun newInstance(permissionType: Int): RedPackageSendDialog {
+            return RedPackageSendDialog().apply {
+                this.arguments = Bundle().apply {
+                    putInt(
+                        com.yizhuan.xchat_android_core.support.config.Constants.KEY_INTENT,
+                        permissionType
+                    )
+                }
+            }
+        }
+    }
+
+    override fun onStart() {
+        gravity = Gravity.BOTTOM
+        width = WindowManager.LayoutParams.MATCH_PARENT
+        height = WindowManager.LayoutParams.WRAP_CONTENT
+        super.onStart()
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun init() {
+        EventBus.getDefault().register(this)
+        if (!haveRoomRedPackagePermission && !haveAllServicePackagePermission) {
+            SingleToastUtil.showToast(R.string.avroom_presenter_avroompresenter_04)
+            dismissAllowingStateLoss()
+            return
+        }
+        if (InitialModel.get().cacheInitInfo == null) {
+            InitialModel.get().init(true)
+            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_redpackage_redpackagesenddialog_01))
+            dismissAllowingStateLoss()
+            return
+        }
+        initView()
+        initEvent()
+        PayModel.get().currentWalletInfo?.let {
+            binding.tvBalance.text = it.diamondNum.toLong().toString()
+        }
+    }
+
+    private fun initView() {
+        val tabTitles = ArrayList<String>()
+        val fragments = ArrayList<Fragment>()
+        if (haveRoomRedPackagePermission) {
+            tabTitles.add(R.string.red_package_room.toStringRes())
+            fragments.add(PrivateRedPackageEditorFragment())
+        }
+        if (haveAllServicePackagePermission) {
+            tabTitles.add(R.string.red_package_public.toStringRes())
+            fragments.add(PublicRedPackageEditorFragment())
+        }
+        val topMagicIndicatorAdapter = TabIndicatorAdapter(context, tabTitles)
+        topMagicIndicatorAdapter.setOnItemSelectListener {
+            binding.viewPager.currentItem = it
+        }
+        val commonNavigator = CommonNavigator(context)
+        commonNavigator.isAdjustMode = true
+        commonNavigator.adapter = topMagicIndicatorAdapter
+        binding.tabLayout.navigator = commonNavigator
+        binding.viewPager.adapter = ViewPagerAdapter(
+            childFragmentManager,
+            fragments.toList(),
+            null
+        )
+        ViewPagerHelper.bind(binding.tabLayout, binding.viewPager)
+    }
+
+    private fun initEvent() {
+        binding.vTopBlank.singleClick {
+            dismissAllowingStateLoss()
+        }
+
+        binding.ivHelp.singleClick {
+            DialogWebViewActivity.start(
+                context,
+                UriProvider.getRedPacketRule()
+            )
+        }
+
+        binding.tvBalance.singleClick {
+            if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) {
+                ChargeActivity.start(context)
+            } else {
+                CommonWebViewActivity.start(
+                    context, UriProvider.getOfficialPay(
+                        4,
+                        DeviceUtil.getDeviceId(context)
+                    )
+                )
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        EventBus.getDefault().unregister(this)
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onWalletInfoUpdate(event: UpdateWalletInfoEvent?) {
+        if (!isViewLoaded) {
+            return
+        }
+        binding.tvBalance.text = PayModel.get().currentWalletInfo?.diamondNum?.toString()
+            ?: "0"
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun handleRedPackageDialog(event: RedPackageEvent?) {
+        dismissAllowingStateLoss()
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/RedPackageTypeItemAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/RedPackageTypeItemAdapter.kt
@@ -0,0 +1,76 @@
+package com.yizhuan.erban.avroom.redpackage.send
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chuhai.utils.ktx.getColorById
+import com.yizhuan.erban.R
+import io.realm.internal.Keep
+
+/**
+ * Created by Max on 2023/10/23 18:02
+ * Desc:
+ **/
+class RedPackageTypeItemAdapter(list: List<ItemData>) :
+    BaseQuickAdapter<RedPackageTypeItemAdapter.ItemData, BaseViewHolder>(
+        R.layout.red_package_private_item_type,
+        list
+    ) {
+
+    private var selectPosition = -1
+
+    @Keep
+    data class ItemData(
+        /**
+         * 红包种类 0 旧版本 1 无门槛红包 2 关注红包 3 分享红包 4 弹幕红包
+         */
+        val type: Int, val name: Int, val tips: Int
+    )
+
+    override fun convert(helper: BaseViewHolder, item: ItemData) {
+        helper.setText(R.id.tv_name, item.name)
+        helper.setText(R.id.tv_tips, item.tips)
+        convertState(helper, item)
+    }
+
+    override fun convertPayloads(
+        helper: BaseViewHolder,
+        item: ItemData,
+        payloads: MutableList<Any>
+    ) {
+        super.convertPayloads(helper, item, payloads)
+        convertState(helper, item)
+    }
+
+    private fun convertState(helper: BaseViewHolder, item: ItemData) {
+        if (helper.bindingAdapterPosition == selectPosition) {
+            helper.setBackgroundRes(R.id.layout_root, R.drawable.red_package_bg_type_selected)
+            helper.setTextColor(
+                R.id.tv_name,
+                helper.itemView.context.getColorById(R.color.color_FF285C)
+            )
+            helper.setTextColor(
+                R.id.tv_tips,
+                helper.itemView.context.getColorById(R.color.color_FF285C)
+            )
+        } else {
+            helper.setBackgroundRes(R.id.layout_root, R.drawable.shape_f8f8fa_8)
+            helper.setTextColor(
+                R.id.tv_name,
+                helper.itemView.context.getColorById(R.color.color_767585)
+            )
+            helper.setTextColor(
+                R.id.tv_tips,
+                helper.itemView.context.getColorById(R.color.color_94959C)
+            )
+        }
+    }
+
+    fun select(position: Int) {
+        this.selectPosition = position
+        notifyItemRangeChanged(0, itemCount, true)
+    }
+
+    fun getSelect(): ItemData? {
+        return data.getOrNull(selectPosition)
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/TabIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/send/TabIndicatorAdapter.java
@@ -0,0 +1,116 @@
+package com.yizhuan.erban.avroom.redpackage.send;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.chuhai.utils.UiUtils;
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.common.util.Utils;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+
+import java.util.List;
+
+/**
+ * @author jack
+ * @Description
+ * @Date 2018/11/1
+ */
+public class TabIndicatorAdapter extends CommonNavigatorAdapter {
+    private List<String> mTitleList;
+    private Context mContext;
+
+    public TabIndicatorAdapter(Context mContext, List<String> mTitleList ) {
+        this.mTitleList = mTitleList;
+        this.mContext = mContext;
+    }
+
+    @Override
+    public int getCount() {
+        return mTitleList == null ? 0 : mTitleList.size();
+    }
+
+    @Override
+    public IPagerTitleView getTitleView(Context context, int index) {
+        ContactsPagerTitleView categoryPagerTitleView = new ContactsPagerTitleView(context, mTitleList.get(index));
+        categoryPagerTitleView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != mOnItemSelectListener) {
+                    mOnItemSelectListener.onItemSelect(index);
+                }
+            }
+        });
+        return categoryPagerTitleView;
+    }
+
+    @Override
+    public IPagerIndicator getIndicator(Context context) {
+        LinePagerIndicator indicator = new LinePagerIndicator(context);
+        indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
+        indicator.setLineHeight(UIUtil.dip2px(mContext, 4));
+        indicator.setRoundRadius(UIUtil.dip2px(mContext, 4));
+        indicator.setLineWidth(UIUtil.dip2px(mContext, 12));
+        indicator.setColors(context.getResources().getColor(R.color.color_FF285C));
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+        lp.topMargin = UIUtil.dip2px(mContext, 2);
+        indicator.setLayoutParams(lp);
+        return indicator;
+    }
+
+    private OnItemSelectListener mOnItemSelectListener;
+
+    public void setOnItemSelectListener(OnItemSelectListener onItemSelectListener) {
+        mOnItemSelectListener = onItemSelectListener;
+    }
+
+    public interface OnItemSelectListener {
+        void onItemSelect(int position);
+    }
+
+    class ContactsPagerTitleView extends AppCompatTextView implements IPagerTitleView {
+
+
+        public ContactsPagerTitleView(Context context, String tabInfo) {
+            super(context);
+            setHeight(Utils.dip2px(getContext(), 25));
+            setTextSize(18);
+            setText(tabInfo);
+            setGravity(Gravity.CENTER);
+
+        }
+
+
+        @Override
+        public void onSelected(int index, int totalCount) {
+//            setBackgroundResource(R.drawable.shape_bg_contact_indicator_item);
+            setTextColor(getResources().getColor(R.color.color_FF285C));
+        }
+
+        @Override
+        public void onDeselected(int index, int totalCount) {
+//            setBackgroundDrawable(null);
+            setTextColor(getResources().getColor(R.color.color_767585));
+        }
+
+        @Override
+        public void onLeave(int index, int totalCount, float leavePercent, boolean leftToRight) {
+
+        }
+
+        @Override
+        public void onEnter(int index, int totalCount, float enterPercent, boolean leftToRight) {
+
+        }
+    }
+
+
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt
@@ -0,0 +1,84 @@
+package com.yizhuan.erban.avroom.room_album
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.recyclerview.widget.GridLayoutManager
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.yizhuan.erban.R
+import com.yizhuan.erban.databinding.DialogChooseGiftRoomAlbumBinding
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
+import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration
+import com.yizhuan.xchat_android_core.gift.GiftModel
+import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
+import com.yizhuan.xchat_android_core.gift.bean.GiftType
+
+class ChooseGiftRoomAlbumDialogFragment : BottomSheetDialogFragment() {
+
+    private var _binding: DialogChooseGiftRoomAlbumBinding? = null
+    private val binding get() = _binding!!
+
+    var onPickedListener: OnPickedListener? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, R.style.ErbanBottomSheetDialog)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.attributes?.apply {
+            width = WindowManager.LayoutParams.MATCH_PARENT
+            height = WindowManager.LayoutParams.MATCH_PARENT
+        }
+
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = DialogChooseGiftRoomAlbumBinding.inflate(layoutInflater, container, false)
+
+        binding.rvGifts.layoutManager = GridLayoutManager(context, 4)
+        binding.rvGifts.addItemDecoration(GridSpacingItemNewDecoration(resources.getDimensionPixelOffset(R.dimen.dp_20), true))
+
+
+        binding.rvGifts.adapter = object : BaseQuickAdapter<GiftInfo, BaseViewHolder>(R.layout.item_gift_room_album){
+            override fun convert(helper: BaseViewHolder, item: GiftInfo) {
+                ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_gift), item.giftUrl)
+                helper.setText(R.id.tv_gift, item.giftName)
+                helper.setText(R.id.tv_value, item.goldPrice.toString())
+            }
+        }.apply {
+            val gifts = GiftModel.get().getGiftInfoList(GiftType.GIFT_TYPE_NORMAL)
+            setNewData(gifts)
+
+            setOnItemClickListener { _, _, position ->
+                onPickedListener?.onPicked(data[position])
+                dismiss()
+            }
+        }
+
+        binding.ivClose.setOnClickListener { dismiss() }
+
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    fun interface OnPickedListener {
+        fun onPicked(giftInfo: GiftInfo)
+    }
+
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/PhotoItem.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/PhotoItem.kt
@@ -0,0 +1,14 @@
+package com.yizhuan.erban.avroom.room_album
+
+import com.chad.library.adapter.base.entity.MultiItemEntity
+
+data class PhotoItem(val path: String, val type: Int) : MultiItemEntity {
+    override fun getItemType(): Int {
+        return type
+    }
+
+    companion object {
+        const val TYPE_PHOTO = 0
+        const val TYPE_ADD = 1
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumActivity.kt
@@ -0,0 +1,114 @@
+package com.yizhuan.erban.avroom.room_album
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.graphics.Canvas
+import android.graphics.LinearGradient
+import android.graphics.Shader
+import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.yizhuan.erban.R
+import com.yizhuan.erban.base.BaseViewBindingActivity
+import com.yizhuan.erban.databinding.ActivityRoomAlbumBinding
+import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView
+
+class RoomAlbumActivity : BaseViewBindingActivity<ActivityRoomAlbumBinding>() {
+
+    val viewModel: RoomAlbumViewModel by viewModels()
+
+    override fun init() {
+        initTitleBar(getString(R.string.room_album))
+        mTitleBar.setBackgroundResource(R.color.white)
+
+        val titles = listOf("我的照片", "普通照片", "解鎖照片")
+
+        binding.indicator.navigator = CommonNavigator(this).apply {
+            isAdjustMode = true
+
+            adapter = object : CommonNavigatorAdapter() {
+                var startColor = ContextCompat.getColor(context, R.color.color_5CF1FF)
+                var endColor = ContextCompat.getColor(context, R.color.color_CF70FF)
+                override fun getCount(): Int {
+                    return 3
+                }
+
+                override fun getTitleView(context: Context, index: Int): IPagerTitleView {
+                    return ColorTransitionPagerTitleView(context).apply {
+                        normalColor = ContextCompat.getColor(context, R.color.color_767585)
+                        selectedColor = ContextCompat.getColor(context, R.color.color_1F1B4F)
+                        text = titles[index]
+                    }.apply {
+                        setOnClickListener { binding.vp.currentItem = index }
+                    }
+                }
+
+                override fun getIndicator(context: Context?): IPagerIndicator {
+                    return object : GradientLinePagerIndicator(context) {
+                        @SuppressLint("DrawAllocation")
+                        override fun onDraw(canvas: Canvas) {
+                            val g = LinearGradient(
+                                lineRect.left,
+                                lineRect.top,
+                                lineRect.right,
+                                lineRect.bottom,
+                                intArrayOf(startColor, endColor),
+                                null,
+                                Shader.TileMode.CLAMP
+                            )
+                            paint.shader = g
+                            canvas.drawRoundRect(lineRect, roundRadius, roundRadius, paint)
+                        }
+
+                    }.apply {
+                        lineHeight = resources.getDimensionPixelOffset(R.dimen.dp_4).toFloat()
+                        lineWidth = resources.getDimensionPixelOffset(R.dimen.dp_15).toFloat()
+                        roundRadius = resources.getDimensionPixelOffset(R.dimen.dp_2).toFloat()
+                        mode = LinePagerIndicator.MODE_EXACTLY
+                    }
+                }
+            }
+        }
+        ViewPagerHelper.bind(binding.indicator, binding.vp)
+
+        val fragments = listOf(
+            RoomAlbumFragment.newInstance(RoomAlbumFragment.TYPE_MINE),
+            RoomAlbumFragment.newInstance(RoomAlbumFragment.TYPE_COMMON),
+            RoomAlbumFragment.newInstance(RoomAlbumFragment.TYPE_LOCKED)
+        )
+
+        binding.vp.adapter = object : FragmentStateAdapter(this) {
+            override fun getItemCount(): Int {
+                return fragments.size
+            }
+
+            override fun createFragment(position: Int): Fragment {
+                return fragments[position]
+            }
+        }
+
+        binding.tvUpload.setOnClickListener {
+            UploadRoomAlbumDialogFragment().show(
+                supportFragmentManager,
+                UploadRoomAlbumDialogFragment::class.java.simpleName
+            )
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context) {
+            val starter = Intent(context, RoomAlbumActivity::class.java)
+            context.startActivity(starter)
+        }
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragment.kt
@@ -0,0 +1,201 @@
+package com.yizhuan.erban.avroom.room_album
+
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chad.library.adapter.base.diff.BaseQuickDiffCallback
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.bean.RoomAlbumPhotoInfo
+import com.yizhuan.erban.base.BaseViewBindingFragment
+import com.yizhuan.erban.community.photo.BigPhotoActivity
+import com.yizhuan.erban.community.photo.PagerOption
+import com.yizhuan.erban.community.utils.ObjectTypeHelper
+import com.yizhuan.erban.databinding.FragmentRoomAlbumBinding
+import com.yizhuan.erban.ui.utils.ImageLoadUtils
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
+import com.yizhuan.erban.ui.widget.ButtonItem
+import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration
+import com.yizhuan.xchat_android_core.Constants
+
+class RoomAlbumFragment : BaseViewBindingFragment<FragmentRoomAlbumBinding>() {
+
+    private val activityViewModel by activityViewModels<RoomAlbumViewModel>()
+    private val viewModel by viewModels<RoomAlbumFragmentViewModel>()
+
+    private val type: Int by lazy {
+        requireArguments().getInt("type")
+    }
+
+    private var page = 1
+
+    override fun init() {
+        binding.recyclerView.layoutManager = GridLayoutManager(context, 2)
+        val offsetH = resources.getDimensionPixelOffset(R.dimen.dp_7)
+        val offsetV = resources.getDimensionPixelOffset(R.dimen.dp_4)
+        binding.recyclerView.addItemDecoration(
+            GridSpacingItemNewDecoration(
+                offsetV,
+                offsetH,
+                false
+            )
+        )
+        val adapter = object :
+            BaseQuickAdapter<RoomAlbumPhotoInfo, BaseViewHolder>(R.layout.item_room_album) {
+            override fun convert(helper: BaseViewHolder, item: RoomAlbumPhotoInfo) {
+                val ivPhoto = helper.getView<ImageView>(R.id.iv_pic)
+                if (item.status == 1) {
+                    ImageLoadUtilsV2.loadImage(ivPhoto, item.photoUrl)
+                    helper.setVisible(R.id.iv_lock, false)
+                } else {
+                    ImageLoadUtils.loadImageWithBlur(
+                        context,
+                        item.photoUrl,
+                        ivPhoto,
+                        25, 4
+                    )
+                    helper.setVisible(R.id.iv_lock, true)
+                }
+
+                helper.setVisible(R.id.v_action, type == TYPE_MINE)
+                helper.setVisible(R.id.v_bottom_mask, item.type == 2)
+                helper.setVisible(R.id.iv_gift, item.type == 2)
+                helper.setVisible(R.id.iv_diamond, item.type == 2)
+                helper.setVisible(R.id.tv_value, item.type == 2)
+
+                helper.itemView.setOnClickListener {
+                    if (item.type != 1) {
+                        return@setOnClickListener
+                    }
+
+                    BigPhotoActivity.start(
+                        activity,
+                        ObjectTypeHelper.pathToCustomItems(item.photoUrl),
+                        0, PagerOption().setSave(true)
+                    )
+                }
+
+                if (item.type == 2) {
+                    val ivGift = helper.getView<ImageView>(R.id.iv_gift)
+                    ImageLoadUtilsV2.loadImage(ivGift, item.giftUrl)
+                    helper.setText(R.id.tv_value, item.totalGoldPrice.toString())
+                }
+
+            }
+
+            override fun onCreateDefViewHolder(
+                parent: ViewGroup?,
+                viewType: Int
+            ): BaseViewHolder {
+                val holder = super.onCreateDefViewHolder(parent, viewType)
+                holder.addOnClickListener(R.id.v_action)
+                return holder
+            }
+
+        }.apply {
+            addFooterView(View(context).apply {
+                layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resources.getDimensionPixelOffset(R.dimen.dp_80))
+            })
+            setEnableLoadMore(true)
+            setOnLoadMoreListener({
+                viewModel.loadPhotos(type, ++page)
+            }, binding.recyclerView)
+
+            setOnItemChildClickListener { _, view, position ->
+                if (view.id == R.id.v_action) {
+                    val buttonItems = listOf(
+                        ButtonItem("發送到公屏") {
+                            dialogManager.showOkCancelDialog("確認將該照片發送至公屏") {
+                                viewModel.sendPhoto(data[position].id)
+                            }
+                        },
+                        ButtonItem("刪除照片") {
+                            viewModel.deletePhoto(data[position].id)
+                        },
+                        ButtonItem("查看大圖") {
+                            BigPhotoActivity.start(
+                                activity,
+                                ObjectTypeHelper.pathToCustomItems(data[position].photoUrl),
+                                0, PagerOption().setSave(true)
+                            )
+                        }
+                    )
+                    dialogManager.showCommonPopupDialog(buttonItems)
+
+                }
+            }
+        }
+
+        binding.recyclerView.adapter = adapter
+
+        binding.refreshLayout.setOnRefreshListener {
+            page = Constants.PAGE_START
+            viewModel.loadPhotos(type)
+        }
+
+        viewModel.loadPhotos(type)
+
+        activityViewModel.uploadLiveData.observe(this) {
+            page = Constants.PAGE_START
+            viewModel.loadPhotos(type)
+        }
+
+        viewModel.myPhotosLiveData.observe(this@RoomAlbumFragment) {
+            adapter.loadMoreComplete()
+
+            adapter.setNewDiffData(object : BaseQuickDiffCallback<RoomAlbumPhotoInfo>(it) {
+                override fun areItemsTheSame(
+                    oldItem: RoomAlbumPhotoInfo,
+                    newItem: RoomAlbumPhotoInfo
+                ): Boolean {
+                    return oldItem.id == newItem.id
+                }
+
+                override fun areContentsTheSame(
+                    oldItem: RoomAlbumPhotoInfo,
+                    newItem: RoomAlbumPhotoInfo
+                ): Boolean {
+                    return oldItem.photoUrl === newItem.photoUrl
+                }
+            })
+
+            binding.refreshLayout.finishRefresh()
+        }
+        viewModel.deleteLiveData.observe(this) {
+            viewModel.loadPhotos(type)
+        }
+        viewModel.loadStateLiveData.observe(this) {
+            if (it == true) {
+                adapter.loadMoreComplete()
+            } else {
+                if (page > 1) {
+                    page--
+                }
+                adapter.loadMoreFail()
+            }
+            binding.refreshLayout.finishRefresh()
+        }
+        viewModel.noMoreLiveData.observe(this) {
+            if (it == true) {
+                adapter.loadMoreEnd()
+            }
+        }
+    }
+
+    companion object {
+        const val TYPE_MINE = 0
+        const val TYPE_COMMON = 1
+        const val TYPE_LOCKED = 2
+        fun newInstance(type: Int) = RoomAlbumFragment().apply {
+            arguments = Bundle().apply {
+                putInt("type", type)
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragmentViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragmentViewModel.kt
@@ -0,0 +1,68 @@
+package com.yizhuan.erban.avroom.room_album
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.hjq.toast.ToastUtils
+import com.yizhuan.erban.avroom.bean.RoomAlbumPhotoInfo
+import com.yizhuan.erban.base.BaseViewModel
+import com.yizhuan.xchat_android_core.Constants
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.utils.toast
+
+class RoomAlbumFragmentViewModel : BaseViewModel() {
+
+    private val _myPhotosLiveData = MutableLiveData<MutableList<RoomAlbumPhotoInfo>?>()
+    val myPhotosLiveData: LiveData<MutableList<RoomAlbumPhotoInfo>?> = _myPhotosLiveData
+
+    private val _deleteLiveData = MutableLiveData<Boolean?>()
+    val deleteLiveData: LiveData<Boolean?> = _deleteLiveData
+
+    private val _loadStateLiveData = MutableLiveData<Boolean?>()
+    val loadStateLiveData: LiveData<Boolean?> = _loadStateLiveData
+
+    private val _noMoreLiveData = MutableLiveData<Boolean?>()
+    val noMoreLiveData: LiveData<Boolean?> = _noMoreLiveData
+
+    fun loadPhotos(type: Int, page: Int = 1) {
+        safeLaunch(block = {
+            val data = RoomAlbumModel.loadPhotos(AvRoomDataManager.get().roomUid, type, page)
+
+            data?.let {
+                val value = _myPhotosLiveData.value
+                if (page == 1) {
+                    _myPhotosLiveData.value = it.toMutableList()
+                } else {
+                    value?.addAll(it)
+                    _myPhotosLiveData.value = value
+                }
+
+                _loadStateLiveData.value = true
+                _noMoreLiveData.value = it.size < Constants.PAGE_SIZE
+            }
+
+        }, onError = {
+            it.message.toast()
+            _loadStateLiveData.value = false
+        })
+    }
+
+    fun sendPhoto(photoId: Int) {
+        safeLaunch(block = {
+            RoomAlbumModel.sendPhoto(AvRoomDataManager.get().roomUid, photoId)
+        }, onComplete = {
+            ToastUtils.show("發送成功")
+        })
+    }
+
+    fun deletePhoto(photoId: Int) {
+        safeLaunch(block = {
+            RoomAlbumModel.deletePhoto(photoId)
+
+            _deleteLiveData.value = true
+
+        }, onComplete = {
+            ToastUtils.show("成功")
+        })
+    }
+
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumModel.kt
@@ -0,0 +1,100 @@
+package com.yizhuan.erban.avroom.room_album
+
+import com.yizhuan.erban.avroom.bean.RoomAlbumPhotoInfo
+import com.yizhuan.xchat_android_core.Constants
+import com.yizhuan.xchat_android_core.bean.response.ServiceResult
+import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo
+import com.yizhuan.xchat_android_core.utils.net.RxHelper
+import com.yizhuan.xchat_android_core.utils.net.launchRequest
+import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import io.reactivex.Single
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+object RoomAlbumModel {
+    private val api = RxNet.create(Api::class.java)
+
+    suspend fun loadPhotos(roomUid: Long, type: Int, page: Int): List<RoomAlbumPhotoInfo>? {
+        return launchRequest {
+            api.loadPhotos(roomUid, type, page, Constants.PAGE_SIZE)
+        }
+    }
+
+    suspend fun uploadPhotos(roomUid: Long, type: Int, photoUrls: String, giftId: Int?): String? {
+        return launchRequest {
+            api.uploadPhotos(roomUid, type, photoUrls, giftId)
+        }
+    }
+
+    suspend fun sendPhoto(roomUid: Long, photoId: Int): String? {
+        return launchRequest {
+            api.sendPhoto(roomUid, photoId)
+        }
+    }
+
+    suspend fun deletePhoto(photoId: Int): String? {
+        return launchRequest {
+            api.deletePhoto(photoId)
+        }
+    }
+
+    fun unlockRoomPhoto(roomUid: Long, photoId: Int): Single<GiftReceiveInfo> {
+        return api.unlockRoomPhoto(roomUid, photoId)
+            .compose(RxHelper.handleCommon())
+            .compose(RxHelper.handleSchAndExce())
+    }
+
+    fun listUnlockRoomPhoto(roomUid: Long): Single<List<Int>> {
+        return api.listUnlockRoomPhoto(roomUid)
+            .compose(RxHelper.handleCommon())
+            .compose(RxHelper.handleSchAndExce())
+    }
+
+    private interface Api {
+
+        @GET("roomAlbum/pagePhoto")
+        suspend fun loadPhotos(
+            @Query("roomUid") roomUid: Long,
+            @Query("type") type: Int,
+            @Query("page") page: Int,
+            @Query("pageSize") pageSize: Int,
+        ): ServiceResult<List<RoomAlbumPhotoInfo>>
+
+        @FormUrlEncoded
+        @POST("roomAlbum/upload")
+        suspend fun uploadPhotos(
+            @Field("roomUid") roomUid: Long,
+            @Field("type") type: Int,
+            @Field("photoUrls") photoUrls: String,
+            @Field("giftId") giftId: Int?,
+        ): ServiceResult<String>
+
+        @FormUrlEncoded
+        @POST("roomAlbum/sendPhoto")
+        suspend fun sendPhoto(
+            @Field("roomUid") roomUid: Long,
+            @Field("id") photoId: Int,
+        ): ServiceResult<String>
+
+        @FormUrlEncoded
+        @POST("roomAlbum/delete")
+        suspend fun deletePhoto(
+            @Field("id") photoId: Int,
+        ): ServiceResult<String>
+
+        @FormUrlEncoded
+        @POST("roomAlbum/unlockPhoto")
+        fun unlockRoomPhoto(
+            @Field("roomUid") roomUid: Long,
+            @Field("id") photoId: Int
+        ): Single<ServiceResult<GiftReceiveInfo>>
+
+        @GET("roomAlbum/listUnlockPhoto")
+        fun listUnlockRoomPhoto(
+            @Query("roomUid") roomUid: Long,
+        ): Single<ServiceResult<List<Int>>>
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumViewModel.kt
@@ -0,0 +1,48 @@
+package com.yizhuan.erban.avroom.room_album
+
+import android.annotation.SuppressLint
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.yizhuan.erban.base.BaseViewModel
+import com.yizhuan.erban.base.Event
+import com.yizhuan.xchat_android_core.file.FileModel
+import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.utils.toast
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+class RoomAlbumViewModel : BaseViewModel() {
+
+
+    private val _uploadLiveData = MutableLiveData<Event<Boolean>>()
+    val uploadLiveData: LiveData<Event<Boolean>?> = _uploadLiveData
+
+    @SuppressLint("CheckResult")
+    fun upload(list: MutableList<String>, type: Int, unlockedGift: GiftInfo?) {
+        Observable.fromIterable(list)
+            .flatMap {
+                FileModel.get().uploadFile(it).toObservable()
+            }
+            .toList()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                safeLaunch(onError = {
+                    _uploadLiveData.value = Event(false)
+                }, block = {
+                    RoomAlbumModel.uploadPhotos(
+                        AvRoomDataManager.get().roomUid,
+                        type,
+                        it.joinToString(","),
+                        unlockedGift?.giftId
+                    )
+                    _uploadLiveData.value = Event(true)
+                })
+            }, {
+                it.message.toast()
+                _uploadLiveData.value = Event(false)
+            })
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt
@@ -0,0 +1,59 @@
+package com.yizhuan.erban.avroom.room_album
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import com.hjq.toast.ToastUtils
+import com.yizhuan.erban.base.BaseDialog
+import com.yizhuan.erban.databinding.DialogLockRoomAlbumPhotoBinding
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
+import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+
+class UnlockRoomAlbumPhotoDialog : BaseDialog<DialogLockRoomAlbumPhotoBinding>(){
+
+    var onUnlockRoomPhotoListener: OnUnlockRoomPhotoListener? = null
+
+    @SuppressLint("CheckResult")
+    override fun init() {
+        val arguments = requireArguments()
+        val giftUrl = arguments.getString("giftUrl")
+        val giftName = arguments.getString("giftName")
+        val price = arguments.getInt("price")
+        val photoId = arguments.getInt("photoId")
+
+        ImageLoadUtilsV2.loadImage(binding.ivGift, giftUrl)
+        binding.tvGiftName.text = giftName
+        binding.tvValue.text = price.toString()
+
+        binding.tvAction.setOnClickListener {
+            RoomAlbumModel.unlockRoomPhoto(AvRoomDataManager.get().roomUid, photoId)
+                .subscribe({
+                    onUnlockRoomPhotoListener?.onUnlockRoomPhoto(it)
+                    dismiss()
+                }, {
+                    ToastUtils.show(it.message)
+                })
+        }
+
+        binding.ivClose.setOnClickListener {
+            dismiss()
+        }
+    }
+
+    companion object{
+        fun newInstance(photoId:Int, giftUrl: String?, giftName:String, price:Int): UnlockRoomAlbumPhotoDialog {
+            val args = Bundle()
+            args.putInt("photoId", photoId)
+            args.putString("giftUrl", giftUrl)
+            args.putString("giftName", giftName)
+            args.putInt("price", price)
+            val fragment = UnlockRoomAlbumPhotoDialog()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    fun interface OnUnlockRoomPhotoListener{
+        fun onUnlockRoomPhoto(unlockRoomAlbumPhotoInfo: GiftReceiveInfo)
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/UploadRoomAlbumDialogFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/UploadRoomAlbumDialogFragment.kt
@@ -0,0 +1,294 @@
+package com.yizhuan.erban.avroom.room_album
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Dialog
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.hjq.toast.ToastUtils
+import com.yizhuan.erban.R
+import com.yizhuan.erban.common.widget.dialog.DialogManager
+import com.yizhuan.erban.databinding.DialogRoomAlbumUploadBinding
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
+import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration
+import com.yizhuan.xchat_android_core.Constants
+import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
+import com.yizhuan.xchat_android_library.common.photo.PhotoProvider
+import com.yizhuan.xchat_android_library.common.photo.PhotoProvider.photoProvider
+import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil.compress
+import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil.getCompressCachePath
+import com.yizhuan.xchat_android_library.common.util.PhotosCompressCallback
+import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions
+import kotlinx.coroutines.Job
+
+class UploadRoomAlbumDialogFragment : BottomSheetDialogFragment() {
+
+    private var _binding: DialogRoomAlbumUploadBinding? = null
+    private val binding get() = _binding!!
+
+    private val viewModel by activityViewModels<RoomAlbumViewModel>()
+
+    private lateinit var photoAdapter: BaseMultiItemQuickAdapter<PhotoItem, BaseViewHolder>
+
+    private var unlockedGift: GiftInfo? = null
+
+    private var compressJob: Job? = null
+
+    val dialogManager by lazy {
+        DialogManager(context)
+    }
+
+    private val addItem = PhotoItem("", PhotoItem.TYPE_ADD)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, R.style.ErbanBottomSheetDialog)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.attributes?.apply {
+            width = WindowManager.LayoutParams.MATCH_PARENT
+            height = WindowManager.LayoutParams.MATCH_PARENT
+        }
+
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = DialogRoomAlbumUploadBinding.inflate(layoutInflater, container, false)
+
+        binding.rvPhoto.layoutManager = GridLayoutManager(context, 3)
+        binding.rvPhoto.addItemDecoration(
+            GridSpacingItemNewDecoration(
+                resources.getDimensionPixelOffset(
+                    R.dimen.dp_18
+                ), true
+            )
+        )
+
+        photoAdapter =
+            object : BaseMultiItemQuickAdapter<PhotoItem, BaseViewHolder>(mutableListOf(addItem)) {
+                init {
+                    addItemType(PhotoItem.TYPE_PHOTO, R.layout.item_publish_image)
+                    addItemType(PhotoItem.TYPE_ADD, R.layout.item_add_picture)
+                }
+
+                override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+                    val holder = super.onCreateViewHolder(parent, viewType)
+                    if (viewType == PhotoItem.TYPE_PHOTO) {
+                        holder.setGone(R.id.iv_gif_tag, false)
+                        holder.setImageResource(R.id.iv_delete, R.drawable.ic_delete_room_album)
+                        holder.addOnClickListener(R.id.iv_delete)
+                    }
+                    return holder
+                }
+
+                override fun convert(helper: BaseViewHolder, item: PhotoItem) {
+                    if (item.type == PhotoItem.TYPE_ADD) {
+                        return
+                    }
+
+                    ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_photo), item.path, false, 8)
+                }
+            }.apply {
+                setOnItemChildClickListener { _, view, position ->
+                    if (view.id == R.id.iv_delete) {
+                        remove(position)
+                        if (data.last().type != PhotoItem.TYPE_ADD) {
+                            addData(addItem)
+                        }
+                    }
+                }
+                setOnItemClickListener { _, _, position ->
+                    if (position == data.size - 1) {
+                        checkStoragePermission()
+                    }
+                }
+            }
+
+        binding.rvPhoto.adapter = photoAdapter
+
+        binding.vGift.isEnabled = false
+        binding.rgType.setOnCheckedChangeListener { group, checkedId ->
+            if (checkedId == binding.rbCommon.id) {
+                binding.tvNoGift.visibility = View.VISIBLE
+                binding.tvNoGift.text =
+                    getString(R.string.room_album_type_no_need_unlocked_gift_tips)
+                binding.groupGift.visibility = View.INVISIBLE
+                unlockedGift = null
+
+                binding.vGift.isEnabled = false
+                binding.tvGiftLabel.setTextColor(
+                    ContextCompat.getColor(
+                        requireContext(),
+                        R.color.color_B3B3C3
+                    )
+                )
+            } else {
+                binding.tvNoGift.visibility = View.VISIBLE
+                binding.tvNoGift.text =
+                    getString(R.string.room_album_type_choose_unlocked_gift_tips)
+
+                binding.groupGift.visibility = View.INVISIBLE
+                binding.vGift.isEnabled = true
+                binding.tvGiftLabel.setTextColor(
+                    ContextCompat.getColor(
+                        requireContext(),
+                        R.color.color_1F1B4F
+                    )
+                )
+            }
+        }
+
+        binding.vGift.setOnClickListener {
+            val chooseGiftRoomAlbumDialogFragment = ChooseGiftRoomAlbumDialogFragment()
+            chooseGiftRoomAlbumDialogFragment.onPickedListener =
+                ChooseGiftRoomAlbumDialogFragment.OnPickedListener {
+                    unlockedGift = it
+
+                    binding.tvNoGift.visibility = View.INVISIBLE
+                    binding.groupGift.visibility = View.VISIBLE
+
+                    ImageLoadUtilsV2.loadImage(binding.ivGift, it.giftUrl)
+                    binding.tvGiftName.text = it.giftName
+                    binding.tvGiftValue.text = it.goldPrice.toString()
+                }
+            chooseGiftRoomAlbumDialogFragment.show(
+                childFragmentManager,
+                UploadRoomAlbumDialogFragment::class.java.simpleName
+            )
+        }
+
+        binding.slConfirm.setOnClickListener {
+            val list = mutableListOf<String>()
+            photoAdapter.data.forEach {
+                if (it.type == PhotoItem.TYPE_PHOTO) {
+                    list.add(it.path)
+                }
+            }
+            if (list.size < 1) {
+                ToastUtils.show("未選擇圖片")
+                return@setOnClickListener
+            }
+
+            val type = if (binding.rgType.checkedRadioButtonId == binding.rbCommon.id) 1 else 2
+            if (type == 2 && unlockedGift == null) {
+                ToastUtils.show("未選擇解鎖禮物")
+                return@setOnClickListener
+            }
+
+            dialogManager.showProgressDialog(context)
+            viewModel.upload(
+                list,
+                type,
+                unlockedGift
+            )
+        }
+
+        viewModel.uploadLiveData.observe(this) {
+            it?.getContentIfNotHandled()?.let { success ->
+                dialogManager.hideProgressDialog()
+
+                if (success) {
+                    dismiss()
+                }
+
+            }
+        }
+
+        binding.ivClose.setOnClickListener { dismiss() }
+
+        return binding.root
+    }
+
+    private fun checkStoragePermission() {
+        if (!EasyPermissions.hasPermissions(
+                requireContext(),
+                if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES
+                else Manifest.permission.READ_EXTERNAL_STORAGE
+            )
+        ) {
+            EasyPermissions.requestPermissions(
+                this,
+                getString(R.string.permission_storage_rationale),
+                100,
+                if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES
+                else Manifest.permission.READ_EXTERNAL_STORAGE
+            )
+        } else {
+            photoProvider(
+                this,
+                7 - photoAdapter.data.size,
+                true,
+                200,
+                true
+            )
+        }
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != Activity.RESULT_OK) {
+            return
+        }
+        if (requestCode == 200) {
+            PhotoProvider.getResultPathListAsync(data) {
+                it?.let { paths ->
+                    compressPhotos(paths.toMutableList())
+                }
+            }
+        }
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    private fun compressPhotos(paths: MutableList<String>) {
+        compressJob?.cancel(null)
+        compressJob = compress(
+            requireContext(), paths,
+            getCompressCachePath(),
+            object : PhotosCompressCallback {
+                override fun onSuccess(compressedImgList: ArrayList<String>) {
+                    val list = photoAdapter.data
+                    val removeLast = list.removeLast()
+                    compressedImgList.forEach { item ->
+                        list.add(PhotoItem(item, PhotoItem.TYPE_PHOTO))
+                    }
+                    if (list.size < 6) {
+                        list.add(removeLast)
+                    }
+                    photoAdapter.notifyDataSetChanged()
+                }
+
+                override fun onFail(e: Throwable) {
+                    ToastUtils.show(getString(R.string.picker_image_error))
+                }
+            }, 200, false, Constants.UPLOAD_IMAGE_MAX_SIZE, Constants.UPLOAD_IMAGE_MAX_FILE_LENGTH
+        )
+
+    }
+
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+}
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
@@ -296,17 +296,24 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
        if (roomInfo != null) {
            List<GiftReceiver> targetUsers = new ArrayList<>();
            int totalCoin = 0;
-
+            boolean isPlaySvga = false;
            if (AvRoomDataManager.get().mIsNeedGiftEffect &&
                    !AvRoomDataManager.get().isSelfGamePlaying()) {
-                SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
-                handler.postDelayed(() -> {
-                    removeView(imageView);
-                    imageView.stopAnimation(true);
-                }, 1800);
+                if (svgaUrl != null && !svgaUrl.isEmpty()) {
+                    isPlaySvga = true;
+                    SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
+                    handler.postDelayed(() -> {
+                        removeView(imageView);
+                        imageView.stopAnimation(true);
+                    }, 1800);
+                }
            }

-            handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
+            if (isPlaySvga) {
+                handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
+            } else {
+                drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos);
+            }
        }
    }

@@ -354,7 +361,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
        targetUsers.add(giftReceiver);
        if (!isShowAnimation) return;
        giftInfo = giftReceiveInfo.getDisplayGift().get(pos);
-        if (totalCoin >= 520 || (giftInfo != null && giftInfo.isHasEffect())) {
+        if (giftInfo != null && giftInfo.isHasEffect()) {
            Message msg = Message.obtain();
            msg.what = 0;
            GiftEffectInfo giftEffectInfo = new GiftEffectInfo();
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
@@ -3,6 +3,7 @@ package com.yizhuan.erban.avroom.widget;
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GIFT_COMPOUND;
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_ALBUM;
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME;
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L1;
 import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L2;
@@ -23,6 +24,7 @@ import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ROOM_DI
 import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ROOM_GIFT;

 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -42,6 +44,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
@@ -52,6 +55,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;

+import com.bumptech.glide.request.target.Target;
 import com.netease.nim.uikit.business.uinfo.UserInfoHelper;
 import com.netease.nim.uikit.common.ui.span.RadiusBackgroundSpan;
 import com.netease.nim.uikit.common.util.log.LogUtil;
@@ -59,6 +63,7 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessageExtension;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment;
+import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
 import com.netease.nimlib.sdk.msg.constant.NotificationType;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
@@ -67,13 +72,18 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.UIHelper;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.avroom.dialog.PKResultDialog;
+import com.yizhuan.erban.avroom.room_album.UnlockRoomAlbumPhotoDialog;
 import com.yizhuan.erban.common.util.Utils;
 import com.yizhuan.erban.common.widget.CustomAutoWidthImageSpan;
 import com.yizhuan.erban.common.widget.CustomImageSpan;
 import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan;
+import com.yizhuan.erban.community.photo.BigPhotoActivity;
+import com.yizhuan.erban.community.photo.PagerOption;
+import com.yizhuan.erban.community.utils.ObjectTypeHelper;
 import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper;
 import com.yizhuan.erban.treasurefairy.HomeFairyActivity;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
 import com.yizhuan.erban.ui.widget.DividerItemDecoration;
 import com.yizhuan.erban.ui.widget.MyItemAnimator;
 import com.yizhuan.erban.ui.widget.RecyclerViewNoViewpagerScroll;
@@ -93,6 +103,7 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
 import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver;
 import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts;
 import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
+import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox;
 import com.yizhuan.xchat_android_core.helper.ImHelperUtils;
 import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent;
 import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel;
@@ -119,16 +130,20 @@ import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageRoomMsgAttachment;
+import com.yizhuan.xchat_android_core.im.custom.bean.RoomAlbumAttachment;
+import com.yizhuan.xchat_android_core.im.custom.bean.RoomAlbumMsgInfo;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment;
+import com.yizhuan.xchat_android_core.im.custom.bean.RoomPhoto;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean;
+import com.yizhuan.xchat_android_core.im.custom.bean.User;
 import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.WelcomeAttachment;
 import com.yizhuan.xchat_android_core.level.UserLevelResourceType;
@@ -735,8 +750,28 @@ public class MessageView extends FrameLayout {
            this.data = data;
        }

+        @Override
+        public int getItemViewType(int position) {
+            ChatRoomMessage chatRoomMessage = data.get(position);
+            if (chatRoomMessage.getMsgType() == MsgTypeEnum.custom) {
+                MsgAttachment attachment = chatRoomMessage.getAttachment();
+                if (attachment instanceof CustomAttachment) {
+                    if (((CustomAttachment) attachment).getFirst() == CustomAttachment.CUSTOM_MSG_ROOM_ALBUM) {
+                        return CustomAttachment.CUSTOM_MSG_ROOM_ALBUM;
+                    }
+                }
+            }
+
+            return super.getItemViewType(position);
+        }
+
        @Override
        public MessageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            if (viewType == CustomAttachment.CUSTOM_MSG_ROOM_ALBUM) {
+                return new MessageViewHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.layout_msg_view_holder_room_album, parent, false));
+
+            }
            return new MessageViewHolder(LayoutInflater.from(parent.getContext())
                    .inflate(R.layout.list_item_chatrrom_msg, parent, false));
        }
@@ -995,6 +1030,8 @@ public class MessageView extends FrameLayout {
                        setGiftCompoundMsg(chatRoomMessage, tvContent);
                    } else if (first == CUSTOM_MSG_FAIRY) {
                        setFairyMsg(chatRoomMessage, tvContent);
+                    } else if (first == CUSTOM_MSG_ROOM_ALBUM) {
+                        setRoomAlbumMsg(chatRoomMessage, baseViewHolder);
                    } else {
                        tvContent.setTextColor(Color.WHITE);
                        tvContent.setText(tvContent.getResources().getText(R.string.not_support_message_tip));
@@ -1008,6 +1045,103 @@ public class MessageView extends FrameLayout {
            }
        }

+        private void setRoomAlbumMsg(ChatRoomMessage chatRoomMessage, MessageViewHolder baseViewHolder) {
+            RoomAlbumAttachment attachment = (RoomAlbumAttachment) chatRoomMessage.getAttachment();
+            RoomAlbumMsgInfo mRoomAlbumMsgInfo = attachment.getMRoomAlbumMsgInfo();
+
+            if (mRoomAlbumMsgInfo == null) {
+                return;
+            }
+
+            RoomPhoto roomPhoto = mRoomAlbumMsgInfo.getRoomPhoto();
+            User user = mRoomAlbumMsgInfo.getUser();
+            boolean isMyself = UserModel.get().isMyseft(user.getUid());
+
+            ImageView ivUserLevel = baseViewHolder.itemView.findViewById(R.id.iv_user_level);
+            ImageView ivUserCharm = baseViewHolder.itemView.findViewById(R.id.iv_user_charm);
+            ImageView ivPhoto = baseViewHolder.itemView.findViewById(R.id.iv_photo);
+            ImageView ivGift = baseViewHolder.itemView.findViewById(R.id.iv_gift);
+            ImageView ivDiamond = baseViewHolder.itemView.findViewById(R.id.iv_diamond);
+            TextView tvNick = baseViewHolder.itemView.findViewById(R.id.tv_nick);
+            TextView tvValue = baseViewHolder.itemView.findViewById(R.id.tv_value);
+            TextView tvUnlock = baseViewHolder.itemView.findViewById(R.id.tv_unlock);
+            View vBottomMask = baseViewHolder.itemView.findViewById(R.id.v_bottom_mask);
+
+            ImageLoadUtilsV2.loadImage2(ivUserLevel, mRoomAlbumMsgInfo.getUserLevel().getExperUrl(), Target.SIZE_ORIGINAL);
+            ImageLoadUtilsV2.loadImage2(ivUserCharm, mRoomAlbumMsgInfo.getUserLevel().getCharmUrl(), Target.SIZE_ORIGINAL);
+            tvNick.setText(user.getNick());
+            tvUnlock.setText("解鎖");
+            tvUnlock.setBackgroundResource(R.drawable.bg_9168fa_6);
+
+            if (roomPhoto.getType() == 1) {
+                vBottomMask.setVisibility(View.INVISIBLE);
+                ivGift.setVisibility(View.INVISIBLE);
+                ivDiamond.setVisibility(View.INVISIBLE);
+                tvValue.setVisibility(View.INVISIBLE);
+                tvUnlock.setVisibility(View.INVISIBLE);
+                ImageLoadUtilsV2.loadImage(ivPhoto, roomPhoto.getPhotoUrl());
+            } else {
+                vBottomMask.setVisibility(View.VISIBLE);
+                ivGift.setVisibility(View.VISIBLE);
+                ivDiamond.setVisibility(View.VISIBLE);
+                tvValue.setVisibility(View.VISIBLE);
+                tvUnlock.setVisibility(View.VISIBLE);
+
+                if (isMyself) {
+                    tvUnlock.setVisibility(View.INVISIBLE);
+                }
+
+                if (isMyself || hadUnlock(roomPhoto.getId())) {
+                    ImageLoadUtilsV2.loadImage(ivPhoto, roomPhoto.getPhotoUrl());
+                    tvUnlock.setText("已解鎖");
+                    tvUnlock.setBackgroundResource(R.drawable.bg_9e9ea8_6);
+                } else {
+                    ImageLoadUtils.loadImageWithBlur(mContext, roomPhoto.getPhotoUrl(), ivPhoto, 25, 4);
+                }
+
+                ImageLoadUtilsV2.loadImage(ivGift, roomPhoto.getGiftUrl());
+                tvValue.setText(String.valueOf(roomPhoto.getTotalGoldPrice()));
+            }
+
+            ivPhoto.setOnClickListener(v -> {
+                if (roomPhoto.getType() == 2 && !isMyself && !hadUnlock(roomPhoto.getId())) {
+                    unlockRoomPhoto(baseViewHolder.getAbsoluteAdapterPosition(), roomPhoto);
+                    return;
+                }
+
+                BigPhotoActivity.start((Activity) mContext, ObjectTypeHelper.pathToCustomItems(roomPhoto.getPhotoUrl()),
+                        0, new PagerOption());
+            });
+
+            baseViewHolder.itemView.setOnClickListener(v -> {
+                if (roomPhoto.getType() == 2 && !isMyself && !hadUnlock(roomPhoto.getId())) {
+                    unlockRoomPhoto(baseViewHolder.getAbsoluteAdapterPosition(), roomPhoto);
+                }
+            });
+
+
+            tvUnlock.setOnClickListener(v -> unlockRoomPhoto(baseViewHolder.getAbsoluteAdapterPosition(), roomPhoto));
+        }
+
+        private void unlockRoomPhoto(int position, RoomPhoto roomPhoto) {
+            UnlockRoomAlbumPhotoDialog unlockRoomAlbumPhotoDialog = UnlockRoomAlbumPhotoDialog.Companion
+                    .newInstance(roomPhoto.getId(), roomPhoto.getGiftUrl(), roomPhoto.getGiftName(), roomPhoto.getTotalGoldPrice());
+            unlockRoomAlbumPhotoDialog.setOnUnlockRoomPhotoListener(giftReceiveInfo -> {
+                giftReceiveInfo.setRoomAlbum(true);
+                GiftToolbox.sendGiftRoomMessage(giftReceiveInfo);
+
+                AvRoomDataManager.get().addUnlockedRoomAlbumPhoto(roomPhoto.getId());
+                notifyItemChanged(position);
+            });
+            unlockRoomAlbumPhotoDialog.show(mContext);
+
+        }
+
+        private boolean hadUnlock(int photoId) {
+            List<Integer> unlockedIds= AvRoomDataManager.get().getUnlockedRoomAlbumPhotos();
+            return unlockedIds.contains(photoId);
+        }
+
        private void setFairyMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) {
            if (chatRoomMessage.getAttachment() instanceof FairyMsgAttachment) {
                FairyMsgAttachment attachment = (FairyMsgAttachment) chatRoomMessage.getAttachment();
@@ -1326,7 +1460,7 @@ public class MessageView extends FrameLayout {
                case CustomAttachment.CUSTOM_MESS_TAROT_SENIOR_PRIZE_WINNING:
                    text.append(ResUtil.getString(R.string.avroom_widget_messageview_026), new ForegroundColorSpan(textColor))
                            .append(nickName, new ForegroundColorSpan(roomTipNickColor))
-                            .append(ResUtil.getString(R.string.avroom_widget_messageview_0160),  new ForegroundColorSpan(textColor))
+                            .append(ResUtil.getString(R.string.avroom_widget_messageview_0160), new ForegroundColorSpan(textColor))
                            .append(tarotMsgBean.getDrawGoldNum() + ResUtil.getString(R.string.avroom_widget_messageview_027), new ForegroundColorSpan(roomTipColor));
                    tvContent.setText(text.build());
                    break;
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
@@ -116,6 +116,9 @@ public class MicroView extends LinearLayout implements View.OnLayoutChangeListen
    }

    private void subMsg() {
+        if (isInEditMode()) {
+            return;
+        }
        subscribe = IMNetEaseManager.get()
                .getChatRoomEventObservable().subscribe(
                        roomEvent -> onReceiveRoomEvent(roomEvent),
--- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
@@ -35,7 +35,6 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -46,6 +45,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;

 import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

@@ -69,7 +69,8 @@ import com.yizhuan.erban.application.XChatApplication;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog;
 import com.yizhuan.erban.avroom.redpackage.RedPackageGoRoomDialog;
-import com.yizhuan.erban.avroom.redpackage.RedPackageOpenDialog;
+import com.yizhuan.erban.avroom.redpackage.RedPackageHandler;
+import com.yizhuan.erban.avroom.redpackage.open.RedPackageOpenDialog;
 import com.yizhuan.erban.common.LoadingFragment;
 import com.yizhuan.erban.common.NetworkErrorFragment;
 import com.yizhuan.erban.common.NoDataFragment;
@@ -89,10 +90,7 @@ import com.yizhuan.erban.ui.setting.ResetPasswordActivity;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
 import com.yizhuan.erban.ui.widget.DefaultToolBar;
 import com.yizhuan.erban.ui.widget.dialog.AllPlayEffectDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelOneDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelThreeDialog;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelTwoDialog;
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelDialog;
 import com.yizhuan.erban.ui.widget.dialog.AllServiceVipLevelUPDialog;
 import com.yizhuan.erban.ui.widget.dialog.OpenNobleGlobalNoticeDialog;
 import com.yizhuan.erban.utils.UserUtils;
@@ -103,7 +101,6 @@ import com.yizhuan.xchat_android_core.UriProvider;
 import com.yizhuan.xchat_android_core.bean.BaseProtocol;
 import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
 import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Attachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info;
 import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo;
@@ -123,6 +120,7 @@ import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
 import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
+import com.yizhuan.xchat_android_core.support.room.RoomContext;
 import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
@@ -130,7 +128,6 @@ import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
 import com.yizhuan.xchat_android_library.common.util.DeviceUtil;
 import com.yizhuan.xchat_android_library.rxbus.RxBus;
 import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
 import com.yizhuan.xchat_android_library.utils.NetworkUtils;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -958,10 +955,19 @@ public abstract class BaseActivity extends RxAppCompatActivity
                        return;
                    RedPackageNotifyInfo notifyInfo = new Gson().fromJson(String.valueOf(baseProtocol.getData()), RedPackageNotifyInfo.class);
                    RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
-                    if (roomInfo != null && roomInfo.getUid() == notifyInfo.getRoomUid() && context instanceof AVRoomActivity) {
-                        RedPackageOpenDialog.Companion.newInstance(notifyInfo).show(BaseActivity.this);
+                    RoomContext roomContext = RoomContext.Companion.get();
+                    RedPackageHandler redPackageHandler = null;
+                    if (roomContext != null) {
+                        redPackageHandler = roomContext.findAbility(RedPackageHandler.class.getSimpleName());
+                    }
+                    if (redPackageHandler != null) {
+                        redPackageHandler.onAllServiceSignaling(this, notifyInfo);
                    } else {
-                        RedPackageGoRoomDialog.Companion.newInstance(notifyInfo).show(this);
+                        if (roomInfo != null && roomInfo.getUid() == notifyInfo.getRoomUid() && context instanceof AVRoomActivity) {
+                            RedPackageOpenDialog.Companion.newInstance(notifyInfo).show(BaseActivity.this);
+                        } else {
+                            RedPackageGoRoomDialog.Companion.newInstance(notifyInfo).show(this);
+                        }
                    }
                }
            case CUSTOM_MSG_VIP:
@@ -1202,8 +1208,14 @@ public abstract class BaseActivity extends RxAppCompatActivity

    private void showGiftDialog() {
        if (giftList.size() == 0) return;
-        if (giftList.peekFirst() != null && !giftList.peekFirst().isHomeShow()) return;
-        giftDialog = generateAllServiceGiftDialog(this, giftList.peekFirst());
+        AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
+        if (data == null) {
+            return;
+        }
+        if (!data.isHomeShow()) {
+            return;
+        }
+        giftDialog = generateAllServiceGiftDialog(this, data);
        giftDialog.setOnDismissListener(dialog -> {
            giftList.pollFirst();
            AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
@@ -1222,19 +1234,8 @@ public abstract class BaseActivity extends RxAppCompatActivity
        }
    }

-    private AllServiceGiftDialog generateAllServiceGiftDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        switch (JavaUtil.str2int(dataBean.getLevelNum())) {
-            default:
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_1:
-                return new AllServiceGiftLevelOneDialog(context, dataBean);
-
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_2:
-
-                return new AllServiceGiftLevelTwoDialog(context, dataBean);
-
-            case AllServiceGiftDialog.ALL_SERVICE_GIFT_LEVEL_3:
-                return new AllServiceGiftLevelThreeDialog(context, dataBean);
-        }
+    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
+        return new AllServiceGiftLevelDialog(context, dataBean);
    }

    public void onGrabApprenticesEvent(GrabApprenticesEvent event) {
--- a/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt
@@ -14,9 +14,10 @@ import java.lang.reflect.ParameterizedType

 abstract class BaseDialog<T : ViewBinding> : RxDialogFragment() {

+    val isViewLoaded: Boolean get() = _binding != null
    private var _binding: T? = null
    private var onDismissListener: (() -> Unit)? = null
-    val binding get() = _binding
+    val binding get() = _binding!!
    open var width = ScreenUtil.getDialogWidth()
    open var height = WindowManager.LayoutParams.WRAP_CONTENT
    open var gravity = Gravity.CENTER
@@ -70,6 +71,7 @@ abstract class BaseDialog<T : ViewBinding> : RxDialogFragment() {
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
+        this.onDismissListener = null
    }

    abstract fun init()
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java
@@ -13,8 +13,8 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;

+import com.chuhai.core.component.SuperBottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.common.util.Utils;
 import com.yizhuan.erban.ui.widget.ButtonItem;
@@ -24,7 +24,7 @@ import java.util.List;
 /**
 * @author xiaoyu
 */
-public class CommonPopupDialog extends BottomSheetDialog implements OnClickListener {
+public class CommonPopupDialog extends SuperBottomSheetDialog implements OnClickListener {
    private static final int BUTTON_ITEM_ID = 135798642;

    private int mId;
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java
@@ -1,95 +0,0 @@
-package com.yizhuan.erban.home.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog;
-import com.yizhuan.erban.shipantics.PullRadishActivity;
-import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper;
-import com.yizhuan.erban.treasurefairy.HomeFairyActivity;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
-import com.yizhuan.erban.utils.CommonJumpHelper;
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
-
-import java.util.List;
-
-public class RoomActAdapter extends StaticPagerAdapter {
-
-    private Context mContext;
-    private List<BannerInfo> data;
-    private RoomActClickListener listener;
-
-    public RoomActAdapter(Context context, List<BannerInfo> data) {
-        this.data = data;
-        this.mContext = context;
-    }
-
-    @Override
-    public View getView(ViewGroup container, int position) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_room_act, container, false);
-        ImageView ivCover = view.findViewById(R.id.iv_cover);
-        BannerInfo bannerInfo = data.get(position);
-        String actId = String.valueOf(bannerInfo.getBannerId());
-        ivCover.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        if (bannerInfo.isFairy()) {
-            ivCover.setImageResource(R.drawable.ic_fairy_entrance);
-        } else if (bannerInfo.isFirstCharge()) {
-            ivCover.setImageResource(R.drawable.ic_first_charge_enter);
-        } else if (bannerInfo.isBox()) {
-            GlideApp.with(BasicConfig.INSTANCE.getAppContext())
-                    .load(GoldBoxHelper.getBoxIcon())
-                    .error(R.drawable.icon_room_treasure_box)
-                    .into(ivCover);
-        } else if (bannerInfo.isRadish()) {
-            ivCover.setImageResource(R.drawable.ic_radish_entrance);
-        } else {
-            ImageLoadUtils.loadImage(mContext, bannerInfo.getBannerPic(), ivCover, R.drawable.default_cover);
-        }
-        ivCover.setOnClickListener(v -> {
-            if (bannerInfo.isFairy()) {
-                HomeFairyActivity.start(mContext);
-            } else if (bannerInfo.isFirstCharge()) {
-                FirstChargeDialog.start(mContext);
-            } else if (bannerInfo.isBox()) {
-                GoldBoxHelper.handleBoxClick(mContext);
-            } else if (bannerInfo.isRadish()) {
-                PullRadishActivity.start(mContext);
-            } else {
-                AvRoomModel.get().activityClickLog("2", actId).subscribe();
-                if (bannerInfo.getSkipType() == 3 && bannerInfo.getShowType() != 1) {
-                    if (listener != null) {
-                        listener.onWebClick(bannerInfo.getSkipUri());
-                    }
-                } else {
-                    CommonJumpHelper.bannerJump(mContext, bannerInfo);
-                }
-            }
-        });
-        return view;
-    }
-
-    @Override
-    public int getCount() {
-        if (data != null) {
-            return data.size();
-        } else {
-            return 0;
-        }
-    }
-
-    public void setRoomActClickListener(RoomActClickListener listener) {
-        this.listener = listener;
-    }
-
-    public interface RoomActClickListener {
-        void onWebClick(String url);
-    }
-}
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.kt
@@ -0,0 +1,80 @@
+package com.yizhuan.erban.home.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import com.netease.nim.uikit.support.glide.GlideApp
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog
+import com.yizhuan.erban.shipantics.PullRadishActivity
+import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper
+import com.yizhuan.erban.treasurefairy.HomeFairyActivity
+import com.yizhuan.erban.ui.utils.ImageLoadUtils
+import com.yizhuan.erban.ui.webview.room_banner.RoomBannerWebDialogActivity
+import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter
+import com.yizhuan.erban.utils.CommonJumpHelper
+import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+import com.yizhuan.xchat_android_core.room.model.AvRoomModel
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig
+import okhttp3.internal.filterList
+
+class RoomActAdapter(private val mContext: Context, private val data: List<BannerInfo>) :
+    StaticPagerAdapter() {
+    override fun getView(container: ViewGroup, position: Int): View {
+        val view = LayoutInflater.from(mContext).inflate(R.layout.item_room_act, container, false)
+        val ivCover = view.findViewById<ImageView>(R.id.iv_cover)
+        val bannerInfo = data[position]
+        val actId = bannerInfo.bannerId.toString()
+        ivCover.scaleType = ImageView.ScaleType.CENTER_CROP
+        if (bannerInfo.isFairy) {
+            ivCover.setImageResource(R.drawable.ic_fairy_entrance)
+        } else if (bannerInfo.isFirstCharge) {
+            ivCover.setImageResource(R.drawable.ic_first_charge_enter)
+        } else if (bannerInfo.isBox) {
+            GlideApp.with(BasicConfig.INSTANCE.appContext)
+                .load(GoldBoxHelper.getBoxIcon())
+                .error(R.drawable.icon_room_treasure_box)
+                .into(ivCover)
+        } else if (bannerInfo.isRadish) {
+            ivCover.setImageResource(R.drawable.ic_radish_entrance)
+        } else {
+            ImageLoadUtils.loadImage(
+                mContext,
+                bannerInfo.bannerPic,
+                ivCover,
+                R.drawable.default_cover
+            )
+        }
+        ivCover.setOnClickListener { v: View? ->
+            if (bannerInfo.isFairy) {
+                HomeFairyActivity.start(mContext)
+            } else if (bannerInfo.isFirstCharge) {
+                FirstChargeDialog.start(mContext)
+            } else if (bannerInfo.isBox) {
+                GoldBoxHelper.handleBoxClick(mContext)
+            } else if (bannerInfo.isRadish) {
+                PullRadishActivity.start(mContext)
+            } else {
+                AvRoomModel.get().activityClickLog("2", actId).subscribe()
+                if (bannerInfo.skipType == 3) {
+                    val list = data.filterList {
+                        skipType == 3
+                    }
+                    val newPosition = list.indexOfFirst {
+                        it == bannerInfo
+                    }
+                    RoomBannerWebDialogActivity.start(mContext, newPosition, list)
+                } else {
+                    CommonJumpHelper.bannerJump(mContext, bannerInfo)
+                }
+            }
+        }
+        return view
+    }
+
+    override fun getCount(): Int {
+        return data.size
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt
@@ -57,8 +57,8 @@ class RoomNewFriendsAdapter :
        tvGenderAge.setGender(item.gender)

        //设置星座
-        val star = StarUtils.getConstellationString(Date(item.birth))
-        helper.setText(R.id.tv_constellation, star)
+        val star = StarUtils.getConstellation(Date(item.birth))
+        helper.setImageResource(R.id.iv_constellation, star)

        val tvTalk = helper.getView<TextView>(R.id.tv_talk)

--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt
@@ -8,6 +8,8 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.text.Editable
 import android.text.TextWatcher
+import android.widget.EditText
+import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseActivity
@@ -18,7 +20,6 @@ import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel
 import com.yizhuan.xchat_android_core.utils.net.RxHelper
 import com.yizhuan.xchat_android_library.utils.ResUtil
-import kotlinx.android.synthetic.main.activity_give_gold_search.*

 class GiveGoldSearchActivity : BaseActivity(), TextWatcher {

@@ -42,7 +43,7 @@ class GiveGoldSearchActivity : BaseActivity(), TextWatcher {
                .setPageSize(Int.MAX_VALUE)
                .setEmptyView(EmptyViewHelper.createEmptyTextView(this, ResUtil.getString(R.string.pay_activity_givegoldsearchactivity_01)))
                .setLayoutManager(LinearLayoutManager(this))
-                .setRecyclerView(recyclerView)
+                .setRecyclerView(findViewById(R.id.recyclerView))
                .setAdapter(adapter)
                .build()
        adapter.setOnItemClickListener { _, _, position ->
@@ -53,8 +54,8 @@ class GiveGoldSearchActivity : BaseActivity(), TextWatcher {
            })
            finish()
        }
-        editSearch.addTextChangedListener(this)
-        tvCancel.setOnClickListener { finish() }
+        findViewById<EditText>(R.id.editSearch).addTextChangedListener(this)
+        findViewById<TextView>(R.id.tvCancel).setOnClickListener { finish() }
    }

    override fun afterTextChanged(s: Editable?) {
--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
@@ -3,10 +3,10 @@ package com.yizhuan.erban.pay.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.widget.TextView
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseActivity
 import com.yizhuan.xchat_android_library.utils.ResUtil
-import kotlinx.android.synthetic.main.activity_give_gold_success.*

 class GiveGoldSuccessActivity : BaseActivity() {

@@ -24,9 +24,9 @@ class GiveGoldSuccessActivity : BaseActivity() {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_give_gold_success)
        initTitleBar(ResUtil.getString(R.string.pay_activity_givegoldsuccessactivity_01))
-        tvNickname.text = "轉贈給:${intent.getStringExtra("nickname")}"
-        tvGold.text = "${intent.getStringExtra("gold")?.toInt()}鉆石"
-        tvSure.setOnClickListener { finish() }
+        findViewById<TextView>(R.id.tvNickname).text = "轉贈給:${intent.getStringExtra("nickname")}"
+        findViewById<TextView>(R.id.tvGold).text = "${intent.getStringExtra("gold")?.toInt()}鉆石"
+        findViewById<TextView>(R.id.tvSure).setOnClickListener { finish() }
    }


--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
@@ -10,6 +10,7 @@ import android.text.TextWatcher
 import android.util.SparseArray
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -39,7 +40,6 @@ import com.yizhuan.xchat_android_core.pay.PayModel
 import com.yizhuan.xchat_android_core.user.UserModel
 import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo
 import com.yizhuan.xchat_android_library.utils.ResUtil
-import kotlinx.android.synthetic.main.activity_give_gold_to_user.*

 class GiveGoldToUserActivity : BaseViewBindingActivity<ActivityGiveGoldToUserBinding>(),
    GridPasswordNoFocusView.OnPasswordChangedListener,
@@ -371,7 +371,7 @@ class GiveGoldToUserActivity : BaseViewBindingActivity<ActivityGiveGoldToUserBin
        if (password.length == 6) {
            searchUserInfo?.apply {
                dialogManager.showProgressDialog(context)
-                PayModel.get().giveGold(uid, mEditGold.text.toString(), DESAndBase64(password))
+                PayModel.get().giveGold(uid, findViewById<EditText>(R.id.mEditGold).text.toString(), DESAndBase64(password))
                    .compose(bindToLifecycle())
                    .doOnError {
                        toast(it.message)
--- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java
@@ -120,7 +120,7 @@ public class NimTeamMessageFragment extends MessageFragment {
    @Subscribe(threadMode = ThreadMode.MAIN)
    @SuppressLint("CheckResult")
    public void onNimAudioChatEvent(NimAudioChatEvent event) {
-        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO)
+        checkPermission(Manifest.permission.RECORD_AUDIO)
                .subscribe(result -> {
                    if (result) {
                        event.getSuccess().accept(result);
@@ -133,7 +133,7 @@ public class NimTeamMessageFragment extends MessageFragment {
    @Subscribe(threadMode = ThreadMode.MAIN)
    @SuppressLint("CheckResult")
    public void onNimImageActionEvent(NimImageActionEvent event) {
-        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA)
+        checkPermission(Manifest.permission.CAMERA)
                .subscribe(result -> {
                    if (result) {
                        event.getSuccess().accept(result);
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt
@@ -10,7 +10,19 @@ import com.yizhuan.erban.treasurefairy.event.UpdateDataEvent
 import com.yizhuan.erban.treasurefairy.view.MyFairyItemView
 import com.yizhuan.xchat_android_core.bean.response.ListResult
 import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo
-import com.yizhuan.xchat_android_core.treasurefairy.*
+import com.yizhuan.xchat_android_core.treasurefairy.Compound
+import com.yizhuan.xchat_android_core.treasurefairy.DrawInfo
+import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo
+import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo
+import com.yizhuan.xchat_android_core.treasurefairy.FairyResolveParam
+import com.yizhuan.xchat_android_core.treasurefairy.FairyTestParam
+import com.yizhuan.xchat_android_core.treasurefairy.ForestInfo
+import com.yizhuan.xchat_android_core.treasurefairy.MyFairyInfo
+import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo
+import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo
+import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo
+import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo
+import com.yizhuan.xchat_android_core.treasurefairy.TreasureFairyModel
 import com.yizhuan.xchat_android_core.utils.net.ServerException
 import com.yizhuan.xchat_android_core.utils.toast
 import org.greenrobot.eventbus.EventBus
@@ -95,8 +107,8 @@ class FairyViewModel : BaseViewModel() {
    val exchangeDebrisRecordLiveData: LiveData<ListResult<ExchangeGiftInfo>> =
        _exchangeDebrisRecordLiveData

-    private val _buyDebrisLiveData = MutableLiveData<String?>()
-    val buyDebrisLiveData: LiveData<String?> = _buyDebrisLiveData
+    private val _buyDebrisLiveData = MutableLiveData<Event<Int>>()
+    val buyDebrisLiveData: LiveData<Event<Int>> = _buyDebrisLiveData

    init {
        initPrizeInfoList()
@@ -506,6 +518,7 @@ class FairyViewModel : BaseViewModel() {
            val result = TreasureFairyModel.exchangeGift(itemId)
            _debrisExchangeLiveData.value = result?.let { Event(it) }
            _myFairyInfoLiveData.value = TreasureFairyModel.getMyFairyInfo()
+            initDrawInfo()
        }
    }

@@ -539,11 +552,19 @@ class FairyViewModel : BaseViewModel() {
        )
    }

-    fun buyDebris(num: String, uid: String) {
+    fun buyDebris(num: Int, uid: String) {
        safeLaunch(
            block = {
-                val result = TreasureFairyModel.buyDebris(num, uid)
-                _buyDebrisLiveData.value = result
+                TreasureFairyModel.buyDebris(num, uid)
+
+                _drawInfoLiveData.value?.apply {
+                    this.drawTicketNum = this.drawTicketNum + num
+                    _drawInfoLiveData.value = this
+                }
+
+                initDrawInfo()
+
+                _buyDebrisLiveData.value = Event(num)
            }
        )
    }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
@@ -10,21 +10,26 @@ import android.os.Build
 import android.os.Bundle
 import android.text.style.ForegroundColorSpan
 import android.view.*
+import android.view.animation.AnimationUtils
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.toColorInt
+import androidx.core.widget.doAfterTextChanged
 import com.alibaba.fastjson.JSON
+import com.hjq.toast.ToastUtils
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingActivity
 import com.yizhuan.erban.common.widget.dialog.DialogManager
 import com.yizhuan.erban.databinding.TreasureFairyDialogHomeBinding
+import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity
 import com.yizhuan.erban.treasurefairy.dialog.*
 import com.yizhuan.erban.treasurefairy.view.CustomDrawable
 import com.yizhuan.erban.ui.webview.FairyDialogWebViewActivity
+import com.yizhuan.erban.utils.KeyBoardUtils
 import com.yizhuan.erban.utils.SpannableBuilder
 import com.yizhuan.xchat_android_core.UriProvider
 import com.yizhuan.xchat_android_core.auth.AuthModel
@@ -40,6 +45,7 @@ import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo
 import com.yizhuan.xchat_android_library.common.SpConstants
 import com.yizhuan.xchat_android_library.common.util.SPUtils
 import com.yizhuan.xchat_android_library.utils.FormatUtils
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
 import com.yizhuan.xchat_android_library.utils.TimeUtils
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -64,8 +70,6 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding

    private var isCheck = false

-    private var isSelect = false
-
    private var mPrice = -1

    companion object {
@@ -113,26 +117,57 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
        binding.viewPrice3.setOnClickListener {
            setFairyPriceSelect(3)
        }
-        binding.tvBuy.setOnClickListener {
-            if (!isSelect) {
-                toast("請選擇購買的碎片數量")
-            } else {
-                val date = SPUtils.getLong(SpConstants.FAIRY_BUY_DEBRIS, 0L)
-                if (date != 0L) {
-                    if (TimeUtils.isToday(date)) {
-                        viewModel.buyDebris(
-                            mPrice.toString(),
-                            AuthModel.get().currentUid.toString()
+
+        binding.etQuantity.doAfterTextChanged {
+            try {
+                mPrice = it.toString().toInt()
+                if (mPrice > TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT) {
+                    mPrice = TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
+                    binding.etQuantity.setText(mPrice.toString())
+                    binding.etQuantity.setSelection(binding.etQuantity.text.length)
+                    SingleToastUtil.showToast(
+                        getString(
+                            R.string.treasure_box_activity_treasureboxactivity_01,
+                            TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
                        )
-                    } else {
-                        FairyBuyDebrisDialog.newInstance(mPrice).show(context)
-                    }
-                } else {
-                    FairyBuyDebrisDialog.newInstance(mPrice).show(context)
+                    )
                }
+                setFairyPriceSelect(0)
+            } catch (e: NumberFormatException) {
+                e.printStackTrace()
+                mPrice = -1
            }
        }

+        binding.tvBuy.setOnClickListener {
+            if (mPrice < 1) {
+                toast("請選擇購買的碎片數量")
+                return@setOnClickListener
+            }
+
+            val date = SPUtils.getLong(SpConstants.FAIRY_BUY_DEBRIS, 0L)
+            if (TimeUtils.isToday(date)) {
+                viewModel.buyDebris(
+                    mPrice,
+                    AuthModel.get().currentUid.toString()
+                )
+                return@setOnClickListener
+            }
+
+            FairyBuyDebrisDialog.newInstance(mPrice).show(context)
+        }
+
+        viewModel.buyDebrisLiveData.observe(this) {
+            val date = SPUtils.getLong(SpConstants.FAIRY_BUY_SUCCESS, 0L)
+            if (TimeUtils.isToday(date)) {
+                ToastUtils.show("購買碎片成功")
+                return@observe
+            }
+
+            FairyBuySuccessDialog.newInstance(it.peekContent()).show(this)
+
+        }
+
        binding.ivMyFairy.setOnClickListener {
            MyFairyDialog.newInstance().show(this)
        }
@@ -184,14 +219,16 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
            isCheck = isChecked
        }

-        binding.ivRefresh.setOnClickListener {
+        binding.viewBgLuckyValue.setOnClickListener {
+            binding.ivRefresh.startAnimation(
+                AnimationUtils.loadAnimation(
+                    this,
+                    R.anim.comm_loading
+                )
+            )
            viewModel.initDrawInfo()
        }

-        viewModel.buyDebrisLiveData.observe(this) {
-            toast("購買碎片成功")
-        }
-
        viewModel.prizeInfoListLiveData.observe(this) {
            it?.forEachIndexed { index, prizeInfo ->
                if (index < fairyItems.size) {
@@ -206,6 +243,9 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                    ?.indexOfFirst { prize ->
                        it[0].itemIndex == prize.itemIndex
                    } ?: -2
+                if (targetIndex >= fairyItems.size) {
+                    targetIndex = 0
+                }
                if (targetIndex == -2) {
                    viewModel.initPrizeInfoList()
                }
@@ -217,6 +257,8 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
        }

        viewModel.drawInfoLiveData.observe(this) {
+            binding.ivRefresh.clearAnimation()
+
            it?.let {
                drawInfo = it
                binding.tvKeyNum.text = FormatUtils.formatBigNum(it.drawTicketNum.toString())
@@ -226,7 +268,10 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                    SpannableBuilder()
                        .append("還差", ForegroundColorSpan("#59FDFF".toColorInt()))
                        .append("${it.needLuckyNum}", ForegroundColorSpan("#FFE8AA".toColorInt()))
-                        .append("幸運值，額外獲贈傳説精靈", ForegroundColorSpan("#59FDFF".toColorInt()))
+                        .append(
+                            "幸運值，額外獲贈傳説精靈",
+                            ForegroundColorSpan("#59FDFF".toColorInt())
+                        )
                        .build()
                binding.ivLuckyStone.post {
                    val drawable =
@@ -242,7 +287,8 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                        0f,
                        binding.ivLuckyStone.width.toFloat(),
                        binding.ivLuckyStone.height *
-                                (1 - it.luckyNum / it.needLuckyNum.toFloat().coerceAtLeast(1f)),
+                                (1 - it.luckyNum / (it.luckyNum + it.needLuckyNum).toFloat()
+                                    .coerceAtLeast(1f)),
                        Path.Direction.CW
                    )
                    drawable.setSrcPath(path)
@@ -253,7 +299,11 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding

        viewModel.showGetKeyLiveData.observe(this) {
            it.getContentIfNotHandled()?.let {
-                DialogManager(context).showOkCancelDialog("購買限時裝扮活動奪寶券", "去參与", "取消") {
+                DialogManager(context).showOkCancelDialog(
+                    "購買限時裝扮活動奪寶券",
+                    "去參与",
+                    "取消"
+                ) {
                    FairyDialogWebViewActivity.start(context, UriProvider.getFairyKey())
                }
            }
@@ -261,7 +311,23 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
    }

    private fun setFairyPriceSelect(pos: Int) {
-        isSelect = true
+        if (pos == 0) {
+            binding.viewPrice1.isSelected = false
+            binding.viewPrice2.isSelected = false
+            binding.viewPrice3.isSelected = false
+            binding.ivDebris1.alpha = 0.4f
+            binding.ivDebris2.alpha = 0.4f
+            binding.ivDebris3.alpha = 0.4f
+            binding.tvOne.alpha = 0.4f
+            binding.tvTwo.alpha = 0.4f
+            binding.tvThree.alpha = 0.4f
+            return
+        }
+
+        binding.etQuantity.text = null
+        KeyBoardUtils.hideKeyBoard(this, binding.etQuantity)
+        binding.etQuantity.clearFocus()
+
        when (pos) {
            1 -> {
                mPrice = 1
@@ -275,6 +341,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                binding.tvTwo.alpha = 0.4f
                binding.tvThree.alpha = 0.4f
            }
+
            2 -> {
                mPrice = 10
                binding.viewPrice1.isSelected = false
@@ -287,6 +354,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                binding.tvTwo.alpha = 1f
                binding.tvThree.alpha = 0.4f
            }
+
            3 -> {
                mPrice = 100
                binding.viewPrice1.isSelected = false
@@ -307,9 +375,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
        if (keyNum >= num) {
            return true
        }
-        DialogManager(context).showOkCancelDialog("購買限時裝扮活動奪寶券", "去參与", "取消") {
-            FairyDialogWebViewActivity.start(context, UriProvider.getFairyKey())
-        }
+        FairyBuyDebrisModifyQuantityDialog.newInstance(num).show(this)
        return false
    }

@@ -446,6 +512,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                        )
                }
            }
+
            CustomAttachment.CUSTOM_MSG_LUCKY_SEA -> if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL) {
                val attachment = RoomLuckySeaAttachment(
                    CustomAttachment.CUSTOM_MSG_LUCKY_SEA,
@@ -465,6 +532,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                IMNetEaseManager.get()
                    .noticeRoomEvent(message, RoomEvent.LUCKY_SEA_GIFT_SERVER_NOTIFY)
            }
+
            CustomAttachment.CUSTOM_MSG_LUCKY_GIFT -> if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY || baseProtocol.second == CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL) {
                val attachment =
                    RoomReceivedLuckyGiftAttachment(CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY)
@@ -479,6 +547,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                IMNetEaseManager.get().noticeServiceLuckyBagNotice(message)
                IMNetEaseManager.get().addMessages(message)
            }
+
            CustomAttachment.CUSTOM_MSG_FAIRY -> if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5) {
                val attachment = FairyMsgAttachment(
                    CustomAttachment.CUSTOM_MSG_FAIRY,
@@ -494,6 +563,7 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
                )
                IMNetEaseManager.get().noticeRoomEvent(message, RoomEvent.FAIRY_DRAW_GIFT_L5)
            }
+
            else -> {}
        }
    }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/ExchangeDebrisAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/ExchangeDebrisAdapter.kt
@@ -13,6 +13,7 @@ class ExchangeDebrisAdapter :
        ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_prize_icon), item.rewardPicUrl)
        helper.setText(R.id.tv_prize_name, item.getPrizeName())

+        helper.setText(R.id.tv_value, item.expendNum.toString())
        helper.addOnClickListener(R.id.tv_exchange)
    }

--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt
@@ -18,13 +18,6 @@ class ExchangeFairyRecordAdapter :
        helper.setText(R.id.tv_time_year, formatYear.format(item.createTime))
        helper.setText(R.id.tv_time_hour, formatHour.format(item.createTime))
        helper.setText(R.id.tv_prize_name, "${item.rewardName}x${item.rewardNum}")
-        helper.setText(
-            R.id.tv_prize_type, when (item.convertLevel) {
-                1 -> mContext.getString(R.string.fairy_primary_call)
-                2 -> mContext.getString(R.string.fairy_epic_call)
-                else -> mContext.getString(R.string.fairy_legend_call)
-            }
-        )
    }

 }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt
@@ -19,8 +19,9 @@ class TestFairyRecordAdapter :
        helper.setText(R.id.tv_time_hour, formatHour.format(item.createTime))
        helper.setText(R.id.tv_prize_name, item.elfName)
        helper.setText(
-            R.id.tv_prize_type, when (item.elfLevel) {
-                2 -> "史詩試煉"
+            R.id.tv_prize_type, when (item.type) {
+                4 -> "傳說試煉"
+                7 -> "精靈分解"
                else -> "傳說試煉"
            }
        )
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ExchangeFairyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ExchangeFairyDialog.kt
@@ -33,28 +33,28 @@ class ExchangeFairyDialog : BaseDialog<TreasureFairyDialogExchangeBinding>() {

    @SuppressLint("CheckResult")
    override fun init() {
-        binding?.ivBack?.setOnClickListener {
+        binding.ivBack.setOnClickListener {
            dismissAllowingStateLoss()
        }
-        binding?.tvRecord?.setOnClickListener {
+        binding.tvRecord.setOnClickListener {
            ExchangeRecordDialog.newInstance().show(context)
        }
-        binding?.rg?.setOnCheckedChangeListener { _, checkedId ->
+        binding.rg.setOnCheckedChangeListener { _, checkedId ->
            when (checkedId) {
-                R.id.rb_epic -> binding?.viewPager?.currentItem = 0
-                R.id.rb_legend -> binding?.viewPager?.currentItem = 1
+                R.id.rb_epic -> binding.viewPager.currentItem = 0
+                R.id.rb_legend -> binding.viewPager.currentItem = 1
            }
        }
-        binding?.viewPager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+        binding.viewPager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
            override fun onPageSelected(position: Int) {
                when (position) {
-                    0 -> binding?.rg?.check(R.id.rb_epic)
-                    1 -> binding?.rg?.check(R.id.rb_legend)
+                    0 -> binding.rg.check(R.id.rb_epic)
+                    1 -> binding.rg.check(R.id.rb_legend)
                }
            }
        })

-        binding?.viewPager?.adapter = RoomVPAdapter(
+        binding.viewPager.adapter = RoomVPAdapter(
            childFragmentManager,
            listOf(
                ExchangeSummonFragment.newInstance(),
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/FairyBuyDebrisDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/FairyBuyDebrisDialog.kt
@@ -4,16 +4,15 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.Gravity
 import android.view.WindowManager
-import androidx.fragment.app.viewModels
-import com.hjq.toast.ToastUtils
+import androidx.fragment.app.activityViewModels
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseDialog
 import com.yizhuan.erban.databinding.TreasureFairyDialogBuyDebrisBinding
 import com.yizhuan.erban.treasurefairy.FairyViewModel
 import com.yizhuan.xchat_android_core.auth.AuthModel
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
 import com.yizhuan.xchat_android_library.common.SpConstants
 import com.yizhuan.xchat_android_library.common.util.SPUtils
-import com.yizhuan.xchat_android_library.utils.TimeUtils

 /**
 * 购买碎片
@@ -23,7 +22,7 @@ class FairyBuyDebrisDialog : BaseDialog<TreasureFairyDialogBuyDebrisBinding>() {
    override var width = WindowManager.LayoutParams.MATCH_PARENT
    override var height = WindowManager.LayoutParams.WRAP_CONTENT
    override var gravity = Gravity.CENTER
-    private val viewModel: FairyViewModel by viewModels()
+    private val viewModel: FairyViewModel by activityViewModels()

    companion object {
        fun newInstance(num: Int): FairyBuyDebrisDialog {
@@ -36,13 +35,15 @@ class FairyBuyDebrisDialog : BaseDialog<TreasureFairyDialogBuyDebrisBinding>() {
    }

    private val num by lazy { requireArguments().getInt("num") }
+    private val price by lazy { AvRoomDataManager.get().mSeizeTreasureSwitchVo?.price ?: 0 }
+

    @SuppressLint("CheckResult")
    override fun init() {
-        binding?.tvDebrisNum?.text = getString(R.string.buy_debris, num)
-        binding?.tvPrizeName?.text = (num * 100).toString()
+        binding.tvDebrisNum.text = getString(R.string.buy_debris, num)
+        binding.tvPrizeName.text = (num * price).toString()

-        binding?.cbPay?.setOnCheckedChangeListener { _, isChecked ->
+        binding.cbPay.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                SPUtils.putLong(SpConstants.FAIRY_BUY_DEBRIS, System.currentTimeMillis())
            } else {
@@ -50,24 +51,15 @@ class FairyBuyDebrisDialog : BaseDialog<TreasureFairyDialogBuyDebrisBinding>() {
            }
        }

-        binding?.tvBuy?.setOnClickListener {
-            viewModel.buyDebris(num.toString(), AuthModel.get().currentUid.toString())
+        binding.tvBuy.setOnClickListener {
+            viewModel.buyDebris(num, AuthModel.get().currentUid.toString())
        }

        viewModel.buyDebrisLiveData.observe(this) {
-            val date = SPUtils.getLong(SpConstants.FAIRY_BUY_SUCCESS, 0L)
-            if (date != 0L) {
-                if (TimeUtils.isToday(date)) {
-                    ToastUtils.show("購買碎片成功")
-                } else {
-                    FairyBuySuccessDialog.newInstance(num).show(context)
-                }
-            } else {
-                FairyBuySuccessDialog.newInstance(num).show(context)
+            it.getContentIfNotHandled()?.let {
+                dismissAllowingStateLoss()
            }
-            dismissAllowingStateLoss()
        }
-
    }

 }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt
@@ -0,0 +1,102 @@
+package com.yizhuan.erban.treasurefairy.dialog
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.Gravity
+import android.view.WindowManager
+import androidx.core.widget.doAfterTextChanged
+import androidx.fragment.app.activityViewModels
+import com.yizhuan.erban.R
+import com.yizhuan.erban.base.BaseDialog
+import com.yizhuan.erban.databinding.TreasureFairyDialogBuyDebrisModifyQuantityBinding
+import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity
+import com.yizhuan.erban.treasurefairy.FairyViewModel
+import com.yizhuan.xchat_android_core.auth.AuthModel
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.utils.StringUtils
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+
+/**
+ * 购买碎片
+ */
+class FairyBuyDebrisModifyQuantityDialog :
+    BaseDialog<TreasureFairyDialogBuyDebrisModifyQuantityBinding>() {
+
+    override var width = WindowManager.LayoutParams.MATCH_PARENT
+    override var height = WindowManager.LayoutParams.WRAP_CONTENT
+    override var gravity = Gravity.CENTER
+    private val viewModel: FairyViewModel by activityViewModels()
+
+    companion object {
+        fun newInstance(num: Int): FairyBuyDebrisModifyQuantityDialog {
+            val args = Bundle()
+            args.putInt("num", num)
+            val fragment = FairyBuyDebrisModifyQuantityDialog()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    private var num = 0
+    private val price by lazy { AvRoomDataManager.get().mSeizeTreasureSwitchVo?.price ?: 0 }
+
+    @SuppressLint("CheckResult")
+    override fun init() {
+        num = requireArguments().getInt("num")
+
+        binding.etNum.setText(num.toString())
+        binding.tvPrizeName.text = (num * price).toString()
+
+        binding.ivDecrease.setOnClickListener {
+            num = (num - 10).coerceAtLeast(1)
+            binding.etNum.setText(num.toString())
+            binding.etNum.setSelection(num.toString().length)
+            binding.tvPrizeName.text = (num * price).toString()
+        }
+
+        binding.ivIncrease.setOnClickListener {
+            num = (num + 10).coerceAtMost(200)
+            binding.etNum.setText(num.toString())
+            binding.etNum.setSelection(num.toString().length)
+            binding.tvPrizeName.text = (num * price).toString()
+        }
+
+        binding.etNum.doAfterTextChanged {
+            var n = StringUtils.toInt(binding.etNum.text.toString(), 0)
+
+            if (n < 1) {
+                binding.etNum.setText("1")
+                binding.etNum.setSelection(1)
+                num = 1
+                return@doAfterTextChanged
+            }
+
+            if (n > TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT) {
+                n = TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
+                binding.etNum.setText(n.toString())
+                binding.etNum.setSelection(n.toString().length)
+                SingleToastUtil.showToast(
+                    getString(
+                        R.string.treasure_box_activity_treasureboxactivity_01,
+                        TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
+                    )
+                )
+            }
+            binding.tvPrizeName.text = (n * price).toString()
+            num = n
+        }
+
+
+        binding.tvBuy.setOnClickListener {
+            viewModel.buyDebris(num, AuthModel.get().currentUid.toString())
+        }
+
+        viewModel.buyDebrisLiveData.observe(this) {
+            it.getContentIfNotHandled()?.let {
+                dismissAllowingStateLoss()
+            }
+        }
+
+    }
+
+}
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/FairyBuySuccessDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/FairyBuySuccessDialog.kt
@@ -34,9 +34,9 @@ class FairyBuySuccessDialog : BaseDialog<TreasureFairyDialogBuySuccessBinding>()

    @SuppressLint("CheckResult", "SetTextI18n")
    override fun init() {
-        binding?.tvDebrisNum?.text = "x${num}"
+        binding.tvDebrisNum.text = "x${num}"

-        binding?.cbPay?.setOnCheckedChangeListener { buttonView, isChecked ->
+        binding.cbPay.setOnCheckedChangeListener { buttonView, isChecked ->
            if (isChecked) {
                SPUtils.putLong(SpConstants.FAIRY_BUY_SUCCESS, System.currentTimeMillis())
            } else {
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/HomePrizeDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/HomePrizeDialog.kt
@@ -34,7 +34,7 @@ class HomePrizeDialog : BaseDialog<TreasureFairyDialogHomePrizeBinding>() {

    @SuppressLint("CheckResult")
    override fun init() {
-        binding?.rootView?.setOnClickListener {
+        binding.rootView.setOnClickListener {
            dismissAllowingStateLoss()
        }
        val prizeInfoList = viewModel.resultLiveData.value?.peekContent()
@@ -43,7 +43,7 @@ class HomePrizeDialog : BaseDialog<TreasureFairyDialogHomePrizeBinding>() {
        prizeAdapter = HomePrizeAdapter(isSingle)
        rvDelegate = RVDelegate.Builder<PrizeInfo>()
            .setAdapter(prizeAdapter)
-            .setRecyclerView(binding?.recyclerView)
+            .setRecyclerView(binding.recyclerView)
            .setLayoutManager(
                if (isSingle) {
                    LinearLayoutManager(context)
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairyDialog.kt
@@ -39,31 +39,31 @@ class MyFairyDialog : BaseDialog<TreasureFairyDialogMyFairyBinding>() {
    override fun init() {
        EventBus.getDefault().register(this)

-        binding?.ivBack?.setOnClickListener {
+        binding.ivBack.setOnClickListener {
            dismissAllowingStateLoss()
        }
-        binding?.ivFairyTest?.setOnClickListener {
+        binding.ivFairyTest.setOnClickListener {
            TestFairyDialog.newInstance().show(context)
        }
-        binding?.ivRecord?.setOnClickListener {
+        binding.ivRecord.setOnClickListener {
            MyFairyRecordDialog.newInstance().show(context)
        }
-        binding?.rg?.setOnCheckedChangeListener { _, checkedId ->
+        binding.rg.setOnCheckedChangeListener { _, checkedId ->
            when (checkedId) {
-                R.id.rb_base -> binding?.viewPager?.currentItem = 0
-                R.id.rb_legend -> binding?.viewPager?.currentItem = 1
+                R.id.rb_base -> binding.viewPager.currentItem = 0
+                R.id.rb_legend -> binding.viewPager.currentItem = 1
            }
        }
-        binding?.viewPager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+        binding.viewPager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
            override fun onPageSelected(position: Int) {
                when (position) {
-                    0 -> binding?.rg?.check(R.id.rb_base)
-                    1 -> binding?.rg?.check(R.id.rb_legend)
+                    0 -> binding.rg.check(R.id.rb_base)
+                    1 -> binding.rg.check(R.id.rb_legend)
                }
                DemoCache.saveMyFairyIndex(position)
            }
        })
-        binding?.viewPager?.adapter = RoomVPAdapter(
+        binding.viewPager.adapter = RoomVPAdapter(
            childFragmentManager,
            listOf(
                MyFairyFragment.newInstance(MyFairyItemView.BASE),
@@ -71,7 +71,7 @@ class MyFairyDialog : BaseDialog<TreasureFairyDialogMyFairyBinding>() {
            )
        )

-        binding?.viewPager?.setCurrentItem(DemoCache.readMyFairyIndex(), false)
+        binding.viewPager.setCurrentItem(DemoCache.readMyFairyIndex(), false)

        viewModel.getMyFairyInfo()
    }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ResolveFairyResultDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ResolveFairyResultDialog.kt
@@ -36,13 +36,13 @@ class ResolveFairyResultDialog : BaseDialog<TreasureFairyDialogResolveFairyResul
    private val resolveInfo by lazy { requireArguments().getSerializable("resolveInfo") as ResolveInfo }
    @SuppressLint("CheckResult")
    override fun init() {
-        binding?.tvClose?.setOnClickListener {
+        binding.tvClose.setOnClickListener {
            dismissAllowingStateLoss()
        }
        prizeAdapter = ResolveFairyResultAdapter()
        rvDelegate = RVDelegate.Builder<ResolveInfo>()
            .setAdapter(prizeAdapter)
-            .setRecyclerView(binding?.recyclerView)
+            .setRecyclerView(binding.recyclerView)
            .setLayoutManager(
                LinearLayoutManager(context)
            )
@@ -50,6 +50,7 @@ class ResolveFairyResultDialog : BaseDialog<TreasureFairyDialogResolveFairyResul

        rvDelegate.setNewData(arrayListOf(resolveInfo))
        viewModel.cleanTestParam()
+        viewModel.initDrawInfo()
    }

 }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyDialog.kt
@@ -32,29 +32,29 @@ class TestFairyDialog : BaseDialog<TreasureFairyDialogTestFairyBinding>() {

    @SuppressLint("CheckResult")
    override fun init() {
-        binding?.ivBack?.setOnClickListener {
+        binding.ivBack.setOnClickListener {
            dismissAllowingStateLoss()
        }
-        binding?.tvRecord?.setOnClickListener {
+        binding.tvRecord.setOnClickListener {
            TestFairyRecordDialog.newInstance().show(context)
        }
-        binding?.rg?.setOnCheckedChangeListener { _, checkedId ->
+        binding.rg.setOnCheckedChangeListener { _, checkedId ->
            when (checkedId) {
-                R.id.rb_epic -> binding?.viewPager?.currentItem = 0
-                R.id.rb_legend -> binding?.viewPager?.currentItem = 1
+                R.id.rb_epic -> binding.viewPager.currentItem = 0
+                R.id.rb_legend -> binding.viewPager.currentItem = 1
            }
        }
-        binding?.viewPager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+        binding.viewPager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
            override fun onPageSelected(position: Int) {
                when (position) {
-                    0 -> binding?.rg?.check(R.id.rb_epic)
-                    1 -> binding?.rg?.check(R.id.rb_legend)
+                    0 -> binding.rg.check(R.id.rb_epic)
+                    1 -> binding.rg.check(R.id.rb_legend)
                }
                viewModel.cleanTestParam()
            }
        })

-        binding?.viewPager?.adapter = RoomVPAdapter(
+        binding.viewPager.adapter = RoomVPAdapter(
            childFragmentManager,
            listOf(
                TestFairyFragment.newInstance(MyFairyItemView.BASE),
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyResultDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyResultDialog.kt
@@ -36,13 +36,13 @@ class TestFairyResultDialog : BaseDialog<TreasureFairyDialogTestFairyResultBindi
    private val fairyInfo by lazy { requireArguments().getSerializable("fairyInfo") as FairyInfo }
    @SuppressLint("CheckResult")
    override fun init() {
-        binding?.tvClose?.setOnClickListener {
+        binding.tvClose.setOnClickListener {
            dismissAllowingStateLoss()
        }
        prizeAdapter = TestFairyResultAdapter()
        rvDelegate = RVDelegate.Builder<FairyInfo>()
            .setAdapter(prizeAdapter)
-            .setRecyclerView(binding?.recyclerView)
+            .setRecyclerView(binding.recyclerView)
            .setLayoutManager(
                LinearLayoutManager(context)
            )
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt
@@ -2,9 +2,8 @@ package com.yizhuan.erban.treasurefairy.fragment

 import android.annotation.SuppressLint
 import android.os.Bundle
-import androidx.activity.viewModels
+import android.view.View
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yizhuan.erban.R
@@ -32,7 +31,7 @@ class ExchangeDebrisFragment :
        }
    }

-    private val viewModel: FairyViewModel by viewModels()
+    private val viewModel: FairyViewModel by activityViewModels()
    private lateinit var rvDelegate: RVDelegate<ExchangeGiftInfo>
    private lateinit var debrisAdapter: ExchangeDebrisAdapter

@@ -50,9 +49,6 @@ class ExchangeDebrisFragment :
            )
            .setLayoutManager(GridLayoutManager(context, 2, LinearLayoutManager.VERTICAL, false))
            .build()
-        viewModel.fairyCallInfoLiveData.observe(viewLifecycleOwner) {
-            rvDelegate.setNewData(it)
-        }
        viewModel.debrisExchangeListLiveData.observe(viewLifecycleOwner) {
            rvDelegate.setNewData(it)
        }
@@ -67,6 +63,8 @@ class ExchangeDebrisFragment :
        viewModel.getDebrisExchangeList()
        viewModel.getMyFairyInfo()

+        binding.llMyDebris.visibility = View.VISIBLE
+        binding.rvMyFairy.visibility = View.GONE
        viewModel.myFairyInfoLiveData.observe(viewLifecycleOwner) {
            it?.let {
                binding.tvDebrisNum.text = it.chipNum.toString()
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeSummonFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeSummonFragment.kt
@@ -2,21 +2,22 @@ package com.yizhuan.erban.treasurefairy.fragment

 import android.annotation.SuppressLint
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
 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.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingFragment
 import com.yizhuan.erban.common.EmptyViewHelper
 import com.yizhuan.erban.databinding.TreasureFairyFragmentExchangeDebrisBinding
 import com.yizhuan.erban.treasurefairy.FairyViewModel
-import com.yizhuan.erban.treasurefairy.adapter.ExchangeDebrisAdapter
 import com.yizhuan.erban.treasurefairy.adapter.ExchangeSummonAdapter
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
 import com.yizhuan.erban.ui.utils.RVDelegate
 import com.yizhuan.erban.ui.utils.loadAvatar
 import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo
+import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo
 import com.yizhuan.xchat_android_core.user.UserModel
 import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
 import com.yizhuan.xchat_android_core.utils.toast
@@ -33,7 +34,7 @@ class ExchangeSummonFragment :
        }
    }

-    private val viewModel: FairyViewModel by viewModels()
+    private val viewModel: FairyViewModel by activityViewModels()
    private lateinit var rvDelegate: RVDelegate<ExchangeGiftInfo>
    private lateinit var exchangeSummonAdapter: ExchangeSummonAdapter

@@ -54,9 +55,6 @@ class ExchangeSummonFragment :
        viewModel.fairyCallInfoLiveData.observe(viewLifecycleOwner) {
            rvDelegate.setNewData(it)
        }
-        viewModel.debrisExchangeListLiveData.observe(viewLifecycleOwner) {
-            rvDelegate.setNewData(it)
-        }
        exchangeSummonAdapter.setOnItemChildClickListener { _, _, position ->
            exchangeSummonAdapter.getItem(position)?.let {
                dialogManager.showTipsDialog("您將要兌換“${it.getPrizeName()}”", "兌換") {
@@ -85,5 +83,20 @@ class ExchangeSummonFragment :
            }
        }

+        val myFairyAdapter =
+            object : BaseQuickAdapter<FairyInfo, BaseViewHolder>(R.layout.item_my_fairy) {
+                override fun convert(helper: BaseViewHolder, item: FairyInfo) {
+                    ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_fairy), item.elfPicUrl)
+                    helper.setText(R.id.tv_count, item.elfNum.toString())
+                }
+            }
+        binding.rvMyFairy.adapter = myFairyAdapter
+
+        viewModel.myFairyInfoLiveData.observe(this) {
+            it?.let {
+                myFairyAdapter.setNewData(it.highElves?.take(3))
+            }
+        }
+
    }
 }
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
@@ -2,6 +2,8 @@ package com.yizhuan.erban.treasurefairy.fragment

 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -96,16 +98,7 @@ class TestFairyFragment : BaseViewBindingFragment<TreasureFairyFragmentTestFairy
            .build()

        viewModel.myFairyInfoLiveData.observe(viewLifecycleOwner) {
-            val fairyInfos = it?.let {
-                when (fairyType) {
-                    MyFairyItemView.LEGEND -> {
-                        it.highElves
-                    }
-                    else -> {
-                        it.lowElves
-                    }
-                }
-            }
+            val fairyInfos = it?.lowElves
            if(fairyType == MyFairyItemView.BASE) {
                val list = mutableListOf<FairyInfo>()
                it?.lowElves?.take(3)?.let { it1 -> list.addAll(it1) }
@@ -151,11 +144,18 @@ class TestFairyFragment : BaseViewBindingFragment<TreasureFairyFragmentTestFairy

        if (fairyType == MyFairyItemView.BASE) {
            binding.viewBgAnim.setBackgroundResource(R.drawable.treasure_fairy_bg_test_fairy_anim_legend)
+            val p = binding.ivFairy3.layoutParams as ConstraintLayout.LayoutParams
+            p.verticalBias = 0.9f
+            binding.tvResolveTips.visibility = View.VISIBLE
+            binding.tvResolveTips.text = getString(R.string.tips_fairy_resolve_low)
            binding.viewBgTop.setBackgroundResource(R.drawable.treasure_fairy_bg_test_fairy_legend)
            binding.ivBegin.setBackgroundResource(R.drawable.treasure_fairy_bg_resolve_fairy_begin)
            binding.tvTips.text = "點擊投入需要分解的精靈"
        } else {
            binding.viewBgAnim.setBackgroundResource(R.drawable.treasure_fairy_bg_test_fairy_anim_epic)
+            val p = binding.ivFairy3.layoutParams as ConstraintLayout.LayoutParams
+            p.verticalBias = 0.94f
+            binding.tvResolveTips.visibility = View.GONE
            binding.viewBgTop.setBackgroundResource(R.drawable.treasure_fairy_bg_test_fairy)
            binding.ivBegin.setBackgroundResource(R.drawable.treasure_fairy_bg_test_fairy_begin)
            binding.tvTips.text = "點擊投入試煉傳說精靈"
@@ -225,8 +225,16 @@ class TestFairyFragment : BaseViewBindingFragment<TreasureFairyFragmentTestFairy
            if (fairyType == MyFairyItemView.BASE) {
                fairyResolveViews.forEachIndexed { index, imageView ->
                    it?.get(index)?.elfPicUrl?.let { elfPicUrl ->
+                        binding.tvResolveTips.text = getString(
+                            if (it[index].level == FairyInfo.LEVEL_HIGH) {
+                                R.string.tips_fairy_resolve_high
+                            } else {
+                                R.string.tips_fairy_resolve_low
+                            }
+                        )
                        imageView.load(elfPicUrl)
                    } ?: run {
+                        binding.tvResolveTips.text = getString(R.string.tips_fairy_resolve_low)
                        imageView.setImageDrawable(null)
                    }
                }
--- a/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java
@@ -22,13 +22,13 @@ import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderAudioParty;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderChatHint;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderContent;
-import com.yizhuan.erban.ui.im.chat.MsgViewHolderP2PContactRecharge;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderFairy;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderGift;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderHello;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderLevel;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderLottery;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderOnline;
+import com.yizhuan.erban.ui.im.chat.MsgViewHolderP2PContactRecharge;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPackage;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPacket;
 import com.yizhuan.erban.ui.im.chat.MsgViewHolderSkill;
@@ -44,7 +44,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.P2PContactRechargeAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.FairySendAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment;
@@ -60,6 +59,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
+import com.yizhuan.xchat_android_core.im.custom.bean.P2PContactRechargeAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment;
 import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment;
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java
@@ -30,6 +30,7 @@ public class MsgViewHolderRedPackage extends MsgViewHolderBase {
    private TextView tvNickname;
    private TextView tvAll;
    private TextView tvTip;
+    @Deprecated(since = "2.2.0版本，红包失效时间是客户端写死的，以后用消息体内的endTime")
    private int halfHour = 60 * 30 * 1000;


@@ -57,30 +58,40 @@ public class MsgViewHolderRedPackage extends MsgViewHolderBase {
            tvAll.setVisibility(View.GONE);
            tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_02));
            contentContainer.setAlpha(0.5f);
-        } else if (CurrentTimeUtils.getCurrentTime() - message.getTime() < halfHour) {
-            tvNickname.setText(notifyInfo.getSendUserNick());
-            tvAll.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_03));
-            tvAll.setVisibility(View.VISIBLE);
-            tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_04));
-            contentContainer.setAlpha(1f);
-            DialogManager.OkCancelDialogListener listener = () -> AVRoomActivity.start(context, notifyInfo.getRoomUid(),
-                    AVRoomActivity.FROM_TYPE_ALL_RED, notifyInfo.getSendUserNick(), notifyInfo);
-            contentContainer.setOnClickListener(v -> {
-                        if (AvRoomDataManager.get().isOwnerOnMic() && AvRoomDataManager.get().getRoomId() != notifyInfo.getRoomUid()) {
-                            new DialogManager(context).showOkCancelDialog(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_05), true, listener);
-                        } else {
-                            listener.onOk();
+        } else{
+            long endTime;
+            notifyInfo.getEndTime();
+            if (notifyInfo.getEndTime() != null) {
+                // 2.2.0版本后 新增动态失效时间
+                endTime = notifyInfo.getEndTime();
+            } else {
+                // 可能是2.2.0版本前：失效时间固定为30分
+                endTime = message.getTime() + halfHour;
+            }
+            if (CurrentTimeUtils.getCurrentTime() < endTime) {
+                tvNickname.setText(notifyInfo.getSendUserNick());
+                tvAll.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_03));
+                tvAll.setVisibility(View.VISIBLE);
+                tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_04));
+                contentContainer.setAlpha(1f);
+                DialogManager.OkCancelDialogListener listener = () -> AVRoomActivity.start(context, notifyInfo.getRoomUid(),
+                        AVRoomActivity.FROM_TYPE_ALL_RED, notifyInfo.getSendUserNick(), notifyInfo);
+                contentContainer.setOnClickListener(v -> {
+                            if (AvRoomDataManager.get().isOwnerOnMic() && AvRoomDataManager.get().getRoomId() != notifyInfo.getRoomUid()) {
+                                new DialogManager(context).showOkCancelDialog(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_05), true, listener);
+                            } else {
+                                listener.onOk();
+                            }
                        }
-
-                    }
-            );
-        } else {//已失效
-            tvNickname.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_06));
-            tvAll.setVisibility(View.GONE);
-            tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_07));
-            contentContainer.setAlpha(0.5f);
+                );
+            } else {
+                //已失效
+                tvNickname.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_06));
+                tvAll.setVisibility(View.GONE);
+                tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_07));
+                contentContainer.setAlpha(0.5f);
+            }
        }
-
    }


--- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
@@ -654,7 +654,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
    @Subscribe(threadMode = ThreadMode.MAIN)
    @SuppressLint("CheckResult")
    public void onNimAudioChatEvent(NimAudioChatEvent event) {
-        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO)
+        checkPermission(Manifest.permission.RECORD_AUDIO)
                .subscribe(result -> {
                    if (result) {
                        event.getSuccess().accept(result);
@@ -667,7 +667,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
    @Subscribe(threadMode = ThreadMode.MAIN)
    @SuppressLint("CheckResult")
    public void onNimImageActionEvent(NimImageActionEvent event) {
-        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA)
+        checkPermission(Manifest.permission.CAMERA)
                .subscribe(result -> {
                    if (result) {
                        event.getSuccess().accept(result);
--- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java
@@ -306,12 +306,6 @@ public class LoginPasswordActivity extends BaseActivity {
    }

    private void login() {
-        //发起登录
-        HashMap<String, Object> map = new HashMap<>(3);
-        map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE);
-        map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN);
-        ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map);
-
        getDialogManager().showProgressDialog(this, getString(R.string.login_is_logining));
        AuthModel.get().login(
                        "",
@@ -344,6 +338,13 @@ public class LoginPasswordActivity extends BaseActivity {
                        dealWithLoginError(e);
                    }
                });
+
+        //发起登录
+        HashMap<String, Object> map = new HashMap<>(3);
+        map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE);
+        map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN);
+        ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map);
+
    }

    /**
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java
@@ -3,35 +3,25 @@ package com.yizhuan.erban.ui.pay;
 import android.app.Activity;
 import android.util.Log;

-import androidx.annotation.NonNull;
-
 import com.alibaba.fastjson.JSONObject;
-import com.android.billingclient.api.AcknowledgePurchaseParams;
-import com.android.billingclient.api.AcknowledgePurchaseResponseListener;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClient.BillingResponseCode;
-import com.android.billingclient.api.BillingClient.SkuType;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.ConsumeParams;
-import com.android.billingclient.api.ConsumeResponseListener;
+import com.android.billingclient.api.ProductDetails;
+import com.android.billingclient.api.ProductDetailsResponseListener;
 import com.android.billingclient.api.Purchase;
-import com.android.billingclient.api.Purchase.PurchasesResult;
 import com.android.billingclient.api.PurchasesUpdatedListener;
-import com.android.billingclient.api.SkuDetails;
-import com.android.billingclient.api.SkuDetailsParams;
-import com.android.billingclient.api.SkuDetailsResponseListener;
-import com.yizhuan.erban.event.ChargeEvent;
+import com.android.billingclient.api.QueryProductDetailsParams;
+import com.android.billingclient.api.QueryPurchasesParams;

-import org.greenrobot.eventbus.EventBus;
 import org.jetbrains.annotations.NotNull;

 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;

 public class BillingManager implements PurchasesUpdatedListener {

@@ -55,9 +45,6 @@ public class BillingManager implements PurchasesUpdatedListener {
    /*商品列表*/
    private final List<Purchase> purchaseList = new ArrayList<>();

-    /*消耗令牌*/
-    private Set<String> mTokensToBeConsumed;
-
    /*监听接口*/
    public interface BillingUpdatesListener {
        void onBillingClientSetupFinished();
@@ -109,35 +96,24 @@ public class BillingManager implements PurchasesUpdatedListener {

    /*请求商品库存*/
    public void onQueryPurchases() {
-        Runnable queryToExecute = () -> {
-            //系统当前时间
-            long time = System.currentTimeMillis();
-            //请求内购商品
-            PurchasesResult purchasesResult = billingClient.queryPurchases(SkuType.INAPP);
-            onQueryPurchasesFinished(purchasesResult);
-        };
+        Runnable queryToExecute = () ->
+                billingClient.queryPurchasesAsync(
+                        QueryPurchasesParams.newBuilder()
+                                .setProductType(BillingClient.ProductType.INAPP)
+                                .build(), this::onPurchasesUpdated);
        executeServiceRequest(queryToExecute);
    }

-    /*请求商品信息完成*/
-    private void onQueryPurchasesFinished(PurchasesResult result) {
-        if (billingClient == null || result.getResponseCode() != BillingResponseCode.OK) {
-            Log.w(TAG, "billingClient is null or result code (" + result.getResponseCode()
-                    + ") was bad - quitting");
-            return;
-        }
-        purchaseList.clear();
-        onPurchasesUpdated(result.getBillingResult(), result.getPurchasesList());
-    }
-
    /*更新商品*/
    @Override
    public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) {
-        //Log.i(TAG, "billingResult.getResponseCode()==" + billingResult.getResponseCode() + ",purchases.size()==" + purchases.size());
-
+        Log.i(TAG, "billingResult.getResponseCode()==" + billingResult.getResponseCode());
+        purchaseList.clear();
        if (billingResult.getResponseCode() == BillingResponseCode.OK) {
-            for (Purchase purchase : purchases) {
-                handlePurchase(purchase);
+            if (purchases != null) {
+                for (Purchase purchase : purchases) {
+                    handlePurchase(purchase);
+                }
            }
            mBillingUpdatesListener.onPurchasesUpdated(purchaseList);
        } else {
@@ -178,28 +154,46 @@ public class BillingManager implements PurchasesUpdatedListener {
    }

    /*查询内购商品详情*/
-    public void querySkuDetailsAsync(@SkuType final String itemType, final List<String> skuList,
-                                     final SkuDetailsResponseListener listener) {
+    public void querySkuDetailsAsync(final List<String> productIdList,
+                                     final ProductDetailsResponseListener listener) {
        Runnable queryRequest = () -> {
-            SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
-            params.setSkusList(skuList)
-                    .setType(itemType);
-            billingClient.querySkuDetailsAsync(params.build(), listener);
+            ArrayList<QueryProductDetailsParams.Product> products = new ArrayList<>();
+            for (String productId : productIdList) {
+                products.add(QueryProductDetailsParams.Product.newBuilder()
+                        .setProductId(productId)
+                        .setProductType(BillingClient.ProductType.INAPP)
+                        .build());
+            }
+            QueryProductDetailsParams queryProductDetailsParams =
+                    QueryProductDetailsParams.newBuilder()
+                            .setProductList(products)
+                            .build();
+
+            billingClient.queryProductDetailsAsync(
+                    queryProductDetailsParams,
+                    listener
+            );
        };
        executeServiceRequest(queryRequest);
    }

    /*启动购买，订购流程*/
-    public void initiatePurchaseFlow(final SkuDetails skuDetails, String recordId) {
+    public void initiatePurchaseFlow(final ProductDetails productDetails, String recordId) {
        Runnable purchaseFlowRequest = () -> {
+            BillingFlowParams.ProductDetailsParams p = BillingFlowParams.ProductDetailsParams.newBuilder()
+                    .setProductDetails(productDetails)
+                    .build();
            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("p", skuDetails.getPrice());
-            jsonObject.put("a", skuDetails.getPriceAmountMicros() / 10000);
-            jsonObject.put("c", skuDetails.getPriceCurrencyCode());
+            ProductDetails.OneTimePurchaseOfferDetails oneTimePurchaseOfferDetails = productDetails.getOneTimePurchaseOfferDetails();
+            if (oneTimePurchaseOfferDetails != null) {
+                jsonObject.put("p", oneTimePurchaseOfferDetails.getFormattedPrice());
+                jsonObject.put("a", oneTimePurchaseOfferDetails.getPriceAmountMicros() / 10000);
+                jsonObject.put("c", oneTimePurchaseOfferDetails.getPriceCurrencyCode());
+            }
            BillingFlowParams purchaseParams = BillingFlowParams.newBuilder()
                    .setObfuscatedAccountId(recordId)
                    .setObfuscatedProfileId(jsonObject.toJSONString())
-                    .setSkuDetails(skuDetails)
+                    .setProductDetailsParamsList(List.of(p))
                    .build();
            BillingResult billingResult = billingClient.launchBillingFlow(mActivity, purchaseParams);
            Log.i(TAG, " initiatePurchaseFlow billingResult=" + billingResult.getResponseCode() + "  " + billingResult.getDebugMessage());
@@ -208,28 +202,10 @@ public class BillingManager implements PurchasesUpdatedListener {
    }

    public void consumeAsync(final String purchaseToken) {
-        if (mTokensToBeConsumed == null) {
-            mTokensToBeConsumed = new HashSet<>();
-        } else if (mTokensToBeConsumed.contains(purchaseToken)) {
-            Log.i(TAG, "Token was already scheduled to be consumed - skipping...");
-            return;
-        }
-        mTokensToBeConsumed.add(purchaseToken);
-
        final ConsumeParams consumeParams = ConsumeParams.newBuilder().setPurchaseToken(purchaseToken).build();

-        final ConsumeResponseListener consumeResponseListener = new ConsumeResponseListener() {
-            @Override
-            public void onConsumeResponse(@NonNull @NotNull BillingResult billingResult, @NonNull @NotNull String s) {
-                mBillingUpdatesListener.onConsumeFinished(purchaseToken, billingResult.getResponseCode());
-            }
-        };
-        executeServiceRequest(() -> billingClient.consumeAsync(consumeParams, consumeResponseListener));
-    }
-
-
-    public void acknowledgePurchase(AcknowledgePurchaseParams acknowledgePurchaseParams, AcknowledgePurchaseResponseListener Listener) {
-        billingClient.acknowledgePurchase(acknowledgePurchaseParams, Listener);
+        executeServiceRequest(() -> billingClient.consumeAsync(consumeParams, (billingResult, s) ->
+                mBillingUpdatesListener.onConsumeFinished(purchaseToken, billingResult.getResponseCode())));
    }

    /**
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
@@ -24,8 +24,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

 import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.ProductDetails;
 import com.android.billingclient.api.Purchase;
-import com.android.billingclient.api.SkuDetails;
 import com.appsflyer.AFInAppEventParameterName;
 import com.appsflyer.AFInAppEventType;
 import com.appsflyer.AppsFlyerLib;
@@ -186,19 +186,19 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
            productKeys.add(chargeBean.getChargeProdId());
        }
        mChargeAdapter.setNewData(chargeBeanList);
-        billingManager.querySkuDetailsAsync(BillingClient.SkuType.INAPP, productKeys, (billingResult, skuDetailsList) -> {
+        billingManager.querySkuDetailsAsync(productKeys, (billingResult, productDetails) -> {
            if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) {
-                Log.w(TAG, "Unsuccessful query for type: " + BillingClient.SkuType.INAPP
+                Log.w(TAG, "Unsuccessful query for type: " + BillingClient.ProductType.INAPP
                        + ". Error code: " + billingResult.getResponseCode());
                getDialogManager().dismissDialog();
                toast(getString(R.string.Recharge_failure));
-            } else if (skuDetailsList != null && skuDetailsList.size() > 0) {
+            } else if (productDetails.size() > 0) {
                getDialogManager().dismissDialog();
                List<ChargeBean> showChargeList = new ArrayList<>();
                for (ChargeBean chargeBean : chargeBeanList) {
-                    for (SkuDetails skuDetails : skuDetailsList) {
-                        if (skuDetails.getSku().equals(chargeBean.getChargeProdId())) {
-                            chargeBean.setSkuDetails(skuDetails);
+                    for (ProductDetails product : productDetails) {
+                        if (product.getProductId().equals(chargeBean.getChargeProdId())) {
+                            chargeBean.setProductDetails(product);
                            showChargeList.add(chargeBean);
                            break;
                        }
@@ -221,30 +221,28 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
                    purchase.getAccountIdentifiers() != null) {
                PayModel.get().verifyOrder(
                                purchase.getAccountIdentifiers().getObfuscatedAccountId(),
-                                purchase.getSkus().get(0),
+                                purchase.getProducts().get(0),
                                purchase.getPackageName(),
                                purchase.getPurchaseToken())
                        .compose(bindToLifecycle())
-                        .subscribe(
-                                token -> {
-                                    //L.i("token=" + token);
+                        .subscribe(token -> {
                                    billingManager.consumeAsync(token);

-                                    SkuDetails skuDetails = null;
+                                    ProductDetails productDetails = null;
                                    for (ChargeBean datum : mChargeAdapter.getData()) {
-                                        if (datum.getChargeProdId().equals(purchase.getSkus().get(0))) {
-                                            skuDetails = datum.getSkuDetails();
+                                        if (datum.getChargeProdId().equals(purchase.getProducts().get(0))) {
+                                            productDetails = datum.getProductDetails();
                                            break;
                                        }
                                    }
-                                    if (skuDetails != null) {
+                                    if (productDetails != null) {
                                        Map<String, Object> eventValue = new HashMap<>();
                                        eventValue.put(AFInAppEventParameterName.CONTENT_TYPE, "Gold");
                                        eventValue.put(AFInAppEventParameterName.QUANTITY, 1);
                                        eventValue.put(AFInAppEventParameterName.CONTENT_ID, purchase.getOrderId());
-                                        eventValue.put(AFInAppEventParameterName.REVENUE, skuDetails.getPriceAmountMicros() / 1000000f);
-                                        eventValue.put("Price", skuDetails.getPrice());
-                                        eventValue.put(AFInAppEventParameterName.CURRENCY, skuDetails.getPriceCurrencyCode());
+                                        eventValue.put(AFInAppEventParameterName.REVENUE, productDetails.getOneTimePurchaseOfferDetails().getPriceAmountMicros() / 1000000f);
+                                        eventValue.put("Price", productDetails.getOneTimePurchaseOfferDetails().getFormattedPrice());
+                                        eventValue.put(AFInAppEventParameterName.CURRENCY, productDetails.getOneTimePurchaseOfferDetails().getPriceCurrencyCode());
                                        AppsFlyerLib.getInstance().logEvent(getApplicationContext(), AFInAppEventType.PURCHASE, eventValue);
                                    }
                                },
@@ -269,12 +267,12 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter

    /*购买商品*/
    @SuppressLint("CheckResult")
-    public void buyProduct(SkuDetails skuDetails) {
-        if (skuDetails != null) {
-            Log.d(TAG, "BuyProduct:" + skuDetails.getSku());
-            PayModel.get().placeOrder(skuDetails.getSku())
+    public void buyProduct(ProductDetails productDetails) {
+        if (productDetails != null) {
+            Log.d(TAG, "BuyProduct:" + productDetails.getProductId());
+            PayModel.get().placeOrder(productDetails.getProductId())
                    .compose(bindToLifecycle())
-                    .subscribe(recordId -> billingManager.initiatePurchaseFlow(skuDetails, recordId.getRecordId()),
+                    .subscribe(recordId -> billingManager.initiatePurchaseFlow(productDetails, recordId.getRecordId()),
                            throwable -> {
                                if (throwable instanceof FailReasonException) {
                                    FailReasonException failReasonException = (FailReasonException) throwable;
@@ -342,8 +340,8 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
            }
            if (mChargePosition != -1) {
                ChargeBean bean = mChargeAdapter.getItem(mChargePosition);
-                if (bean != null && bean.getSkuDetails() != null) {
-                    buyProduct(bean.getSkuDetails());
+                if (bean != null && bean.getProductDetails() != null) {
+                    buyProduct(bean.getProductDetails());
                    //点击充值
                    HashMap<String, Object> map = new HashMap<>(3);
                    map.put(IReportConstants.MONEY, bean.money);
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java
@@ -21,8 +21,8 @@ public class ChargeAdapter extends BaseQuickAdapter<ChargeBean, BaseViewHolder>
        if (chargeBean == null) return;
        baseViewHolder.getView(R.id.ll_bg).setSelected(chargeBean.isSelected);
        baseViewHolder.setText(R.id.tv_title, chargeBean.getProdName());
-        if (chargeBean.getSkuDetails() != null) {
-            baseViewHolder.setText(R.id.item_charge_money, chargeBean.getSkuDetails().getPrice());
+        if (chargeBean.getProductDetails() != null) {
+            baseViewHolder.setText(R.id.item_charge_money, chargeBean.getProductDetails().getOneTimePurchaseOfferDetails().getFormattedPrice());
        } else {
            baseViewHolder.setText(R.id.item_charge_money, "USD$" + chargeBean.getMoney());
        }
--- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt
@@ -6,8 +6,10 @@ import android.os.Build
 import android.os.Environment
 import android.text.SpannableString
 import android.view.View
+import com.chuhai.utils.log.ILog
 import com.netease.nim.uikit.StatusBarUtil
 import com.tongdaxing.erban.upgrade.AppUpgradeHelper
+import com.yizhuan.erban.BuildConfig
 import com.yizhuan.erban.R
 import com.yizhuan.erban.UIHelper
 import com.yizhuan.erban.base.BaseViewBindingActivity
@@ -35,12 +37,13 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.io.File
+import kotlin.random.Random

 /**
 * 设置页
 * Created by wushaocheng on 2023/2/1.
 */
-class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.OnClickListener {
+class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.OnClickListener,ILog {
    override fun init() {
        EventBus.getDefault().register(this)
        initWhiteTitleBar(ResUtil.getString(R.string.ui_setting_settingactivity_01))
@@ -74,6 +77,12 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
        binding.tvShieldManager.setOnClickListener(this)
        binding.rlyPermission.setOnClickListener(this)
        binding.rlyCheck.setOnClickListener(this)
+
+        if (BuildConfig.DEBUG) {
+            binding.titleBar.setOnTitleClickListener {
+                debug()
+            }
+        }
    }

    @SuppressLint("CheckResult")
@@ -103,6 +112,7 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
                    BindPhoneActivity.start(this)
                }
            }
+
            R.id.rly_contact_us -> UIHelper.openContactUs(this)
            R.id.rly_help -> UIHelper.showUsinghelp(this)
            R.id.rly_update -> startActivity(Intent(applicationContext, AboutActivity::class.java))
@@ -115,9 +125,14 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
                }
                ModifyPwdActivity.start(this, ModifyPwdActivity.PAY_PWD)
            }
+
            R.id.btn_login_out -> {
                val cacheLoginUserInfo = UserModel.get().cacheLoginUserInfo ?: return
-                if (!cacheLoginUserInfo.isBindPasswd && !SPUtils.getBoolean(SpConstants.SET_PASSWORD, false)) {
+                if (!cacheLoginUserInfo.isBindPasswd && !SPUtils.getBoolean(
+                        SpConstants.SET_PASSWORD,
+                        false
+                    )
+                ) {
                    dialogManager.showOkCancelWithTitleDialog(ResUtil.getString(R.string.set_login_password),
                        SpannableString(ResUtil.getString(R.string.set_login_password_tip)),
                        ResUtil.getString(R.string.login_fragment_adduserinfofragment_04),
@@ -126,7 +141,10 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
                            override fun onCancel() {}
                            override fun onOk() {
                                SPUtils.putBoolean(SpConstants.SET_PASSWORD, true)
-                                ModifyPwdActivity.start(this@SettingActivity, ModifyPwdActivity.LOGIN_PWD)
+                                ModifyPwdActivity.start(
+                                    this@SettingActivity,
+                                    ModifyPwdActivity.LOGIN_PWD
+                                )
                            }
                        })
                } else {
@@ -134,10 +152,12 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
                    LogoutHelper.logout()
                }
            }
+
            R.id.tv_community_norms -> CommonWebViewActivity.start(
                this,
                UriProvider.getCommnunityNorms()
            )
+
            R.id.rly_clear_cache -> dialogManager.showOkCancelWithTitleDialog(ResUtil.getString(R.string.ui_setting_settingactivity_07),
                SpannableString(ResUtil.getString(R.string.ui_setting_settingactivity_08)),
                ResUtil.getString(R.string.ui_setting_settingactivity_09),
@@ -148,6 +168,7 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
                        clearCache()
                    }
                })
+
            R.id.tv_notice_setting -> NoticeSettingActivity.start(context)
            R.id.tv_shield_manager -> ShieldManageActivity.start(context)
            R.id.rly_permission -> PermissionGuideActivity.start(context)
@@ -194,4 +215,14 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
        dialogManager.dismissDialog()
        EventBus.getDefault().unregister(this)
    }
+
+    private fun debug() {
+//        RedPackageOpenDialog2().show(this)
+//        val json = "{\"first\":3,\"second\":32,\"data\":{\"recvUserUid\":2735,\"recvUserAvatar\":\"https://img.pekolive.com/default_avatar.png\",\"recvUserNick\":\"66丢丢丢丢丢多多多的hhhh\",\"sendUserNick\":\"11的ass\",\"sendUserAvatar\":\"http://beta.img.pekolive.com/Fk7aur-1RBqKXC-qqBwMTjivZ3lV?imageslim\",\"sendUserUid\":2737,\"giftUrl\":\"http://beta.img.pekolive.com/Fn6h_gPFD5MwA-Ql_kcWqNpKp0JM?imageslim\",\"giftName\":\"幽靈糖果\",\"giftId\":2075,\"giftNum\":${Random.nextInt(1,1000)},\"giftGolds\":33440,\"notifyStaySecond\":5,\"isHomeShow\":true,\"isSkipRoom\":true,\"isFullScreen\":false,\"isSendMsg\":false,\"roomUid\":2737,\"roomErbanNo\":11,\"roomTitle\":\"11的工会\",\"levelNum\":${Random.nextInt(1,4)}}}"
+//        onReceivedNimBroadcastMessage(json)
+//        val json = "{\"first\":85,\"second\":855,\"data\":{\"nick\":\"66丢丢丢丢丢多多多的hhhh\",\"preVipName\":\"子爵\",\"floatPic\":\"https://image.hfighting.com/Fq3JtbK2acO3FN-3vWZo8ldtHfse\",\"uid\":2735,\"currVipName\":\"侯爵\",\"erbanNo\":66,\"roomUid\":2734,\"avatar\":\"https://img.pekolive.com/default_avatar.png\",\"currVipLevel\":5}}"
+//        onReceivedNimBroadcastMessage(json)
+//        CommonWebViewActivity.start(this,"https://api.anan.chat/anan_vestBag/modules/rank/index.html#/rank")
+//        CommonWebViewActivity.start(this,"https://api.anan.chat/anan_vestBag/modules/myincome/index.html#/DiamondLog")
+    }
 }
--- a/app/src/main/java/com/yizhuan/erban/ui/user/activity/AboutActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/activity/AboutActivity.java
@@ -1,11 +1,14 @@
 package com.yizhuan.erban.ui.user.activity;

+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.TextView;

 import com.netease.nim.uikit.StatusBarUtil;
+import com.yizhuan.erban.BuildConfig;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseActivity;
+import com.yizhuan.erban.ui.setting.LabActivity;
 import com.yizhuan.xchat_android_library.utils.config.BasicConfig;

 public class AboutActivity extends BaseActivity {
@@ -27,6 +30,11 @@ public class AboutActivity extends BaseActivity {

    private void initView() {
        mTvVersions = findViewById(R.id.versions);
+
+        if (BuildConfig.DEBUG) {
+            findViewById(R.id.img_about_logo).setOnClickListener(v ->
+                    startActivity(new Intent(this, LabActivity.class)));
+        }
    }

    @Override
--- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java
@@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.user.adapter;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.LinearGradient;
+import android.util.TypedValue;
 import android.widget.TextView;

 import androidx.core.content.ContextCompat;
@@ -44,7 +45,7 @@ public class MainIndicatorAdapter extends CommonNavigatorAdapter {
        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_767585));
        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_1F1A4E));
        scaleTransitionPagerTitleView.setMinScale(minScale);
-        scaleTransitionPagerTitleView.setTextSize(textSize);
+        scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources().getDimensionPixelSize(R.dimen.sp_16));
        int padding = UIUtil.dip2px(context, 12);
        scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0);
        scaleTransitionPagerTitleView.setText(mTitleList.get(i));
@@ -114,6 +115,7 @@ public class MainIndicatorAdapter extends CommonNavigatorAdapter {
        indicator.setLineHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_8));
        indicator.setLineWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_35));
        indicator.setRoundRadius(context.getResources().getDimensionPixelOffset(R.dimen.dp_5));
+        indicator.setYOffset(context.getResources().getDimensionPixelOffset(R.dimen.dp_4));
        return indicator;
    }

--- a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java
@@ -316,7 +316,7 @@ public class ImageLoadUtils {
        GlideApp.with(context)
                .load(url)
                .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .placeholder(R.drawable.default_avatar)
+                .placeholder(R.drawable.default_cover)
                .transform(new BlurTransformation(context, blur, scale))
                .into(imageView);
    }
--- a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtilsV2.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtilsV2.java
@@ -127,6 +127,21 @@ public class ImageLoadUtilsV2 {

    }

+    /**
+     * 加载图片
+     * @param view
+     * @param url
+     * @param size 大小（Glide.override属性）
+     */
+    @Deprecated(since = "临时加的，后续会整合优化项目的图片加载器！")
+    public static void loadImage2(ImageView view, String url, int size) {
+        if (view == null) {
+            return;
+        }
+        GlideApp.with(view).load(url).placeholder(R.drawable.default_cover)
+                .error(R.drawable.default_cover).override(size).into(view);
+    }
+
    /**
     *
     * @param url -
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
@@ -9,11 +9,11 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.SslErrorHandler;
@@ -59,7 +59,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

-import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;

@@ -99,32 +98,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
    private static final String POSITION = "position";
    private int mPosition;

-    private int mProgress;
-
-    private Handler mHandler = new Handler();
-
-    private ProgressRunnable mProgressRunnable = new ProgressRunnable(this);
-
-    private static class ProgressRunnable implements Runnable {
-        private WeakReference<CommonWebViewActivity> mWeakReference;
-
-        ProgressRunnable(CommonWebViewActivity activity) {
-            mWeakReference = new WeakReference<>(activity);
-        }
-
-        @Override
-        public void run() {
-            CommonWebViewActivity activity = mWeakReference.get();
-            if (activity == null) return;
-            if (activity.mProgress < 96) {
-                activity.mProgress += 3;
-                activity.mProgressBar.setProgress(activity.mProgress);
-                activity.mHandler.postDelayed(activity.mProgressRunnable, 10);
-            }
-        }
-    }
-
-
    public static void start(Context context, String url) {
        Intent intent = new Intent(context, CommonWebViewActivity.class);
        intent.putExtra("url", url);
@@ -222,7 +195,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O

    @SuppressLint("SetJavaScriptEnabled")
    private void initData() {
-        mHandler.post(mProgressRunnable);
        webView.getSettings().setJavaScriptEnabled(true);
        webView.getSettings().setUseWideViewPort(true);
        webView.getSettings().setLoadWithOverviewMode(true);
@@ -290,9 +262,20 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
                mProgressBar.setVisibility(View.GONE);
                super.onPageFinished(view, url);
            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                super.onPageStarted(view, url, favicon);
+                mProgressBar.setVisibility(View.VISIBLE);
+            }
        });
        //获取webviewtitle作为titlebar的title
        wvcc = new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                super.onProgressChanged(view, newProgress);
+                mProgressBar.setProgress(newProgress);
+            }

            @Override
            public void onReceivedTitle(WebView view, String title) {
@@ -520,11 +503,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O

    @Override
    protected void onDestroy() {
-        if (mHandler != null) {
-            mHandler.removeCallbacks(mProgressRunnable);
-            mProgressRunnable = null;
-            mHandler = null;
-        }
        EventBus.getDefault().unregister(this);

        if (webViewCallBack != null) {
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.webview;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;

 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
@@ -28,8 +28,18 @@ public class DialogWebViewActivity extends CommonWebViewActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, ScreenUtil.screenHeight / 3 * 2);
-        getWindow().setGravity(Gravity.BOTTOM);
+        getWindow().getDecorView().setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+        );
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+        View topView = findViewById(R.id.v_top);
+        topView.setOnClickListener(v -> finish());
+        ViewGroup.LayoutParams params = topView.getLayoutParams();
+        params.height = ScreenUtil.screenHeight / 3;
+        topView.setLayoutParams(params);
        showTitleBar = getIntent().getBooleanExtra("showTitleBar", true);
        if (!showTitleBar) {
            layoutTitleBar.setVisibility(View.GONE);
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/room_banner/RoomBannerTabAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/room_banner/RoomBannerTabAdapter.kt
@@ -0,0 +1,47 @@
+package com.yizhuan.erban.ui.webview.room_banner
+
+import android.view.View
+import android.widget.ImageView
+import androidx.core.view.isInvisible
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.yizhuan.erban.R
+import com.yizhuan.erban.ui.utils.load
+import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+
+/**
+ * Created by Max on 2023/11/17 12:30
+ * Desc:
+ **/
+class RoomBannerTabAdapter :
+    BaseQuickAdapter<BannerInfo, BaseViewHolder>(R.layout.room_banner_item_tab) {
+
+    private var selectedPosition = -1
+    override fun convert(helper: BaseViewHolder, item: BannerInfo?) {
+        helper.getView<ImageView>(R.id.iv_content).load(item?.bannerUrl)
+        convertState(helper, item)
+    }
+
+    override fun convertPayloads(
+        helper: BaseViewHolder,
+        item: BannerInfo?,
+        payloads: MutableList<Any>
+    ) {
+        super.convertPayloads(helper, item, payloads)
+        convertState(helper, item)
+    }
+
+    private fun convertState(helper: BaseViewHolder, item: BannerInfo?) {
+        helper.getView<View>(R.id.v_selector).isInvisible =
+            helper.absoluteAdapterPosition != selectedPosition
+    }
+
+    fun getSelectedPosition(): Int {
+        return selectedPosition
+    }
+
+    fun select(position: Int) {
+        this.selectedPosition = position
+        notifyItemRangeChanged(0, itemCount, true)
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
@@ -0,0 +1,91 @@
+package com.yizhuan.erban.ui.webview.room_banner
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import androidx.recyclerview.widget.RecyclerView
+import com.chuhai.utils.UiUtils
+import com.yizhuan.erban.R
+import com.yizhuan.erban.ui.webview.CommonWebViewActivity
+import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+
+
+/**
+ * Created by Max on 2023/11/17 11:38
+ * Desc:房间内-Banner-WEB展示页面
+ **/
+class RoomBannerWebDialogActivity : CommonWebViewActivity() {
+
+    private var recyclerView: RecyclerView? = null
+    private var adapter: RoomBannerTabAdapter? = null
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, position: Int, list: List<BannerInfo>) {
+            val newList = ArrayList<BannerInfo>()
+            newList.addAll(list)
+            val intent = Intent(context, RoomBannerWebDialogActivity::class.java)
+            intent.putExtra("position", position)
+            intent.putExtra("list", newList)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun getLayoutId(): Int {
+        return R.layout.room_banner_dialog
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_FULLSCREEN
+                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)
+        window.setLayout(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.MATCH_PARENT
+        )
+        val topView = findViewById<View>(R.id.v_top)
+        topView.setOnClickListener { v: View? -> finish() }
+        val params = topView.layoutParams
+        params.height = UiUtils.dip2px(168f)
+        topView.layoutParams = params
+        webView.setBackgroundColor(Color.parseColor("#C9CBD1"))
+        recyclerView = findViewById(R.id.recyclerView)
+        val position = 0.coerceAtLeast(intent.getIntExtra("position", 0))
+        val list = intent.getSerializableExtra("list") as? ArrayList<BannerInfo>
+//        if ((list?.size ?: 0) <= 1) {
+//            recyclerView?.isVisible = false
+//        }
+        adapter = RoomBannerTabAdapter().apply {
+            setOnItemClickListener { adapter, view, position ->
+                if (this@RoomBannerWebDialogActivity.adapter?.getSelectedPosition() == position) {
+                    return@setOnItemClickListener
+                }
+                switchTab(position)
+            }
+        }
+        recyclerView?.adapter = adapter
+        adapter?.setNewData(list)
+        switchTab(position)
+    }
+
+    private fun switchTab(position: Int) {
+        val url = adapter?.getItem(position)?.skipUri
+        showWebView(url)
+        adapter?.select(position)
+        recyclerView?.post {
+            recyclerView?.scrollToPosition(position)
+        }
+    }
+
+    override fun showWebView(url: String?) {
+        if (url.isNullOrEmpty()) {
+            return
+        }
+        super.showWebView(url)
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java
@@ -1,78 +0,0 @@
-package com.yizhuan.erban.ui.widget.dialog;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceBinding;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
-
-/**
- * Created by huangmeng1 on 2018/3/29.
- */
-
-public class AllServiceGiftDialog extends BaseDialog {
-
-    public static final int ALL_SERVICE_GIFT_LEVEL_1 = 1;
-    public static final int ALL_SERVICE_GIFT_LEVEL_2 = 2;
-    public static final int ALL_SERVICE_GIFT_LEVEL_3 = 3;
-
-    protected int giftLevel = 1;
-    protected AllServiceGiftProtocol.DataBean dataBean;
-    private DialogGiftAllServiceBinding binding;
-
-    public AllServiceGiftDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        this(context, 0);
-        this.dataBean = dataBean;
-    }
-
-    public AllServiceGiftDialog(Context context, int theme, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, theme);
-        this.dataBean = dataBean;
-    }
-
-    public AllServiceGiftDialog(Context context, int theme) {
-        super(context, theme);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = SizeUtils.dp2px(getContext(), 62);
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_left);
-        }
-        if (dataBean != null) {
-            binding.tvRoomId.setOnClickListener(v -> AVRoomActivity.start(getContext(), dataBean.getRoomErbanNo()));
-            binding.setGiftBean(dataBean);
-        }
-    }
-
-}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt
@@ -0,0 +1,105 @@
+package com.yizhuan.erban.ui.widget.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.Window
+import android.view.WindowManager
+import androidx.databinding.DataBindingUtil
+import com.chuhai.utils.ktx.singleClick
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.activity.AVRoomActivity
+import com.yizhuan.erban.databinding.AllServiceGiftGoRoomTipsDialogBinding
+import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity
+import com.yizhuan.xchat_android_core.initial.InitialModel
+import com.yizhuan.xchat_android_library.common.util.SPUtils
+import com.yizhuan.xchat_android_library.utils.JavaUtil
+
+/**
+ * Created by Max on 2023/10/30 10:29
+ * Desc:跳转房间提示
+ **/
+class AllServiceGiftGoRoomTipsDialog(
+    context: Context,
+    private val roomName: String,
+    private val roomId: Long
+) :
+    BaseDialog(context, R.style.dialog) {
+
+    private var binding: AllServiceGiftGoRoomTipsDialogBinding? = null
+
+    companion object {
+        /**
+         * 是否需要提示前往房间
+         */
+        fun isNeedTips(): Boolean {
+            return !SPUtils.getBoolean("all_service_gift_go_room_no_tips", false)
+        }
+
+        /**
+         * 忽略提示/不在提示
+         */
+        private fun ignoreTips() {
+            SPUtils.putBoolean("all_service_gift_go_room_no_tips", true)
+        }
+    }
+
+    private var isCheck: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setCancelable(false)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        val inflate =
+            LayoutInflater.from(context)
+                .inflate(R.layout.all_service_gift_go_room_tips_dialog, null)
+        setContentView(inflate.rootView)
+        binding = DataBindingUtil.bind(inflate)
+
+        binding?.tvRoomName?.text = roomName
+        binding?.ivCheckbox?.setOnClickListener {
+            updateCheckbox(!isCheck)
+        }
+        binding?.tvTips?.setOnClickListener {
+            updateCheckbox(!isCheck)
+        }
+        binding?.tvGo?.singleClick {
+            if (isCheck) {
+                ignoreTips()
+            }
+            if (roomId == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) {
+                PublicChatHallHomeActivity.openPublicChatHallPage(context)
+            } else {
+                AVRoomActivity.start(context, roomId)
+            }
+            dismiss()
+        }
+        binding?.tvCancel?.singleClick {
+            if (isCheck) {
+                ignoreTips()
+            }
+            dismiss()
+        }
+        updateCheckbox(false)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        this.window?.attributes?.let {
+            it.width = WindowManager.LayoutParams.MATCH_PARENT
+            it.height = WindowManager.LayoutParams.WRAP_CONTENT
+            it.gravity = Gravity.CENTER
+            window?.attributes = it
+        }
+    }
+
+    private fun updateCheckbox(isCheck: Boolean) {
+        this.isCheck = isCheck
+        if (isCheck) {
+            binding?.ivCheckbox?.setImageResource(R.drawable.base_ic_checkbox_selected)
+        } else {
+            binding?.ivCheckbox?.setImageResource(R.drawable.base_ic_checkbox_unselected)
+        }
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
@@ -0,0 +1,192 @@
+package com.yizhuan.erban.ui.widget.dialog
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewConfiguration
+import android.view.Window
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.core.view.isVisible
+import androidx.databinding.DataBindingUtil
+import com.chuhai.utils.ktx.getColorById
+import com.chuhai.utils.ktx.singleClick
+import com.chuhai.utils.ktx.toStringRes
+import com.chuhai.utils.spannable.SpannableTextBuilder
+import com.yizhuan.erban.R
+import com.yizhuan.erban.avroom.activity.AVRoomActivity
+import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelBinding
+import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity
+import com.yizhuan.xchat_android_core.initial.InitialModel
+import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol
+import com.yizhuan.xchat_android_library.utils.JavaUtil
+import io.reactivex.Observable
+import io.reactivex.disposables.Disposable
+import java.util.concurrent.TimeUnit
+
+/**
+ * Created by Max on 2023/10/27 18:42
+ * Desc:全服礼物弹窗
+ **/
+class AllServiceGiftLevelDialog : BaseDialog {
+
+    private var data: AllServiceGiftProtocol.DataBean? = null
+    private var binding: DialogGiftAllServiceLevelBinding? = null
+
+    private var disposable: Disposable? = null
+
+    companion object {
+        private var marqueeError = false
+    }
+
+    constructor(context: Context?, data: AllServiceGiftProtocol.DataBean) : super(
+        context, R.style.FullScreenDialog
+    ) {
+        this.data = data
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        val inflate =
+            LayoutInflater.from(context).inflate(R.layout.dialog_gift_all_service_level, null)
+        setContentView(inflate.rootView)
+        setCancelable(true)
+        setCanceledOnTouchOutside(true)
+        binding = DataBindingUtil.bind(inflate)
+        val window = window
+        if (window != null) {
+            window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            val windowParams = window.attributes
+            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT
+            //MATCH_PARENT会挡住键盘，
+            // wrap_parent在小米8又会截掉一点，在华为测试关闭按钮点击不到
+            //暂时找不到原因，
+            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT
+            windowParams.dimAmount = 0.0f
+            windowParams.gravity = Gravity.TOP
+            windowParams.x = 0
+            windowParams.y = 0
+            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)
+            window.attributes = windowParams
+            window.setWindowAnimations(R.style.anim_left)
+        }
+        val data = this.data
+        val binding = this.binding
+        if (data != null && binding != null) {
+            init(data, binding)
+        } else {
+            dismiss()
+        }
+    }
+
+    private fun init(
+        data: AllServiceGiftProtocol.DataBean,
+        binding: DialogGiftAllServiceLevelBinding
+    ) {
+        binding.ivAvatar.singleClick {
+            goRoom(data)
+        }
+        binding.tvRoomGo.singleClick {
+            goRoom(data)
+        }
+        binding.giftBean = data
+        if ((data.giftNum) <= 1) {
+            binding.tvCount.text = ""
+        } else {
+            binding.tvCount.text = "X${data.giftNum}"
+        }
+        SpannableTextBuilder(binding.tvMessage)
+            .appendText(
+                data.sendUserNick,
+                binding.tvMessage.context.getColorById(R.color.color_FFE468)
+            )
+            .appendText(
+                R.string.avroom_widget_messageview_0137.toStringRes(),
+                binding.tvMessage.context.getColorById(R.color.white)
+            )
+            .appendText(
+                data.recvUserNick + " ",
+                binding.tvMessage.context.getColorById(R.color.color_FFE468)
+            )
+            .appendText(
+                data.giftName,
+                binding.tvMessage.context.getColorById(R.color.white)
+            ).apply()
+        when (data.levelNum.toIntOrNull()) {
+            2 -> {
+                binding.ivAvatarBg.setImageResource(R.drawable.all_service_gift_bg_avatar_2)
+                binding.layoutRoot.setBackgroundResource(R.drawable.all_service_gift_bg_2)
+                binding.tvRoomGo.setBackgroundResource(R.drawable.all_service_gift_bg_room_go2)
+            }
+
+            3 -> {
+                binding.ivAvatarBg.setImageResource(R.drawable.all_service_gift_bg_avatar_3)
+                binding.layoutRoot.setBackgroundResource(R.drawable.all_service_gift_bg_3)
+                binding.tvRoomGo.setBackgroundResource(R.drawable.all_service_gift_bg_room_go3)
+            }
+
+            else -> {
+                binding.ivAvatarBg.setImageDrawable(null)
+                binding.layoutRoot.setBackgroundResource(R.drawable.all_service_gift_bg_1)
+                binding.tvRoomGo.setBackgroundResource(R.drawable.all_service_gift_bg_room_go1)
+            }
+        }
+        setupTextMarquee(binding.tvMessage)
+        disposable = Observable.timer(data.notifyStaySecond.toLong(), TimeUnit.SECONDS)
+            .subscribe { dismiss() }
+        binding.groupRoom.isVisible = data.roomUid != 0L
+    }
+
+    /**
+     * 添加跑马灯
+     * 以及反射一些参数影响跑马灯
+     */
+    private fun setupTextMarquee(view: TextView) {
+        view.isSelected = true
+        if (marqueeError) {
+            return
+        }
+        try {
+            val configuration = ViewConfiguration.get(
+                context
+            )
+            val claz: Class<*> = configuration.javaClass
+            val field = claz.getDeclaredField("mFadingMarqueeEnabled")
+            field.isAccessible = true
+            field[configuration] = true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            marqueeError = true
+        }
+    }
+
+    private fun goRoom(
+        data: AllServiceGiftProtocol.DataBean
+    ) {
+        if (data.roomUid <= 0L) {
+            // 非房间场景送的礼物
+            return
+        }
+        if (AllServiceGiftGoRoomTipsDialog.isNeedTips()) {
+            AllServiceGiftGoRoomTipsDialog(context, data.roomTitle ?: "", data.roomUid).show()
+        } else {
+            if (data.roomUid == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) {
+                PublicChatHallHomeActivity.openPublicChatHallPage(context)
+            } else {
+                AVRoomActivity.start(context, data.roomUid)
+            }
+        }
+    }
+
+    override fun dismiss() {
+        super.dismiss()
+        if (disposable?.isDisposed != true) {
+            disposable?.dispose()
+        }
+        disposable = null
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
@@ -1,82 +0,0 @@
-package com.yizhuan.erban.ui.widget.dialog;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelOneBinding;
-import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelOneDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceLevelOneBinding binding;
-
-    public AllServiceGiftLevelOneDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-        giftLevel = ALL_SERVICE_GIFT_LEVEL_1;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_level_one, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            //MATCH_PARENT会挡住键盘，
-            // wrap_parent在小米8又会截掉一点，在华为测试关闭按钮点击不到
-            //暂时找不到原因，
-            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_left);
-        }
-        if (dataBean != null) {
-            binding.getRoot().setOnClickListener(v -> {
-                if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
-                    PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
-                } else {
-                    AVRoomActivity.start(getContext(), dataBean.getRoomUid());
-                }
-            });
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-        }
-        binding.ivCloseDialogOne.setOnClickListener(v -> dismiss());
-    }
-}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
@@ -1,86 +0,0 @@
-package com.yizhuan.erban.ui.widget.dialog;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelThreeBinding;
-import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelThreeDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceLevelThreeBinding binding;
-    private float screenWidth;
-
-    public AllServiceGiftLevelThreeDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_level_three, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        Point point = new Point();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            windowParams.height =WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_fade);
-            window.getWindowManager().getDefaultDisplay().getSize(point);
-            screenWidth = point.x;
-        }
-        if (dataBean != null) {
-            binding.giftClose.setOnClickListener(v -> {
-                dismiss();
-            });
-            binding.getRoot().setOnClickListener(v -> {
-                if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
-                    PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
-                } else {
-                    AVRoomActivity.start(getContext(), dataBean.getRoomUid());
-                }
-            });
-            // 设置定时器
-            Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS)
-                    .subscribe(aLong -> {
-                        dismiss();
-                    });
-            binding.setGiftBean(dataBean);
-        }
-    }
-}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
@@ -1,85 +0,0 @@
-package com.yizhuan.erban.ui.widget.dialog;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelTwoBinding;
-import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-
-/**
- * Created by MadisonRong on 11/05/2018.
- */
-
-public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog {
-
-    private DialogGiftAllServiceLevelTwoBinding binding;
-    private float screenWidth;
-
-    public AllServiceGiftLevelTwoDialog(Context context, AllServiceGiftProtocol.DataBean dataBean) {
-        super(context, R.style.FullScreenDialog, dataBean);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dialog_gift_all_service_level_two, null);
-        setContentView(inflate.getRootView());
-        setCancelable(true);
-        setCanceledOnTouchOutside(true);
-        binding = DataBindingUtil.bind(inflate);
-
-        Window window = getWindow();
-        Point point = new Point();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams windowParams = window.getAttributes();
-            windowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            windowParams.dimAmount = 0.0f;
-            windowParams.gravity = Gravity.TOP;
-            windowParams.x = 0;
-            windowParams.y = 0;
-            window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
-            window.setAttributes(windowParams);
-            window.setWindowAnimations(R.style.anim_left);
-            window.getWindowManager().getDefaultDisplay().getSize(point);
-            screenWidth = point.x;
-        }
-        if (dataBean != null) {
-            binding.getRoot().setOnClickListener(v -> {
-                if (dataBean.getRoomUid() == JavaUtil.str2long(InitialModel.get().getPublicChatHallUid())) {
-                    PublicChatHallHomeActivity.openPublicChatHallPage(getContext());
-                } else {
-                    AVRoomActivity.start(getContext(), dataBean.getRoomUid());
-                }
-            });
-            // 设置定时器
-            Observable.timer((long) (dataBean.getNotifyStaySecond()), TimeUnit.SECONDS)
-                    .subscribe(aLong -> dismiss());
-            binding.setGiftBean(dataBean);
-        }
-
-        binding.ivCloseDialogTwo.setOnClickListener(v -> dismiss());
-
-    }
-
-}
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java
@@ -16,6 +16,7 @@ import android.widget.FrameLayout;

 import androidx.annotation.NonNull;

+import com.chuhai.utils.ServiceTime;
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGADynamicEntity;
 import com.opensource.svgaplayer.SVGAImageView;
@@ -41,6 +42,8 @@ public class AllServiceVipLevelUPDialog extends BaseDialog {

    private final VipMessageInfo vipMessageInfo;
    private DialogVipAllServiceLevelUpBinding binding;
+    private long startTime = 0;
+    private int frameCount = 0;

    public AllServiceVipLevelUPDialog(Context context, @NonNull VipMessageInfo vipMessageInfo) {
        super(context, R.style.FullScreenDialog);
@@ -77,7 +80,7 @@ public class AllServiceVipLevelUPDialog extends BaseDialog {
                .append(ResUtil.getString(R.string.widget_dialog_allserviceviplevelupdialog_01), new ForegroundColorSpan(Color.WHITE))
                .append("-", new CircleImageSpan(new ColorDrawable(Color.TRANSPARENT), vipMessageInfo.getAvatar(), 50, 50))
                .append(" " + StringExtensionKt.sub(vipMessageInfo.getNick(), 6) + " ", new ForegroundColorSpan(getContext().getResources().getColor(R.color.notice_nick)))
-                .append(ResUtil.getString(R.string.widget_dialog_allserviceviplevelupdialog_02) + vipMessageInfo.getCurrVipName(), new ForegroundColorSpan(Color.WHITE)+"!");
+                .append(ResUtil.getString(R.string.widget_dialog_allserviceviplevelupdialog_02) + vipMessageInfo.getCurrVipName(), new ForegroundColorSpan(Color.WHITE) + "!");

        SVGAImageView svgaImageView = new SVGAImageView(getContext());
        svgaImageView.setLoops(1);
@@ -87,7 +90,19 @@ public class AllServiceVipLevelUPDialog extends BaseDialog {
        svgaImageView.setCallback(new SimpleSvgaCallback() {
            @Override
            public void onFinished() {
-                closeSelf();
+                long offset = ServiceTime.INSTANCE.getTime() - startTime;
+                if (offset < 6000) {
+                    int centerFrame = frameCount / 2;
+                    if (centerFrame > 0) {
+                        // 目前的SVGA资源最后一帧是半透明的，这里强制跳到中间帧，最大程度避免这种情况
+                        svgaImageView.stepToFrame(centerFrame, false);
+                    }
+                    svgaImageView.postDelayed(() -> {
+                        closeSelf();
+                    }, 6000 - offset);
+                } else {
+                    closeSelf();
+                }
            }
        });
        binding.flSvgaVipNotify.addView(svgaImageView);
@@ -95,6 +110,8 @@ public class AllServiceVipLevelUPDialog extends BaseDialog {
            SVGAParser.Companion.shareParser().decodeFromURL(new URL(vipMessageInfo.getFloatPic()), new SVGAParser.ParseCompletion() {
                @Override
                public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) {
+                    frameCount = svgaVideoEntity.getFrames();
+                    startTime = ServiceTime.INSTANCE.getTime();
                    SVGADynamicEntity dynamicEntity = new SVGADynamicEntity();
                    TextPaint textPaint = new TextPaint();
                    textPaint.setColor(Color.WHITE);//字体颜色
--- a/app/src/main/java/com/yizhuan/erban/view/ShadowFrameLayout.java
+++ b/app/src/main/java/com/yizhuan/erban/view/ShadowFrameLayout.java
@@ -0,0 +1,92 @@
+package com.yizhuan.erban.view;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import com.yizhuan.erban.R;
+
+/**
+ * @author wzq
+ */
+public class ShadowFrameLayout extends FrameLayout {
+
+    private Paint mShadowPaint;
+    private float mCornerRadius;
+    /**
+     * 只有上面有阴影
+     */
+    private boolean mShadowTop;
+
+    private float mShadowRadius;
+
+    private RectF mRectF;
+
+    public ShadowFrameLayout(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public ShadowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public ShadowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.ShadowFrameLayout);
+        int shadowColor = typedArray.getColor(R.styleable.ShadowFrameLayout_shadowColor,
+                ContextCompat.getColor(context, R.color.color_1E686868));
+        int backgroundColor = typedArray.getColor(R.styleable.ShadowFrameLayout_backgroundColor, Color.WHITE);
+        mShadowRadius = typedArray.getDimension(R.styleable.ShadowFrameLayout_shadowRadius, 0);
+        mCornerRadius = typedArray.getDimension(R.styleable.ShadowFrameLayout_cornerRadius, 0);
+        mShadowTop = typedArray.getBoolean(R.styleable.ShadowFrameLayout_shadowTop, false);
+        typedArray.recycle();
+
+        mShadowPaint = new Paint();
+        mShadowPaint.setShadowLayer(mShadowRadius, 0, 0, shadowColor);
+        mShadowPaint.setAntiAlias(true);
+        mShadowPaint.setColor(backgroundColor);
+        setLayerType(LAYER_TYPE_SOFTWARE, null);
+
+        mRectF = new RectF();
+    }
+
+    @Override
+    public void setBackgroundColor(@ColorInt int color) {
+        mShadowPaint.setColor(color);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int measuredWidth = getMeasuredWidth();
+        int measuredHeight = getMeasuredHeight();
+        if (mShadowTop) {
+            // 矩形只有上方有阴影
+            mRectF.set(0, mShadowRadius, measuredWidth, measuredHeight + mCornerRadius);
+        } else {
+            // 环绕阴影
+            mRectF.set(mShadowRadius, mShadowRadius, measuredWidth - mShadowRadius, measuredHeight - mShadowRadius);
+        }
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        canvas.drawRoundRect(mRectF, mCornerRadius, mCornerRadius, mShadowPaint);
+        super.dispatchDraw(canvas);
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/view/WrapHeightViewPager.kt
+++ b/app/src/main/java/com/yizhuan/erban/view/WrapHeightViewPager.kt
@@ -0,0 +1,37 @@
+package com.yizhuan.erban.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.viewpager.widget.ViewPager
+
+/**
+ * Created by Max on 2022/10/10 15:30
+ * 高度自适应（采用最大的子页面高度）-ViewPager
+ */
+class WrapHeightViewPager : ViewPager {
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        var height = 0
+        for (i in 0 until childCount) {
+            val child: View = getChildAt(i)
+            child.measure(
+                widthMeasureSpec,
+                MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+            )
+            val h = child.measuredHeight
+            if (h > height) {
+                height = h
+            }
+        }
+        super.onMeasure(
+            widthMeasureSpec, MeasureSpec.makeMeasureSpec(
+                height,
+                MeasureSpec.EXACTLY
+            )
+        )
+    }
+}
--- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt
@@ -14,8 +14,8 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.GridLayoutManager
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.SkuDetails
 import com.appsflyer.AFInAppEventParameterName
 import com.appsflyer.AFInAppEventType
 import com.appsflyer.AppsFlyerLib
@@ -233,12 +233,12 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),

        binding.tvOpenVip.setOnClickListener {
            if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
-                if ((googleChargeBean?.skuDetails?.price ?: "0") == "0") {
+                if ((googleChargeBean?.productDetails?.oneTimePurchaseOfferDetails?.priceAmountMicros ?: "0") == "0") {
                    toast(getString(R.string.Recharge_failure))
                    return@setOnClickListener
                }
                SelectPayTypeDialog.newInstance(
-                    googleChargeBean?.skuDetails?.price ?: "0",
+                    googleChargeBean?.productDetails?.oneTimePurchaseOfferDetails?.formattedPrice ?: "0",
                    true,
                    googleChargeBean?.getMoney() ?: 0.0
                )
@@ -248,7 +248,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
                        }
                        setOnGoogleChargeClick {
                            googleChargeBean?.let { charge ->
-                                buyProduct(charge.skuDetails)
+                                buyProduct(charge.productDetails)
                            }
                        }
                        setOnChargeClick {
@@ -396,20 +396,18 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
                    chargeInfo?.let { chargeBean ->
                        val productKeys: MutableList<String> = ArrayList()
                        productKeys.add(chargeBean.getChargeProdId())
-                        billingManager?.querySkuDetailsAsync(
-                            BillingClient.SkuType.INAPP, productKeys
-                        ) { billingResult: BillingResult, skuDetailsList: List<SkuDetails>? ->
+                        billingManager?.querySkuDetailsAsync(productKeys) { billingResult: BillingResult, productDetails: List<ProductDetails> ->
                            if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
                                Log.w(
                                    TAG,
                                    "Unsuccessful query for type: " + BillingClient.SkuType.INAPP
                                            + ". Error code: " + billingResult.responseCode
                                )
-                            } else if (skuDetailsList != null && skuDetailsList.isNotEmpty()) {
+                            } else if (productDetails.isNotEmpty()) {
                                val showChargeList: MutableList<ChargeBean> = ArrayList()
-                                for (skuDetails in skuDetailsList) {
-                                    if (skuDetails.sku == chargeBean.getChargeProdId()) {
-                                        chargeBean.skuDetails = skuDetails
+                                for (skuDetails in productDetails) {
+                                    if (skuDetails.productId == chargeBean.getChargeProdId()) {
+                                        chargeBean.productDetails = skuDetails
                                        showChargeList.add(chargeBean)
                                        break
                                    }
@@ -439,7 +437,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
            ) {
                PayModel.get().verifyOrder(
                    purchase.accountIdentifiers!!.obfuscatedAccountId,
-                    purchase.skus[0],
+                    purchase.products[0],
                    purchase.packageName,
                    purchase.purchaseToken
                )
@@ -448,21 +446,21 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
                        { token: String? ->
                            //L.i("token=" + token);
                            billingManager?.consumeAsync(token)
-                            var skuDetails: SkuDetails? = null
-                            if (googleChargeBean?.getChargeProdId() == purchase.skus[0]) {
-                                skuDetails = googleChargeBean?.skuDetails
+                            var skuDetails: ProductDetails? = null
+                            if (googleChargeBean?.getChargeProdId() == purchase.products[0]) {
+                                skuDetails = googleChargeBean?.productDetails
                            }
                            if (skuDetails != null) {
                                val eventValue: MutableMap<String, Any> =
                                    HashMap()
                                eventValue[AFInAppEventParameterName.CONTENT_TYPE] = "Gold"
                                eventValue[AFInAppEventParameterName.QUANTITY] = 1
-                                eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId
+                                eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId!!
                                eventValue[AFInAppEventParameterName.REVENUE] =
-                                    skuDetails.priceAmountMicros / 1000000f
-                                eventValue["Price"] = skuDetails.price
+                                    skuDetails.oneTimePurchaseOfferDetails?.priceAmountMicros!! / 1000000f
+                                eventValue["Price"] = skuDetails.oneTimePurchaseOfferDetails?.formattedPrice!!
                                eventValue[AFInAppEventParameterName.CURRENCY] =
-                                    skuDetails.priceCurrencyCode
+                                    skuDetails.oneTimePurchaseOfferDetails?.priceCurrencyCode!!
                                AppsFlyerLib.getInstance().logEvent(
                                    applicationContext,
                                    AFInAppEventType.PURCHASE,
@@ -490,15 +488,15 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),

    /*购买商品*/
    @SuppressLint("CheckResult")
-    fun buyProduct(skuDetails: SkuDetails?) {
-        if (skuDetails != null) {
-            Log.d(TAG, "BuyProduct:" + skuDetails.sku)
-            PayModel.get().placeOrder(skuDetails.sku)
+    fun buyProduct(productDetails: ProductDetails?) {
+        if (productDetails != null) {
+            Log.d(TAG, "BuyProduct:" + productDetails.productId)
+            PayModel.get().placeOrder(productDetails.productId)
                .compose(bindToLifecycle())
                .subscribe(
                    { recordId: PayRecordId ->
                        billingManager?.initiatePurchaseFlow(
-                            skuDetails,
+                            productDetails,
                            recordId.recordId
                        )
                    }
--- a/app/src/main/res/color/color_selector_radio_button.xml
+++ b/app/src/main/res/color/color_selector_radio_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/white" android:state_checked="true" />
+
+    <item android:color="@color/color_9168FA" />
+
+</selector>
--- a/app/src/main/res/drawable-xhdpi/all_service_gift_avatar_level_one_background.png
+++ b/app/src/main/res/drawable-xhdpi/all_service_gift_avatar_level_one_background.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max	9096a9b57f	fix:修复输入密码进入游戏房的房间状态不一致问题	2023-12-04 18:54:11 +08:00
Max	c46c49715c	feat：补充日志信息	2023-12-04 17:42:29 +08:00
Max	31b785c511	fix:调整礼物飘窗样式问题	2023-12-04 17:42:14 +08:00
Max	6f01c5ddad	fix:修复进入有密码的房间，游戏未加载问题	2023-12-04 17:34:47 +08:00
Max	306f15f7f9	feat：通过时间，简单过滤多次重复401异常处理	2023-12-04 16:58:11 +08:00
Max	0babbedeb9	feat:同步habu完成房间banner资源位展示优化	2023-12-01 16:54:21 +08:00
Max	d09e60d206	feat:同步hubu完成【升级飘窗、加入公会】功能优化	2023-12-01 16:31:06 +08:00
Max	e37796286b	feat:同步Habu完成地区隔离功能	2023-12-01 16:10:22 +08:00
Max	bdcfb21e6e	Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix	2023-11-01 18:34:23 +08:00
Max	5c7d2e9645	fix:调整幸运礼物动画播放条件（去掉价值520的条件，恢复luckyGiftSvgaUrl逻辑）	2023-11-01 18:34:15 +08:00
Max	d2f24c4457	Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix	2023-11-01 16:29:11 +08:00
Max	7ec11e0aba	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-11-01 16:28:58 +08:00
Max	f4a9690c1b	fix:修复红包组件内的compositeDisposable导致再次激活无法执行任务	2023-11-01 16:20:43 +08:00
Max	0742894540	Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix	2023-11-01 14:59:16 +08:00
Max	d0fe8e892e	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-11-01 14:59:05 +08:00
Max	b9120dca54	feat：调整红包打开按钮动画时长 feat：调整红包入口图标	2023-11-01 14:58:47 +08:00
Max	8ebaddad07	Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix	2023-11-01 11:34:52 +08:00
Max	b63b4ba07a	fix:修复幸运礼物重复动效（去掉本地自己播的一个svga）	2023-11-01 11:34:43 +08:00
Max	a211267517	fix:修复麦位魅力值展示问题（主麦）	2023-11-01 11:22:04 +08:00
Max	d0e88440e3	Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix	2023-10-31 19:19:32 +08:00
Max	260ed56c99	Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix	2023-10-31 19:19:22 +08:00
Max	505917b70f	Merge branch 'v2.2.0/float_gift' into v2.2.0/test	2023-10-31 19:19:05 +08:00
Max	03d013fcba	fix：修复合并导致的礼物飘窗未展示房间名称问题	2023-10-31 19:18:57 +08:00
Max	19301bbd84	fix：修复公屏相册条目的等级icon加载模糊问题	2023-10-31 19:07:08 +08:00
Max	694a73931b	Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix	2023-10-31 18:06:49 +08:00
Max	d34929d7c7	fix:修复礼物信令解析时未判空导致的解析中断	2023-10-31 18:06:40 +08:00
Max	73eccecfc9	Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix	2023-10-31 17:26:18 +08:00
Max	eb1546570a	Merge branch 'v2.2.0/float_gift' into v2.2.0/test # Conflicts: # app/src/main/res/layout/dialog_gift_all_service_level2.xml	2023-10-31 17:26:06 +08:00
Max	7ba43a51d4	fix:调整礼物飘窗弹窗-去围观位置	2023-10-31 17:25:22 +08:00
Max	bae4660840	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-10-31 17:19:15 +08:00
Max	b9fd24e0ff	fix:红包过期时间动态展示（发布、小秘书） fix:调整全服红包文案字数限制	2023-10-31 17:19:06 +08:00
Max	4bef25e1e3	Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix	2023-10-31 15:54:47 +08:00
Max	72480daa98	Merge branch 'v2.2.0/float_gift' into v2.2.0/test	2023-10-31 15:54:35 +08:00
Max	1defcb0d28	fix：修复礼物飘窗与其他特效飘窗重叠问题（加顶部间距：之前版本是这么解决的，应该是之前版本没做完善这块需求）	2023-10-31 15:54:26 +08:00
Max	4885a0bdbd	Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix	2023-10-31 15:14:14 +08:00
Max	5900702ca6	fix：修复公屏历史消息未查询相册类型消息问题	2023-10-31 15:14:04 +08:00
Max	9e6928580f	Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix	2023-10-31 11:25:46 +08:00
Max	e644ced1ed	fix:去除聊天页-语音&图片时的WRITE_EXTERNAL_STORAGE权限	2023-10-31 11:25:16 +08:00
Max	1667dd3863	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-10-31 11:11:59 +08:00
Max	c04d3e283b	fix:点击红包图标已领取且领取完时增加提示并更新入口	2023-10-31 11:10:51 +08:00
Max	2b6d66c31e	Merge branch 'v2.2.0/float_gift' into v2.2.0/test	2023-10-31 10:19:48 +08:00
Max	e56bbb5f8f	fix:修复非房间礼物飘窗弹窗点击跳转未屏蔽问题	2023-10-31 10:17:09 +08:00
Max	7bf7e232d0	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-10-30 20:11:15 +08:00
Max	d63a441296	feat：去掉房间设置中的-全服红包开关（暂时操作隐藏入口）	2023-10-30 20:08:08 +08:00
Max	e81ec19168	Merge branch 'v2.2.0/float_gift' into v2.2.0/test # Conflicts: # gradle.properties	2023-10-30 20:02:52 +08:00
Max	588b96ec7b	fix:跳转提示去房间的忽略提示规则	2023-10-30 20:02:04 +08:00
Max	514abbc314	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-10-30 19:49:16 +08:00
Max	94d9183952	fix:修复全服红包未展示自定义文案问题	2023-10-30 19:49:09 +08:00
Max	6eedd5cc46	fix：修复切换同类型房间导致的Widget未更新Context问题	2023-10-30 19:30:26 +08:00
Max	087091275f	fix:增加领取成功后主动刷新入口图标数据	2023-10-30 17:10:20 +08:00
Max	f54a8ec175	feat:完善发送红包的权限细分 feat：删除红包无用旧代码	2023-10-30 16:49:00 +08:00
Max	fee8f2ceb9	Merge branch 'v2.2.0/red_package' into v2.2.0/test # Conflicts: # app/src/main/res/values/strings.xml	2023-10-30 15:37:59 +08:00
Max	a18a66b496	fix;修复红包失效时的入口更新问题	2023-10-30 15:36:00 +08:00
Max	80e21bee74	fix:修复房间内点击红包跳转到其他房间后没弹出红包问题	2023-10-30 15:16:06 +08:00
Max	e031dd9d02	fix:修复红包内若干bug	2023-10-30 14:45:19 +08:00
Max	19a3b64a32	Merge branch 'v2.2.0/float_gift' into v2.2.0/test # Conflicts: # app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt # app/src/main/res/values/strings.xml	2023-10-30 12:45:11 +08:00
Max	34a5571338	feat:完成礼物飘窗跳转提示	2023-10-30 12:35:56 +08:00
Max	5b4eeb80e8	Merge branch 'v2.2.0/red_package' into v2.2.0/test	2023-10-29 23:14:28 +08:00
Max	f7889ace18	feat:完善游戏房、个播房红包展示 feat:完善红包冲突场景	2023-10-29 23:14:20 +08:00
Max	cfc909df42	Merge branch 'v2.2.0/float_gift' into v2.2.0/test # Conflicts: # app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt # app/src/main/res/layout/dialog_gift_all_service_level.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml	2023-10-28 12:56:42 +08:00
Max	ebc989cccf	feat:使用动态比例实现飘窗礼物布局（待验证）	2023-10-28 12:25:24 +08:00
Max	5ad1c017c3	feat:完善礼物飘窗文本样式	2023-10-28 11:43:19 +08:00
Max	15a80f5537	feat：初步完成全服飘窗礼物UI优化	2023-10-27 20:06:11 +08:00
Max	38fde6109b	Merge branch 'v2.2.0/red_package' into v2.2.0/dev # Conflicts: # gradle.properties	2023-10-27 17:09:46 +08:00
Max	3199114ff6	fix:修复开红包结果页的view隐藏展示问题 fix:修复发红包背景展示问题	2023-10-27 17:06:40 +08:00
Max	57139f1f97	feat:完善全服红包跳转逻辑	2023-10-27 16:32:54 +08:00
Max	c7d7d98873	feat:完善抢红包条件的完成路径跳转 feat:完善抢红包细节	2023-10-27 13:01:05 +08:00
Max	d7da6d4be4	feat:完善抢红包文案和交互	2023-10-27 11:21:13 +08:00
Max	b9a2f03184	feat:完善红包入口逻辑 feat:初步可以领取红包	2023-10-27 02:10:55 +08:00
Max	5ef9be75d2	feat:初步搭建新房间框架 feat:初步搭建红包处理器与组件等（未完成）	2023-10-26 20:17:11 +08:00
Max	cf3ab9ce84	feat：调整发红包部分字段	2023-10-25 18:25:31 +08:00
Max	3ba31c46d8	feat:补充支付订单为空的判断	2023-10-25 17:14:31 +08:00
Max	e8f7eca1af	fix:修复google支付回调时导致的空指针异常 fix:完善房间上麦时权限申请的前置状态判断	2023-10-25 16:56:05 +08:00
Max	d93b6fbf60	feat:新增core模块（核心组件模块，慢慢整理重构）	2023-10-25 16:48:32 +08:00
Max	6ec57834fd	feat:初步完成发红包接口对接 feat:增加服务器时间字段	2023-10-25 15:17:08 +08:00
Max	c3dab80e71	feat:初步完成房间红包入口组件UI feat:完善网络调试工具Stetho的配置	2023-10-24 19:06:04 +08:00
Max	60e56beb43	feat:完成打开红包弹窗UI	2023-10-24 15:40:07 +08:00
Max	a0667bdd8d	feat:初步完成领红包弹窗UI框架	2023-10-24 14:12:42 +08:00
Max	ba65ad680f	feat:完成发红包UI国际化	2023-10-24 10:29:47 +08:00
Max	5163c2dc9d	feat:初步完成发红包弹窗UI	2023-10-23 20:15:02 +08:00
wzq	ad5a769f25	清除 Google 内购代码	2023-10-19 18:02:03 +08:00
wzq	be291fa7e1	升级 Google 内购库	2023-10-19 17:22:58 +08:00
wzq	27713e5300	混淆 bean	2023-10-19 15:00:22 +08:00
wzq	80e180f2b8	debug 混淆配置; 升级eventbus	2023-10-19 14:46:11 +08:00
wzq	ba93c9c0fe	eventbus 混淆规则更新	2023-10-19 14:26:44 +08:00
wzq	6f9d1d81ad	房间相册 UI问题	2023-10-19 12:02:18 +08:00
wzq	81d0cd819d	房间相册-公屏修复崩溃及图片不显示	2023-10-19 10:19:51 +08:00
wzq	36897df28b	房间相册-上传多张图片上传时去除参数中的空格	2023-10-19 10:05:02 +08:00
wzq	6bdfe0426e	房间相册-上传删除已选照片后, 重新显示添加按钮	2023-10-18 18:58:21 +08:00
wzq	997b7ee9a3	[Build] debug 打包配置混淆打印信息	2023-10-18 18:08:37 +08:00
wzq	b885a24b8e	[Build] debug 打包配置混淆	2023-10-18 17:40:25 +08:00
wzq	5d2551e04f	房间相册修复神奇的手机无法点击图标关闭解锁弹窗	2023-10-18 17:19:11 +08:00
wzq	309e696a07	房间相册上传图片前压缩图片	2023-10-18 16:43:56 +08:00
wzq	68c9c6a8cb	房间相册照片列表分页问题	2023-10-18 16:30:01 +08:00
wzq	448e6800ab	房间相册公屏消息 UI显示问题	2023-10-18 15:36:49 +08:00
wzq	068ffcbed4	房间相册公屏消息解锁区域放大至整个消息区域	2023-10-18 15:08:03 +08:00
wzq	cf7b49b69d	房间相册 UI问题	2023-10-18 14:37:14 +08:00
wzq	09fd7c586a	房间相册数据展示及交互	2023-10-18 14:35:53 +08:00
wzq	03b77fae08	房间相册查看大图	2023-10-18 14:23:06 +08:00
wzq	b75ba89d75	房间相册公屏消息解锁	2023-10-18 13:14:49 +08:00
wzq	2074039de2	房间相册解锁	2023-10-17 20:57:02 +08:00
wzq	6b580ad2a6	房间相册删除图片	2023-10-17 20:05:47 +08:00
wzq	6134962297	房间相册发送图片至公屏	2023-10-17 19:12:42 +08:00
wzq	ce5cc20ac4	房间相册列表,上传数据对接	2023-10-17 18:16:41 +08:00
wzq	bc718f26c6	房间相册入口	2023-10-17 16:32:42 +08:00
wzq	8f9a5bd565	房间相册公屏消息UI	2023-10-17 14:08:23 +08:00
wzq	623a721e58	房间相册选择解锁礼物UI 交互	2023-10-17 10:10:42 +08:00
wzq	a9be418fc3	房间相册选择解锁礼物UI	2023-10-16 22:39:13 +08:00
wzq	5b781b890c	房间相册上传照片UI	2023-10-16 20:04:09 +08:00
wzq	4a6892d0c6	房间相册UI	2023-10-13 19:37:38 +08:00
wzq	a6e6992b1a	修复首页房间item 周榜框显示重叠	2023-10-13 11:36:38 +08:00
wzq	248e306e85	修复房间 "精灵夺宝" 抽奖一直转圈的问题	2023-10-12 19:10:15 +08:00
wzq	bce08e82ca	引入 okdownload 下载库下载表情. 避免网络请求卡死	2023-10-12 18:39:30 +08:00
wzq	32814780c2	房间 "夺宝精灵" 购买碎片成功弹窗显示问题	2023-10-12 18:30:04 +08:00
wzq	d0dc4cab49	房间 "夺宝精灵" 精灵兑换底部显示我拥有的精灵	2023-10-12 17:25:49 +08:00
wzq	80d571d1d1	房间 "夺宝精灵" 精灵分解. 根据不同等级的精灵, 显示不同的提示文案	2023-10-12 16:36:36 +08:00
wzq	b92c97dfb9	房间 "夺宝精灵" 自定义购买弹窗支持输入数量	2023-10-12 16:01:23 +08:00
wzq	e585899c44	房间 "夺宝精灵" 兑换商店-碎片兑换图标不正确	2023-10-12 15:15:56 +08:00
wzq	03f28b7be0	房间 "夺宝精灵" 兑换商店-精灵兑换 UI适配	2023-10-12 15:04:07 +08:00
wzq	c7225892f0	房间公屏输入框回车键发送信息	2023-10-12 12:00:55 +08:00
wzq	f8d4601c38	适配声网音量回调	2023-10-12 11:51:49 +08:00
wzq	ce4fce319e	房间 "夺宝精灵" 精灵试炼动画文件更换	2023-10-11 18:34:35 +08:00
wzq	ce4293ec35	房间 "夺宝精灵" 精灵分解更新碎片	2023-10-11 17:59:09 +08:00
wzq	1c9de5f03a	房间 "夺宝精灵" 兑换记录移除类型显示	2023-10-11 17:57:48 +08:00
wzq	2734ff1ff2	房间 "夺宝精灵" 精灵试炼记录区分类型	2023-10-11 17:49:48 +08:00
wzq	c7a28c5ac9	房间 "夺宝精灵" 精灵分解提示文案	2023-10-11 16:30:06 +08:00
wzq	ae4d327baf	房间 "夺宝精灵" 精灵试炼传说试炼底部精灵展示为普通精灵	2023-10-11 16:02:49 +08:00
wzq	9e9eb5d5b7	修复房间 "夺宝精灵" 召唤精灵价格不显示	2023-10-11 15:20:10 +08:00
wzq	96b1ad9e4c	修复房间 "夺宝精灵" 幸运值进度条不正确	2023-10-11 11:56:46 +08:00
wzq	48c527e789	修复房间 "夺宝精灵" 幸运值无法刷新	2023-10-11 11:38:58 +08:00
wzq	4e0a55ae46	修复房间 "夺宝精灵" 购买弹窗bug	2023-10-11 10:53:58 +08:00
wzq	c85065d86c	房间 "夺宝精灵" 新增自定义购买数量碎片弹窗	2023-10-10 17:54:47 +08:00
wzq	c1371fab10	房间寻爱活动购买限制数量200调整至99999	2023-10-10 17:03:11 +08:00
wzq	6717f9aa69	房间送礼接口失败后显示toast	2023-10-09 16:09:16 +08:00
wzq	61cafd8c8c	okhttp 网络配置	2023-10-09 14:21:36 +08:00
wzq	e4f0853d3e	升级 Facebook SDK	2023-10-09 11:48:53 +08:00
wzq	46a2985a49	首页滑动折叠效果	2023-10-08 18:15:17 +08:00
wzq	b2f9f07ded	首页 UI问题	2023-10-08 17:41:27 +08:00
wzq	5023d9a250	测试包关于页面点击logo 可切换正式/测试环境	2023-10-08 17:40:55 +08:00
wzq	29957775e0	Fixed NPE.	2023-10-07 16:36:52 +08:00
wzq	5f73c46868	升级 realm 数据库	2023-10-07 16:09:55 +08:00
wzq	656eea5ebc	fixed NPE.	2023-10-07 15:36:05 +08:00
wzq	f9b8c20d85	优化打包, 使用 splits abi 对每种CPU架构打独立的apk; 腾讯TRTC SDK优化集成方式, 并优化参数	2023-10-07 15:01:09 +08:00
wzq	2d7b55ad0d	修复星座计算不正确	2023-10-07 15:00:30 +08:00
wzq	91350218d6	首页UI 适配	2023-10-07 15:00:30 +08:00