fix：修正信息 tag 列表項阿語環境在 Android 低版本時佈局異常問題

fix：UI问题修复

app/build.gradle

@@ -116,6 +116,8 @@ android {
                     'src/module_album/java',
                     'src/module_treasure_box/java',
                     'src/module_public_chat/java',
+                    'src/module_game/java',
+                    'src/module_community/java',
 
             ]
 
@@ -131,6 +133,8 @@ android {
                     'src/module_album/res',
                     'src/module_treasure_box/res',
                     'src/module_public_chat/res',
+                    'src/module_game/res',
+                    'src/module_community/res',
 
             ]
 
@@ -217,7 +221,6 @@ dependencies {
     api "com.jzxiang.pickerview:TimePickerDialog:1.0.1"
     api "com.github.zyyoona7:EasyPopup:1.0.2"
     api "com.github.donkingliang:LabelsView:1.6.5"
-    api "com.github.yyued:SVGAPlayer-Android:2.6.1"
     api "com.ms-square:expandableTextView:0.1.4"
     annotationProcessor 'androidx.annotation:annotation:1.6.0'
 
@@ -272,8 +275,6 @@ dependencies {
     if (!isolationMode && file("../modules/module_google/build.gradle").exists()) {
         implementation project(':modules:module_google')
     }
-
-    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
 }
 
 channel {
@@ -293,7 +294,26 @@ aabResGuard {
     mappingFile = file("aab-res-guard-mapping.txt").toPath() // Mapping file used for incremental obfuscation
     whiteList = [ // White list rules
                   "*.R.raw.*",
-                  "*.R.drawable.icon"
+                  "*.R.drawable.icon",
+                  // SUD游戏-start
+                  "*.R.drawable.fsm_*",
+                  "*.R.string.fsm_*",
+                  "*.R.layout.fsm_*",
+                  "*.R.color.fsm_*",
+                  "*.R.id.fsm_*",
+                  "*.R.style.fsm_*",
+                  "*.R.dimen.fsm_*",
+                  "*.R.array.fsm_*",
+                  "*.R.integer.fsm_*",
+                  "*.R.bool.fsm_*",
+                  "*.R.mipmap.fsm_*",
+                  "*.R.styleable.fsm_*",
+                  "*.R.id.*loading*",
+                  "*.R.id.container_progress",
+                  "*.R.id.reload_btn",
+                  "*.R.id.unitySurfaceView",
+                  "*.R.string.game_view_content_description"
+                  // SUD游戏-end
     ]
     obfuscatedBundleFileName = "MoliStar-app.aab" // Obfuscated file name, must end with '.aab'
     mergeDuplicatedRes = true // Whether to allow the merge of duplicate resources
@@ -318,6 +338,29 @@ xmlClassGuard {
                      "com.chwl.core": "com.hhchu.core",
                      "com.chwl.library": "com.hhchu.library"]
     moveDir = [
+            "com.chwl.app.community.dynamic" : "ffefcef.ddbccaec",
+            "com.chwl.app.community.helper" : "eaeecbea.ccefdeaf",
+            "com.chwl.app.community.holder" : "aafebee.febeeba",
+            "com.chwl.app.community.im" : "eedadfa.cccedea",
+            "com.chwl.app.community.publish" : "ddae.cfdb",
+            "com.chwl.app.community.square" : "bddfb.eedde",
+            "com.chwl.app.community.user_dynamic" : "ddcdbcbc.acbfcfba",
+            "com.chwl.app.community.utils" : "cceaf.cbdcdb",
+            "com.chwl.app.community.widget" : "bdfaa.beeefc",
+            "com.chwl.app.community" : "cadfd.aeddb",
+            "com.chwl.app.avroom.headline" : "eefce.eecad",
+            "com.chwl.core.bean.game" : "caeccd.fdedac",
+            "com.chwl.core.bean.room" : "afceec.aaafbc",
+            "com.chwl.app.game" : "fcbfeb.ebfceac",
+            "com.chwl.core.sud" : "baecf.deccfc",
+            "com.chwl.library.download" : "aeacf.cecdd",
+            "com.chwl.app.pay.activity" : "abbe.faaca",
+            "com.chwl.app.pay.adapter" : "daddd.dcadd",
+            "com.chwl.app.pay.fragment" : "fceff.acfcf",
+            "com.chwl.app.pay.interfaces" : "eaadf.dbeecd",
+            "com.chwl.app.pay.password" : "ebcfe.adfea",
+            "com.chwl.app.pay.widget" : "fbfb.caeb",
+            "com.chwl.app.avroom.online" : "bfbdecb.fafffbbc",
             "com.chwl.app.avroom.game" : "bbecfa.babcfd",
             "com.chwl.app.ui.webview.baishun" : "caebbec.bfcfbdf",
             "com.chwl.core.public_chat_hall.model" : "aada.dceaa",

app/proguard-rules.pro

@@ -482,7 +482,7 @@
 -keep public class com.alibaba.android.arouter.routes.**{*;}
 -keep public class com.alibaba.android.arouter.facade.**{*;}
 -keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
-
+-keep class tech.sud.mgp.SudMGPWrapper.** {*;}
 
 #new after proguard
 -dontwarn bdcb.eedb.**

app/src/main/AndroidManifest.xml

@@ -82,7 +82,8 @@
     <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.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
     <application
         android:name=".application.App"
         android:allowBackup="false"
@@ -265,6 +266,12 @@
             android:name=".avroom.activity.RoomSettingActivity"
             android:label="@string/main_androidmanifest_07"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".avroom.activity.RoomTypeSwitchActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".avroom.activity.RoomBgSettingActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".avroom.activity.RoomManagerListActivity"
             android:label="@string/main_androidmanifest_08"
@@ -317,6 +324,9 @@
             android:name=".ui.pay.ChargeActivity"
             android:label="@string/main_androidmanifest_018"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.wallet.WalletActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".home.activity.CollectionRoomActivity"
             android:label="@string/main_androidmanifest_019"
@@ -867,17 +877,22 @@
 
         <service
             android:name="com.netease.nimlib.service.NimService"
+            android:foregroundServiceType="remoteMessaging"
             android:process=":core" />
         <service
             android:name="com.netease.nimlib.service.NimService$Aux"
+            android:foregroundServiceType="remoteMessaging"
             android:process=":core" />
         <service
             android:name="com.netease.nimlib.job.NIMJobService"
+            android:foregroundServiceType="remoteMessaging"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:process=":core" />
-        <service android:name="com.netease.nimlib.service.ResponseService" />
+        <service android:name="com.netease.nimlib.service.ResponseService"
+            android:foregroundServiceType="remoteMessaging"/>
         <service
             android:name=".service.DaemonService"
+            android:foregroundServiceType="mediaPlayback"
             android:enabled="true" />
 
         <activity android:name=".avroom.room_album.RoomAlbumActivity" />
@@ -903,6 +918,45 @@
             android:name=".decoration.view.DecorationStoreActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".pay.activity.GiveGoldActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".pay.activity.GiveGoldDetailActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".pay.activity.GiveGoldToUserActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".pay.activity.GiveGoldSearchActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".game.ui.game.GameActivity"
+            android:hardwareAccelerated="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".community.dynamic.view.DynamicDetailActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".community.publish.view.PublishActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustNothing" />
+        <activity
+            android:windowSoftInputMode="adjustPan"
+            android:name=".ui.feedback.FeedbackActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".ui.debug.DebugActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".ui.game_team.record.GameTeamRecordActivity"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

app/src/main/java/com/chwl/app/MainActivity.java

@@ -23,23 +23,30 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.chwl.app.base.GlobalViewModelOwner;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.community.square.SquareFragment;
+import com.chwl.app.game.core.GameStateAbility;
+import com.chwl.app.game.data.GameModel2;
+import com.chwl.app.game.ui.game.GameActivity;
+import com.chwl.app.game.ui.game.GameIntent;
+import com.chwl.app.game.ui.home.GameHomeFragment;
 import com.chwl.app.star.StarFragment;
+import com.chwl.app.support.PreloadResourceViewModel;
 import com.chwl.app.ui.login.LoginPasswordActivity;
 import com.chwl.core.home.bean.MainTabInfo;
 import com.chwl.core.settings.SettingsModel;
+import com.chwl.library.utils.JavaUtil;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nim.uikit.common.util.string.StringUtil;
-import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
 import com.netease.nimlib.sdk.NIMClient;
-import com.netease.nimlib.sdk.RequestCallbackWrapper;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.RecentContact;
 import com.netease.nimlib.sdk.team.TeamService;
 import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
 import com.netease.nimlib.sdk.team.model.Team;
-import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
 import com.orhanobut.logger.Logger;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.chwl.app.application.IReportConstants;
@@ -85,7 +92,6 @@ import com.chwl.core.channel_page.model.ChannelPageModel;
 import com.chwl.core.community.event.SquareTaskEvent;
 import com.chwl.core.community.event.UnReadCountEvent;
 import com.chwl.core.home.bean.MainTabType;
-import com.chwl.core.home.event.RefreshHomeDataEvent;
 import com.chwl.core.home.event.VisitorUnreadCountEvent;
 import com.chwl.core.home.model.GameHomeModel;
 import com.chwl.core.home.model.HomeModel;
@@ -120,10 +126,6 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 
 /**
  * @author Administrator
@@ -136,13 +138,13 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private static final String TAG = "MainActivity";
     private static final String EXTRA_APP_QUIT = "APP_QUIT";
     private final SparseArray<Fragment> fragmentArray = new SparseArray<>();
-    private DragLayout avatarLayout;
+    private View avatarLayout;
     private CircleImageView avatarImage;
     private LivingIconView userLivingView;
     private MainTabLayout mMainTabLayout;
     private AnchorCardView anchorCardView;
     private View viewClose;
-    private int mCurrentTabType = MainTabType.TAB_TYPE_STAR;
+    private int mCurrentTabType = MainTabType.TAB_TYPE_HOME;
     /**
      * 房间最小化动画，换成属性动画，原先的补间动画影响了activity的生命周期
      */
@@ -155,13 +157,15 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private boolean mResumed = false;
     @Nullable
     private Fragment tempFragment = null;
+    private DialogManager resumeGameDialogManager;
 
     @Nullable
     private Runnable touchRunnable;
 
     {
-        fragmentArray.put(MainTabType.TAB_TYPE_STAR, new StarFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_HOME, new HomeFragment());
+        fragmentArray.put(MainTabType.TAB_TYPE_GAME, new GameHomeFragment());
+        fragmentArray.put(MainTabType.TAB_TYPE_SQUARE, new SquareFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_MSG, new ContactsListFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_ME, new MeFragment());
     }
@@ -220,7 +224,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        homeViewModel = new ViewModelProvider(this).get(HomeViewModel.class);
+        ViewModelProvider viewModelProvider = new ViewModelProvider(this);
+        homeViewModel = viewModelProvider.get(HomeViewModel.class);
         NimMiddleActivity.firstEnter = false;
         if (savedInstanceState != null) {
             mCurrentTabType = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
@@ -243,17 +248,13 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         EventBus.getDefault().register(this);
         otherModelInit();
 
-        Observable.interval(60, TimeUnit.SECONDS)
-                .compose(bindToLifecycle())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(aLong -> EventBus.getDefault().post(new RefreshHomeDataEvent()));
-
         homeViewModel.getAnchorInfoLiveData().observe(this, anchorInfo -> {
             if (anchorInfo != null) {
                 anchorCardView.setAnchorInfo(anchorInfo);
                 DemoCache.saveAnchorCardView(2);
             }
         });
+        checkResumeGame();
     }
 
     private void otherModelInit() {
@@ -263,6 +264,48 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         IMBroadcastManager.get().onCreate();
         ImageLoadUtilsV2.init(context);
         SettingsModel.get().checkSysAccount();
+        initPreloadResource();
+    }
+
+    @SuppressLint("CheckResult")
+    private void checkResumeGame() {
+        GameModel2.INSTANCE.getResumeGameRoomInfo().compose(bindToLifecycle()).subscribe(gameRoomInfo -> {
+            if (gameRoomInfo != null && gameRoomInfo.getData() != null) {
+                Integer state = gameRoomInfo.getData().getMatchStatus();
+                if (state != null && (state == GameStateAbility.STATE_MATCH_SUCCESS || state == GameStateAbility.STATE_MATCHING)) {
+                    if (resumeGameDialogManager == null) {
+                        resumeGameDialogManager = new DialogManager(this);
+                    }
+                    resumeGameDialogManager.showOkCancelDialog(getString(R.string.resume_game_tips), getString(R.string.join_organization_ok), getString(R.string.join_organization_no), false, new DialogManager.OkCancelDialogListener() {
+                        @Override
+                        public void onOk() {
+                            long gameId = JavaUtil.str2long(gameRoomInfo.getData().getMgId());
+                            int gameMode = 0;
+                            GameActivity.Companion.start(context, new GameIntent(gameId, gameMode));
+                        }
+
+                        @Override
+                        public void onCancel() {
+                            DialogManager.OkCancelDialogListener.super.onCancel();
+                            Long roomId = gameRoomInfo.getRoomId();
+                            if (roomId != null) {
+                                GameModel2.INSTANCE.closeGameRx(roomId).compose(bindToLifecycle()).subscribe(s -> {
+                                }, throwable -> {
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+        }, throwable -> {
+        });
+    }
+
+    private void initPreloadResource() {
+        PreloadResourceViewModel viewModel = new ViewModelProvider(
+                GlobalViewModelOwner.Companion.getInstance()
+        ).get(PreloadResourceViewModel.class);
+        viewModel.start();
     }
 
     @Override
@@ -395,6 +438,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     protected void onDestroy() {
         CleanLeakUtils.fixInputMethodManagerLeak(MainActivity.this);
         super.onDestroy();
+        if (resumeGameDialogManager != null) {
+            resumeGameDialogManager.dismissDialog();
+        }
         ImInitHelper.get().unInit();
         EventBus.getDefault().unregister(this);
         stopRoomMinAnim();
@@ -529,27 +575,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private void updateRoomState() {
         RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
         if (roomInfo != null) {
-            UserModel.get().getUserInfo(roomInfo.getUid())
-                    .subscribe(userInfo -> {
-                        if (userInfo != null) {
-                            displayAvatarLayout(userInfo.getAvatar(), roomInfo.getTitle(), userInfo.getErbanNo());
-                        } else {
-                            NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + "");
-                            if (nimUserInfo == null) {
-                                NimUserInfoCache.getInstance().getUserInfoFromRemote(roomInfo.getUid() + "", new RequestCallbackWrapper<NimUserInfo>() {
-                                    @Override
-                                    public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) {
-                                        if (nimUserInfo != null) {
-                                            displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid());
-                                        }
-                                    }
-                                });
-                            } else {
-                                displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid());
-                            }
-                        }
-                    });
-
+            displayAvatarLayout(roomInfo.getAvatar(), roomInfo.getTitle(), roomInfo.getUid());
         }
     }
 

app/src/main/java/com/chwl/app/application/App.java

@@ -24,6 +24,7 @@ import com.chwl.library.language.LanguageHelper;
 import com.coorchice.library.utils.LogUtils;
 import com.example.lib_utils.ServiceTime;
 import com.hjq.toast.ToastUtils;
+import com.liulishuo.filedownloader.FileDownloader;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nimlib.sdk.NIMClient;
@@ -83,7 +84,6 @@ import com.chwl.library.common.file.FileHelper;
 import com.chwl.library.net.rxnet.RxNet;
 import com.chwl.library.net.rxnet.converter.GsonConverterPlugins;
 import com.chwl.library.utils.AppMetaDataUtil;
-import com.chwl.library.utils.AppUtils;
 import com.chwl.library.utils.DeviceUuidFactory;
 import com.chwl.library.utils.ResUtil;
 import com.chwl.library.utils.SingleToastUtil;
@@ -324,6 +324,7 @@ public class App extends BaseApp {
         BasicConfig.INSTANCE.setVoiceDir(Constants.VOICE_DIR);
         BasicConfig.INSTANCE.setCacheDir(Constants.CACHE_DIR);
         BasicConfig.INSTANCE.setImageDir(Constants.IMAGE_CACHE_DIR);
+        com.example.lib_utils.log.LogUtil.INSTANCE.setConsolePrinterEnabled(BuildConfig.DEBUG);
     }
 
     /**
@@ -415,7 +416,7 @@ public class App extends BaseApp {
         httpParams.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
         httpParams.put("model", SystemUtils.getPhoneModel());
         httpParams.put("appVersion", VersionUtil.getLocalName(context));
-        httpParams.put("appVersionCode", String.valueOf(AppUtils.getVersionCode(context)));
+        httpParams.put("appVersionCode", String.valueOf(VersionUtil.getVersionCode(context)));
         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());
@@ -457,6 +458,7 @@ public class App extends BaseApp {
                 .build();
         Realm.setDefaultConfiguration(config);
 
+        FileDownloader.setup(BasicConfig.INSTANCE.getAppContext());
         LogUtil.i(TAG, channel);
     }
 
@@ -481,7 +483,6 @@ public class App extends BaseApp {
         ChannelModel.get();
         MarketVerifyModel.get();
         GiftModel.get();
-        GiftModel.get().tryLoadGiftList();
         // 模厅
         HallDataManager.get().application();
         //全局处理

app/src/main/java/com/chwl/app/avroom/BottomViewListenerWrapper.java

@@ -47,8 +47,7 @@ public abstract class BottomViewListenerWrapper {
 
     }
 
-    public void onRoomGameplayClick(){
+    public void onRoomGameplayClick(boolean isOnlyPK){
 
     }
-
 }

app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java

@@ -11,6 +11,7 @@ import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
+import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -33,6 +34,7 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.alibaba.fastjson.JSON;
@@ -40,8 +42,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.chwl.app.notify.RoomNotifyManager;
 import com.chwl.app.ui.webview.baishun.BaiShunGameWebFragment;
 import com.chwl.app.ui.webview.baishun.IBaiShunGameListener;
+import com.chwl.library.widget.SVGAView;
 import com.chwl.core.monsterhunting.bean.MonsterDataBean;
 import com.chwl.core.room.game.bean.BaiShunGameConfig;
+import com.chwl.core.support.room.AudioRoomContext;
 import com.chwl.core.support.room.RoomWidget;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nimlib.sdk.NIMSDK;
@@ -174,6 +178,15 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     private static final String TAG = "AVRoomActivity";
     private static final int SHOW_RED_DIALOG_MAX = 10;
     public static boolean isPKModel = false;
+    private static SVGAView.SVGACache svgaCache;
+
+    public static SVGAView.SVGACache getSvgaCache() {
+        if (svgaCache == null) {
+            svgaCache = SVGAView.newCache(20);
+        }
+        return svgaCache;
+    }
+
     /**
      * 管理限制进房
      */
@@ -896,6 +909,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         GiftModel.get().cancelCountDownTimer();
         EventBus.getDefault().unregister(this);
         DemoCache.saveBoolean("FirstCharge", false);
+        if (svgaCache != null) {
+            svgaCache.clear();
+        }
+        svgaCache = null;
         super.onDestroy();
     }
 
@@ -1356,10 +1373,21 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         return this;
     }
 
+    @Override
+    public FragmentManager getFragmentManager() {
+        return super.getFragmentManager();
+    }
+
     @Nullable
     @Override
     public RoomContext getRoomContext() {
-        return RoomContext.Companion.get();
+        return AudioRoomContext.Companion.get();
+    }
+
+    @NonNull
+    @Override
+    public LiveData<? extends RoomContext> getRoomContextLiveData() {
+        return AudioRoomContext.Companion.getContextLiveData();
     }
 
     @NonNull
@@ -1368,12 +1396,19 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         return this;
     }
 
+    @NonNull
+    @Override
+    public androidx.fragment.app.FragmentManager getViewFragmentManager() {
+        return getSupportFragmentManager();
+    }
+
     @Nullable
     @Override
     public RoomWidget findWidget(@NonNull String name) {
         return null;
     }
 
+
     private static class GiftBroadcastObserver implements Observer<BroadcastMessage> {
         private WeakReference<AVRoomActivity> mReference;
 

app/src/main/java/com/chwl/app/avroom/activity/RoomBgSettingActivity.kt

@@ -0,0 +1,77 @@
+package com.chwl.app.avroom.activity
+
+import android.annotation.SuppressLint
+import androidx.core.view.WindowCompat
+import com.chwl.app.R
+import com.chwl.app.avroom.adapter.RoomBgAdapter
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.databinding.RoomBgSettingActivityBinding
+import com.chwl.core.auth.AuthModel
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.room.model.RoomSettingModel
+import com.chwl.library.utils.ResUtil
+import com.netease.nim.uikit.StatusBarUtil
+
+class RoomBgSettingActivity : BaseViewBindingActivity<RoomBgSettingActivityBinding>() {
+    private val adapter = RoomBgAdapter()
+
+    private val model = RoomSettingModel()
+    override fun init() {
+        initWhiteTitleBar(ResUtil.getString(R.string.room_theme))
+        mTitleBar.setTitleColor(resources.getColor(R.color.white))
+        mTitleBar.setLeftImageResource(R.drawable.arrow_left_white)
+        binding.recyclerView.adapter = adapter
+        adapter.selectItem(AvRoomDataManager.get().mCurrentRoomInfo?.backPic)
+        adapter.setOnItemClickListener { _, view, position ->
+            adapter.getItem(position)?.let {
+                if (adapter.getSelectItem() != it) {
+                    showUpdateRoomBackgroundTips(it)
+                }
+            }
+        }
+        val list = listOf(
+            "https://image.molistar.xyz/BG_0.webp",
+            "https://image.molistar.xyz/BG_1.webp",
+            "https://image.molistar.xyz/BG_2.webp",
+            "https://image.molistar.xyz/BG_3.webp",
+            "https://image.molistar.xyz/BG_4.webp",
+            "https://image.molistar.xyz/BG_5.webp"
+        )
+        adapter.setNewData(list)
+    }
+
+    private fun showUpdateRoomBackgroundTips(url: String) {
+        dialogManager.showOkCancelDialog(
+            getString(R.string.room_theme_changed_tips),
+            getString(R.string.btn_text_confirm_select_team_member)
+        ) {
+            updateRoomBackground(url)
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    private fun updateRoomBackground(url: String) {
+        dialogManager.showProgressDialog(this)
+        model.updateRoomBackground(AuthModel.get().currentUid, url)
+            .compose(bindToLifecycle()).subscribe({
+                dialogManager.dismissDialog()
+                toast(R.string.avroom_dialog_roomimposedialog_04)
+                adapter.selectItem(url)
+            }, {
+                dialogManager.dismissDialog()
+                toast(it.message)
+            })
+    }
+
+    override fun needSteepStateBar(): Boolean {
+        return true
+    }
+
+    override fun setStatusBar() {
+        StatusBarUtil.transparencyBar(this)
+        StatusBarUtil.StatusBarLightMode(this)
+        WindowCompat.getInsetsController(window, window.decorView).let {
+            it.isAppearanceLightStatusBars = false
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/activity/RoomSettingActivity.java

@@ -8,11 +8,17 @@ import android.text.SpannableString;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.CompoundButton;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 
+import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.SingleToastUtil;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -112,6 +118,7 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
         }
         initView();
         initLeaveMode();
+        loadGiftValueState();
         getMvpPresenter().requestRoomInfo(roomInfo.getUid());
         mRoomBgLayout.setVisibility(View.GONE);
         if (!AvRoomDataManager.get().isRoomOwner() && !AvRoomDataManager.get().isSuperAdmin()) {
@@ -149,6 +156,7 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
         managerLayout.setOnClickListener(this);
         blackLayout.setOnClickListener(this);
         mRoomBgLayout.setOnClickListener(this);
+        binding.layoutTheme.setOnClickListener(this);
 
         binding.switchAudio.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -190,6 +198,28 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
         }
     }
 
+    private void loadGiftValueState(){
+        if (SuperAdminUtil.isSuperAdmin()) {
+            binding.layoutGiftValue.setVisibility(View.GONE);
+            return;
+        }
+        if (AvRoomDataManager.get().isCpRoom()) {
+            binding.layoutGiftValue.setVisibility(View.GONE);
+            return;
+        }
+        if (!AvRoomDataManager.get().isManager()) {
+            binding.layoutGiftValue.setVisibility(View.GONE);
+            return;
+        }
+        if (AvRoomDataManager.get().isOpenKTV()) {
+            binding.layoutGiftValue.setVisibility(View.GONE);
+            return;
+        }
+        boolean openGiftValue = AvRoomDataManager.get().isShowGiftValue();
+        binding.layoutGiftValue.setVisibility(View.VISIBLE);
+        setSelected(binding.switchGiftValue, openGiftValue);
+    }
+
     /**
      * 更改房间设置的消息
      */
@@ -295,6 +325,9 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.layout_theme:
+                startActivity(new Intent(context, RoomBgSettingActivity.class));
+                break;
             case R.id.manager_layout:
                 RoomManagerListActivity.start(this);
                 break;
@@ -516,10 +549,59 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
                 }
                 break;
 
+            case R.id.switch_gift_value:
+                switchGiftValue();
+                break;
             default:
         }
     }
 
+    private void switchGiftValue(){
+        if (AvRoomDataManager.get().isCpRoom()) {
+            return;
+        }
+        if (AvRoomDataManager.get().isDatingMode()) {
+            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_029));
+            return;
+        }
+        if (AvRoomDataManager.get().isOpenKTV()) {
+            SingleToastUtil.showToast(R.string.before_open_gift_value_should_close_ktv_model);
+            return;
+        }
+        //开启礼物值不需要弹框
+        if (!AvRoomDataManager.get().isShowGiftValue()) {
+            handleOpenGiftValue();
+            return;
+        }
+        if (!GiftValueDialogUiHelper.get().isNeedConfirmDialog(
+                GiftValueDialogUiHelper.TYPE_CLOSE_SHOW_GIFT_VALUE)) {
+            handleOpenGiftValue();
+            return;
+        }
+        GiftValueDialogUiHelper.get().showGiftValueDialog(context, getDialogManager(),
+                GiftValueDialogUiHelper.TYPE_CLOSE_SHOW_GIFT_VALUE,
+                this::handleOpenGiftValue);
+    }
+
+    private void handleOpenGiftValue() {
+        boolean isOpen = !binding.switchGiftValue.isSelected();
+        getDialogManager().showProgressDialog(this);
+        GiftValueModel.get().openGiftValue(isOpen)
+                .compose(RxHelper.bindContext(context))
+                .subscribe(new DontWarnObserver<String>() {
+                    @Override
+                    public void accept(String s, String error) {
+                        super.accept(s, error);
+                        getDialogManager().dismissDialog();
+                        if (error != null) {
+                            SingleToastUtil.showToast(error);
+                        } else {
+                            setSelected(binding.switchGiftValue, !binding.switchGiftValue.isSelected());
+                        }
+                    }
+                });
+    }
+
     @Override
     public void onResultRequestTagAllSuccess(List<RoomSettingTabInfo> tabInfoList) {
         this.tabInfoList = tabInfoList;
@@ -806,4 +888,10 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
         StatusBarUtil.transparencyBar(this);
         StatusBarUtil.StatusBarLightMode(this);
     }
+
+    private void setSelected(ImageView imageView, boolean isSelected) {
+        imageView.setSelected(isSelected);
+        imageView.setImageResource(isSelected ?
+                R.drawable.icon_room_set_lock_true : R.drawable.icon_room_set_lock_false);
+    }
 }

app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt

@@ -0,0 +1,142 @@
+package com.chwl.app.avroom.activity
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.view.View
+import androidx.core.view.isVisible
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.databinding.RoomTypeSwitchActivityBinding
+import com.chwl.app.home.helper.OpenRoomHelper
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.room.bean.RoomInfo
+import com.chwl.core.super_admin.util.SuperAdminUtil
+import com.chwl.library.utils.ResUtil
+import com.chwl.library.utils.SingleToastUtil
+import com.example.lib_utils.ktx.singleClick
+import com.netease.nim.uikit.StatusBarUtil
+
+class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBinding>() {
+
+    private var currentType: Int? = null
+
+    private var selectType: Int? = null
+
+    companion object {
+        fun isCanSwitch(): Boolean {
+            if (SuperAdminUtil.isSuperAdmin()) {
+                return false
+            }
+            if (AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_HOME_PARTY && AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_PARTY && AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_REVELRY) {
+                return false
+            }
+            if (AvRoomDataManager.get().isDatingMode) {
+                return false
+            }
+            val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
+            if (roomInfo == null || roomInfo.isPermitRoom == 1) {
+                return false
+            }
+            return AvRoomDataManager.get().isManager
+        }
+
+        fun start(context: Context) {
+            context.startActivity(Intent(context, RoomTypeSwitchActivity::class.java))
+        }
+    }
+
+    override fun init() {
+        initWhiteTitleBar(ResUtil.getString(R.string.room_type))
+        initEvent()
+        this.currentType = AvRoomDataManager.get().mCurrentRoomInfo?.type
+        updateSelectView(currentType)
+    }
+
+    private fun initEvent() {
+        binding.tvSubmit.singleClick {
+            selectType?.let {
+                if (currentType != it) {
+                    trySwitchRoomType(it)
+                }
+            }
+        }
+        addTypeSelectClick(binding.iv9, RoomInfo.ROOMTYPE_HOME_PARTY)
+        addTypeSelectClick(binding.iv10, RoomInfo.ROOMTYPE_PARTY)
+        addTypeSelectClick(binding.iv15, RoomInfo.ROOMTYPE_REVELRY)
+    }
+
+    private fun addTypeSelectClick(view: View, type: Int) {
+        view.setOnClickListener {
+            updateSelectView(type)
+        }
+    }
+
+    private fun updateSelectView(type: Int?) {
+        this.selectType = type
+        val views = mapOf(
+            RoomInfo.ROOMTYPE_HOME_PARTY to binding.iv9Border,
+            RoomInfo.ROOMTYPE_PARTY to binding.iv10Border,
+            RoomInfo.ROOMTYPE_REVELRY to binding.iv15Border
+        )
+        val displayRes = mapOf(
+            RoomInfo.ROOMTYPE_HOME_PARTY to R.drawable.room_type_bg_9,
+            RoomInfo.ROOMTYPE_PARTY to R.drawable.room_type_bg_10,
+            RoomInfo.ROOMTYPE_REVELRY to R.drawable.room_type_bg_15
+        )
+        views.forEach {
+            it.value.isVisible = it.key == type
+        }
+        val resId = displayRes.get(type)
+        if (resId != null) {
+            binding.ivSelected.setImageResource(resId)
+        } else {
+            binding.ivSelected.setImageDrawable(null)
+        }
+        if (type == currentType) {
+            binding.tvSubmit.setText(R.string.room_type_using)
+        } else {
+            binding.tvSubmit.setText(R.string.room_type_use)
+        }
+    }
+
+    private fun trySwitchRoomType(type: Int) {
+        val currentType = this.currentType
+        if (currentType != null && currentType > type) {
+            dialogManager.showOkCancelDialog(
+                ResUtil.getString(R.string.switch_room_type_tips),
+                ResUtil.getString(R.string.login_fragment_adduserinfofragment_04)
+            ) {
+                requestSwitchRoomType(type)
+            }
+        } else {
+            requestSwitchRoomType(type)
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    private fun requestSwitchRoomType(type: Int) {
+        dialogManager.showProgressDialog(context)
+        OpenRoomHelper.updateRoomInfoRx(
+            AvRoomDataManager.get().mCurrentRoomInfo,
+            type,
+            0
+        ).compose(bindToLifecycle()).subscribe({
+            dialogManager.dismissDialog()
+            finish()
+        }, {
+            SingleToastUtil.showToast(it.message)
+            dialogManager.dismissDialog()
+        })
+    }
+
+    override fun needSteepStateBar(): Boolean {
+        return true
+    }
+
+    override fun setStatusBar() {
+        super.setStatusBar()
+        StatusBarUtil.transparencyBar(this)
+        StatusBarUtil.StatusBarLightMode(this)
+    }
+}

app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java

@@ -15,8 +15,12 @@ import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.utils.AvatarHelper;
+import com.chwl.library.widget.SVGAView;
 import com.chwl.core.utils.extension.StringExtensionKt;
 import com.coorchice.library.SuperTextView;
+import com.example.lib_utils.StringUtils2;
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.chwl.app.R;
@@ -55,6 +59,9 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
     public static final String MICRO_TYPE_DATING = "dating";
     public static final String MICRO_TYPE_DATING_VIP = "dating_vip";
     public static final String MICRO_TYPE_SINGLE = "single";
+    public static final String MICRO_TYPE_PARTY = "party";
+    public static final String MICRO_TYPE_REVELRY = "revelry";
+
     protected static final int TYPE_KING = 2;
     protected static final int TYPE_BOSS = 1;
     protected static final int TYPE_NORMAL = 0;
@@ -76,11 +83,16 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByMicPosition(position - 1);
         if (roomQueueInfo == null) return;
         NormalMicroViewHolder holder = (NormalMicroViewHolder) viewHolder;
+        holder.micPositionNameOffset = getMicPositionNameOffset();
         holder.bind(roomQueueInfo, position - 1);
     }
 
     public abstract String microType();
 
+    protected int getMicPositionNameOffset() {
+        return 2;
+    }
+
     @Override
     public int getItemCount() {
         return 9;
@@ -137,9 +149,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         SVGAImageView ivHalo;
 
         @Nullable
-        ImageView ivHeadWear;
-        @Nullable
-        TextView tvNumber;
+        SVGAView ivHeadWear;
         @Nullable
         ImageView ivCharmLevelTag;
 
@@ -148,6 +158,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
 
         RoomQueueInfo info;
         int position = TYPE_INVALID;
+        int micPositionNameOffset = 2;
 
         NormalMicroViewHolder(View itemView) {
             super(itemView);
@@ -158,13 +169,15 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
             ivAvatar = itemView.findViewById(R.id.avatar);
             ivHeadWear = itemView.findViewById(R.id.iv_head_wear);
             tvNick = itemView.findViewById(R.id.nick);
-            tvNumber = itemView.findViewById(R.id.tv_number);
             ivCharmLevelTag = itemView.findViewById(R.id.iv_charm_level_tag);
             ivKickGuard = itemView.findViewById(R.id.iv_kick_guard);
 
             ivUpImage.setOnClickListener(this);
             ivLockImage.setOnClickListener(this);
             ivAvatar.setOnClickListener(this);
+            if (ivHeadWear != null) {
+                ivHeadWear.bindCache(AVRoomActivity.getSvgaCache());
+            }
         }
 
         public void clear() {
@@ -270,6 +283,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         private void clearHeadWear() {
             if (ivHeadWear == null) return;
             ivHeadWear.clearAnimation();
+            ivHeadWear.stopAnimation();
             ivHeadWear.setImageDrawable(null);
             ivHeadWear.setTag(R.id.mic_item_head_wear, null);
             ivHeadWear.setVisibility(View.GONE);
@@ -277,41 +291,29 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
 
         protected void setDefalutText(int index) {
             tvNick.setTextColor(Color.WHITE);
-            tvNick.setText(ResUtil.getString(R.string.avroom_adapter_basemicroviewadapter_01));
-
-            if (tvNumber != null) {
-                tvNumber.setBackgroundResource(R.drawable.icon_bg_number_default);
-                tvNumber.setTextColor(Color.WHITE);
-                tvNumber.setText(String.valueOf(index + 1));
-            }
+            tvNick.setText(getMicPositionName(index));
+        }
 
+        protected String getMicPositionName(int index) {
+            return "NO." + (index + micPositionNameOffset);
         }
 
         protected void setSelectText(int index, String nick, int gender) {
             tvNick.setText(StringExtensionKt.subAndReplaceDot(StringUtil.removeBlanks(nick), 7));
             tvNick.setTextColor(context.getResources().getColor(R.color.white));
-
-            if (tvNumber != null) {
-                if (AvRoomDataManager.get().isOpenPKMode()) { // pk模式不加性别背景
-                    tvNumber.setBackgroundResource(R.drawable.icon_bg_number_default);
-                    tvNumber.setTextColor(context.getResources().getColor(R.color.white));
-                } else {
-                    tvNumber.setBackgroundResource(gender == 1 ? R.drawable.bg_number_male : R.drawable.bg_number_female);
-                    tvNumber.setTextColor(context.getResources().getColor(R.color.white));
-                }
-                tvNumber.setText(String.valueOf(index + 1));
-            }
-
         }
 
         //优先使用MicMemberInfo里面的头饰
         private void updateNobleView(MicMemberInfo chatRoomMember) {
             if (ivHeadWear == null) return;
             String headWear = chatRoomMember.getHeadWearUrl();
+            int headWearType = chatRoomMember.getHeadWearType();
             if (TextUtils.isEmpty(headWear)) {
                 headWear = NobleUtil.getHeadResource(HeadWearInfo.EFFECT, chatRoomMember) != null ?
                         NobleUtil.getHeadResource(HeadWearInfo.EFFECT, chatRoomMember) :
                         NobleUtil.getHeadResource(HeadWearInfo.PIC, chatRoomMember);
+                String type = NobleUtil.getHeadResource(HeadWearInfo.TYPE, chatRoomMember);
+                headWearType = StringUtils2.INSTANCE.toInt(type);
             }
             String nobleHeadWear = (String) NobleUtil.getResource(NobleResourceType.KEY_HEAD_WEAR, chatRoomMember);
             if (!TextUtils.isEmpty(headWear)) {
@@ -319,7 +321,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
                 //只有头饰发生改变才更新,防止闪烁
                 if (!headWear.equals(ivHeadWear.getTag(R.id.mic_item_head_wear))) {
                     ivHeadWear.setTag(R.id.mic_item_head_wear, headWear);
-                    NobleUtil.loadMicHeadWear(headWear, ivHeadWear, R.id.mic_item_head_wear, headWear);
+                    AvatarHelper.loadAvatarFrame(ivHeadWear, headWear, headWearType);
                 }
             } else if (!TextUtils.isEmpty(nobleHeadWear)) {
                 // 头饰
@@ -500,10 +502,10 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
             //控制最高最低头饰
             Observer<Integer> headWearObserver = headWearValue -> {
                 if (ivCharmLevelTag == null) return;
-                ivCharmLevelTag.setVisibility(View.GONE);
                 if (headWearValue == 1) {
-                    ivCharmLevelTag.setVisibility(View.VISIBLE);
-                    ivCharmLevelTag.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_charm_level_min));
+                    ivCharmLevelTag.setVisibility(View.GONE);
+//                    ivCharmLevelTag.setVisibility(View.VISIBLE);
+//                    ivCharmLevelTag.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_charm_level_min));
                 } else if (headWearValue == 2) {
                     ivCharmLevelTag.setVisibility(View.VISIBLE);
                     ivCharmLevelTag.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_charm_level_max));
@@ -586,6 +588,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         protected void setDefalutText(int index) {
             //重新覆盖掉用户名的逻辑
             tvNick.setText("");
+            tvNick.setVisibility(View.GONE);
             tvNick.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
             ivTag.setVisibility(View.GONE);
         }
@@ -593,6 +596,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         @Override
         protected void setSelectText(int index, String nick, int gender) {
             super.setSelectText(index, nick, gender);
+            tvNick.setVisibility(View.VISIBLE);
             if (UserModel.get().getCacheLoginUserInfo() != null &&
                     UserModel.get().getCacheLoginUserInfo().getUserInfoSkillVo() != null) {
                 if (AvRoomDataManager.get().isRoomOwner() && !TextUtils.isEmpty(UserModel.get().getCacheLoginUserInfo().getUserInfoSkillVo().getSkillTag())) {

app/src/main/java/com/chwl/app/avroom/adapter/CpMicroViewAdapter.java

@@ -27,6 +27,11 @@ public class CpMicroViewAdapter extends BaseMicroViewAdapter {
         return BaseMicroViewAdapter.MICRO_TYPE_CP;
     }
 
+    @Override
+    protected int getMicPositionNameOffset() {
+        return 1;
+    }
+
     @Override
     public void bindToRecyclerView(RecyclerView recyclerView) {
         GridLayoutManager layoutManager = new GridLayoutManager(context, 3);

app/src/main/java/com/chwl/app/avroom/adapter/DatingMicroViewAdapter.kt

@@ -27,6 +27,9 @@ import com.chwl.library.utils.ResUtil
  * @date 2017/12/18
  */
 class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) {
+    override fun getMicPositionNameOffset(): Int {
+        return 1
+    }
 
     /**
      * Set LayoutManager and bind this to RecyclerView
@@ -146,6 +149,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
             if (info.mChatRoomMember == null) {
                 tvNick.alpha = 1f
                 tvNick.text = "主持人"
+                tvNick.isVisible = true
                 ivVipWear.isVisible = false
             } else {
                 if (info.mChatRoomMember.isVipMic) {
@@ -222,7 +226,6 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
                 super.bind(info, position)
                 ivVipWear.isVisible = true
                 ivHeadWear?.isVisible = false
-                tvNumber?.isVisible = false
             }
 
         }

app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt

@@ -54,7 +54,7 @@ class GameMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) {
                 width = when (itemCount) {
                     6 -> ScreenUtil.screenWidth / 6
                     7 -> ScreenUtil.screenWidth / 7
-                    else -> (ScreenUtil.screenWidth / 7.5f).toInt()
+                    else -> (ScreenUtil.screenWidth / 6f).toInt()
                 }
             }
             super.bind(info, position)

app/src/main/java/com/chwl/app/avroom/adapter/MicroViewAdapter.java

@@ -2,7 +2,6 @@ package com.chwl.app.avroom.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,8 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chwl.app.R;
 import com.chwl.core.bean.RoomQueueInfo;
-import com.chwl.core.manager.AvRoomDataManager;
-import com.chwl.library.utils.ResUtil;
 
 /**
  * @author xiaoyu
@@ -27,6 +24,11 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
         super(context);
     }
 
+    @Override
+    protected int getMicPositionNameOffset() {
+        return 1;
+    }
+
     /**
      * Set LayoutManager and bind this to RecyclerView
      */
@@ -62,15 +64,6 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
         }
     }
 
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int position) {
-        RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByMicPosition(position - 1);
-        if (roomQueueInfo == null) {
-            return;
-        }
-        NormalMicroViewHolder holder = (NormalMicroViewHolder) viewHolder;
-        holder.bind(roomQueueInfo, position - 1);
-    }
 
     @Override
     public String microType() {
@@ -91,27 +84,27 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
         @Override
         public void bind(RoomQueueInfo info, int position) {
             super.bind(info, position);
-            if (position == 7) {
-                ivUpImage.setImageResource(R.drawable.icon_room_up_micro_vip);
-            } else {
+//            if (position == 7) {
+//                ivUpImage.setImageResource(R.drawable.icon_room_up_micro_vip);
+//            } else {
                 ivUpImage.setImageResource(R.drawable.icon_room_up_micro);
-            }
+//            }
         }
 
         @SuppressLint("SetTextI18n")
         @Override
         public void setDefalutText(int index) {
-            if (index == 7) {
-                tvNick.setTextColor(Color.WHITE);
-                tvNick.setText(ResUtil.getString(R.string.avroom_adapter_microviewadapter_01));
-                if (tvNumber != null) {
-                    tvNumber.setBackgroundResource(R.drawable.shape_micro_vip);
-                    tvNumber.setTextColor(Color.WHITE);
-                    tvNumber.setText(String.valueOf((index + 1)));
-                }
-            } else {
+//            if (index == 7) {
+//                tvNick.setTextColor(Color.WHITE);
+//                tvNick.setText(ResUtil.getString(R.string.avroom_adapter_microviewadapter_01));
+//                if (tvNumber != null) {
+//                    tvNumber.setBackgroundResource(R.drawable.shape_micro_vip);
+//                    tvNumber.setTextColor(Color.WHITE);
+//                    tvNumber.setText(String.valueOf((index + 1)));
+//                }
+//            } else {
                 super.setDefalutText(index);
-            }
+//            }
         }
     }
 }

app/src/main/java/com/chwl/app/avroom/adapter/PartyMicroViewAdapter.java

@@ -0,0 +1,79 @@
+package com.chwl.app.avroom.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.chwl.app.R;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+
+/**
+ * @author xiaoyu
+ * @date 2017/12/18
+ */
+
+public class PartyMicroViewAdapter extends BaseMicroViewAdapter {
+
+    public PartyMicroViewAdapter(Context context) {
+        super(context);
+    }
+
+    /**
+     * Set LayoutManager and bind this to RecyclerView
+     */
+    @Override
+    public void bindToRecyclerView(RecyclerView recyclerView) {
+        GridLayoutManager layoutManager = new GridLayoutManager(context, 5);
+        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        recyclerView.setLayoutManager(layoutManager);
+        recyclerView.setAdapter(this);
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View item;
+        item = LayoutInflater.from(parent.getContext()).
+                inflate(R.layout.list_item_micro, parent, false);
+        return new MicroViewHolder(item);
+    }
+
+    @Override
+    public String microType() {
+        return BaseMicroViewAdapter.MICRO_TYPE_PARTY;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return TYPE_NORMAL;
+    }
+
+    @Override
+    public int getItemCount() {
+        return 10;
+    }
+
+    class MicroViewHolder extends GiftValueViewHolder {
+        MicroViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        @Override
+        public void bind(RoomQueueInfo info, int position) {
+            super.bind(info, position);
+            ivUpImage.setImageResource(R.drawable.icon_room_up_micro);
+        }
+
+        @SuppressLint("SetTextI18n")
+        @Override
+        public void setDefalutText(int index) {
+            super.setDefalutText(index);
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/adapter/RevelryMicroViewAdapter.java

@@ -0,0 +1,79 @@
+package com.chwl.app.avroom.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.chwl.app.R;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+
+/**
+ * @author xiaoyu
+ * @date 2017/12/18
+ */
+
+public class RevelryMicroViewAdapter extends BaseMicroViewAdapter {
+
+    public RevelryMicroViewAdapter(Context context) {
+        super(context);
+    }
+
+    /**
+     * Set LayoutManager and bind this to RecyclerView
+     */
+    @Override
+    public void bindToRecyclerView(RecyclerView recyclerView) {
+        GridLayoutManager layoutManager = new GridLayoutManager(context, 5);
+        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        recyclerView.setLayoutManager(layoutManager);
+        recyclerView.setAdapter(this);
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View item;
+        item = LayoutInflater.from(parent.getContext()).
+                inflate(R.layout.list_item_micro, parent, false);
+        return new MicroViewHolder(item);
+    }
+
+    @Override
+    public String microType() {
+        return BaseMicroViewAdapter.MICRO_TYPE_REVELRY;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return TYPE_NORMAL;
+    }
+
+    @Override
+    public int getItemCount() {
+        return 15;
+    }
+
+    class MicroViewHolder extends GiftValueViewHolder {
+        MicroViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        @Override
+        public void bind(RoomQueueInfo info, int position) {
+            super.bind(info, position);
+            ivUpImage.setImageResource(R.drawable.icon_room_up_micro);
+        }
+
+        @SuppressLint("SetTextI18n")
+        @Override
+        public void setDefalutText(int index) {
+            super.setDefalutText(index);
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/adapter/RoomBgAdapter.kt

@@ -0,0 +1,45 @@
+package com.chwl.app.avroom.adapter
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chwl.app.R
+import com.chwl.app.ui.utils.load
+
+class RoomBgAdapter : BaseQuickAdapter<String, BaseViewHolder>(R.layout.room_bg_setting_item) {
+    private var selectItem: String? = null
+    override fun convertPayloads(
+        helper: BaseViewHolder,
+        item: String?,
+        payloads: MutableList<Any>
+    ) {
+        super.convertPayloads(helper, item, payloads)
+        convertStatus(helper, item)
+    }
+
+    override fun convert(helper: BaseViewHolder, item: String?) {
+        val imageView = helper.getView<ImageView>(R.id.iv_image)
+        imageView.load(item)
+        convertStatus(helper, item)
+    }
+
+    private fun convertStatus(helper: BaseViewHolder, item: String?) {
+        val statusView = helper.getView<View>(R.id.tv_status)
+        statusView.isVisible = item == selectItem
+    }
+
+    fun getSelectItem() = selectItem
+
+    fun selectItem(url: String?) {
+        selectItem = url
+        notifyItemRangeChanged(0, itemCount, true)
+    }
+}

app/src/main/java/com/chwl/app/avroom/adapter/RoomGameListAdapter.kt

@@ -0,0 +1,18 @@
+package com.chwl.app.avroom.adapter
+
+import android.widget.ImageView
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chwl.app.R
+import com.chwl.app.ui.utils.load
+import com.chwl.core.room.bean.RoomIcon
+import com.chwl.core.room.game.bean.GameInfo
+
+class RoomGameListAdapter :
+    BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.room_gameplay_item2) {
+    override fun convert(helper: BaseViewHolder, item: GameInfo?) {
+        helper.setText(R.id.tv_name, item?.name)
+        val iconView = helper.getView<ImageView>(R.id.iv_icon)
+        iconView.load(item?.pic2)
+    }
+}

app/src/main/java/com/chwl/app/avroom/adapter/RoomGameplayAdapter.kt

@@ -4,14 +4,20 @@ import android.widget.ImageView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.chwl.app.R
+import com.chwl.app.avroom.bean.RoomGameplayItem
 import com.chwl.app.ui.utils.load
-import com.chwl.core.room.bean.RoomIcon
 
 class RoomGameplayAdapter :
-    BaseQuickAdapter<RoomIcon, BaseViewHolder>(R.layout.room_gameplay_item2) {
-    override fun convert(helper: BaseViewHolder, item: RoomIcon?) {
-        helper.setText(R.id.tv_name, item?.name)
+    BaseQuickAdapter<RoomGameplayItem, BaseViewHolder>(R.layout.room_gameplay_item2) {
+    override fun convert(helper: BaseViewHolder, item: RoomGameplayItem?) {
+        helper.setText(R.id.tv_name, item?.getName())
         val iconView = helper.getView<ImageView>(R.id.iv_icon)
-        iconView.load(item?.icon)
+        val iconRes = item?.getIconRes()
+        if (iconRes != null) {
+            iconView.setImageResource(iconRes)
+        } else {
+            val iconUrl = item?.getIconUrl()
+            iconView.load(iconUrl ?: "")
+        }
     }
 }

app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt

@@ -1,15 +0,0 @@
-package com.chwl.app.avroom.adapter
-
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.chwl.app.R
-import com.chwl.core.room.game.bean.GameInfo
-
-class SelectGameAdapter :
-    BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_select_game) {
-
-    override fun convert(helper: BaseViewHolder, item: GameInfo) {
-      helper.setText(R.id.tv_name,item.name)
-    }
-
-}

app/src/main/java/com/chwl/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt

@@ -72,14 +72,10 @@ class SingleAnchorMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(con
                     }
                 }
             super.bind(info, position)
-            tvNumber?.background = null
-            tvNumber?.text = ""
         }
 
         override fun setDefalutText(index: Int) {
             tvNick.text = ""
-            tvNumber?.background = null
-            tvNumber?.text = ""
         }
     }
 

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt

@@ -8,17 +8,18 @@ import android.util.AttributeSet
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.PopupWindow
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
+import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Observer
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import com.netease.nim.uikit.common.util.sys.TimeUtil
 import com.chwl.app.R
 import com.chwl.app.avroom.activity.AVRoomActivity
-import com.chwl.app.common.widget.DragLayout
 import com.chwl.app.databinding.LayoutRoomPkBoardViewBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
@@ -29,6 +30,9 @@ import com.chwl.core.utils.CurrentTimeUtils
 import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.rxbus.RxBus
 import com.chwl.library.utils.CommonUtils
+import com.chwl.library.utils.ResUtil
+import com.chwl.library.widget.drag.ViewDragLayout
+import com.example.lib_utils.UiUtils
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -36,7 +40,7 @@ import java.util.concurrent.TimeUnit
 
 class RoomPKBoardView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : DragLayout(context, attrs, defStyleAttr) {
+) : ViewDragLayout(context, attrs, defStyleAttr) {
 
     private val binding = LayoutRoomPkBoardViewBinding.inflate(LayoutInflater.from(context))
     private val observer = Observer<RoomPkBean?> { updateView(it) }
@@ -45,25 +49,34 @@ class RoomPKBoardView @JvmOverloads constructor(
     private var roomPkBean: RoomPkBean? = null
 
     init {
-        addView(binding.root, LayoutParams(ScreenUtil.dip2px(339f), ScreenUtil.dip2px(233f)))
+        addView(
+            binding.root,
+            FrameLayout.LayoutParams(
+                context.resources.getDimensionPixelOffset(R.dimen.dp_309),
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            ).apply {
+                this.gravity = Gravity.CENTER
+                this.setMargins(0, 0, 0, UiUtils.dip2px(50f))
+            }
+        )
         //注意这里需要先改变Style,再订阅数据
         binding.viewRankListCharmLeft.showCharmStyle()
         binding.viewRankListCharmRight.showCharmStyle()
         AvRoomDataManager.get().roomPkLiveData.observeForever(observer)
         binding.ivDetails.setOnClickListener {
-            if (CommonUtils.isFastDoubleClick(1000)) return@setOnClickListener
+            if (CommonUtils.isFastDoubleClick(500)) return@setOnClickListener
             binding.groupRank.isVisible = !binding.groupRank.isVisible
             if (binding.groupRank.isVisible) {
-                binding.clRoot.setBackgroundResource(R.drawable.bg_room_pk_board)
-                binding.clRoot.updateLayoutParams<FrameLayout.LayoutParams> {
-                    width = ScreenUtil.dip2px(339f)
-                    height = ScreenUtil.dip2px(233f)
+                binding.ivBg.setImageResource(R.drawable.room_pk_bg_full)
+                binding.ivBg.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                    width = ViewGroup.LayoutParams.MATCH_PARENT
+                    height = context.resources.getDimensionPixelOffset(R.dimen.dp_285)
                 }
             } else {
-                binding.clRoot.setBackgroundResource(R.drawable.bg_room_pk_board_small)
-                binding.clRoot.updateLayoutParams<FrameLayout.LayoutParams> {
-                    width = ScreenUtil.dip2px(339f)
-                    height = ScreenUtil.dip2px(137f)
+                binding.ivBg.setImageResource(R.drawable.room_pk_bg_small)
+                binding.ivBg.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                    width = ViewGroup.LayoutParams.MATCH_PARENT
+                    height = context.resources.getDimensionPixelOffset(R.dimen.dp_130)
                 }
             }
             binding.ivDetails.animate().rotationBy(180f).start()
@@ -122,11 +135,17 @@ class RoomPKBoardView @JvmOverloads constructor(
         )
         binding.viewRankListCharmRight.updateData(roomPkBean?.arRank)
         binding.viewRankListContributeRight.updateData(roomPkBean?.asRank)
-
         binding.pbScore.progress = ((roomPkBean?.cPercent ?: 0.5f) * 100).toInt()
-        val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
-        layoutParams.horizontalBias = roomPkBean?.cPercent ?: 0.5f
-        binding.svgaHot.layoutParams = layoutParams
+        binding.pbScore.post {
+            val progress = binding.pbScore.width * (roomPkBean?.cPercent ?: 0.5f)
+            var bias =
+                (progress - binding.svgaHot.width / 2f) / (binding.pbScore.width - binding.svgaHot.width)
+            val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
+            bias = 1f.coerceAtMost(bias)
+            bias = 0f.coerceAtLeast(bias)
+            layoutParams.horizontalBias = bias
+            binding.svgaHot.layoutParams = layoutParams
+        }
 
         binding.tvScoreLeft.text = "${roomPkBean?.cAmount ?: 0}"
         binding.tvScoreRight.text = "${roomPkBean?.aAmount ?: 0}"
@@ -134,13 +153,18 @@ class RoomPKBoardView @JvmOverloads constructor(
         disposable = Observable.interval(1, TimeUnit.SECONDS)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe { _ ->
-                binding.tvTime.text = roomPkBean?.endTime?.let {
+                roomPkBean?.endTime?.let {
                     val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000
-                    binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#fff600"))
-                    binding.tvTime.isVisible = remainTime > 0
-                    binding.tvEndHint.isVisible = remainTime <= 0
-                    TimeUtil.secToTime(remainTime)
-                } ?: "00:00"
+                    binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#FFF17D" else "#ffffff"))
+                    if (remainTime > 0) {
+                        binding.tvTime.text = TimeUtil.secToTime(remainTime)
+                    } else {
+                        binding.tvTime.text =
+                            ResUtil.getString(R.string.layout_layout_room_pk_board_view_02)
+                    }
+                } ?: let {
+                    binding.tvTime.text = "00:00"
+                }
             }
     }
 
@@ -150,7 +174,11 @@ class RoomPKBoardView @JvmOverloads constructor(
             contentView =
                 LayoutInflater.from(context).inflate(R.layout.layout_room_pk_help_view, null)
             helpPopupWindow =
-                PopupWindow(contentView, ScreenUtil.dip2px(244f), ScreenUtil.dip2px(177f))
+                PopupWindow(
+                    contentView,
+                    resources.getDimensionPixelOffset(R.dimen.dp_209),
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+                )
             helpPopupWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
             helpPopupWindow.isOutsideTouchable = true
             helpPopupWindow.isFocusable = true
@@ -158,10 +186,10 @@ class RoomPKBoardView @JvmOverloads constructor(
 
         try {
             helpPopupWindow.showAsDropDown(
-                binding.viewHelpAnchor,
+                binding.ivHelp,
                 0,
-                0,
-                Gravity.START or Gravity.BOTTOM
+                ScreenUtil.dip2px(7f),
+                Gravity.END or Gravity.BOTTOM
             )
         } catch (e: Exception) {
             e.printStackTrace()

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKRankListView.kt

@@ -5,6 +5,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import com.chwl.app.R
 import com.chwl.app.databinding.LayoutRoomPkRankListViewBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
@@ -19,7 +21,6 @@ class RoomPKRankListView @JvmOverloads constructor(
     private val binding = LayoutRoomPkRankListViewBinding.inflate(LayoutInflater.from(context))
     private val tvValues = arrayOf(binding.tvValue1, binding.tvValue2, binding.tvValue3)
     private val ivAvatars = arrayOf(binding.ivAvatar1, binding.ivAvatar2, binding.ivAvatar3)
-    private var defaultAvatarRes = R.drawable.bg_room_pk_rank_contribute_default
 
     init {
         addView(binding.root)
@@ -36,13 +37,9 @@ class RoomPKRankListView @JvmOverloads constructor(
         binding.tvValue1.setBackgroundResource(R.drawable.bg_room_pk_charm)
         binding.tvValue2.setBackgroundResource(R.drawable.bg_room_pk_charm)
         binding.tvValue3.setBackgroundResource(R.drawable.bg_room_pk_charm)
-        binding.viewBg1.setBackgroundResource(R.drawable.bg_room_pk_rank_charm1)
-        binding.viewBg2.setBackgroundResource(R.drawable.bg_room_pk_rank_charm2)
-        binding.viewBg3.setBackgroundResource(R.drawable.bg_room_pk_rank_charm2)
-        binding.ivAvatar1.setImageResource(R.drawable.bg_room_pk_rank_charm_default)
-        binding.ivAvatar2.setImageResource(R.drawable.bg_room_pk_rank_charm_default)
-        binding.ivAvatar3.setImageResource(R.drawable.bg_room_pk_rank_charm_default)
-        defaultAvatarRes = R.drawable.bg_room_pk_rank_charm_default
+        binding.ivAvatarSeat1.setImageResource(R.drawable.room_pk_ic_seat_charm)
+        binding.ivAvatarSeat2.setImageResource(R.drawable.room_pk_ic_seat_charm)
+        binding.ivAvatarSeat3.setImageResource(R.drawable.room_pk_ic_seat_charm)
     }
 
     fun updateData(data: List<RoomPkBean.RankBean>?) {
@@ -50,12 +47,16 @@ class RoomPKRankListView @JvmOverloads constructor(
             val rankBean = data?.getOrNull(i)
             tvValues[i].text = rankBean?.amount ?: "0"
             tvValues[i].isGone = "0" == tvValues[i].text
-            ImageLoadUtils.loadImage(
-                context,
-                rankBean?.avatar,
-                ivAvatars[i],
-                if (rankBean?.avatar.isNullOrEmpty()) defaultAvatarRes else R.drawable.default_avatar
-            )
+            if (rankBean?.avatar.isNullOrEmpty()) {
+                ivAvatars[i].isInvisible = true
+            } else {
+                ivAvatars[i].isVisible = true
+                ImageLoadUtils.loadImage(
+                    context,
+                    rankBean?.avatar,
+                    ivAvatars[i], R.drawable.default_avatar
+                )
+            }
             ivAvatars[i].tag = rankBean?.uid
         }
     }

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt

@@ -3,15 +3,14 @@ package com.chwl.app.avroom.anotherroompk
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.WindowManager
-import androidx.core.view.isVisible
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogRoomPkFinishBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.utils.extension.subAndReplaceDot
 
-class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
+class RoomPkFinishDialog : BaseDialogFragment<DialogRoomPkFinishBinding>() {
 
     companion object {
         @JvmStatic
@@ -30,10 +29,8 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
     @SuppressLint("CheckResult", "SetTextI18n")
     override fun init() {
-        binding?.ivClose?.setOnClickListener { dismissAllowingStateLoss() }
         binding?.tvTitleRed?.text = roomPkBean.cTitle.subAndReplaceDot(7)
         binding?.tvValueRed?.text = "${roomPkBean.cAmount}"
-        binding?.ivRedWin?.isVisible = roomPkBean.cUid == roomPkBean.winUid && roomPkBean.winUid != 0L
         ImageLoadUtils.loadImage(
             context,
             roomPkBean.cAvatar,
@@ -43,8 +40,6 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
         binding?.tvTitleBlue?.text = roomPkBean.aTitle.subAndReplaceDot(7)
         binding?.tvValueBlue?.text = "${roomPkBean.aAmount}"
-        binding?.ivBlueWin?.isVisible =
-            roomPkBean.cUid != roomPkBean.winUid && roomPkBean.winUid != 0L
         ImageLoadUtils.loadImage(
             context,
             roomPkBean.aAvatar,
@@ -53,7 +48,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
         )
 
         roomPkBean.csRank.getOrNull(0)?.let {
-            binding?.tvNickContribute?.text = it.nick.subAndReplaceDot(7)
+            binding?.tvNickContribute?.text = it.nick
             binding?.tvValueContribute?.text =
                 context?.getString(R.string.layout_dialog_room_pk_finish_07, it.amount.toString())
                     ?: ""
@@ -66,7 +61,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
         }
 
         roomPkBean.crRank.getOrNull(0)?.let {
-            binding?.tvNickCharm?.text = it.nick.subAndReplaceDot(7)
+            binding?.tvNickCharm?.text = it.nick
             binding?.tvValueCharm?.text =
                 context?.getString(R.string.layout_activity_jewel_09, it.amount?.toString()) ?: ""
             ImageLoadUtils.loadImage(
@@ -79,25 +74,13 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
         when (roomPkBean.winUid) {
             0L -> {
-                binding?.viewBg?.setBackgroundResource(R.drawable.bg_719cea_radius_10)
-                binding?.clRoot?.setBackgroundResource(R.drawable.bg_room_pk_finish_deuce)
-                binding?.viewContribute?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_deuce)
-                binding?.viewCharm?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_deuce)
-                binding?.ivClose?.setImageResource(R.drawable.ic_room_pk_finish_close_deuce)
+                binding?.ivStatus?.setImageResource(R.drawable.room_pk_result_draw)
             }
             roomPkBean.cUid -> {
-                binding?.viewBg?.setBackgroundResource(R.drawable.bg_edbf89_radius_10)
-                binding?.clRoot?.setBackgroundResource(R.drawable.bg_room_pk_finish_win)
-                binding?.viewContribute?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_win)
-                binding?.viewCharm?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_win)
-                binding?.ivClose?.setImageResource(R.drawable.ic_room_pk_finish_close_win)
+                binding?.ivStatus?.setImageResource(R.drawable.room_pk_result_win)
             }
             else -> {
-                binding?.viewBg?.setBackgroundResource(R.drawable.bg_bfabf6_radius_10)
-                binding?.clRoot?.setBackgroundResource(R.drawable.bg_room_pk_finish_failed)
-                binding?.viewContribute?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_failed)
-                binding?.viewCharm?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_failed)
-                binding?.ivClose?.setImageResource(R.drawable.ic_room_pk_finish_close_failed)
+                binding?.ivStatus?.setImageResource(R.drawable.room_pk_result_fail)
             }
         }
 

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt

@@ -4,13 +4,13 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.WindowManager
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogRoomPkForceFinishBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.utils.extension.subAndReplaceDot
 
-class RoomPkForceFinishDialog : BaseDialog<DialogRoomPkForceFinishBinding>() {
+class RoomPkForceFinishDialog : BaseDialogFragment<DialogRoomPkForceFinishBinding>() {
 
     companion object {
         @JvmStatic

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt

@@ -4,12 +4,11 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.core.view.isVisible
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogRoomPkReceivedBinding
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.RoomPKModel
-import com.chwl.core.utils.extension.ifNotNullOrEmpty
 import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.core.utils.extension.toast
 import io.reactivex.Observable
@@ -17,7 +16,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import java.util.concurrent.TimeUnit
 
-class RoomPkReceivedDialog : BaseDialog<DialogRoomPkReceivedBinding>() {
+class RoomPkReceivedDialog : BaseDialogFragment<DialogRoomPkReceivedBinding>() {
 
     companion object {
 
@@ -37,12 +36,20 @@ class RoomPkReceivedDialog : BaseDialog<DialogRoomPkReceivedBinding>() {
 
     @SuppressLint("CheckResult")
     override fun init() {
-        binding?.tvNick?.text = pkBean.inviteRoomTitle.subAndReplaceDot(7)
+        binding?.tvNick?.text = pkBean.inviteRoomTitle
         binding?.tvTime?.text = "${pkBean.pkDuration}${getString(R.string.layout_activity_room_pk_create_010)}"
-        pkBean.pkDesc.ifNotNullOrEmpty {
-            binding?.tvDescTitle?.isVisible = true
-            binding?.tvDesc?.isVisible = true
-            binding?.tvDesc?.text = it
+        val height: Int
+        if (pkBean.pkDesc.isNullOrEmpty()) {
+            binding?.groupDesc?.isVisible = false
+            height = resources.getDimensionPixelOffset(R.dimen.dp_192)
+        } else {
+            binding?.tvDesc?.text = pkBean.pkDesc
+            binding?.groupDesc?.isVisible = true
+            height = resources.getDimensionPixelOffset(R.dimen.dp_211)
+        }
+        binding?.layoutContent?.let {
+            it.layoutParams.height = height
+            it.requestLayout()
         }
         disposable = Observable.intervalRange(0, 10, 0, 1, TimeUnit.SECONDS)
             .compose(bindToLifecycle())

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkRuleDialog.kt

@@ -1,9 +1,9 @@
 package com.chwl.app.avroom.anotherroompk
 
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogRoomPkRuleBinding
 
-class RoomPkRuleDialog : BaseDialog<DialogRoomPkRuleBinding>() {
+class RoomPkRuleDialog : BaseDialogFragment<DialogRoomPkRuleBinding>() {
 
     companion object {
 

app/src/main/java/com/chwl/app/avroom/bean/RoomGameplayItem.kt

@@ -0,0 +1,63 @@
+package com.chwl.app.avroom.bean
+
+import androidx.annotation.Keep
+import com.chwl.app.avroom.dialog.RoomGameplayDialog
+import com.chwl.core.room.bean.RoomIcon
+import java.io.Serializable
+
+@Keep
+interface RoomGameplayItem : Serializable {
+
+    fun getName(): String?
+
+    fun getIconUrl(): String?
+
+    fun getIconRes(): Int?
+
+    fun onItemClick(dialog: RoomGameplayDialog)
+
+    @Keep
+    class RoomIconItem(
+        private val roomIcon: RoomIcon,
+        private val onClick: (RoomGameplayDialog, RoomIcon) -> Unit
+    ) : RoomGameplayItem {
+        override fun getName(): String? {
+            return roomIcon.name
+        }
+
+        override fun getIconUrl(): String? {
+            return roomIcon.icon
+        }
+
+        override fun getIconRes(): Int? {
+            return null
+        }
+
+        override fun onItemClick(dialog: RoomGameplayDialog) {
+            onClick.invoke(dialog, roomIcon)
+        }
+    }
+
+    @Keep
+    class CustomItem(
+        private val name: String,
+        private val iconRes: Int,
+        private val onClick: (RoomGameplayDialog, CustomItem) -> Unit
+    ) : RoomGameplayItem {
+        override fun getName(): String {
+            return name
+        }
+
+        override fun getIconUrl(): String? {
+            return null
+        }
+
+        override fun getIconRes(): Int {
+            return iconRes
+        }
+
+        override fun onItemClick(dialog: RoomGameplayDialog) {
+            onClick.invoke(dialog, this)
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/core/AudioRoomContext.kt

@@ -1,16 +0,0 @@
-package com.chwl.app.avroom.core
-
-import com.chwl.core.support.room.RoomAbility
-import com.chwl.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)
-    }
-}

app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt

@@ -6,7 +6,7 @@ import android.view.WindowManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.chwl.app.avroom.adapter.CreateRoomGameGuideAdapter
 import com.chwl.app.base.BaseActivity
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogCreateGameRoomBinding
 import com.chwl.app.home.helper.OpenRoomHelper
 import com.chwl.app.ui.utils.RVDelegate
@@ -14,7 +14,7 @@ import com.chwl.core.room.bean.RoomInfo
 import com.chwl.core.room.game.bean.GameInfo
 import com.chwl.core.room.game.GameModel
 
-class CreateGameRoomDialog : BaseDialog<DialogCreateGameRoomBinding>() {
+class CreateGameRoomDialog : BaseDialogFragment<DialogCreateGameRoomBinding>() {
 
     private lateinit var rvDelegate: RVDelegate<GameInfo>
     private val gameAdapter = CreateRoomGameGuideAdapter()
@@ -44,7 +44,7 @@ class CreateGameRoomDialog : BaseDialog<DialogCreateGameRoomBinding>() {
             dismissAllowingStateLoss()
         }
 
-        GameModel.getGameList()
+        GameModel.getGameList(null)
             .compose(bindToLifecycle())
             .subscribe(
                 {

app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt

@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.chwl.app.R
 import com.chwl.app.avroom.adapter.CreateRoomGameAdapter
 import com.chwl.app.base.BaseActivity
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogCreateRoomBinding
 import com.chwl.app.home.helper.OpenRoomHelper
 import com.chwl.app.ui.utils.RVDelegate
@@ -19,7 +19,7 @@ import com.chwl.core.room.game.GameModel
 import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
-class CreateRoomDialog : BaseDialog<DialogCreateRoomBinding>() {
+class CreateRoomDialog : BaseDialogFragment<DialogCreateRoomBinding>() {
 
     private lateinit var rvDelegate: RVDelegate<GameInfo>
     private val gameAdapter = CreateRoomGameAdapter()
@@ -88,7 +88,7 @@ class CreateRoomDialog : BaseDialog<DialogCreateRoomBinding>() {
             dismissAllowingStateLoss()
         }
 
-        GameModel.getGameList()
+        GameModel.getGameList(null)
             .compose(bindToLifecycle())
             .subscribe(
                 {

app/src/main/java/com/chwl/app/avroom/dialog/NewUserGiftDialog.kt

@@ -1,12 +1,12 @@
 package com.chwl.app.avroom.dialog
 
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogNewUserGiftBinding
 import com.chwl.app.ui.utils.load
 import com.chwl.core.gift.bean.GiftInfo
 
 class NewUserGiftDialog(val giftInfo: GiftInfo) :
-    BaseDialog<DialogNewUserGiftBinding>() {
+    BaseDialogFragment<DialogNewUserGiftBinding>() {
 
     override fun init() {
         binding?.ivClose?.setOnClickListener {

app/src/main/java/com/chwl/app/avroom/dialog/PKScoreBoardDialog.java

@@ -1,297 +0,0 @@
-package com.chwl.app.avroom.dialog;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.R;
-import com.chwl.app.common.widget.CircleImageView;
-import com.chwl.app.ui.widget.dialog.BaseDialog;
-import com.chwl.app.ui.widget.dialog.CommonTipDialog;
-import com.chwl.core.manager.AvRoomDataManager;
-import com.chwl.core.manager.IMNetEaseManager;
-import com.chwl.core.manager.RoomEvent;
-import com.chwl.core.room.pk.bean.PKMemberInfo;
-import com.chwl.core.room.pk.bean.PKTeamInfo;
-import com.chwl.core.room.pk.bean.PKTeamMember;
-import com.chwl.core.room.pk.bean.RoomPkData;
-import com.chwl.core.room.pk.event.PKDataUpdateEvent;
-import com.chwl.core.room.pk.event.PKTimeFinishEvent;
-import com.chwl.core.room.pk.event.PKTimeTickEvent;
-import com.chwl.core.room.pk.model.PkModel;
-import com.chwl.core.super_admin.util.SuperAdminUtil;
-import com.chwl.library.utils.FormatUtils;
-import com.chwl.library.utils.ResUtil;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.reactivex.SingleObserver;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-
-/**
- * @author jack
- * @Description
- * @Date 2019/1/3
- */
-public class PKScoreBoardDialog extends BaseDialog {
-
-
-    private TextView tvPkVoteMode;
-    private View tvClose;
-    private ProgressBar pbScore;
-    private TextView tvRedTeamScore;
-    private TextView tvBlueTeamScore;
-    private TextView tvPkTimer;
-    private CircleImageView ivRedAvatar1;
-    private CircleImageView ivRedAvatar2;
-    private CircleImageView ivRedAvatar3;
-    private CircleImageView ivRedAvatar4;
-    private CircleImageView ivBlueAvatar1;
-    private CircleImageView ivBlueAvatar2;
-    private CircleImageView ivBlueAvatar3;
-    private CircleImageView ivBlueAvatar4;
-    private TextView tvRestart;
-
-    private final List<CircleImageView> redTeamAvatars = new ArrayList<>();
-
-    private final List<CircleImageView> blueTeamAvatars = new ArrayList<>();
-
-    private RoomPkData roomPkData;
-
-    private CompositeDisposable compositeDisposable;
-
-    public PKScoreBoardDialog(Context context) {
-        super(context, R.style.easy_dialog_style);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setCanceledOnTouchOutside(true);
-        setContentView(R.layout.dialog_pk_score_board);
-
-        tvPkVoteMode = (TextView) findViewById(R.id.tv_pk_vote_mode);
-        tvClose = findViewById(R.id.tv_close);
-        pbScore = (ProgressBar) findViewById(R.id.pb_score);
-        tvRedTeamScore = (TextView) findViewById(R.id.tv_red_team_score);
-        tvBlueTeamScore = (TextView) findViewById(R.id.tv_blue_team_score);
-        tvPkTimer = (TextView) findViewById(R.id.tv_pk_timer);
-        tvRestart = (TextView) findViewById(R.id.tv_restart);
-
-        ivRedAvatar1 = (CircleImageView) findViewById(R.id.iv_red_avatar_1);
-        ivRedAvatar2 = (CircleImageView) findViewById(R.id.iv_red_avatar_2);
-        ivRedAvatar3 = (CircleImageView) findViewById(R.id.iv_red_avatar_3);
-        ivRedAvatar4 = (CircleImageView) findViewById(R.id.iv_red_avatar_4);
-
-        ivBlueAvatar1 = (CircleImageView) findViewById(R.id.iv_blue_avatar_1);
-        ivBlueAvatar2 = (CircleImageView) findViewById(R.id.iv_blue_avatar_2);
-        ivBlueAvatar3 = (CircleImageView) findViewById(R.id.iv_blue_avatar_3);
-        ivBlueAvatar4 = (CircleImageView) findViewById(R.id.iv_blue_avatar_4);
-
-        redTeamAvatars.add(ivRedAvatar1);
-        redTeamAvatars.add(ivRedAvatar2);
-        redTeamAvatars.add(ivRedAvatar3);
-        redTeamAvatars.add(ivRedAvatar4);
-
-        blueTeamAvatars.add(ivBlueAvatar1);
-        blueTeamAvatars.add(ivBlueAvatar2);
-        blueTeamAvatars.add(ivBlueAvatar3);
-        blueTeamAvatars.add(ivBlueAvatar4);
-        init();
-    }
-
-    private void init() {
-        tvClose.setOnClickListener(v -> dismiss());
-        roomPkData = PkModel.get().getCurPkInfo();
-        if (roomPkData == null) {
-            return;
-        }
-        if (roomPkData.getVoteMode() == RoomPkData.VOTE_MODE_GIFT) {
-            tvPkVoteMode.setText(getContext().getResources().getString(R.string.vote_type_gift_value));
-        } else if (roomPkData.getVoteMode() == RoomPkData.VOTE_MODE_PERSON) {
-            tvPkVoteMode.setText(getContext().getResources().getString(R.string.vote_type_gift_member));
-        }
-
-        PKTeamInfo redTeam = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_RED);
-        for (int i = 0; i < redTeamAvatars.size(); i++) {
-            if (i < redTeam.getTeamMembers().size()) {
-                redTeamAvatars.get(i).setVisibility(View.VISIBLE);
-                PKTeamMember pkTeamMember = redTeam.getTeamMembers().get(i);
-                PKMemberInfo pkMemberInfo = findPKMemberInfo(pkTeamMember.getUid());
-                if (pkMemberInfo == null || pkMemberInfo.getUserInfo() == null) {
-                    continue;
-                }
-                GlideApp.with(redTeamAvatars.get(i))
-                        .load(pkMemberInfo.getUserInfo().getAvatar())
-                        .placeholder(R.drawable.default_avatar)
-                        .dontAnimate()
-                        .into(redTeamAvatars.get(i));
-            } else {
-                redTeamAvatars.get(i).setVisibility(View.GONE);
-            }
-        }
-
-        PKTeamInfo blueTeam = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_BLUE);
-        for (int i = 0; i < blueTeamAvatars.size(); i++) {
-            if (i < blueTeam.getTeamMembers().size()) {
-                blueTeamAvatars.get(i).setVisibility(View.VISIBLE);
-                PKTeamMember pkTeamMember = blueTeam.getTeamMembers().get(i);
-                PKMemberInfo pkMemberInfo = findPKMemberInfo(pkTeamMember.getUid());
-                if (pkMemberInfo == null || pkMemberInfo.getUserInfo() == null) {
-                    continue;
-                }
-                GlideApp.with(blueTeamAvatars.get(i))
-                        .load(pkMemberInfo.getUserInfo().getAvatar())
-                        .placeholder(R.drawable.default_avatar)
-                        .dontAnimate()
-                        .into(blueTeamAvatars.get(i));
-
-            } else {
-                blueTeamAvatars.get(i).setVisibility(View.GONE);
-            }
-        }
-
-        if (AvRoomDataManager.get().isManager() && !SuperAdminUtil.isSuperAdmin()) {
-            tvRestart.setVisibility(View.VISIBLE);
-            tvRestart.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (PkModel.get().getCurPkInfo() == null) {
-                        toast(ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_01));
-                        dismiss();
-                        return;
-                    }
-                    if (PkModel.get().getCurPkInfo().getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK) {
-                        toast(ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_02));
-                        dismiss();
-                        return;
-                    }
-                    CommonTipDialog tipDialog = new CommonTipDialog(getContext());
-                    tipDialog.setTipMsg(ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_03) +
-                            ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_04));
-                    tipDialog.setOnActionListener(
-                            new CommonTipDialog.OnActionListener() {
-                                @Override
-                                public void onOk() {
-                                    PkModel.get().toPKAgain().subscribe(new SingleObserver<String>() {
-                                        @Override
-                                        public void onSubscribe(Disposable d) {
-                                            compositeDisposable.add(d);
-                                        }
-
-                                        @Override
-                                        public void onSuccess(String s) {
-                                            dismiss();
-                                        }
-
-                                        @Override
-                                        public void onError(Throwable e) {
-                                            toast(e.getMessage());
-                                        }
-                                    });
-                                }
-                            }
-                    );
-                    tipDialog.show();
-                }
-            });
-        } else {
-            tvRestart.setVisibility(View.GONE);
-            tvRestart.setOnClickListener(null);
-        }
-        updateTime();
-        onPKDataUpdateEvent(null);
-    }
-
-    private PKMemberInfo findPKMemberInfo(String account) {
-        for (PKMemberInfo pkMemberInfo : PkModel.get().getPkMemberInfoList()) {
-            if (String.valueOf(pkMemberInfo.getUserInfo().getUid()).equals(account)) {
-                return pkMemberInfo;
-            }
-        }
-        return null;
-    }
-
-
-    private void updateTime() {
-        roomPkData = PkModel.get().getCurPkInfo();
-        if (roomPkData == null) {
-            return;
-        }
-        long pkTimeUntilEnd = roomPkData.getCurPkTimeUntilEnd();
-        tvPkTimer.setText(String.format("%1$02d:%2$02d", pkTimeUntilEnd / 60, pkTimeUntilEnd % 60));
-    }
-
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-        compositeDisposable = new CompositeDisposable();
-        compositeDisposable.add(IMNetEaseManager.get().getChatRoomEventObservable()
-                .subscribe(this::onReceiveRoomEvent));
-    }
-
-    private void onReceiveRoomEvent(RoomEvent roomEvent) {
-        int event = roomEvent.getEvent();
-        switch (event) {
-            case RoomEvent.PK_INFO_UPDATE:
-                roomPkData = PkModel.get().getCurPkInfo();
-                if (roomPkData != null && (roomPkData.getPkStatus() == RoomPkData.PK_STATUS_BEFORE_PK ||
-                        roomPkData.getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK)) {
-                    dismiss();
-                }
-                break;
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-        compositeDisposable.dispose();
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onPKDataUpdateEvent(PKDataUpdateEvent event) {
-        if (PkModel.get().getCurPkInfo() == null
-                || PkModel.get().getCurPkInfo().getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK) {
-            dismiss();
-            return;
-        }
-
-        PKTeamInfo redTeam = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_RED);
-        PKTeamInfo blueTeam = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_BLUE);
-        if (redTeam == null || blueTeam == null) {
-            return;
-        }
-        long totalScore = redTeam.getScore() + blueTeam.getScore();
-        if (totalScore > 0) {
-            tvRedTeamScore.setText(FormatUtils.formatPKValue(redTeam.getScore()));
-            tvBlueTeamScore.setText(FormatUtils.formatPKValue(blueTeam.getScore()));
-            int percent = (int) ((float) redTeam.getScore() / (float) totalScore * 100.0f);
-            pbScore.setProgress(percent);
-        } else {
-            pbScore.setProgress(50);
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onPKTimeTickEvent(PKTimeTickEvent event) {
-        updateTime();
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onPKTimeFinishEvent(PKTimeFinishEvent event) {
-        tvPkTimer.setText("00:00");
-    }
-}

app/src/main/java/com/chwl/app/avroom/dialog/PKSelectPeopleDialog.java

@@ -95,7 +95,10 @@ public class PKSelectPeopleDialog extends BaseDialog implements View.OnClickList
             keys[i] = micQueue.keyAt(i);
         }
         Arrays.sort(keys);
-        for (int i = 0; i < keys.length; i++) {
+        for (int i = 0; i < micEntityList.size(); i++) {
+            if (i >= micQueue.size()) {
+                continue;
+            }
             RoomQueueInfo roomQueueInfo = micQueue.get(keys[i]);
             MicMemberInfo chatRoomMember = roomQueueInfo.mChatRoomMember;
             if (chatRoomMember != null) {

app/src/main/java/com/chwl/app/avroom/dialog/RoomGameListDialog.kt

@@ -0,0 +1,236 @@
+package com.chwl.app.avroom.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.chwl.app.R
+import com.chwl.app.avroom.adapter.RoomGameListAdapter
+import com.chwl.app.base.BaseActivity
+import com.chwl.app.common.widget.dialog.DialogManager
+import com.chwl.app.databinding.RoomGameplayDialogBinding
+import com.chwl.app.home.helper.OpenRoomHelper
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.room.bean.RoomInfo
+import com.chwl.core.room.bean.RoomModeType
+import com.chwl.core.room.core.RoomDataService
+import com.chwl.core.room.game.GameModel.getGameList
+import com.chwl.core.room.game.bean.GameInfo
+import com.chwl.core.support.room.AudioRoomContext
+import com.chwl.library.utils.JavaUtil
+import com.chwl.library.utils.ResUtil
+import com.chwl.library.utils.SingleToastUtil
+import com.example.lib_utils.ktx.asLifecycle
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.unity3d.splash.services.core.lifecycle.LifecycleEvent
+import io.reactivex.disposables.CompositeDisposable
+
+class RoomGameListDialog :
+    BottomSheetDialogFragment(), LifecycleObserver {
+    private var binding: RoomGameplayDialogBinding? = null
+    private var compositeDisposable: CompositeDisposable? = null
+    private val adapter = RoomGameListAdapter()
+    private var dialogManager: DialogManager? = null
+    private lateinit var recycleView: RecyclerView
+    override fun getTheme(): Int {
+        return R.style.ErbanBottomSheetDialogDimFalse
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = RoomGameplayDialogBinding.inflate(LayoutInflater.from(context))
+        return binding?.root
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return super.onCreateDialog(savedInstanceState).apply {
+            this.setCanceledOnTouchOutside(true)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initView()
+        val recyclerView: RecyclerView = view.findViewById(R.id.recyclerView)
+        recycleView = recyclerView
+        switchStatus(0)
+        requestData()
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        val lifecycleObserver = object : LifecycleEventObserver {
+            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    context.asLifecycle()?.removeObserver(this)
+                    try {
+                        this@RoomGameListDialog.dismissAllowingStateLoss()
+                    } catch (e: Exception) {
+                    }
+                }
+            }
+        }
+        context.asLifecycle()?.addObserver(lifecycleObserver)
+    }
+
+    private fun initView() {
+        adapter.setOnItemClickListener { _, view, position ->
+            val item = adapter.getItem(position) as GameInfo
+            switchGame(item)
+        }
+        binding?.recyclerView?.adapter = adapter
+    }
+
+    private fun updateDialogHeight(count: Int) {
+        if (count > 10) {
+            val layoutParams = recycleView.layoutParams
+            layoutParams.height = 600
+            recycleView.layoutParams = layoutParams
+        }
+    }
+
+    private fun requestData() {
+        val dataService =
+            AudioRoomContext.get()
+                ?.findAbility<RoomDataService>(RoomDataService::class.java.simpleName)
+        val cacheKey = "game_list#${parentFragment.hashCode()}"
+        val list = dataService?.getData(cacheKey) as? List<GameInfo>
+        if (!list.isNullOrEmpty()) {
+            updateDialogHeight(list.size)
+            loadData(list)
+            return
+        }
+        val disposable = getGameList(AvRoomDataManager.get().roomUid)
+            .doOnError {
+                SingleToastUtil.showToast(it.message)
+                switchStatus(-2)
+            }
+            .subscribe { it: List<GameInfo> ->
+                dataService?.putData(cacheKey, it)
+                updateDialogHeight(it.size)
+                loadData(it)
+            }
+        getCompositeDisposable().add(disposable)
+    }
+
+    private fun loadData(list: List<GameInfo>?) {
+        if (list.isNullOrEmpty()) {
+            switchStatus(-1)
+        } else {
+            adapter.setNewData(list)
+            switchStatus(1)
+        }
+    }
+
+    private fun switchStatus(status: Int) {
+        when (status) {
+            // loading
+            0 -> {
+                binding?.recyclerView?.isVisible = false
+                binding?.layoutStatus?.isVisible = true
+                binding?.groupStatusLoading?.isVisible = true
+                binding?.groupStatusText?.isVisible = false
+            }
+
+            // 有数据
+            1 -> {
+                binding?.recyclerView?.isVisible = true
+                binding?.layoutStatus?.isVisible = false
+            }
+
+            // 空数据
+            -1 -> {
+                binding?.recyclerView?.isVisible = false
+                binding?.layoutStatus?.isVisible = true
+                binding?.groupStatusLoading?.isVisible = false
+                binding?.groupStatusText?.isVisible = true
+                binding?.tvStatus?.setText(R.string.avroom_presenter_roomnewbiehellowwordpresenter_01)
+            }
+
+            // 失败
+            else -> {
+                binding?.recyclerView?.isVisible = false
+                binding?.layoutStatus?.isVisible = true
+                binding?.groupStatusLoading?.isVisible = false
+                binding?.groupStatusText?.isVisible = true
+                binding?.tvStatus?.setText(R.string.request_failed_again_later)
+            }
+        }
+    }
+
+    private fun switchGame(gameInfo: GameInfo) {
+        if (AvRoomDataManager.get().isGamePlaying) {
+            SingleToastUtil.showToast(ResUtil.getString(R.string.room_switch_game_failed_in_game))
+            return
+        }
+        if (!isShowChangeGame()) {
+            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_04))
+            return
+        }
+
+        if (dialogManager == null) {
+            dialogManager = DialogManager(context)
+        }
+        dialogManager?.showOkCancelDialog(
+            getString(R.string.room_switch_game_tips)
+        ) {
+            if (gameInfo.isStandardRoom()) {
+                OpenRoomHelper.updateRoomInfo(
+                    activity as BaseActivity,
+                    AvRoomDataManager.get().mCurrentRoomInfo,
+                    RoomInfo.ROOMTYPE_HOME_PARTY,
+                    0,
+                    false
+                )
+            } else {
+                OpenRoomHelper.updateRoomInfo(
+                    activity as BaseActivity,
+                    AvRoomDataManager.get().mCurrentRoomInfo,
+                    RoomInfo.ROOMTYPE_GAME,
+                    JavaUtil.str2long(gameInfo.mgId),
+                    false
+                )
+            }
+            dismissAllowingStateLoss()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        onUnbindContext()
+        dialogManager?.dismissDialog()
+        dialogManager = null
+    }
+
+    private fun getCompositeDisposable(): CompositeDisposable {
+        var disposable = compositeDisposable
+        if (disposable == null) {
+            disposable = CompositeDisposable()
+            compositeDisposable = disposable
+        }
+        return disposable
+    }
+
+    private fun onUnbindContext() {
+        compositeDisposable?.dispose()
+        compositeDisposable = null
+    }
+
+    //这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式!
+    private fun isShowChangeGame(): Boolean {
+        val currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo
+        return currentRoomInfo != null && currentRoomInfo.type != RoomInfo.ROOM_TYPE_SINGLE &&
+                (currentRoomInfo.roomModeType == RoomModeType.NORMAL_MODE || currentRoomInfo.roomModeType == 2 || currentRoomInfo.roomModeType == 4)
+    }
+}

app/src/main/java/com/chwl/app/avroom/dialog/RoomGameplayDialog.kt

@@ -1,31 +1,51 @@
 package com.chwl.app.avroom.dialog
 
 import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.chwl.app.R
+import com.chwl.app.avroom.activity.CreatePKActivity
 import com.chwl.app.avroom.adapter.RoomGameplayAdapter
+import com.chwl.app.avroom.anotherroompk.RoomPKCreateActivity
+import com.chwl.app.avroom.bean.RoomGameplayItem
+import com.chwl.app.avroom.singleroompk.SingleRoomPKCreateActivity
 import com.chwl.app.databinding.RoomGameplayDialogBinding
 import com.chwl.app.treasure_box.widget.GoldBoxHelper
 import com.chwl.app.ui.webview.CommonWebViewActivity
-import com.chwl.app.ui.webview.baishun.BaiShunGameWebActivity
 import com.chwl.app.ui.webview.room_banner.RoomWebDialogActivity
 import com.chwl.app.utils.CommonJumpHelper
+import com.chwl.core.auth.AuthModel
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.room.anotherroompk.SingleRoomPKModel
 import com.chwl.core.room.bean.RoomIcon
+import com.chwl.core.room.bean.RoomInfo
 import com.chwl.core.room.core.RoomDataService
 import com.chwl.core.room.game.bean.BaiShunGameConfig
 import com.chwl.core.room.model.AvRoomModel
-import com.chwl.core.support.room.RoomContext
+import com.chwl.core.super_admin.util.SuperAdminUtil
+import com.chwl.core.support.room.AudioRoomContext
+import com.chwl.core.utils.CurrentTimeUtils
+import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.SingleToastUtil
+import com.example.lib_utils.ktx.asLifecycle
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.gson.Gson
 import io.reactivex.disposables.CompositeDisposable
 
-class RoomGameplayDialog :
-    BottomSheetDialogFragment() {
+class RoomGameplayDialog : BottomSheetDialogFragment() {
+
+    var isOnlyPK = false
+    private lateinit var recycleView: RecyclerView
+
     private var binding: RoomGameplayDialogBinding? = null
     private var compositeDisposable: CompositeDisposable? = null
     private val adapter = RoomGameplayAdapter()
@@ -54,44 +74,100 @@ class RoomGameplayDialog :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initView()
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.recyclerView)
+        recycleView = recyclerView
+
         switchStatus(0)
         requestData()
     }
 
     private fun initView() {
         adapter.setOnItemClickListener { _, view, position ->
-            val item = adapter.getItem(position) as RoomIcon
-            jump(item)
+            adapter.getItem(position)?.onItemClick(this)
         }
         binding?.recyclerView?.adapter = adapter
     }
 
-    private fun requestData() {
-        val dataService =
-            RoomContext.get()?.findAbility<RoomDataService>(RoomDataService::class.java.simpleName)
-        val cacheKey = "gameplay_list#${parentFragment.hashCode()}"
-        val list = dataService?.getData(cacheKey) as? List<RoomIcon>
-        if (!list.isNullOrEmpty()) {
-            loadData(list)
-            return
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        val lifecycleObserver = object : LifecycleEventObserver {
+            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                if (event == Lifecycle.Event.ON_DESTROY) {
+                    context.asLifecycle()?.removeObserver(this)
+                    try {
+                        this@RoomGameplayDialog.dismissAllowingStateLoss()
+                    } catch (e: Exception) {
+                    }
+                }
+            }
         }
-        val disposable = AvRoomModel.get().roomGamePlayList
-            .doOnError {
-                SingleToastUtil.showToast(it.message)
-                switchStatus(-2)
-            }
-            .subscribe { it: List<RoomIcon> ->
-                dataService?.putData(cacheKey, it)
-                loadData(it)
-            }
-        getCompositeDisposable().add(disposable)
+        context.asLifecycle()?.addObserver(lifecycleObserver)
     }
 
-    private fun loadData(list: List<RoomIcon>?) {
-        if (list.isNullOrEmpty()) {
+    private fun requestData() {
+        if (isOnlyPK) {
+            loadSuccess(arrayListOf())
+        } else {
+            val dataService =
+                AudioRoomContext.get()
+                    ?.findAbility<RoomDataService>(RoomDataService::class.java.simpleName)
+            val cacheKey = "gameplay_list#${parentFragment.hashCode()}"
+            val list = dataService?.getData(cacheKey) as? List<RoomIcon>
+
+            if (!list.isNullOrEmpty()) {
+                updateDialogHeight(list.size)
+                loadSuccess(list)
+                return
+            }
+            val disposable = AvRoomModel.get().roomGamePlayList
+                .doOnError {
+                    loadFail(it)
+                }
+                .subscribe { it: List<RoomIcon> ->
+                    dataService?.putData(cacheKey, it)
+                    updateDialogHeight(it.size)
+                    loadSuccess(it)
+                }
+            getCompositeDisposable().add(disposable)
+        }
+    }
+
+    private fun updateDialogHeight(count: Int) {
+        if (count > 10) {
+            val layoutParams = recycleView.layoutParams
+            layoutParams.height = 600
+            recycleView.layoutParams = layoutParams
+        }
+    }
+
+    private fun loadSuccess(list: List<RoomIcon>?) {
+        var finalList = mutableListOf<RoomGameplayItem>()
+        if (isOnlyPK) {
+            finalList = getLocalList()
+        }
+        list?.let {
+            finalList.addAll(list.map {
+                RoomGameplayItem.RoomIconItem(it) { dialog, item ->
+                    jump(item)
+                }
+            })
+        }
+        if (finalList.isEmpty()) {
             switchStatus(-1)
         } else {
-            adapter.setNewData(list)
+            adapter.setNewData(finalList)
+            switchStatus(1)
+        }
+    }
+
+    private fun loadFail(throwable: Throwable) {
+        SingleToastUtil.showToast(throwable.message)
+        val finalList = getLocalList()
+        if (finalList.isEmpty()) {
+            switchStatus(-2)
+        } else {
+            adapter.setNewData(finalList)
             switchStatus(1)
         }
     }
@@ -194,6 +270,151 @@ class RoomGameplayDialog :
         }
     }
 
+    private fun getLocalList(): MutableList<RoomGameplayItem> {
+        val list = ArrayList<RoomGameplayItem>()
+        getPkItem()?.let {
+            list.add(it)
+        }
+        getRoomPkItem()?.let {
+            list.add(it)
+        }
+//        getSingleRoomPkItem()?.let {
+//            list.add(it)
+//        }
+        return list
+    }
+
+    private fun getPkItem(): RoomGameplayItem? {
+        val context = context ?: return null
+        if (SuperAdminUtil.isSuperAdmin()) {
+            return null
+        }
+        if (AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_HOME_PARTY && AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_PARTY && AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_REVELRY) {
+            return null
+        }
+        val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
+        if (roomInfo == null) {
+            return null
+        }
+        if (AvRoomDataManager.get().isManager && !AvRoomDataManager.get().isCpRoom) {
+            val str =
+                if (AvRoomDataManager.get().isOpenPKMode) context.resources.getString(R.string.room_was_in_PK) else context.resources.getString(
+                    R.string.room_PK_mode
+                )
+            val icon =
+                if (AvRoomDataManager.get().isOpenPKMode) R.drawable.room_gameplay_ic_team_pk else R.drawable.room_gameplay_ic_team_pk
+            return RoomGameplayItem.CustomItem(str, icon) { dialog, item ->
+                if (AvRoomDataManager.get().isDatingMode) {
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_01))
+                    return@CustomItem
+                }
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) {
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_02))
+                    return@CustomItem
+                }
+                dialog.dismissAllowingStateLoss()
+                CreatePKActivity.start(context)
+            }
+        }
+        return null
+    }
+
+    private fun getRoomPkItem(): RoomGameplayItem? {
+        val context = context ?: return null
+        if (SuperAdminUtil.isSuperAdmin()) {
+            return null
+        }
+        if (AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_HOME_PARTY && AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_PARTY && AvRoomDataManager.get().roomType != RoomInfo.ROOMTYPE_REVELRY) {
+            return null
+        }
+        val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
+        if (roomInfo == null) {
+            return null
+        }
+        if ((AvRoomDataManager.get().isRoomOwner || AvRoomDataManager.get().isSuperAdmin) &&
+            !AvRoomDataManager.get().isCpRoom
+        ) {
+            val str =
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_03) else ResUtil.getString(
+                    R.string.avroom_dialog_roomoperationdialog_04
+                )
+            val icon =
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) R.drawable.room_gameplay_ic_room_pk else R.drawable.room_gameplay_ic_room_pk
+            return RoomGameplayItem.CustomItem(str, icon) { dialog, item ->
+                if (AvRoomDataManager.get().isDatingMode) {
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_05))
+                    return@CustomItem
+                }
+                if (AvRoomDataManager.get().isOpenPKMode) {
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_06))
+                    return@CustomItem
+                }
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) {
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_07))
+                    return@CustomItem
+                }
+                dismissAllowingStateLoss()
+                RoomPKCreateActivity.start(context)
+            }
+        }
+        return null
+    }
+
+    private fun getSingleRoomPkItem(): RoomGameplayItem? {
+        val context = context ?: return null
+        if (SuperAdminUtil.isSuperAdmin()) {
+            return null
+        }
+        if (AvRoomDataManager.get().isOpenGame) {
+            return null
+        }
+        if (!AvRoomDataManager.get().isSingleRoom) {
+            return null
+        }
+        val pkBean = AvRoomDataManager.get().roomPkLiveData.value
+        if (AvRoomDataManager.get().isRoomOwner && !AvRoomDataManager.get().isCpRoom) {
+            var str =
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_08) else ResUtil.getString(
+                    R.string.avroom_dialog_roomoperationdialog_09
+                )
+            if (pkBean != null) {
+                if (pkBean.pkState == 2 &&
+                    (pkBean.winUid == 0L || pkBean.winUid == AuthModel.get().currentUid || pkBean.penaltyEndTime < CurrentTimeUtils.getCurrentTime())
+                ) {
+                    str = ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_010)
+                }
+            }
+            val icon =
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) R.drawable.ic_room_opt_single_pk_open else R.drawable.ic_room_opt_single_pk_in
+            val finalStr = str
+            return RoomGameplayItem.CustomItem(str, icon) { dialog, item ->
+                if (pkBean != null && ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_011) == finalStr) {
+                    SingleRoomPKModel.endSingleRoomPk(pkBean.roundId)
+                        .doOnSuccess { s: String? ->
+                            SingleToastUtil.showToast(
+                                ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_012)
+                            )
+                        }
+                        .doOnError { throwable: Throwable ->
+                            SingleToastUtil.showToast(
+                                throwable.message
+                            )
+                        }
+                        .subscribe()
+                    dismissAllowingStateLoss()
+                    return@CustomItem
+                }
+                if (AvRoomDataManager.get().isOpenAnotherPKMode) {
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_013))
+                    return@CustomItem
+                }
+                dismissAllowingStateLoss()
+                SingleRoomPKCreateActivity.start(context)
+            }
+        }
+        return null
+    }
+
     interface GameplayDialogListener {
         fun onShowBaiShunGame(url: String, config: BaiShunGameConfig)
     }

app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.chwl.app.avroom.activity.RoomTypeSwitchActivity;
 import com.coorchice.library.utils.LogUtils;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.hjq.toast.ToastUtils;
@@ -115,22 +116,23 @@ public class RoomOperationDialog extends BottomSheetDialog {
         optAdapter = new OptAdapter(context, null);
         addRoomAlbum(optAdapter);
         addDatingAction(optAdapter);
-        addPKAction(optAdapter);
-        addRoomPKAction(optAdapter);
+//        addPKAction(optAdapter);
+//        addRoomPKAction(optAdapter);
         addSingleRoomPKAction(optAdapter);
         addSendBroadcastAction(optAdapter);
 //        addInviteFansOptAdapter();
         addVipSendBroadcastAction(optAdapter);
-        addRedPacketAction(optAdapter);
+//        addRedPacketAction(optAdapter);
         addRoomSettingAction(optAdapter);
         addGiftEffectAction(optAdapter);
-        addOpenOrClosePublicScreenAction(optAdapter);
+//        addOpenOrClosePublicScreenAction(optAdapter);
 //        addRedPackageSwitch();
         addCleanScreenAction(optAdapter);
 //        addRoomLimit(optAdapter);
-        addGiftValueAction(optAdapter);
+//        addGiftValueAction(optAdapter);
         addSuperAdminAction(optAdapter);
         addShieldReportAction(optAdapter);
+        addRoomTypeSwitchAction(optAdapter);
         rvOPtList.setAdapter(optAdapter);
     }
 
@@ -191,7 +193,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
             return;
         }
         RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
-        if (roomInfo == null || roomInfo.getIsPermitRoom() != 1) {
+        if (roomInfo == null) {
             return;
         }
         if ((AvRoomDataManager.get().isRoomOwner() || AvRoomDataManager.get().isSuperAdmin()) &&
@@ -286,10 +288,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
         if (SuperAdminUtil.isSuperAdmin()) {
             return;
         }
-        if (AvRoomDataManager.get().isOpenGame()) {
-            return;
-        }
-        if (AvRoomDataManager.get().isSingleRoom()) {
+        if (AvRoomDataManager.get().getRoomType() != RoomInfo.ROOMTYPE_HOME_PARTY) {
             return;
         }
         if (AvRoomDataManager.get().isManager() && !AvRoomDataManager.get().isCpRoom()) {
@@ -556,6 +555,18 @@ public class RoomOperationDialog extends BottomSheetDialog {
         }
     }
 
+    /**
+     * 房间类型切换
+     *
+     * @param optAdapter
+     */
+    private void addRoomTypeSwitchAction(OptAdapter optAdapter) {
+        if (RoomTypeSwitchActivity.Companion.isCanSwitch()) {
+            optAdapter.addData(new OptAction(R.drawable.icon_room_type_switch,
+                    getContext().getResources().getString(R.string.room_type), () -> RoomTypeSwitchActivity.Companion.start(getContext())));
+        }
+    }
+
     /**
      * 超管管理
      */

app/src/main/java/com/chwl/app/avroom/dialog/RoomTeamPKResultDialog.java

@@ -1,14 +1,13 @@
 package com.chwl.app.avroom.dialog;
 
 import android.content.Context;
-import android.graphics.Color;
 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 android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -17,18 +16,16 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.netease.nim.uikit.support.glide.GlideApp;
 import com.chwl.app.R;
-import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.databinding.RoomTeamPkResultDialogBinding;
 import com.chwl.app.ui.widget.dialog.BaseDialog;
-import com.chwl.library.common.util.Utils;
-import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.room.pk.bean.PKTeamInfo;
 import com.chwl.core.room.pk.bean.PKTeamMember;
 import com.chwl.core.room.pk.bean.RoomPkData;
 import com.chwl.library.utils.FormatUtils;
 import com.chwl.library.utils.ResUtil;
+import com.netease.nim.uikit.support.glide.GlideApp;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,19 +37,14 @@ import lombok.Data;
  * @Description
  * @Date 2019/1/4
  */
-public class PKResultDialog extends BaseDialog {
+public class RoomTeamPKResultDialog extends BaseDialog {
     private final static int TEAM_RED = PKTeamInfo.TEAM_RED;
     private final static int TEAM_BLUE = PKTeamInfo.TEAM_BLUE;
 
     private final static int PK_RESULT_VICTORY = 1;
     private final static int PK_RESULT_FAIL = -1;
     private final static int PK_RESULT_TIE = 0;
-
-    private LinearLayout llGuardianName;
-    private LinearLayout llGuardianValue;
-    private LinearLayout llPkMember;
-    private LinearLayout llScore;
-    private ImageView ivResultBottom;
+    private RoomTeamPkResultDialogBinding binding;
     private ImageView ivResultTop;
     private RecyclerView rvList;
     private TextView tvScore;
@@ -60,9 +52,6 @@ public class PKResultDialog extends BaseDialog {
     private TextView tvGuardianValue;
     private TextView tvTeamStatus;
     private TextView tvSeeOtherTeam;
-    private TextView tvTeamLose;
-    private LinearLayout llResultTie;
-    private TextView tvTieScore;
 
     private int pkResult = PK_RESULT_TIE;
     private boolean isShowOpponent = false;//是否在显示对手
@@ -70,8 +59,9 @@ public class PKResultDialog extends BaseDialog {
     private RoomPkData roomPkData;
     private PKTeamInfo teamInfo;
 
-    public PKResultDialog(Context context, RoomPkData roomPkData) {
+    public RoomTeamPKResultDialog(Context context, RoomPkData roomPkData) {
         super(context, R.style.full_screen_dialog);
+        binding = RoomTeamPkResultDialogBinding.inflate(LayoutInflater.from(getContext()));
         Window window = getWindow();
         if (window != null) {
             WindowManager.LayoutParams lps = window.getAttributes();
@@ -87,31 +77,20 @@ public class PKResultDialog extends BaseDialog {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setCanceledOnTouchOutside(true);
-        setContentView(R.layout.dialog_pk_result);
+        setContentView(binding.getRoot());
 
-        llPkMember = (LinearLayout) findViewById(R.id.ll_pk_member);
-        llScore = (LinearLayout) findViewById(R.id.ll_score);
-
-        ivResultBottom = (ImageView) findViewById(R.id.iv_result_bottom);
         ivResultTop = (ImageView) findViewById(R.id.iv_result_top);
-        rvList = (RecyclerView) findViewById(R.id.rv_list);
+        rvList = (RecyclerView) findViewById(R.id.recycler_view);
 
         tvScore = (TextView) findViewById(R.id.tv_score);
-        llGuardianName = (LinearLayout) findViewById(R.id.ll_guardian_name);
-        llGuardianValue = (LinearLayout) findViewById(R.id.ll_guardian_value);
         tvGuardianName = (TextView) findViewById(R.id.tv_guardian_name);
         tvGuardianValue = (TextView) findViewById(R.id.tv_guardian_value);
         tvTeamStatus = (TextView) findViewById(R.id.tv_team_status);
         tvSeeOtherTeam = (TextView) findViewById(R.id.tv_see_other_team);
-        tvTeamLose = (TextView) findViewById(R.id.tv_team_lose);
-
-        llResultTie = (LinearLayout) findViewById(R.id.ll_result_tie);
-        tvTieScore = (TextView) findViewById(R.id.tv_tie_score);
 
 
         adapter = new PkResultMemberAdapter(null);
         rvList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-        rvList.addItemDecoration(new ColorDecoration(Color.TRANSPARENT, Utils.dip2px(getContext(), 10), 0, true));
         rvList.setAdapter(adapter);
 
         tvSeeOtherTeam.setOnClickListener(v -> {
@@ -130,28 +109,29 @@ public class PKResultDialog extends BaseDialog {
             return;
         }
         if (roomPkData.getVoteMode() == RoomPkData.VOTE_MODE_PERSON) {
-            llGuardianName.setVisibility(View.GONE);
-            llGuardianValue.setVisibility(View.GONE);
+            binding.groupGuardianName.setVisibility(View.GONE);
+            binding.groupGuardianValue.setVisibility(View.GONE);
         }
         int result = roomPkData.getResult();
         int teamId = findTeamIdByAccount(String.valueOf(AuthModel.get().getCurrentUid()));
         if (teamId == PKTeamInfo.TEAM_NONE) {
             //观众
             if (result == RoomPkData.PK_RESULT_DRAW) {
+                teamInfo = findTeamByTeamId(PKTeamInfo.TEAM_RED);
                 pkResult = PK_RESULT_TIE;
                 tvTeamStatus.setText(ResUtil.getString(R.string.avroom_dialog_pkresultdialog_01));
-                llPkMember.setVisibility(View.GONE);
-                llScore.setVisibility(View.GONE);
-                llGuardianName.setVisibility(View.GONE);
-                llGuardianValue.setVisibility(View.GONE);
-                llResultTie.setVisibility(View.VISIBLE);
-                tvTieScore.setText(FormatUtils.formatPKValue(roomPkData.getTeams().get(0).getScore()));
-                refreshBgByStatus();
+                if (teamInfo != null) {
+                    tvScore.setText(teamInfo.getScore() + "");
+                } else {
+                    tvScore.setText("0");
+                }
+                binding.groupGuardianName.setVisibility(View.GONE);
+                binding.groupGuardianValue.setVisibility(View.GONE);
+                refreshView(pkResult, teamInfo);
             } else {
                 pkResult = PK_RESULT_VICTORY;
                 teamInfo = findTeamByTeamId(result);
                 refreshView(pkResult, teamInfo);
-
             }
 
         } else {
@@ -161,10 +141,13 @@ public class PKResultDialog extends BaseDialog {
             if (result == RoomPkData.PK_RESULT_DRAW) {
                 pkResult = PK_RESULT_TIE;
                 tvTeamStatus.setText(ResUtil.getString(R.string.avroom_dialog_pkresultdialog_02));
-                tvScore.setText(teamInfo.getScore() + "");
-                llGuardianName.setVisibility(View.GONE);
-                llGuardianValue.setVisibility(View.GONE);
-                tvTeamLose.setVisibility(View.GONE);
+                if (teamInfo != null) {
+                    tvScore.setText(teamInfo.getScore() + "");
+                } else {
+                    tvScore.setText("0");
+                }
+                binding.groupGuardianName.setVisibility(View.GONE);
+                binding.groupGuardianValue.setVisibility(View.GONE);
                 refreshView(pkResult, teamInfo);
 
             } else {
@@ -175,7 +158,7 @@ public class PKResultDialog extends BaseDialog {
     }
 
 
-    private void showTeamMembers(PKTeamInfo teamInfo) {
+    private void showTeamMembers(int pkResult, PKTeamInfo teamInfo) {
         List<PkResultMember> pkResultMembers = new ArrayList<>();
         for (PKTeamMember pkTeamMember : teamInfo.getTeamMembers()) {
             PkResultMember resultMember = new PkResultMember();
@@ -184,22 +167,29 @@ public class PKResultDialog extends BaseDialog {
             resultMember.isMVP = pkTeamMember.getUid().equals(teamInfo.getMvp());
             pkResultMembers.add(resultMember);
         }
+        if (pkResult == PK_RESULT_VICTORY) {
+            adapter.setAvatarBg(R.drawable.room_team_pk_result_avatar_bg_win);
+        } else if (pkResult == PK_RESULT_FAIL) {
+            adapter.setAvatarBg(R.drawable.room_team_pk_result_avatar_bg_fail);
+        } else {
+            adapter.setAvatarBg(R.drawable.room_team_pk_result_avatar_bg_draw);
+        }
         adapter.setNewData(pkResultMembers);
     }
 
     private void showColorByTeam(PKTeamInfo pkTeamInfo) {
         if (pkTeamInfo.getTeam() == PKTeamInfo.TEAM_RED) {
-            tvScore.setTextColor(getContext().getResources().getColor(R.color.color_FD4D72));
-            tvGuardianName.setTextColor(getContext().getResources().getColor(R.color.color_FD4D72));
-            tvGuardianValue.setTextColor(getContext().getResources().getColor(R.color.color_FD4D72));
-            tvTeamStatus.setTextColor(getContext().getResources().getColor(R.color.color_FD4D72));
-            tvSeeOtherTeam.setTextColor(getContext().getResources().getColor(R.color.color_59B9FB));
+            tvScore.setTextColor(getContext().getResources().getColor(R.color.color_FF396F));
+            tvGuardianName.setTextColor(getContext().getResources().getColor(R.color.color_FF396F));
+            tvGuardianValue.setTextColor(getContext().getResources().getColor(R.color.color_FF396F));
+            tvTeamStatus.setTextColor(getContext().getResources().getColor(R.color.color_FF4B81));
+            tvSeeOtherTeam.setTextColor(getContext().getResources().getColor(R.color.color_73B8FF));
         } else if (pkTeamInfo.getTeam() == PKTeamInfo.TEAM_BLUE) {
-            tvScore.setTextColor(getContext().getResources().getColor(R.color.color_59B9FB));
-            tvGuardianName.setTextColor(getContext().getResources().getColor(R.color.color_59B9FB));
-            tvGuardianValue.setTextColor(getContext().getResources().getColor(R.color.color_59B9FB));
-            tvTeamStatus.setTextColor(getContext().getResources().getColor(R.color.color_59B9FB));
-            tvSeeOtherTeam.setTextColor(getContext().getResources().getColor(R.color.color_FD4D72));
+            tvScore.setTextColor(getContext().getResources().getColor(R.color.color_73B8FF));
+            tvGuardianName.setTextColor(getContext().getResources().getColor(R.color.color_73B8FF));
+            tvGuardianValue.setTextColor(getContext().getResources().getColor(R.color.color_73B8FF));
+            tvTeamStatus.setTextColor(getContext().getResources().getColor(R.color.color_73B8FF));
+            tvSeeOtherTeam.setTextColor(getContext().getResources().getColor(R.color.color_FF4B81));
         } else {
             //未知
         }
@@ -207,14 +197,11 @@ public class PKResultDialog extends BaseDialog {
 
     private void refreshBgByStatus() {
         if (pkResult == PK_RESULT_VICTORY) {
-            ivResultTop.setImageResource(R.drawable.pk_result_victory_top);
-            ivResultBottom.setImageResource(R.mipmap.pk_result_victory_bottom);
+            ivResultTop.setImageResource(R.drawable.room_team_pk_result_top_win);
         } else if (pkResult == PK_RESULT_FAIL) {
-            ivResultTop.setImageResource(R.drawable.pk_result_fail_top);
-            ivResultBottom.setImageResource(R.mipmap.pk_result_fail_bottom);
+            ivResultTop.setImageResource(R.drawable.room_team_pk_result_top_fail);
         } else if (pkResult == PK_RESULT_TIE) {
-            ivResultTop.setImageResource(R.drawable.pk_result_tie_top);
-            ivResultBottom.setImageResource(R.mipmap.pk_result_tie_bottom);
+            ivResultTop.setImageResource(R.drawable.room_team_pk_result_top_draw);
         }
     }
 
@@ -268,7 +255,7 @@ public class PKResultDialog extends BaseDialog {
 
     private void refreshView(int pkResult, PKTeamInfo teamInfo) {
         refreshBgByStatus();
-        showTeamMembers(teamInfo);
+        showTeamMembers(pkResult, teamInfo);
         showColorByTeam(teamInfo);
 
         tvScore.setText(FormatUtils.formatPKValue(teamInfo.getScore()));
@@ -291,7 +278,6 @@ public class PKResultDialog extends BaseDialog {
                 if (pkResult == PK_RESULT_VICTORY) {
                     tvTeamStatus.setText(ResUtil.getString(R.string.avroom_dialog_pkresultdialog_06));
                 } else if (pkResult == PK_RESULT_FAIL) {
-                    tvTeamLose.setVisibility(View.VISIBLE);
                 }
                 tvSeeOtherTeam.setText(ResUtil.getString(R.string.avroom_dialog_pkresultdialog_07));
             } else {
@@ -305,7 +291,6 @@ public class PKResultDialog extends BaseDialog {
                 if (pkResult == PK_RESULT_VICTORY) {
                     tvTeamStatus.setText(ResUtil.getString(R.string.avroom_dialog_pkresultdialog_011));
                 } else if (pkResult == PK_RESULT_FAIL) {
-                    tvTeamLose.setVisibility(View.VISIBLE);
                 }
                 tvSeeOtherTeam.setText(ResUtil.getString(R.string.avroom_dialog_pkresultdialog_012));
             } else {
@@ -327,20 +312,26 @@ public class PKResultDialog extends BaseDialog {
 
     class PkResultMemberAdapter extends BaseQuickAdapter<PkResultMember, BaseViewHolder> {
 
+        private int avatarBgResId = R.drawable.room_team_pk_result_avatar_bg_win;
+
+        public void setAvatarBg(int redId) {
+            this.avatarBgResId = redId;
+        }
+
         public PkResultMemberAdapter(@Nullable List<PkResultMember> data) {
-            super(R.layout.item_pk_result_member_rv, data);
+            super(R.layout.room_team_pk_result_item, data);
         }
 
         @Override
         protected void convert(BaseViewHolder helper, PkResultMember item) {
-            CircleImageView avatar = helper.getView(R.id.civ_avatar);
+            ImageView avatarBg = helper.getView(R.id.iv_avatar_bg);
+            avatarBg.setImageResource(avatarBgResId);
+            ImageView avatar = helper.getView(R.id.iv_avatar);
             GlideApp.with(avatar)
                     .load(item.avatar)
                     .placeholder(R.drawable.default_avatar)
                     .dontAnimate()
                     .into(avatar);
-
-            helper.setVisible(R.id.iv_mvp_mark, item.isMVP);
         }
     }
 

app/src/main/java/com/chwl/app/avroom/dialog/RoomTeamPkDialog.kt

@@ -0,0 +1,325 @@
+package com.chwl.app.avroom.dialog
+
+import android.text.TextUtils
+import android.view.WindowManager
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialogFragment
+import com.chwl.app.databinding.RoomTeamPkDialogBinding
+import com.chwl.app.ui.utils.loadAvatar
+import com.chwl.app.ui.widget.dialog.CommonTipDialog
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.room.pk.bean.PKTeamInfo
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember
+import com.chwl.core.room.pk.bean.RoomPkData
+import com.chwl.core.room.pk.event.PKDataUpdateEvent
+import com.chwl.core.room.pk.event.PKTimeFinishEvent
+import com.chwl.core.room.pk.event.PKTimeTickEvent
+import com.chwl.core.room.pk.model.PkModel
+import com.chwl.library.utils.FormatUtils
+import com.chwl.library.utils.ResUtil
+import com.chwl.library.utils.SingleToastUtil
+import io.reactivex.SingleObserver
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import java.util.Locale
+
+class RoomTeamPkDialog : BaseDialogFragment<RoomTeamPkDialogBinding>() {
+
+    private var compositeDisposable: CompositeDisposable? = null
+
+    private var onActionListener: OnActionListener? = null
+
+    override var width = WindowManager.LayoutParams.MATCH_PARENT
+
+    override fun init() {
+        binding.layoutRoot.setOnClickListener {
+            dismissAllowingStateLoss()
+        }
+        binding.userListBlue.showBlueStyle()
+        binding.ivClose.setOnClickListener {
+            dismissAllowingStateLoss()
+        }
+        binding.tvNext.setOnClickListener {
+            if (PkModel.get().isFighting) {
+                onRestartClick()
+            } else {
+                onStartClick()
+            }
+        }
+        binding.ivAvatarRed.setOnClickListener {
+            if (!PkModel.get().isFighting) {
+                onSeatClick(PKTeamInfo.TEAM_RED)
+            }
+        }
+        binding.ivAvatarBlue.setOnClickListener {
+            if (!PkModel.get().isFighting) {
+                onSeatClick(PKTeamInfo.TEAM_BLUE)
+            }
+        }
+        binding.userListRed.setOnClickListener {
+            if (!PkModel.get().isFighting) {
+                onSeatClick(PKTeamInfo.TEAM_RED)
+            }
+        }
+        binding.userListBlue.setOnClickListener {
+            if (!PkModel.get().isFighting) {
+                onSeatClick(PKTeamInfo.TEAM_BLUE)
+            }
+        }
+        updateView()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        EventBus.getDefault().register(this)
+        compositeDisposable = CompositeDisposable()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
+        compositeDisposable?.dispose()
+    }
+
+    fun setOnActionListener(onActionListener: OnActionListener?) {
+        this.onActionListener = onActionListener
+    }
+
+    fun updateView() {
+        if (_binding == null) {
+            return
+        }
+        updateTeamUserList()
+        updateTime()
+        updateProgress()
+        if (PkModel.get().isFighting) {
+            binding.tvNext.setText(R.string.pk_restart)
+        } else {
+            binding.tvNext.setText(R.string.start_pk)
+        }
+        updateManageButtonVisible(AvRoomDataManager.get().isManager)
+    }
+
+    private fun updateTeamUserList() {
+        val pkMemberInfoList = PkModel.get().pkMemberInfoList
+        val redList =
+            pkMemberInfoList.filter { it.teamId == PKTeamInfo.TEAM_RED }.take(4).mapNotNull {
+                it.userInfo
+            }
+        val blueList =
+            pkMemberInfoList.filter { it.teamId == PKTeamInfo.TEAM_BLUE }.take(4).mapNotNull {
+                it.userInfo
+            }
+        binding.userListRed.updateData(redList.drop(1).map {
+            it.avatar
+        })
+        binding.userListBlue.updateData(blueList.drop(1).map {
+            it.avatar
+        })
+        binding.ivAvatarRed.loadAvatar(redList.firstOrNull()?.avatar)
+        binding.ivAvatarBlue.loadAvatar(blueList.firstOrNull()?.avatar)
+    }
+
+    private fun updateManageButtonVisible(isVisible: Boolean) {
+        val dimensionRatio: String
+        if (isVisible) {
+            binding.ivBg.setImageResource(R.drawable.room_team_pk_bg)
+            binding.tvNext.isVisible = true
+            dimensionRatio = "309:379"
+        } else {
+            binding.ivBg.setImageResource(R.drawable.room_team_pk_bg_no_manage)
+            binding.tvNext.isVisible = false
+            dimensionRatio = "309:324"
+        }
+        val params = binding.layoutContent.layoutParams as ConstraintLayout.LayoutParams
+        params.dimensionRatio = dimensionRatio
+        binding.layoutContent.layoutParams = params
+    }
+
+    private fun updateTime() {
+        if (_binding == null) {
+            return
+        }
+        val roomPkData = PkModel.get().curPkInfo
+        val pkTimeUntilEnd: Long
+        if (roomPkData?.pkStatus != RoomPkData.PK_STATUS_IN_PK) {
+            pkTimeUntilEnd = roomPkData?.duration ?: 0
+        } else {
+            pkTimeUntilEnd = roomPkData.curPkTimeUntilEnd
+        }
+        binding.tvTime.text =
+            String.format(Locale.ENGLISH, "%1$02d:%2$02d", pkTimeUntilEnd / 60, pkTimeUntilEnd % 60)
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onPKDataUpdateEvent(event: PKDataUpdateEvent) {
+        updateProgress()
+        if (event.type == PKDataUpdateEvent.TYPE_RESULT) {
+            safeDismiss()
+        }
+    }
+
+    private fun updateProgress() {
+        if (_binding == null) {
+            return
+        }
+        val roomPkData = PkModel.get().curPkInfo
+        if (roomPkData?.pkStatus != RoomPkData.PK_STATUS_IN_PK) {
+            updateProgress(0, 0)
+            return
+        }
+        val redTeam = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_RED)
+        val blueTeam = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_BLUE)
+        if (redTeam == null || blueTeam == null) {
+            updateProgress(0, 0)
+            return
+        }
+        updateProgress(redTeam.score, blueTeam.score)
+    }
+
+    private fun updateProgress(redScore: Long, blueScore: Long) {
+        val totalScore = redScore + blueScore
+        if (totalScore > 0) {
+            binding.tvScoreRed.text = FormatUtils.formatPKValue(redScore)
+            binding.tvScoreBlue.text = FormatUtils.formatPKValue(blueScore)
+            updateProgress(redScore.toFloat() / totalScore.toFloat())
+        } else {
+            updateProgress(0.5f)
+        }
+    }
+
+    private fun updateProgress(percent: Float) {
+        binding.pbScore.post {
+            binding.pbScore.progress = (percent * 100).toInt()
+            val progress = binding.pbScore.width * (percent)
+            var bias =
+                (progress - binding.svgaHot.width / 2f) / (binding.pbScore.width - binding.svgaHot.width)
+            val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
+            bias = 1f.coerceAtMost(bias)
+            bias = 0f.coerceAtLeast(bias)
+            layoutParams.horizontalBias = bias
+            binding.svgaHot.layoutParams = layoutParams
+        }
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onPKTimeTickEvent(event: PKTimeTickEvent?) {
+        updateTime()
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onPKTimeFinishEvent(event: PKTimeFinishEvent?) {
+        updateView()
+    }
+
+    private fun onSeatClick(teamType: Int) {
+        //不是管理员或者房主弹出排麦dialog
+        if (!AvRoomDataManager.get().isManager) {
+            //已经排麦不操作
+            if (!PkModel.get().pkMemberInfoList.isNullOrEmpty() && AvRoomDataManager.get().myIsInQueue) {
+                SingleToastUtil.showToastShort(ResUtil.getString(R.string.avroom_widget_pkboardview_03))
+                return
+            }
+            onActionListener?.onShowPKMicQueueDialog()
+            return
+        }
+        //添加红队人员
+        val selectDialog =
+            PKSelectPeopleDialog(context, teamType, PkModel.get().pkMemberInfoList)
+        selectDialog.setOnSelectPeopleListener { micEntityList -> //更新队伍,麦序,显示头像
+            val upMicMemberList: MutableList<RoomPKInvitedUpMicMember> =
+                ArrayList()
+            for (micEntity in micEntityList) {
+                if (TextUtils.isEmpty(micEntity.uid)) {
+                    continue
+                }
+                val roomPKInvitedUpMicMember = RoomPKInvitedUpMicMember()
+                if (micEntity.isSelect) {
+                    roomPKInvitedUpMicMember.groupType = teamType
+                } else {
+                    if (TextUtils.isEmpty(micEntity.uid)) {
+                        roomPKInvitedUpMicMember.groupType = PKTeamInfo.TEAM_NONE
+                    } else {
+                        val teamId = PkModel.get().getTeamIdInPKMemberList(micEntity.uid)
+                        roomPKInvitedUpMicMember.groupType =
+                            if (teamId == teamType) PKTeamInfo.TEAM_NONE else teamId
+                    }
+                }
+                roomPKInvitedUpMicMember.uid = micEntity.uid
+                roomPKInvitedUpMicMember.nick = micEntity.nick
+                val micQueue = AvRoomDataManager.get().mMicQueueMemberMap
+                //设置坑位的位置
+                for (i in 0 until micQueue.size()) {
+                    val key = micQueue.keyAt(i)
+                    val roomQueueInfo = micQueue[key]
+                    if (roomQueueInfo.mChatRoomMember != null && roomQueueInfo.mChatRoomMember.account == micEntity.uid
+                    ) {
+                        roomPKInvitedUpMicMember.position = key
+                    }
+                }
+                upMicMemberList.add(roomPKInvitedUpMicMember)
+            }
+            PkModel.get().inviteInTeam(upMicMemberList)
+                .doOnError { throwable: Throwable ->
+                    SingleToastUtil.showToastShort(
+                        throwable.message
+                    )
+                }
+                .subscribe()
+        }
+        selectDialog.show()
+    }
+
+    private fun onStartClick() {
+        onActionListener?.onBeginPK()
+    }
+
+    private fun onRestartClick() {
+        if (PkModel.get().curPkInfo == null) {
+            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_01))
+            dismissAllowingStateLoss()
+            return
+        }
+        if (PkModel.get().curPkInfo?.pkStatus == RoomPkData.PK_STATUS_AFTER_PK) {
+            SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_02))
+            dismissAllowingStateLoss()
+            return
+        }
+        val tipDialog = CommonTipDialog(context)
+        tipDialog.setTipMsg(
+            ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_03) +
+                    ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_04)
+        )
+        tipDialog.setOnActionListener(
+            object : CommonTipDialog.OnActionListener {
+                override fun onOk() {
+                    PkModel.get().toPKAgain().subscribe(object : SingleObserver<String?> {
+                        override fun onSubscribe(d: Disposable) {
+                            compositeDisposable?.add(d)
+                        }
+
+                        override fun onSuccess(t: String) {
+                            dismissAllowingStateLoss()
+                        }
+
+                        override fun onError(e: Throwable) {
+                            SingleToastUtil.showToast(e.message)
+                        }
+                    })
+                }
+            }
+        )
+        tipDialog.show()
+    }
+
+    interface OnActionListener {
+        fun onBeginPK()
+        fun onShowPKMicQueueDialog()
+    }
+}

app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt

@@ -9,7 +9,7 @@ import android.view.WindowManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.chwl.app.avroom.adapter.SendBroadcastAdapter
 import com.chwl.app.base.BaseActivity
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogSendBroadcastBinding
 import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.app.utils.SpannableBuilder
@@ -24,7 +24,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import java.util.concurrent.TimeUnit
 
-class SendBroadcastDialog : BaseDialog<DialogSendBroadcastBinding>() {
+class SendBroadcastDialog : BaseDialogFragment<DialogSendBroadcastBinding>() {
 
     private lateinit var rvDelegate: RVDelegate<String>
     private lateinit var adapter: SendBroadcastAdapter

app/src/main/java/com/chwl/app/avroom/dialog/SingleRoomTipDialog.kt

@@ -2,11 +2,11 @@ package com.chwl.app.avroom.dialog
 
 import android.annotation.SuppressLint
 import android.view.WindowManager
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogSingleRoomTipBinding
 
 class SingleRoomTipDialog :
-    BaseDialog<DialogSingleRoomTipBinding>() {
+    BaseDialogFragment<DialogSingleRoomTipBinding>() {
     @SuppressLint("ClickableViewAccessibility")
     override fun init() {
         binding?.root?.setOnClickListener {

app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt

@@ -23,8 +23,10 @@ import android.widget.TextView
 import androidx.annotation.CallSuper
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.withResumed
 import androidx.recyclerview.widget.RecyclerView
@@ -42,6 +44,7 @@ import com.chwl.app.avroom.adapter.OnMicroItemClickListener
 import com.chwl.app.avroom.adapter.RoomMessageIndicatorAdapter
 import com.chwl.app.avroom.dialog.AttentionHintDialog
 import com.chwl.app.avroom.dialog.DatingVipRuleDialog
+import com.chwl.app.avroom.dialog.RoomGameListDialog
 import com.chwl.app.avroom.dialog.RoomGameplayDialog
 import com.chwl.app.avroom.dialog.RoomOperationDialog
 import com.chwl.app.avroom.presenter.BaseRoomPresenter
@@ -60,6 +63,8 @@ import com.chwl.app.music.widget.MusicPlayerView
 import com.chwl.app.public_chat.ui.message.HeadlineViewModel
 import com.chwl.app.room_chat.activity.RoomMsgActivity
 import com.chwl.app.ui.pay.ChargeActivity
+import com.chwl.app.ui.webview.CommonWebViewActivity
+import com.chwl.app.ui.webview.DialogWebViewActivity
 import com.chwl.app.ui.widget.ButtonItem
 import com.chwl.app.ui.widget.GiftDialog
 import com.chwl.app.ui.widget.GiftDialog.OnGiftDialogBtnClickListener
@@ -76,6 +81,7 @@ import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView
 import com.chwl.app.utils.KeyBoardUtils
 import com.chwl.app.vip.dialog.SelectPayTypeDialog
 import com.chwl.core.Constants
+import com.chwl.core.UriProvider
 import com.chwl.core.auth.AuthModel
 import com.chwl.core.bean.RoomMicInfo
 import com.chwl.core.gift.GiftModel
@@ -93,6 +99,8 @@ import com.chwl.core.manager.RoomEvent
 import com.chwl.core.mentoring_relationship.event.MentoringStopCountingEvent
 import com.chwl.core.room.anotherroompk.ShowGiftDialogEvent
 import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent
+import com.chwl.core.room.bean.RightBottomIconConfig
+import com.chwl.core.room.bean.RoomIcon
 import com.chwl.core.room.bean.RoomInfo
 import com.chwl.core.room.event.RoomAtEvent
 import com.chwl.core.room.event.RoomClearScreenEvent
@@ -104,6 +112,8 @@ import com.chwl.core.share.bean.SessionType
 import com.chwl.core.super_admin.SaConstant
 import com.chwl.core.super_admin.model.SuperAdminModel
 import com.chwl.core.super_admin.util.SuperAdminUtil
+import com.chwl.core.support.room.AudioRoomContext
+import com.chwl.core.support.room.RoomContext
 import com.chwl.core.support.room.RoomView
 import com.chwl.core.support.room.RoomWidget
 import com.chwl.core.user.UserModel
@@ -115,6 +125,7 @@ import com.chwl.library.common.util.LimitClickUtils
 import com.chwl.library.net.rxnet.utils.RxNetWorkUtils
 import com.chwl.library.rxbus.RxBus
 import com.chwl.library.utils.*
+import com.google.gson.Gson
 import com.netease.nim.uikit.common.antispam.AntiSpamEvent
 import com.netease.nimlib.sdk.StatusCode
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder
@@ -236,7 +247,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
         publicChatMessageWidget = PublicChatRoomMessageWidget(requireContext())
         val tabList: MutableList<String> = java.util.ArrayList(2)
         tabList.add(getString(R.string.room))
-        tabList.add(getString(R.string.public_chat_room))
+        tabList.add(getString(R.string.public_chat))
         val messageIndicator = mView.findViewById<MagicIndicator>(R.id.message_indicator)
         messagePager.offscreenPageLimit = tabList.size
         messagePager.adapter = object : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -643,6 +654,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
     open fun updateView() {
         // 更新底欄
         showBottomViewForDifRole()
+        bottomView.notifyStateChanged()
     }
 
     /**
@@ -657,6 +669,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
             bottomView.showHomePartyDownMicBottom()
         }
         bottomView.showInputOrIcon(isOnMic)
+        bottomView.updateGameEntrance()
         // 更新聽筒消息
         bottomView.setRemoteMuteOpen(!AudioEngineManager.get().isRemoteMute)
         if (isOnMic) {
@@ -784,12 +797,66 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
     override fun onClick(v: View) {
         if (mClickLimit.checkForTime(500)) return
         when (v.id) {
+            R.id.iv_config_entrance -> {
+                val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo ?: return
+                val configInfo = AvRoomDataManager.get().rightBottomIconConfig ?: return
+                if (configInfo.skipType == 1) {
+                    playConfigWeb(configInfo.skipUrl)
+                } else if (configInfo.skipType == 2) {
+                    playConfigBaishunGame(configInfo)
+                }
+            }
+            R.id.iv_game -> {
+                val dialog = RoomGameplayDialog()
+                dialog.isOnlyPK = false
+                dialog.listener = object : RoomGameplayDialog.GameplayDialogListener {
+                    override fun onShowBaiShunGame(url: String, config: BaiShunGameConfig) {
+                        (activity as? AVRoomActivity)?.showBaiShunGame(url, config)
+                    }
+                }
+                dialog.show(childFragmentManager, "ROOM_GAME_PLAY")
+            }
             R.id.input_send -> {
                 sendMsg()
             }
             R.id.input_headline_send -> {
                 sendHeadline()
             }
+            R.id.layout_room_rank -> {
+                DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking())
+            }
+        }
+    }
+
+    private fun playConfigWeb(url: String) {
+        CommonWebViewActivity.start(mContext, url)
+    }
+
+    private fun playConfigBaishunGame(configInfo: RightBottomIconConfig) {
+        val roomIcon: RoomIcon = RoomIcon(
+            skipContent = configInfo.skipUrl,
+            skipType = 3,
+            showType = 1,
+            code = "BAISHUN",
+            ruleValue = configInfo.reserve)
+        try {
+            val url = roomIcon.skipContent
+            val ruleValue = Gson().fromJson<RoomIcon.RuleValueBean>(
+                roomIcon.ruleValue,
+                RoomIcon.RuleValueBean::class.java
+            )
+            val config = Gson().fromJson<BaiShunGameConfig>(
+                ruleValue.RESERVE,
+                BaiShunGameConfig::class.java
+            )
+            if (config != null && url != null) {
+                config.reloadDynamicParams()
+                (activity as? AVRoomActivity)?.showBaiShunGame(url, config)
+            } else {
+                SingleToastUtil.showToast(R.string.manager_trtc_trtcengineadapter_042)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
     }
 
@@ -1420,14 +1487,19 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
             RoomMsgActivity.start(mContext)
         }
 
-        override fun onRoomGameplayClick() {
-            val dialog = RoomGameplayDialog()
-            dialog.listener = object : RoomGameplayDialog.GameplayDialogListener {
-                override fun onShowBaiShunGame(url: String, config: BaiShunGameConfig) {
-                    (activity as? AVRoomActivity)?.showBaiShunGame(url, config)
+        override fun onRoomGameplayClick(isOnlyPK: Boolean) {
+            if (isOnlyPK) {
+                val dialog = RoomGameplayDialog()
+                dialog.isOnlyPK = isOnlyPK
+                dialog.listener = object : RoomGameplayDialog.GameplayDialogListener {
+                    override fun onShowBaiShunGame(url: String, config: BaiShunGameConfig) {
+                        (activity as? AVRoomActivity)?.showBaiShunGame(url, config)
+                    }
                 }
+                dialog.show(childFragmentManager, "ROOM_GAME_PLAY")
+            } else {
+                RoomGameListDialog().show(childFragmentManager, "GAME_LIST")
             }
-            dialog.show(childFragmentManager, "ROOM_GAME_PLAY")
         }
     }
 
@@ -1453,10 +1525,22 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
         return this
     }
 
+    override fun getViewFragmentManager(): FragmentManager {
+        return activity?.supportFragmentManager ?: childFragmentManager
+    }
+
     override fun findWidget(name: String): RoomWidget? {
         return widgets[name]
     }
 
+    override fun getRoomContext(): RoomContext? {
+        return AudioRoomContext.get()
+    }
+
+    override fun getRoomContextLiveData(): LiveData<out RoomContext?> {
+        return AudioRoomContext.contextLiveData
+    }
+
     open fun initWidget() {
         publicChatMessageWidget?.let {
             registerWidget(PublicChatRoomMessageWidget::class.java.simpleName, it)

app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt

@@ -6,7 +6,6 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnTouchListener
 import android.view.ViewGroup
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.RecyclerView
@@ -16,15 +15,23 @@ import com.chwl.app.avroom.adapter.GameMiniMicroViewAdapter
 import com.chwl.app.avroom.adapter.OnMicroItemClickListener
 import com.chwl.app.avroom.game.GameDelegate
 import com.chwl.app.avroom.game.OnGameStatusChangeListener
+import com.chwl.app.avroom.headline.RoomHeadlineWidget
+import com.chwl.app.avroom.online.RoomOnlineWidget
 import com.chwl.app.avroom.presenter.GameRoomPresenter
-import com.chwl.app.avroom.rank.RoomRankWidget
+import com.chwl.app.avroom.rank.RoomRankNumberWidget
 import com.chwl.app.avroom.view.IGameRoomView
 import com.chwl.app.databinding.FragmentGameRoomBinding
+import com.chwl.app.home.helper.OpenRoomHelper
+import com.chwl.app.ui.webview.DialogWebViewActivity
 import com.chwl.app.ui.widget.GiftDialog.OnGiftDialogBtnClickListener
+import com.chwl.core.UriProvider
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.music.model.PlayerModel
+import com.chwl.core.room.bean.RoomInfo
 import com.chwl.core.room.event.FinishAvRoomEvent
+import com.chwl.core.sud.model.GameViewInfoModel
 import com.chwl.library.base.factory.CreatePresenter
+import com.chwl.library.utils.SingleToastUtil
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -70,18 +77,21 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
             AvRoomDataManager.get().mCurrentRoomInfo?.mgId
         )
         gameDelegate.setOnGameStatusChangeListener(this)
-        gameBinding.rankWidget.setContentBackgroundResource(R.drawable.room_rank_widget_bg_game)
     }
 
     @SuppressLint("CheckResult")
     override fun initiate() {
         gameBinding.microView.bindAdapter(GameMicroViewAdapter(context))
+        resetGameViewRect()
         super.initiate()
         //游戏模式暂时不需要这个
         PlayerModel.get().stop()
         gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
         gameBinding.tvShowMiniMic.setOnClickListener { showMiniMic() }
         gameBinding.ivShowMic.setOnClickListener { showMic() }
+        gameBinding.headlineWidget.setOnClickListener {
+            switchMessageLayoutHeight()
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -95,23 +105,61 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
         }
     }
 
+    override fun onClick(v: View) {
+        super.onClick(v)
+        when (v.id) {
+            R.id.iv_back_room -> {
+                if (AvRoomDataManager.get().isGamePlaying) {
+                    SingleToastUtil.showToast(getString(R.string.avroom_fragment_homepartyfragment_03))
+                    return
+                }
+                dialogManager.showOkCancelDialog(
+                    getString(R.string.room_switch_standard_room_tips)
+                ) {
+                    var type = AvRoomDataManager.get().mCurrentRoomInfo?.oldType
+                    if (type == null || type <= 0) {
+                        type = RoomInfo.ROOMTYPE_HOME_PARTY
+                    }
+                    OpenRoomHelper.updateRoomInfo(
+                        baseActivity,
+                        AvRoomDataManager.get().mCurrentRoomInfo,
+                        type,
+                        0,
+                        false
+                    )
+                }
+            }
+            R.id.layout_hour_rank -> {
+                DialogWebViewActivity.start(
+                    mContext,
+                    UriProvider.getRoomHourRankUrl(AvRoomDataManager.get().roomUid)
+                )
+            }
+        }
+    }
+
     @SuppressLint("ClickableViewAccessibility")
-    private fun setMessagePagerAutoHeight(recyclerView: RecyclerView){
+    private fun setMessagePagerAutoHeight(recyclerView: RecyclerView) {
         recyclerView.setOnTouchListener(OnTouchListener { v: View?, event: MotionEvent ->
             if (recyclerView.scrollState == RecyclerView.SCROLL_STATE_IDLE
                 && event.action == MotionEvent.ACTION_UP
             ) {
-                val layoutParams: ViewGroup.LayoutParams = messagePager.layoutParams
-                val bigHeight = ScreenUtil.dip2px(200f)
-                val littleHeight = ScreenUtil.dip2px(80f)
-                layoutParams.height =
-                    if (layoutParams.height == littleHeight) bigHeight else littleHeight
-                messagePager.layoutParams = layoutParams
+                switchMessageLayoutHeight()
             }
             false
         })
     }
 
+    private fun switchMessageLayoutHeight() {
+        val view = gameBinding.layoutMessage
+        val layoutParams: ViewGroup.LayoutParams = view.layoutParams
+        val bigHeight = ScreenUtil.dip2px(200f)
+        val littleHeight = ScreenUtil.dip2px(80f)
+        layoutParams.height =
+            if (layoutParams.height == littleHeight) bigHeight else littleHeight
+        view.layoutParams = layoutParams
+    }
+
     private fun showMiniMic() {
         if (isShowMiniMic) return
         isShowMiniMic = true
@@ -143,20 +191,34 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
         super.updateView()
         gameDelegate.updateGame(AvRoomDataManager.get().mCurrentRoomInfo?.mgId)
         gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
-        if (isSixMic()) {
-            gameBinding.tvShowMiniMic.isVisible = !isShowMiniMic
-            gameBinding.ivShowMic.isVisible = isShowMiniMic
-        } else {
-            showMic()
-            gameBinding.tvShowMiniMic.isInvisible = true
-            gameBinding.ivShowMic.isVisible = false
-        }
+//        if (isSixMic()) {
+//            gameBinding.tvShowMiniMic.isVisible = !isShowMiniMic
+//            gameBinding.ivShowMic.isVisible = isShowMiniMic
+//        } else {
+//            showMic()
+//            gameBinding.tvShowMiniMic.isInvisible = true
+//            gameBinding.ivShowMic.isVisible = false
+//        }
         gameBinding.microView.adapter.notifyDataSetChanged()
+        if (AvRoomDataManager.get().mCurrentRoomInfo?.isPermitRoom == 1) {
+            gameBinding.layoutHourRank.visibility = View.VISIBLE
+        } else {
+            gameBinding.layoutHourRank.visibility = View.GONE
+        }
+    }
+
+    private fun resetGameViewRect(){
+        gameBinding.vGameRect.post {
+            gameDelegate.gameViewRect = GameViewInfoModel.GameViewRectModel().apply {
+                top = gameBinding.vGameRect.top
+                bottom = gameBinding.layoutRoot.height - gameBinding.vGameRect.bottom
+            }
+        }
     }
 
     override fun onGameStart() {
         if (isSixMic()) {
-            showMiniMic()
+//            showMiniMic()
         }
     }
 
@@ -212,6 +274,8 @@ class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
 
     override fun initWidget() {
         super.initWidget()
-        registerWidget(RoomRankWidget::class.java.simpleName, gameBinding.rankWidget)
+        registerWidget(RoomOnlineWidget::class.java.simpleName, gameBinding.onlineWidget)
+        registerWidget(RoomHeadlineWidget::class.java.simpleName, gameBinding.headlineWidget)
+        registerWidget(RoomRankNumberWidget::class.java.simpleName, gameBinding.rankNumberWidget)
     }
 }

app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java

@@ -15,16 +15,13 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.chwl.app.avroom.adapter.SelectGameAdapter;
-import com.chwl.app.home.helper.OpenRoomHelper;
+import com.chwl.app.avroom.activity.RoomTitleEditActivity;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
 import com.chwl.app.ui.widget.GiftDialog;
 import com.chwl.app.ui.widget.UserInfoDialog;
-import com.chwl.core.room.bean.RoomModeType;
-import com.chwl.core.room.game.GameModel;
-import com.chwl.core.room.game.bean.GameInfo;
 import com.chwl.library.utils.JavaUtil;
 import com.example.lib_utils.UiUtils;
 import com.netease.nim.uikit.common.util.string.StringUtil;
@@ -35,7 +32,6 @@ import com.opensource.svgaplayer.SVGAImageView;
 import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.chwl.app.R;
 import com.chwl.app.avroom.activity.AVRoomActivity;
-import com.chwl.app.avroom.activity.RoomOnlineUserActivity;
 import com.chwl.app.avroom.dialog.ExitRoomPopupWindow;
 import com.chwl.app.avroom.widget.GiftV2View;
 import com.chwl.app.avroom.widget.RoomEffectView;
@@ -104,7 +100,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
 
     //收藏房间
     private String FOLLOW_ROOM_TYPE = "";
-    private SelectGameAdapter gameAdapter;
 
     public static HomePartyFragment newInstance() {
         HomePartyFragment homePartyFragment = new HomePartyFragment();
@@ -118,12 +113,12 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
         super.onNewIntent(intent);
         // clear views
         roomTitle.setText("");
+        gameMainBinding.ivRoomCover.setImageResource(R.drawable.default_cover);
         setRoomId(0, 0);
         updateOnlineNumberView(0);
         if (roomFragment instanceof HomePartyRoomFragment) {
             ((HomePartyRoomFragment) roomFragment).onNewIntent(intent);
         }
-
     }
 
     @Override
@@ -199,10 +194,10 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
 
     @Override
     public void onSetListener() {
+        gameMainBinding.ivRoomNotice.setOnClickListener(this);
         roomMore.setOnClickListener(this);
         ivFollowRoom.setOnClickListener(this);
 //        ivRoomShare.setOnClickListener(this);
-        gameMainBinding.llRoomInfo.setOnClickListener(this);
         gameMainBinding.ivBack.setOnClickListener(this);
 
         mRoomEffectView.setOnPlayAnimCallback(new Function0<Boolean>() {
@@ -223,76 +218,8 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
         }
     }
 
-    private void initRvGame() {
-        RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
-        if (roomInfo == null || gameAdapter != null) return;
-        gameMainBinding.rvGame.setLayoutManager(new LinearLayoutManager(mContext));
-        gameMainBinding.rvGame.setAdapter(gameAdapter = new SelectGameAdapter());
-        gameMainBinding.llSelectGame.setOnClickListener(v -> {
-            if (gameMainBinding.rvGame.getVisibility() == View.VISIBLE) {
-                gameMainBinding.rvGame.setVisibility(View.GONE);
-                gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below);
-            } else {
-                if (!isShowChangeGame()) {
-                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_01));
-                    return;
-                }
-                if (AvRoomDataManager.get().isGamePlaying()) {
-                    SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_02));
-                } else {
-                    gameMainBinding.rvGame.setVisibility(View.VISIBLE);
-                    gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type);
-                }
-            }
-        });
-
-        gameAdapter.setOnItemClickListener((adapter, view, position) -> {
-            if (AvRoomDataManager.get().isGamePlaying()) {
-                SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_03));
-            }
-            if (!isShowChangeGame()) {
-                SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_04));
-                return;
-            }
-
-            GameInfo gameInfo = gameAdapter.getItem(position);
-            if (gameInfo != null) {
-                gameMainBinding.rvGame.setVisibility(View.GONE);
-                gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below);
-                if (gameInfo.isStandardRoom()) {
-                    OpenRoomHelper.updateRoomInfo(
-                            getBaseActivity(),
-                            AvRoomDataManager.get().mCurrentRoomInfo,
-                            RoomInfo.ROOMTYPE_HOME_PARTY,
-                            0,
-                            false);
-                } else {
-                    OpenRoomHelper.updateRoomInfo(
-                            getBaseActivity(),
-                            AvRoomDataManager.get().mCurrentRoomInfo,
-                            RoomInfo.ROOMTYPE_GAME,
-                            JavaUtil.str2long(gameInfo.getMgId()),
-                            false);
-                }
-            }
-        });
-    }
-
-    //这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式!
-    private boolean isShowChangeGame() {
-        RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
-        return currentRoomInfo != null &&
-                AvRoomDataManager.get().isRoomOwner() &&
-                currentRoomInfo.getIsPermitRoom() != 1 &&
-                currentRoomInfo.getType() != RoomInfo.ROOM_TYPE_SINGLE &&
-                (currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE ||
-                        currentRoomInfo.getRoomModeType() == 2 ||
-                        currentRoomInfo.getRoomModeType() == 4);
-    }
-
     public void setRoomBg(RoomInfo roomInfo) {
         if (svgaRoomBg == null) return;
-        updateView(roomInfo);
         AVRoomActivity.setBackBg(mContext, roomInfo, svgaRoomBg, bgPicture);
     }
 
@@ -315,7 +242,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
                             addTipMsg();
                         case RoomEvent.ROOM_INFO_UPDATE:
                             updateView(AvRoomDataManager.get().mCurrentRoomInfo);
-                            setRoomBg(AvRoomDataManager.get().mCurrentRoomInfo);
                             break;
                         case RoomEvent.RECEIVE_NORMALE_GIFT:
                             onReceiveGiftMsg(roomEvent.getGiftReceiveInfo());
@@ -435,8 +361,18 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
                         tempFragment = SingleRoomFragment.newInstance();
                     }
                     break;
+                case RoomInfo.ROOMTYPE_PARTY:
+                    if (!(tempFragment instanceof PartyRoomFragment)) {
+                        tempFragment = PartyRoomFragment.Companion.newInstance();
+                    }
+                    break;
+                case RoomInfo.ROOMTYPE_REVELRY:
+                    if (!(tempFragment instanceof RevelryRoomFragment)) {
+                        tempFragment = RevelryRoomFragment.Companion.newInstance();
+                    }
+                    break;
                 default:
-                    if (!(tempFragment instanceof HomePartyRoomFragment)) {
+                    if (tempFragment == null || !(tempFragment.getClass().getSimpleName().equals(HomePartyRoomFragment.class.getSimpleName()))) {
                         tempFragment = HomePartyRoomFragment.newInstance();
                     }
                     break;
@@ -448,10 +384,11 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
                         .replace(R.id.container, roomFragment)
                         .commitAllowingStateLoss();
             }
-
+            setRoomBg(currentRoomInfo);
             gameMainBinding.setRoomInfo(currentRoomInfo);
             updateHasAnimationEffect();
             roomTitle.setText(RegexUtil.getPrintableString(currentRoomInfo.getTitle()));
+            ImageLoadUtilsV2.loadImage(gameMainBinding.ivRoomCover, currentRoomInfo.getAvatar());
             if (!StringUtil.isEmpty(currentRoomInfo.getRoomPwd())) {
                 roomTitle.setCompoundDrawablesWithIntrinsicBounds(null, null,
                         getResources().getDrawable(R.drawable.icon_room_lock), null);
@@ -466,34 +403,10 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
 
             setIdOnlineData();
 
-            if (isShowChangeGame()) {
-                initRvGame();
-                gameMainBinding.llChangeGame.setVisibility(View.VISIBLE);
-                if (AvRoomDataManager.get().isOpenGame()) {
-                    gameMainBinding.tvCurrGame.setText(currentRoomInfo.getMgName());
-                } else {
-                    gameMainBinding.tvCurrGame.setText(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_08));
-                }
-                GameModel.INSTANCE.getGameList()
-                        .compose(bindToLifecycle())
-                        .subscribe(gameInfos -> {
-                            if (AvRoomDataManager.get().isOpenGame()) {
-                                for (int i = 0; i < gameInfos.size(); i++) {
-                                    GameInfo gameInfo = gameInfos.get(i);
-                                    if (JavaUtil.str2long(gameInfo.getMgId()) == currentRoomInfo.getMgId()) {
-                                        gameInfos.remove(i);
-                                        break;
-                                    }
-                                }
-                                GameInfo gameInfo = new GameInfo();
-                                gameInfo.asStandardRoom();
-                                gameInfo.setName(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_09));
-                                gameInfos.add(gameInfo);
-                            }
-                            gameAdapter.setNewData(gameInfos);
-                        });
+            if (AvRoomDataManager.get().getRoomType() != RoomInfo.ROOMTYPE_GAME) {
+                gameMainBinding.ivRoomNotice.setVisibility(View.VISIBLE);
             } else {
-                gameMainBinding.llChangeGame.setVisibility(View.GONE);
+                gameMainBinding.ivRoomNotice.setVisibility(View.GONE);
             }
         }
     }
@@ -516,6 +429,9 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.iv_room_notice:
+                showRoomIntroduction(AvRoomDataManager.get().isRoomOwner() || AvRoomDataManager.get().isRoomAdmin());
+                break;
             case R.id.room_more:
                 int gravity = Gravity.END;
                 if(UiUtils.INSTANCE.isRtl(requireContext())){
@@ -524,9 +440,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
                 ExitRoomPopupWindow.newInstance((AVRoomActivity) requireActivity())
                         .showAtLocation(gameMainBinding.getRoot(), gravity, 0, 0);
                 break;
-            case R.id.ll_room_info:
-                RoomOnlineUserActivity.start(getActivity());
-                break;
             case R.id.iv_follow_room:
                 followRoom();
                 break;
@@ -661,7 +574,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
                 onlineNumber = 1;
             }
         }
-        gameMainBinding.roomNums.setText(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_013) + onlineNumber);
+//        gameMainBinding.roomNums.setText(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_013) + onlineNumber);
     }
 
     public void showUserCardDialog(String uid){
@@ -680,4 +593,22 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
         }
 
     }
+
+    private void showRoomIntroduction(Boolean modify) {
+        var isModify = modify;
+        RoomInfo info = AvRoomDataManager.get().mCurrentRoomInfo;
+        if (info == null) {
+            return;
+        }
+        if (SuperAdminUtil.isSuperAdmin()) {
+            isModify = false;
+        }
+        if (isModify) {
+            RoomTitleEditActivity.startForResult(getActivity(), info.getRoomDesc(), info.getIntroduction());
+        } else {
+            DialogFragment dialogFragment =
+                    RoomTitleDialogFragment.getInstance(info.getRoomDesc(), info.getIntroduction());
+            dialogFragment.show(requireActivity().getSupportFragmentManager(), "roomTitle");
+        }
+    }
 }

app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java

@@ -4,15 +4,24 @@ import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.databinding.DataBindingUtil;
 
-import com.chwl.app.avroom.gameplay.RoomGameplayListWidget;
-import com.chwl.app.avroom.gameplay.RoomGameplayWidget;
-import com.chwl.app.avroom.rank.RoomRankWidget;
+import com.chwl.app.avroom.dialog.RoomTeamPKResultDialog;
+import com.chwl.app.avroom.dialog.RoomTeamPkDialog;
+import com.chwl.app.avroom.headline.RoomHeadlineWidget;
+import com.chwl.app.avroom.online.RoomOnlineWidget;
+import com.chwl.app.avroom.rank.RoomRankNumberWidget;
 import com.chwl.app.music.widget.MusicPlayerView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
 import com.chwl.app.ui.webview.DialogWebViewActivity;
+import com.chwl.core.room.bean.RightBottomIconConfig;
+import com.chwl.core.room.bean.RoomIcon;
+import com.chwl.core.room.core.RoomDataService;
+import com.chwl.core.room.pk.event.PKDataUpdateEvent;
+import com.chwl.core.support.room.AudioRoomContext;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.chwl.app.R;
@@ -26,12 +35,9 @@ import com.chwl.app.avroom.anotherroompk.RoomPkForceFinishDialog;
 import com.chwl.app.avroom.anotherroompk.RoomPkReceivedDialog;
 import com.chwl.app.avroom.dialog.MicQueueDialog;
 import com.chwl.app.avroom.dialog.PKMicQueueDialog;
-import com.chwl.app.avroom.dialog.PKResultDialog;
-import com.chwl.app.avroom.dialog.PKScoreBoardDialog;
 import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper;
 import com.chwl.app.avroom.presenter.HomePartyPresenter;
 import com.chwl.app.avroom.view.IHomePartyView;
-import com.chwl.app.avroom.widget.PKBoardView;
 import com.chwl.app.base.BaseMvpActivity;
 import com.chwl.app.common.widget.dialog.DialogManager;
 import com.chwl.app.databinding.FragmentAvRoomGameBinding;
@@ -79,6 +85,7 @@ import io.reactivex.Single;
 import io.reactivex.SingleObserver;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
 
 /**
  * 轰趴房间
@@ -88,10 +95,10 @@ import io.reactivex.disposables.Disposable;
  */
 @CreatePresenter(HomePartyPresenter.class)
 public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, HomePartyPresenter> implements
-        IHomePartyView, PKBoardView.OnActionListener {
+        IHomePartyView, RoomTeamPkDialog.OnActionListener {
 
     private long myUid;
-    private PKBoardView pkBoardView;
+    private RoomTeamPkDialog teamPkDialog;
     private Disposable mDisposable;
     private FragmentAvRoomGameBinding gameBinding;
     /**
@@ -101,6 +108,8 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
     private PKMicQueueDialog pkMicQueueDialog;
     private Disposable roomPkOrderDisposable;
 
+    private boolean hasBaishunGames;
+
     public static HomePartyRoomFragment newInstance() {
         HomePartyRoomFragment roomFragment = new HomePartyRoomFragment();
         Bundle bundle = new Bundle();
@@ -122,8 +131,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
         gameBinding.setKtvModel(false);
         gameBinding.playTogether.setVisibility(View.GONE);
         microView = mView.findViewById(R.id.micro_view);
-        pkBoardView = mView.findViewById(R.id.layout_pk_board);
-        pkBoardView.setOnActionListener(this);
+        gameBinding.ivTeamPk.setOnClickListener(this);
     }
 
     @Override
@@ -135,7 +143,9 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
     @Override
     public void initWidget() {
         super.initWidget();
-        registerWidget(RoomRankWidget.class.getSimpleName(), gameBinding.rankWidget);
+        registerWidget(RoomOnlineWidget.class.getSimpleName(), gameBinding.onlineWidget);
+        registerWidget(RoomHeadlineWidget.class.getSimpleName(), gameBinding.headlineWidget);
+        registerWidget(RoomRankNumberWidget.class.getSimpleName(), gameBinding.rankNumberWidget);
     }
 
     @SuppressLint("CheckResult")
@@ -148,6 +158,28 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
         updateQueuingMicBtn();
         updatePkScoreBoard();
         initRoomPkOrder(AvRoomDataManager.get().showPkBeginTime, AvRoomDataManager.get().pkBeginTime);
+        requestData();
+    }
+
+    private void requestData() {
+        RoomDataService dataService = (RoomDataService) AudioRoomContext.Companion.get().findAbility(RoomDataService.class.getSimpleName());
+        String cacheKey = "gameplay_list#" + hashCode();
+        Disposable disposable = AvRoomModel.get().getRoomGamePlayList().doOnError(new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Exception {
+                hasBaishunGames = false;
+                updateConfigButtonArea();
+            }
+        }).subscribe(new Consumer<List<RoomIcon>>() {
+            @Override
+            public void accept(List<RoomIcon> roomIcons) throws Exception {
+                if (dataService != null) {
+                    dataService.putData(cacheKey, roomIcons);
+                }
+                hasBaishunGames = roomIcons.size() > 0;
+                updateConfigButtonArea();
+            }
+        });
     }
 
     @Override
@@ -196,6 +228,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                 gameBinding.setRoomInfo(AvRoomDataManager.get().mCurrentRoomInfo);
                 updateQueuingMicBtn();
                 updatePkScoreBoard();
+                updateConfigButtonArea();
                 getMvpPresenter().updateLeaveMode();
                 break;
             case RoomEvent.ENTER_ROOM:
@@ -257,8 +290,12 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                 //PK 开始弹出大记分板
                 if (PkModel.get().getCurPkInfo() != null
                         && PkModel.get().getCurPkInfo().getPkStatus() == RoomPkData.PK_STATUS_IN_PK) {
-                    PKScoreBoardDialog pkScoreBoardDialog = new PKScoreBoardDialog(getContext());
-                    pkScoreBoardDialog.show();
+                    showTeamPkDialog();
+                }
+                break;
+            case RoomEvent.PK_CREATE:
+                if (PkModel.get().getCurPkInfo() != null) {
+                    showTeamPkDialog();
                 }
                 break;
             case RoomEvent.ROOM_PK_INVITE:
@@ -345,14 +382,14 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
     private void updatePkScoreBoard() {
         if (AvRoomDataManager.get().isOpenPKMode()) {
 
-            if (pkBoardView.getVisibility() == View.GONE) {
+            if (gameBinding.ivTeamPk.getVisibility() == View.GONE) {
                 // 通知更新背景
                 PKStateEvent pkStateEvent = new PKStateEvent();
                 pkStateEvent.setCreate(true);
                 EventBus.getDefault().post(pkStateEvent);
+                showTeamPkDialog();
             }
-
-            pkBoardView.setVisibility(View.VISIBLE);
+            gameBinding.ivTeamPk.setVisibility(View.VISIBLE);
             //这里通过接口获取PK 详情 更新pk 记分板
             if (PkModel.get().getCurPkInfo() == null) {
                 PkModel.get().loadPKDataByRoomId(
@@ -366,7 +403,9 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
 
                             @Override
                             public void onSuccess(RoomPkData roomPkData) {
-                                pkBoardView.updateView();
+                                if (teamPkDialog != null) {
+                                    teamPkDialog.updateView();
+                                }
                             }
 
                             @Override
@@ -375,7 +414,9 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                             }
                         });
             } else {
-                pkBoardView.updateView();
+                if (teamPkDialog != null) {
+                    teamPkDialog.updateView();
+                }
             }
             //取消掉正在进行的龙珠
             if (AvRoomDataManager.get().haveStartDragon) {
@@ -387,23 +428,41 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
             }
 
         } else {
-            if (pkBoardView.getVisibility() == View.VISIBLE) {
+            if (gameBinding.ivTeamPk.getVisibility() == View.VISIBLE) {
                 // 通知更新bg
                 PKStateEvent pkStateEvent = new PKStateEvent();
                 pkStateEvent.setCreate(false);
                 EventBus.getDefault().post(pkStateEvent);
             }
-            pkBoardView.setVisibility(View.GONE);
-        }
-
-        if (SuperAdminUtil.isSuperAdmin()) {
-            pkBoardView.setVisibility(View.GONE);
+            gameBinding.ivTeamPk.setVisibility(View.GONE);
+            dismissTeamPkDialog();
         }
 
         //龙珠相关界面设置
         setDragonView();
     }
 
+    private void showTeamPkDialog() {
+        if (getActivity() == null) {
+            return;
+        }
+        if (teamPkDialog != null) {
+            if (teamPkDialog.isResumed()) {
+                return;
+            }
+            dismissTeamPkDialog();
+        }
+        teamPkDialog = new RoomTeamPkDialog();
+        teamPkDialog.setOnActionListener(this);
+        teamPkDialog.safeShow(requireActivity().getSupportFragmentManager(), this, null);
+    }
+
+    private void dismissTeamPkDialog() {
+        if (teamPkDialog != null) {
+            teamPkDialog.safeDismiss();
+            teamPkDialog = null;
+        }
+    }
 
     private void cleanDragonBar() {
         LogUtil.e("cleanDragonBar");
@@ -440,6 +499,13 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
             gameBinding.ivQueuingMicro.setVisibility(View.GONE);
             gameBinding.bottomView.updateQueuingMicButton();
         }
+        updateMicroView();
+        changeModelShowView();
+        refreshDatingNextStatus();
+//        updateConfigButtonArea();
+    }
+
+    protected void updateMicroView(){
         String microType = microView.getAdapter() == null ? BaseMicroViewAdapter.MICRO_TYPE_NULL : microView.getAdapter().microType();
         if (AvRoomDataManager.get().isCpRoom()) {
             if (!microType.equals(BaseMicroViewAdapter.MICRO_TYPE_CP)) {
@@ -457,16 +523,37 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
         if (microView.getAdapter() != null) {
             microView.getAdapter().notifyDataSetChanged();
         }
-        changeModelShowView();
-        refreshDatingNextStatus();
     }
 
-
     public void updateMicBtn() {
         super.updateMicBtn();
         refreshDatingNextStatus();
     }
 
+    public void updateConfigButtonArea() {
+        RightBottomIconConfig configModel = AvRoomDataManager.get().rightBottomIconConfig;
+        if (configModel == null) {
+            gameBinding.ivConfigEntrance.setVisibility(View.GONE);
+        } else {
+            if (configModel.getIcon1Url() == null) {
+                gameBinding.ivConfigEntrance.setVisibility(View.GONE);
+            } else {
+                ImageLoadUtils.loadAvatar(configModel.getIcon1Url(), gameBinding.ivConfigEntrance);
+                gameBinding.ivConfigEntrance.setVisibility(View.VISIBLE);
+            }
+
+            if (configModel.getIcon2Url() != null) {
+                ImageLoadUtils.loadAvatar(configModel.getIcon2Url(), gameBinding.ivGame);
+            }
+        }
+
+        if (hasBaishunGames) {
+            gameBinding.ivGame.setVisibility(View.VISIBLE);
+        }else {
+            gameBinding.ivGame.setVisibility(View.GONE);
+        }
+    }
+
     private void updateQueuingMicBtn() {
         if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
             bottomView.updateQueuingMicButton();
@@ -525,10 +612,10 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
             mDisposable.dispose();
             mDisposable = null;
         }
+        dismissTeamPkDialog();
         super.onDestroy();
     }
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onDatingSelectUserEvent(DatingSelectUserEvent event) {
         if (getMvpPresenter() != null) {
@@ -560,6 +647,9 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
     public void onClick(View v) {
         super.onClick(v);
         switch (v.getId()) {
+            case R.id.iv_team_pk:
+                showTeamPkDialog();
+                break;
             case R.id.play_together:
                 if (!DynamicFaceModel.get().isShowingFace()) {
                     FaceInfo faceInfo = DynamicFaceModel.get().getPlayTogetherFace();
@@ -685,12 +775,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
 
     }
 
-    @Override
-    public void onEndPK() {
-        PKResultDialog pkResultDialog = new PKResultDialog(getContext(), PkModel.get().getCurPkInfo());
-        pkResultDialog.show();
-    }
-
     @Override
     public void onShowPKMicQueueDialog() {
         if (PkModel.get().isFighting()) {
@@ -1019,4 +1103,16 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
         super.onInitMusicPlayerView(view);
         view.linkIconView(gameBinding.ivMusic, gameBinding.ivMusic);
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onPKDataUpdateEvent(PKDataUpdateEvent event) {
+        RoomPkData data = PkModel.get().getCurPkInfo();
+        if (data == null) {
+            return;
+        }
+        if (event.getType() == PKDataUpdateEvent.TYPE_RESULT && data.getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK) {
+            RoomTeamPKResultDialog teamPkResultDialog = new RoomTeamPKResultDialog(getContext(), PkModel.get().getCurPkInfo());
+            teamPkResultDialog.show();
+        }
+    }
 }

app/src/main/java/com/chwl/app/avroom/fragment/PartyRoomFragment.kt

@@ -0,0 +1,34 @@
+package com.chwl.app.avroom.fragment
+
+import com.chwl.app.avroom.adapter.BaseMicroViewAdapter
+import com.chwl.app.avroom.adapter.PartyMicroViewAdapter
+import com.example.lib_utils.UiUtils
+import com.example.lib_utils.ktx.setMargin
+
+/**
+ * 聚会房
+ */
+class PartyRoomFragment : HomePartyRoomFragment() {
+
+    companion object {
+        fun newInstance(): PartyRoomFragment {
+            return PartyRoomFragment()
+        }
+    }
+
+    override fun onFindViews() {
+        super.onFindViews()
+        microView.setMargin(0,UiUtils.dip2px(30f),0,0)
+    }
+
+    override fun updateMicroView() {
+        val microType =
+            if (microView.adapter == null) BaseMicroViewAdapter.MICRO_TYPE_NULL else microView.adapter.microType()
+        if (microType != BaseMicroViewAdapter.MICRO_TYPE_PARTY) {
+            microView.bindAdapter(PartyMicroViewAdapter(mContext))
+        }
+        if (microView.adapter != null) {
+            microView.adapter.notifyDataSetChanged()
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/fragment/RevelryRoomFragment.kt

@@ -0,0 +1,34 @@
+package com.chwl.app.avroom.fragment
+
+import com.chwl.app.avroom.adapter.BaseMicroViewAdapter
+import com.chwl.app.avroom.adapter.RevelryMicroViewAdapter
+import com.example.lib_utils.UiUtils
+import com.example.lib_utils.ktx.setMargin
+
+/**
+ * 狂欢房
+ */
+class RevelryRoomFragment : HomePartyRoomFragment() {
+
+    companion object {
+        fun newInstance(): RevelryRoomFragment {
+            return RevelryRoomFragment()
+        }
+    }
+
+    override fun onFindViews() {
+        super.onFindViews()
+        microView.setMargin(0, UiUtils.dip2px(30f),0,0)
+    }
+
+    override fun updateMicroView() {
+        val microType =
+            if (microView.adapter == null) BaseMicroViewAdapter.MICRO_TYPE_NULL else microView.adapter.microType()
+        if (microType != BaseMicroViewAdapter.MICRO_TYPE_REVELRY) {
+            microView.bindAdapter(RevelryMicroViewAdapter(mContext))
+        }
+        if (microView.adapter != null) {
+            microView.adapter.notifyDataSetChanged()
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt

@@ -13,10 +13,10 @@ import com.chwl.app.avroom.adapter.OnMicroItemClickListener
 import com.chwl.app.avroom.adapter.SingleAnchorMicroViewAdapter
 import com.chwl.app.avroom.adapter.SingleRoomPKMicroViewAdapter
 import com.chwl.app.avroom.dialog.RequestUpMicDialog
-import com.chwl.app.avroom.gameplay.RoomGameplayListWidget
-import com.chwl.app.avroom.gameplay.RoomGameplayWidget
+import com.chwl.app.avroom.headline.RoomHeadlineWidget
+import com.chwl.app.avroom.online.RoomOnlineWidget
 import com.chwl.app.avroom.presenter.SingleRoomPresenter
-import com.chwl.app.avroom.rank.RoomRankWidget
+import com.chwl.app.avroom.rank.RoomRankNumberWidget
 import com.chwl.app.avroom.singleroompk.SingleRoomPkFinishDialog
 import com.chwl.app.avroom.singleroompk.SingleRoomPkForceFinishDialog
 import com.chwl.app.avroom.singleroompk.SingleRoomPkReceivedDialog
@@ -26,6 +26,7 @@ import com.chwl.app.fansteam.FansTeamJoinActivity
 import com.chwl.app.fansteam.FansTeamJoinedActivity
 import com.chwl.app.fansteam.FansTeamViewModel
 import com.chwl.app.music.widget.MusicPlayerView
+import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.app.ui.webview.CommonWebViewActivity
 import com.chwl.app.ui.webview.DialogWebViewActivity
 import com.chwl.core.UriProvider
@@ -36,6 +37,10 @@ import com.chwl.core.im.custom.bean.RequestUpmicAttachment
 import com.chwl.core.im.custom.bean.RoomPKAttachment
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.manager.RoomEvent
+import com.chwl.core.room.core.RoomDataService
+import com.chwl.core.room.model.AvRoomModel
+import com.chwl.core.support.room.AudioRoomContext.Companion.get
+import com.chwl.core.support.room.RoomAbility
 import com.chwl.core.user.bean.UserInfo
 import com.chwl.library.base.factory.CreatePresenter
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
@@ -63,6 +68,8 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
     private lateinit var gameBinding: FragmentSingleRoomBinding
     private lateinit var upMicDialog: RequestUpMicDialog
 
+    private var hasBaishunGames = false
+
     private val fansTeamViewModel: FansTeamViewModel by viewModels()
     override fun getRootLayoutId(): Int {
         return R.layout.fragment_single_room
@@ -237,7 +244,9 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
 
     override fun initWidget() {
         super.initWidget()
-        registerWidget(RoomRankWidget::class.java.simpleName, gameBinding.rankWidget)
+        registerWidget(RoomOnlineWidget::class.java.simpleName, gameBinding.onlineWidget)
+        registerWidget(RoomHeadlineWidget::class.java.simpleName, gameBinding.headlineWidget)
+        registerWidget(RoomRankNumberWidget::class.java.simpleName, gameBinding.rankNumberWidget)
     }
 
     override fun onInitMusicPlayerView(view: MusicPlayerView) {

app/src/main/java/com/chwl/app/avroom/game/AppConfig.java

@@ -9,8 +9,8 @@ import com.chwl.app.BuildConfig;
 
 public class AppConfig {
 
-    protected static final String APP_ID = "1578948593831571457";
-    protected static final String APP_KEY = "J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd";
-    protected static boolean isTestEnv = BuildConfig.DEBUG;
+    public static final String APP_ID = "1578948593831571457";
+    public static final String APP_KEY = "J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd";
+    public static boolean isTestEnv = BuildConfig.DEBUG;
 
 }

app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt

@@ -18,11 +18,15 @@ import com.chwl.core.room.game.bean.GameCfg
 import com.chwl.core.room.game.GameModel
 import com.chwl.core.room.game.GameStatus
 import com.chwl.core.room.model.HomePartyModel
+import com.chwl.core.sud.model.GameViewInfoModel.GameViewRectModel
+import com.chwl.core.sud.state.SudMGPAPPState
+import com.chwl.core.sud.state.SudMGPMGState
 import com.chwl.core.user.UserModel
 import com.chwl.core.utils.LogUtils
 import com.chwl.core.utils.net.RxHelper
 import com.chwl.library.language.LanguageHelper
 import com.chwl.library.net.rxnet.callback.CallBack
+import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.SingleToastUtil
 import okhttp3.*
 import org.json.JSONException
@@ -54,6 +58,8 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
 
     private var onGameStatusChangeListener: OnGameStatusChangeListener? = null
 
+    var gameViewRect: GameViewRectModel? = null
+
     fun setOnGameStatusChangeListener(onGameStatusChangeListener: OnGameStatusChangeListener) {
         this.onGameStatusChangeListener = onGameStatusChangeListener
     }
@@ -340,12 +346,26 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
 
                 //遊戲安全操作區域
                 val viewGameRect = JSONObject()
-                viewGameRect.put("left", 0)
-                viewGameRect.put("top", container.context.resources.getDimensionPixelOffset(R.dimen.dp_180))
-                viewGameRect.put("right", 0)
-                viewGameRect.put("bottom", container.context.resources.getDimensionPixelOffset(R.dimen.dp_150))
+                val viewRect = gameViewRect
+                if (viewRect != null) {
+                    Log.d(TAG,"notifyGameViewInfo top:${viewRect.top} viewRect:${viewRect.bottom}")
+                    viewGameRect.put("left", viewRect.left)
+                    viewGameRect.put("top", viewRect.top)
+                    viewGameRect.put("right", viewRect.right)
+                    viewGameRect.put("bottom", viewRect.bottom)
+                } else {
+                    viewGameRect.put("left", 0)
+                    viewGameRect.put(
+                        "top",
+                        container.context.resources.getDimensionPixelOffset(R.dimen.dp_185)
+                    )
+                    viewGameRect.put("right", 0)
+                    viewGameRect.put(
+                        "bottom",
+                        container.context.resources.getDimensionPixelOffset(R.dimen.dp_180)
+                    )
+                }
                 jsonObject.put("view_game_rect", viewGameRect)
-
                 //通知遊戲
                 val json = jsonObject.toString()
                 Log.d(TAG, "notifyGameViewInfo:$json")
@@ -386,7 +406,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
                         }
                     }
                 }
-                SudMGPMGState.APP_COMMON_SELF_CLICK_JOIN_BTN -> {
+                SudMGPMGState.MG_COMMON_SELF_CLICK_JOIN_BTN -> {
 
                     try {
                         val jsonObject = JSONObject(dataJson)
@@ -397,7 +417,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
                     }
 
                 }
-                SudMGPMGState.APP_COMMON_SELF_CLICK_START_BTN -> {
+                SudMGPMGState.MG_COMMON_SELF_CLICK_START_BTN -> {
                     notifySelfPlayingState(true)
                 }
                 SudMGPMGState.MG_COMMON_GAME_STATE -> handleGameState(dataJson)
@@ -469,7 +489,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId:
         } else if (isJoin) {
             val upPosition = AvRoomDataManager.get().findGamePosition()
             if (upPosition == Int.MIN_VALUE) {
-                showToast("當前遊戲人數已滿!")
+                showToast(ResUtil.getString(R.string.room_game_number_full))
             } else {
                 UserModel.get().cacheLoginUserInfo?.gameStatus = 1
                 homePartyModel.upMicroPhone(upPosition,

app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java

@@ -1,61 +0,0 @@
-/*
-  Copyright © Sud.Tech
-  https://sud.tech
- */
-package com.chwl.app.avroom.game;
-
-/**
- * Time:2021/10/19
- * Description: APP to MG 的状态定义
- */
-public class SudMGPAPPState {
-
-    // region 通用状态
-
-    /**
-     * 加入状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_IN = "app_common_self_in";
-
-    /**
-     * 准备状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_READY = "app_common_self_ready";
-
-    /**
-     * 游戏状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_PLAYING = "app_common_self_playing";
-
-    /**
-     * 队长状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_CAPTAIN = "app_common_self_captain";
-
-    /**
-     * 踢人
-     * v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_KICK = "app_common_self_kick";
-
-    /**
-     * 结束游戏
-     * v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_END = "app_common_self_end";
-
-    /**
-     * 麦克风状态
-     */
-    public static final String APP_COMMON_SELF_MICROPHONE = "app_common_self_microphone";
-
-    /**
-     * 文字命中状态
-     */
-    public static final String APP_COMMON_SELF_TEXT_HIT = "app_common_self_text_hit";
-
-}

app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java

@@ -1,125 +0,0 @@
-/*
-  Copyright © Sud.Tech
-  https://sud.tech
- */
-package com.chwl.app.avroom.game;
-
-/**
- * Time:2021/10/19
- * Description: MG to APP 的状态定义
- */
-public class SudMGPMGState {
-
-    // region 通用状态-游戏
-
-    /**
-     * 公屏消息  （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PUBLIC_MESSAGE = "mg_common_public_message";
-
-    /**
-     * 关键词状态
-     */
-    public static final String MG_COMMON_KEY_WORD_TO_HIT = "mg_common_key_word_to_hit";
-
-    // endregion 通用状态-游戏
-
-
-    // region 通用状态-玩家
-
-    /**
-     * 加入状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_IN = "mg_common_player_in";
-
-    /**
-     * 准备状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_READY = "mg_common_player_ready";
-
-    /**
-     * 队长状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_CAPTAIN = "mg_common_player_captain";
-
-    /**
-     * 游戏状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_PLAYING = "mg_common_player_playing";
-
-    /**
-     * 游戏状态（已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_GAME_STATE = "mg_common_game_state";
-
-    // endregion 通用状态-玩家
-
-
-    // region 碰碰我最强
-    // endregion 碰碰我最强
-
-    // region 飞刀达人
-    // endregion 飞刀达人
-
-    // region 你画我猜
-
-    /**
-     * 选词中
-     */
-    public static final String MG_DG_SELECTING = "mg_dg_selecting";
-
-    /**
-     * 作画中
-     */
-    public static final String MG_DG_PAINTING = "mg_dg_painting";
-
-    /**
-     * 错误答案
-     */
-    public static final String MG_DG_ERRORANSWER = "mg_dg_erroranswer";
-
-    /**
-     * 总积分
-     */
-    public static final String MG_DG_TOTALSCORE = "mg_dg_totalscore";
-
-    /**
-     * 本次积分
-     */
-    public static final String MG_DG_SCORE = "mg_dg_score";
-
-    // endregion 你画我猜
-
-
-    /**
-     * 加入游戏按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_JOIN_BTN = "mg_common_self_click_join_btn";
-    /**
-     * 取消加入游戏按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_CANCEL_JOIN_BTN = "mg_common_self_click_cancel_join_btn";
-    /**
-     * 准备按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_READY_BTN = "mg_common_self_click_ready_btn";
-    /**
-     * 取消准备按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_CANCEL_READY_BTN = "mg_common_self_click_cancel_ready_btn";
-    /**
-     * 开始游戏按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_START_BTN = "mg_common_self_click_start_btn";
-    /**
-     * 分享按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_SHARE_BTN = "mg_common_self_click_share_btn";
-
-}

app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt

@@ -0,0 +1,113 @@
+package com.chwl.app.avroom.headline
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.LayoutInflater
+import androidx.core.view.isVisible
+import androidx.databinding.DataBindingUtil
+import com.chwl.app.R
+import com.chwl.app.databinding.RoomHeadlineWidgetBinding
+import com.chwl.app.public_chat.core.ChatRoomClient
+import com.chwl.app.public_chat.core.ChatRoomClientManager
+import com.chwl.app.ui.utils.loadAvatar
+import com.chwl.core.im.custom.bean.CustomAttachment
+import com.chwl.core.im.custom.bean.HeadlineChangedAttachment
+import com.chwl.core.public_chat_hall.bean.HeadlineBean
+import com.chwl.core.public_chat_hall.model.PublicChatModel
+import com.chwl.core.support.room.FrameLayoutRoomWidget
+import com.chwl.core.support.room.RoomView
+import com.example.lib_utils.AppUtils
+import com.example.lib_utils.UiUtils
+import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage
+import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum
+
+class RoomHeadlineWidget : FrameLayoutRoomWidget {
+
+    private val binding: RoomHeadlineWidgetBinding =
+        DataBindingUtil.inflate(
+            LayoutInflater.from(
+                context
+            ), R.layout.room_headline_widget, this, true
+        )
+
+    private var chatRoomClient: ChatRoomClient? = 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 {
+        if (UiUtils.isRtl(AppUtils.getApp())) {
+            binding.tvHeadlineContent.gravity = Gravity.RIGHT
+        }
+    }
+
+    override fun onStart(roomView: RoomView) {
+        super.onStart(roomView)
+        if (!isInEditMode) {
+            updateHeadline(null)
+        }
+        chatRoomClient = ChatRoomClientManager.getPublicChatClient()
+        chatRoomClient?.let {
+            initChatRoom(it)
+        }
+        requestCurrentHeadline()
+    }
+
+    private fun onReceiveMessage(message: ChatRoomMessage) {
+        if (message.msgType == MsgTypeEnum.custom) {
+            val attachment: CustomAttachment = (message.attachment as? CustomAttachment) ?: return
+            when (attachment.first) {
+                CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED -> {
+                    when (attachment.second) {
+                        CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED_SUB -> {
+                            val data = (attachment as? HeadlineChangedAttachment) ?: return
+                            updateHeadline(data.headlineData)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun initChatRoom(chatRoomClient: ChatRoomClient) {
+        // 登录流程：在PublicChatRoomMessageWidget中已经执行了
+        getCompositeDisposable().add(chatRoomClient.messageObservable.subscribe {
+            it.forEach { message ->
+                onReceiveMessage(message)
+            }
+        })
+    }
+
+    private fun requestCurrentHeadline() {
+        safeLaunch {
+            val data = PublicChatModel.getCurrentHeadline()
+            updateHeadline(data)
+        }
+    }
+
+    private fun updateHeadline(data: HeadlineBean?) {
+        binding.tvHeadlineContent.text = data?.content ?: ""
+        binding.ivAvatar.loadAvatar(data?.avatar)
+        binding.tvName.text = "${data?.nick ?: ""} :"
+        binding.tvMoney.text = data?.payMoneyNum?.toString() ?: "0"
+        this.isVisible = data?.isValid() == true && !data.content.isNullOrEmpty()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        chatRoomClient = null
+    }
+}

app/src/main/java/com/chwl/app/avroom/online/RoomOnlineAvatarAdapter.kt

@@ -0,0 +1,39 @@
+package com.chwl.app.avroom.online
+
+import android.widget.ImageView
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chad.library.adapter.base.diff.BaseQuickDiffCallback
+import com.chwl.app.R
+import com.chwl.app.ui.utils.loadAvatar
+
+class RoomOnlineAvatarAdapter :
+    BaseQuickAdapter<Pair<String, String?>, BaseViewHolder>(R.layout.room_online_widget_item_avatar) {
+
+    override fun convert(helper: BaseViewHolder, item: Pair<String, String?>?) {
+        val avatarView = helper.getView<ImageView>(R.id.iv_avatar)
+        avatarView.loadAvatar(item?.second)
+    }
+
+    fun updateData(list: List<Pair<String, String?>>?) {
+        val newList = ArrayList<Pair<String, String?>>()
+        if (list != null) {
+            newList.addAll(list)
+        }
+        setNewDiffData(object : BaseQuickDiffCallback<Pair<String, String?>>(newList) {
+            override fun areItemsTheSame(
+                oldItem: Pair<String, String?>,
+                newItem: Pair<String, String?>
+            ): Boolean {
+                return newItem.first == oldItem.first
+            }
+
+            override fun areContentsTheSame(
+                oldItem: Pair<String, String?>,
+                newItem: Pair<String, String?>
+            ): Boolean {
+                return newItem.second == oldItem.second
+            }
+        }, true)
+    }
+}

app/src/main/java/com/chwl/app/avroom/online/RoomOnlineWidget.kt

@@ -0,0 +1,220 @@
+package com.chwl.app.avroom.online
+
+import android.content.Context
+import android.graphics.Outline
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewOutlineProvider
+import androidx.databinding.DataBindingUtil
+import com.chwl.app.R
+import com.chwl.app.avroom.activity.RoomOnlineUserActivity
+import com.chwl.app.databinding.RoomOnlineWidgetBinding
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil
+import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.manager.IMNetEaseManager
+import com.chwl.core.manager.RoomEvent
+import com.chwl.core.room.core.RoomDataService
+import com.chwl.core.room.model.AvRoomModel
+import com.chwl.core.support.room.FrameLayoutRoomWidget
+import com.chwl.core.support.room.RoomContext
+import com.chwl.core.support.room.RoomView
+import com.chwl.core.support.room.RoomWidget
+import com.example.lib_utils.UiUtils
+import com.example.lib_utils.ktx.singleClick
+import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage
+import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessageExtension
+import io.reactivex.Observable
+import java.util.concurrent.TimeUnit
+
+class RoomOnlineWidget : FrameLayoutRoomWidget, RoomWidget {
+
+    companion object {
+        const val MAX_DISPLAY_COUNT = 3
+        private const val ONLINE_DISPLAY_LIST = "online_display_list"
+        private const val ONLINE_NUMBER = "online_number"
+    }
+
+    private val binding: RoomOnlineWidgetBinding =
+        DataBindingUtil.inflate(
+            LayoutInflater.from(
+                context
+            ), R.layout.room_online_widget, this, true
+        )
+
+    private val adapter = RoomOnlineAvatarAdapter()
+
+    private var dataList: MutableList<Pair<String, String?>>? = null
+
+    private val dataService: RoomDataService?
+        get() = roomContext?.findAbility<RoomDataService>(
+            RoomDataService::class.java.simpleName
+        )
+
+    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 {
+        if (!isInEditMode) {
+            this.singleClick {
+                RoomOnlineUserActivity.start(context)
+            }
+            adapter.setOnItemClickListener { adapter, view, position ->
+                RoomOnlineUserActivity.start(context)
+            }
+            binding.recyclerView.adapter = adapter
+            binding.recyclerView.addItemDecoration(
+                VerticalDecoration(
+                    UIUtil.dip2px(context, 4.5),
+                    false,
+                    false
+                )
+            )
+            val isRTL = UiUtils.isRtl(context)
+            binding.recyclerView.outlineProvider = object : ViewOutlineProvider() {
+                override fun getOutline(view: View?, outline: Outline?) {
+                    if (isRTL) {
+                        outline?.setRect(
+                            UiUtils.dip2px(9f),
+                            0,
+                            (view?.width ?: 0),
+                            (view?.height ?: 0),
+                        )
+                    } else {
+                        outline?.setRect(
+                            0,
+                            0,
+                            (view?.width ?: 0) - UiUtils.dip2px(9f),
+                            (view?.height ?: 0),
+                        )
+                    }
+                }
+            }
+            binding.recyclerView.clipToOutline = true
+        }
+    }
+
+    override fun onInitialize(roomView: RoomView, roomContext: RoomContext) {
+        super.onInitialize(roomView, roomContext)
+        (dataService?.getData(ONLINE_NUMBER) as? Int)?.let {
+            updateCount(it)
+        }
+        (dataService?.getData(ONLINE_DISPLAY_LIST) as? MutableList<Pair<String, String?>>)?.let {
+            updateList(it)
+        }
+        startUpdateOnlineTask()
+        registerMemberChangedListener()
+    }
+
+    override fun onUnbindContext() {
+        super.onUnbindContext()
+        updateList(null)
+        updateCount(0)
+    }
+
+    private fun refreshData() {
+        val disposable = AvRoomModel.get()
+            .getRoomOnlineList(AvRoomDataManager.get().roomUid)
+            .subscribe({
+                updateList(it.take(MAX_DISPLAY_COUNT).map {
+                    Pair<String, String?>(it.uid.toString(), it.avatar)
+                }.toMutableList())
+                updateCount(it.size)
+            }, {
+                it.printStackTrace()
+            })
+        getCompositeDisposable().add(disposable)
+    }
+
+    private fun updateCount(count: Int) {
+        dataService?.putData(ONLINE_NUMBER, count)
+        binding.tvNumber.text = count.toString()
+    }
+
+    private fun updateList(list: MutableList<Pair<String, String?>>?) {
+        dataService?.putData(ONLINE_DISPLAY_LIST, list)
+        this.dataList = list
+        adapter.updateData(list)
+    }
+
+    private fun startUpdateOnlineTask() {
+        getCompositeDisposable().add(Observable.interval(
+            0, 30, TimeUnit.SECONDS
+        ).subscribe {
+            refreshData()
+        })
+    }
+
+    private fun registerMemberChangedListener() {
+        getCompositeDisposable().add(IMNetEaseManager.get().chatRoomEventObservable.subscribe {
+            when (it.event) {
+                RoomEvent.ROOM_MEMBER_IN -> {
+                    updateOnlineCount(1)
+                    toItem(it.account, it.chatRoomMessage)?.let {
+                        tryUpdateList(it, true)
+                    }
+                }
+
+                RoomEvent.ROOM_MEMBER_EXIT -> {
+                    updateOnlineCount(-1)
+                    toItem(it.account, it.chatRoomMessage)?.let {
+                        tryUpdateList(it, false)
+                    }
+                }
+            }
+        })
+    }
+
+    private fun toItem(account: String?, message: ChatRoomMessage?): Pair<String, String?>? {
+        if (account == null) {
+            return null
+        }
+        if (message == null) {
+            return Pair(account, null)
+        }
+        val messageExtension: ChatRoomMessageExtension = message.chatRoomMessageExtension
+        var avatar = messageExtension.senderAvatar
+        val extensionData = messageExtension.senderExtension.get(account) as? Map<String, Any>
+        avatar = (extensionData?.getOrElse("avatar") {
+            avatar
+        } as? String) ?: avatar
+        return Pair(account, avatar)
+    }
+
+    private fun tryUpdateList(item: Pair<String, String?>, enterOrExit: Boolean) {
+        val index = dataList?.indexOfFirst {
+            it.first == item.first
+        } ?: -1
+        if (enterOrExit) {
+            if (index < 0 && (dataList?.size ?: 0) < MAX_DISPLAY_COUNT) {
+                dataList?.add(item)
+                updateList(dataList)
+            }
+        } else {
+            if (index >= 0) {
+                dataList?.removeAt(index)
+                updateList(dataList)
+            }
+        }
+    }
+
+    private fun updateOnlineCount(addCount: Int) {
+        val number = binding.tvNumber.text.toString().toIntOrNull()
+        if (number != null) {
+            binding.tvNumber.text = (number + addCount).toString()
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/presenter/AvRoomPresenter.java

@@ -9,6 +9,8 @@ import android.util.SparseArray;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.chwl.core.manager.RoomMicQueueModel;
+import com.chwl.core.support.room.AudioRoomContext;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -20,8 +22,6 @@ import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData;
 import com.netease.nimlib.sdk.util.Entry;
 import com.chwl.app.R;
 import com.chwl.app.avroom.activity.AVRoomActivity;
-import com.chwl.app.avroom.core.AudioRoomContext;
-import com.chwl.core.support.room.RoomContext;
 import com.chwl.app.avroom.view.IAvRoomView;
 import com.chwl.app.base.BaseMvpPresenter;
 import com.chwl.core.Constants;
@@ -122,11 +122,11 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
         AvRoomDataManager.get().updateServiceRoomInfo(roomInfo);
         mAvRoomModel.enterRoom(roomInfo.getRoomId(), 3, fromType, fromNick, fromUid)
                 .flatMap(this::dealServerMicInfo)
-                .map(this::dealMicMemberFromIMNet)
-                .flatMap(this::dealMicChatRoomMemberFromIMNet)
+                .flatMap((Function<SparseArray<RoomQueueInfo>, ObservableSource<SparseArray<RoomQueueInfo>>>) roomQueue -> RoomMicQueueModel.INSTANCE.queueMicQueue(roomInfo.getRoomId(),roomQueue))
                 .compose(bindUntilEvent(PresenterEvent.DESTROY))
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(roomQueueInfoSparseArray -> {
+                    AvRoomDataManager.get().replaceMicQueue(roomQueueInfoSparseArray);
                     long uid = AuthModel.get().getCurrentUid();
                     AudioEngineManager.get().startRtcEngine(uid, roomInfo.getAudioSdkType());
                     // TODO 临时方案：后续逐步完善整个房间的RoomContext替换计划
@@ -221,52 +221,12 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
         IMNetEaseManager.get().getChatRoomEventObservable().onNext(new RoomEvent().setEvent(RoomEvent.ROOM_EXIT));
     }
 
-    /**
-     * 处理网易云信队列上人员的信息
-     */
-    private Observable<SparseArray<RoomQueueInfo>> dealMicChatRoomMemberFromIMNet(List<String> accounts) {
-        if (ListUtils.isListEmpty(accounts))
-            return Observable.just(AvRoomDataManager.get().mMicQueueMemberMap);
-        return IMNetEaseManager.get().fetchRoomMembersByIds(accounts).observeOn(AndroidSchedulers.mainThread())
-                .flatMap(chatRoomMembers -> {
-                    for (ChatRoomMember chatRoomMember : chatRoomMembers) {
-                        AvRoomDataManager.get().updateQueueChatRoomMemberExtension(chatRoomMember);
-                    }
-                    return Single.just(AvRoomDataManager.get().mMicQueueMemberMap);
-                }).toObservable();
-    }
-
-
-    /**
-     * 处理网易云信坑位信息
-     */
-    private List<String> dealMicMemberFromIMNet(List<Entry<String, String>> entries) {
-        List<String> accounts = new ArrayList<>();
-        if (!ListUtils.isListEmpty(entries)) {
-            JsonParser jsonParser = new JsonParser();
-            MicMemberInfo chatRoomMember;
-            for (Entry<String, String> entry : entries) {
-                RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().mMicQueueMemberMap.get(Integer.parseInt(entry.key));
-                if (roomQueueInfo != null) {
-                    JsonObject valueJsonObj = jsonParser.parse(entry.value).getAsJsonObject();
-                    if (valueJsonObj != null) {
-                        chatRoomMember = mGson.fromJson(valueJsonObj, MicMemberInfo.class);
-                        accounts.add(chatRoomMember.getAccount());
-                        roomQueueInfo.mChatRoomMember = chatRoomMember;
-                    }
-                    AvRoomDataManager.get().mMicQueueMemberMap.put(Integer.valueOf(entry.key), roomQueueInfo);
-                }
-            }
-        }
-        return accounts;
-    }
-
 
     /**
      * 处理服务端坑位信息
      */
     @Nullable
-    private ObservableSource<List<Entry<String, String>>> dealServerMicInfo(EnterChatRoomResultData enterChatRoomResultData) {
+    private ObservableSource<SparseArray<RoomQueueInfo>> dealServerMicInfo(EnterChatRoomResultData enterChatRoomResultData) {
         AvRoomDataManager.get().mEnterChatRoomResultData = enterChatRoomResultData;
         if (enterChatRoomResultData == null)
             return Observable.error(new Throwable(GET_ROOM_FROM_IMNET_ERROR));
@@ -296,11 +256,12 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
                     //初始化所有坑位
                     Map<String, String> micMapStr = mGson.fromJson(roomMicStr, new TypeToken<Map<String, String>>() {
                     }.getType());
+                    SparseArray<RoomQueueInfo> queue = new SparseArray<>();
                     for (Map.Entry<String, String> entry : micMapStr.entrySet()) {
-                        AvRoomDataManager.get().mMicQueueMemberMap.put(Integer.valueOf(entry.getKey()),
+                        queue.put(Integer.valueOf(entry.getKey()),
                                 new RoomQueueInfo(mGson.fromJson(entry.getValue(), RoomMicInfo.class), null));
                     }
-                    return mAvRoomModel.queryRoomMicInfo(roomInfo.getRoomId());
+                    return Observable.just(queue);
                 }
             }
             return Observable.error(new Throwable(GET_ROOM_FROM_IMNET_ERROR));

app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomPresenter.java

@@ -565,13 +565,12 @@ public class BaseRoomPresenter<V extends IBaseRoomView> extends BaseMvpPresenter
     @SuppressLint("CheckResult")
     public void sendPublicChatTextMessage(String message) {
         if (TextUtils.isEmpty(message)) return;
-        String sessionId = InitialModel.get().getPublicChatSessionId();
-        if (sessionId == null) {
+        ChatRoomClient client = ChatRoomClientManager.INSTANCE.getPublicChatClient();
+        if (client == null) {
             SingleToastUtil.showToast(R.string.public_chat_not_found);
             return;
         }
-        ChatRoomClient client = ChatRoomClientManager.INSTANCE.getClient(sessionId);
-        ChatRoomMessage textMessage = ChatRoomMessageBuilder.createChatRoomTextMessage(sessionId, message);
+        ChatRoomMessage textMessage = ChatRoomMessageBuilder.createChatRoomTextMessage(client.getSessionId(), message);
         client.sendMessage(textMessage).compose(bindToLifecycle()).subscribe(new BiConsumer<Object, Throwable>() {
             @Override
             public void accept(Object o, Throwable throwable) throws Exception {

app/src/main/java/com/chwl/app/avroom/presenter/HomePartyUserListPresenter.java

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 
 import com.chwl.app.avroom.view.IHomePartyUserListView;
 import com.chwl.app.base.BaseMvpPresenter;
-import com.chwl.core.room.model.HomePartyUserListModel;
+import com.chwl.core.room.model.AvRoomModel;
 
 /**
  * <p>  </p>
@@ -14,15 +14,12 @@ import com.chwl.core.room.model.HomePartyUserListModel;
  */
 public class HomePartyUserListPresenter extends BaseMvpPresenter<IHomePartyUserListView> {
 
-    private final HomePartyUserListModel mHomePartyUserListMode;
-
     public HomePartyUserListPresenter() {
-        mHomePartyUserListMode = new HomePartyUserListModel();
     }
 
     @SuppressLint("CheckResult")
     public void requestRoomOnlineList(long roomUid){
-        mHomePartyUserListMode.getRoomOnlineList(roomUid).compose(bindToLifecycle()).subscribe((data, throwable) -> {
+        AvRoomModel.get().getRoomOnlineList(roomUid).compose(bindToLifecycle()).subscribe((data, throwable) -> {
             if (getMvpView() != null) {
                 if (data != null) {
                     getMvpView().onRequestRoomOnlineListSuccess(data);

app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java

@@ -32,7 +32,7 @@ import androidx.recyclerview.widget.SimpleItemAnimator;
 import com.chwl.app.R;
 import com.chwl.app.UIHelper;
 import com.chwl.app.avroom.activity.AVRoomActivity;
-import com.chwl.app.avroom.dialog.PKResultDialog;
+import com.chwl.app.avroom.dialog.RoomTeamPKResultDialog;
 import com.chwl.app.avroom.widget.OnMsgLongClickListener;
 import com.chwl.app.avroom.widget.TemplateMessageAdapter;
 import com.chwl.app.common.widget.CustomImageSpan;
@@ -50,7 +50,6 @@ import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 import com.chwl.app.utils.ObjectTypeHelper;
 import com.chwl.app.utils.RegexUtil;
 import com.chwl.core.DemoCache;
-import com.chwl.core.XConstants;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
 import com.chwl.core.decoration.car.bean.CarInfo;
@@ -90,6 +89,7 @@ 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.ImageAttachment;
+import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
 import com.netease.nimlib.sdk.msg.constant.NotificationType;
 
@@ -388,9 +388,6 @@ public class PublicChatMessageView extends FrameLayout {
             }
             return;
         }
-        if (mMessageAdapter.getItemCount() > 0) {
-            messageListView.smoothScrollToPosition(mMessageAdapter.getItemCount() - 1);
-        }
     }
 
     public void release() {
@@ -538,7 +535,7 @@ public class PublicChatMessageView extends FrameLayout {
             try {
                 if (chatRoomMessage.getMsgType() == MsgTypeEnum.tip) {
                     // 房間通告
-                    tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_92F9E8));
+                    tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_white));
                     tvContent.setText(chatRoomMessage.getContent());
                     tvContent.setBackgroundResource(R.drawable.shape_room_message_tip_bg);
                 } else if (chatRoomMessage.getMsgType() == MsgTypeEnum.text) {
@@ -549,16 +546,20 @@ public class PublicChatMessageView extends FrameLayout {
                     setMsgNotification(chatRoomMessage, tvContent, baseViewHolder.getAdapterPosition());
                     setVIPMessageBackground(chatRoomMessage, tvContent);
                 } else if (chatRoomMessage.getMsgType() == MsgTypeEnum.custom) {
-                    CustomAttachment attachment = (CustomAttachment) chatRoomMessage.getAttachment();
-                    int first = attachment.getFirst();
-                    int second = attachment.getSecond();
-                    if (first == CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED) {
-                        if (second == CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED_SUB) {
-                            setHeadlineMsg(chatRoomMessage, tvContent, attachment);
+                    if (chatRoomMessage.getAttachment() != null && chatRoomMessage.getAttachment() instanceof CustomAttachment) {
+                        CustomAttachment attachment = (CustomAttachment) chatRoomMessage.getAttachment();
+                        int first = attachment.getFirst();
+                        int second = attachment.getSecond();
+                        if (first == CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED) {
+                            if (second == CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED_SUB) {
+                                setHeadlineMsg(chatRoomMessage, tvContent, attachment);
+                            }
+                        } else {
+                            tvContent.setTextColor(Color.WHITE);
+                            tvContent.setText(tvContent.getResources().getText(R.string.not_support_message_tip));
                         }
                     } else {
-                        tvContent.setTextColor(Color.WHITE);
-                        tvContent.setText(tvContent.getResources().getText(R.string.not_support_message_tip));
+                        tvContent.setText("");
                     }
                 }
             } catch (UnsupportedOperationException e) {
@@ -566,6 +567,9 @@ public class PublicChatMessageView extends FrameLayout {
                 clearBackground(tvContent);
                 tvContent.setTextColor(Color.WHITE);
                 tvContent.setText(tvContent.getResources().getText(R.string.not_support_message_tip));
+            } catch (Exception e) {
+                clearBackground(tvContent);
+                tvContent.setText("");
             }
         }
 
@@ -833,7 +837,7 @@ public class PublicChatMessageView extends FrameLayout {
                         }
                     } else if (attachment.getFirst() == CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK) {
                         if (attachment.getSecond() == CustomAttachment.CUSTOM_MESS_SUB_ROOM_PK_RESULT) {
-                            PKResultDialog pkResultDialog = new PKResultDialog(getContext(), ((RoomPkAttachment) attachment).getRoomPkData());
+                            RoomTeamPKResultDialog pkResultDialog = new RoomTeamPKResultDialog(getContext(), ((RoomPkAttachment) attachment).getRoomPkData());
                             pkResultDialog.show();
                         }
                     } else if (attachment instanceof RoomFollowOwnerAttachment2 && !AvRoomDataManager.get().isRoomFans) {

app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatRoomMessageWidget.kt

@@ -2,18 +2,10 @@ package com.chwl.app.avroom.public_chat
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.core.view.isVisible
-import androidx.databinding.DataBindingUtil
 import com.chwl.app.R
-import com.chwl.app.databinding.RoomPublicChatMessageWidgetBinding
 import com.chwl.app.public_chat.core.ChatRoomClient
 import com.chwl.app.public_chat.core.ChatRoomClientManager
-import com.chwl.core.im.custom.bean.CustomAttachment
 import com.chwl.core.im.custom.bean.HeadlineChangedAttachment
-import com.chwl.core.initial.InitialModel
-import com.chwl.core.public_chat_hall.bean.HeadlineBean
-import com.chwl.core.public_chat_hall.model.PublicChatModel
 import com.chwl.core.support.room.FrameLayoutRoomWidget
 import com.chwl.core.support.room.RoomView
 import com.chwl.library.utils.SingleToastUtil
@@ -24,12 +16,7 @@ import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum
 
 class PublicChatRoomMessageWidget : FrameLayoutRoomWidget {
 
-    private val binding: RoomPublicChatMessageWidgetBinding =
-        DataBindingUtil.inflate(
-            LayoutInflater.from(
-                context
-            ), R.layout.room_public_chat_message_widget, this, true
-        )
+    private val messageView: PublicChatMessageView = PublicChatMessageView(context)
 
     private var chatRoomClient: ChatRoomClient? = null
 
@@ -48,36 +35,24 @@ class PublicChatRoomMessageWidget : FrameLayoutRoomWidget {
         defStyleRes: Int
     ) : super(context, attrs, defStyleAttr, defStyleRes)
 
+    init {
+        addView(messageView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
+    }
+
     override fun onStart(roomView: RoomView) {
         super.onStart(roomView)
-        val sessionId = InitialModel.get().publicChatSessionId
-        if (sessionId != null) {
-            chatRoomClient = ChatRoomClientManager.getClient(sessionId);
-        } else {
+        chatRoomClient = ChatRoomClientManager.getPublicChatClient()
+        if (chatRoomClient == null) {
             SingleToastUtil.showToast(R.string.public_chat_not_found)
         }
         chatRoomClient?.let {
             initChatRoom(it)
         }
-        requestCurrentHeadline()
     }
 
     private fun onReceiveMessage(message: ChatRoomMessage) {
         if (!filterMessageForMessageList(message)) {
-            binding.messageView.addMessages(message)
-        }
-        if (message.msgType == MsgTypeEnum.custom) {
-            val attachment: CustomAttachment = (message.attachment as? CustomAttachment) ?: return
-            when (attachment.first) {
-                CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED -> {
-                    when (attachment.second) {
-                        CustomAttachment.CUSTOM_MSG_HEADLINE_CHANGED_SUB -> {
-                            val data = (attachment as? HeadlineChangedAttachment) ?: return
-                            updateHeadline(data.headlineData)
-                        }
-                    }
-                }
-            }
+            messageView.addMessages(message)
         }
     }
 
@@ -110,30 +85,13 @@ class PublicChatRoomMessageWidget : FrameLayoutRoomWidget {
                 QueryDirectionEnum.QUERY_OLD,
                 typeEnums
             ).subscribe({
-                binding.messageView.addHistoryMessages(it.reversed())
+                messageView.addHistoryMessages(it.reversed())
             }, {
                 it.printStackTrace()
             })
         )
     }
 
-    private fun requestCurrentHeadline() {
-        safeLaunch {
-            val data = PublicChatModel.getCurrentHeadline()
-            updateHeadline(data)
-        }
-    }
-
-    private fun updateHeadline(data: HeadlineBean?) {
-        val content = data?.content
-        if (data?.isValid() == true && !content.isNullOrEmpty()) {
-            binding.tvHeadlineContent.text = content
-            binding.tvHeadlineContent.isVisible = true
-        } else {
-            binding.tvHeadlineContent.isVisible = false
-        }
-    }
-
     private fun filterMessageForMessageList(message: ChatRoomMessage): Boolean {
         if (message.msgType == MsgTypeEnum.custom && message.attachment is HeadlineChangedAttachment) {
             val data = (message.attachment as HeadlineChangedAttachment).headlineData
@@ -144,7 +102,7 @@ class PublicChatRoomMessageWidget : FrameLayoutRoomWidget {
         return false
     }
 
-    fun getMessageView() = binding.messageView
+    fun getMessageView() = messageView
 
     override fun onStop() {
         super.onStop()

app/src/main/java/com/chwl/app/avroom/rank/RoomRankNumberWidget.kt

@@ -0,0 +1,92 @@
+package com.chwl.app.avroom.rank
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.databinding.DataBindingUtil
+import com.chwl.core.support.room.FrameLayoutRoomWidget
+import com.chwl.core.support.room.RoomWidget
+import com.chwl.app.R
+import com.chwl.app.databinding.RoomRankNumberWidgetBinding
+import com.chwl.app.ui.webview.DialogWebViewActivity
+import com.chwl.core.UriProvider
+import com.chwl.core.im.custom.bean.RoomSerialValueChangedAttachment
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.manager.IMNetEaseManager
+import com.chwl.core.manager.RoomEvent
+import com.chwl.core.support.room.RoomContext
+import com.chwl.core.support.room.RoomView
+import com.chwl.library.utils.FormatUtils
+import com.example.lib_utils.ktx.singleClick
+
+/**
+ * 房间榜单入口
+ */
+class RoomRankNumberWidget : FrameLayoutRoomWidget, RoomWidget {
+
+    private val binding: RoomRankNumberWidgetBinding =
+        DataBindingUtil.inflate(
+            LayoutInflater.from(
+                context
+            ), R.layout.room_rank_number_widget, this, true
+        )
+
+    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.singleClick {
+            DialogWebViewActivity.start(context, UriProvider.getRoomRanking())
+        }
+    }
+
+    override fun onInitialize(roomView: RoomView, roomContext: RoomContext) {
+        super.onInitialize(roomView, roomContext)
+        refreshData()
+        registerMemberChangedListener()
+    }
+
+    override fun onUnbindContext() {
+        super.onUnbindContext()
+        updateView(null)
+    }
+
+    private fun registerMemberChangedListener() {
+        getCompositeDisposable().add(IMNetEaseManager.get().chatRoomEventObservable.subscribe {
+            when (it.event) {
+                RoomEvent.SERIAL_VALUE_CHANGED -> {
+                    val attachment =
+                        it.chatRoomMessage.attachment as? RoomSerialValueChangedAttachment
+                    attachment?.serialValue?.let {
+                        updateView(attachment.serialValue)
+                    }
+                }
+            }
+        })
+    }
+
+    private fun refreshData() {
+        val value = AvRoomDataManager.get().serialValue
+        updateView(value)
+    }
+
+    private fun updateView(value: Double?) {
+        if (value == null || value <= 0) {
+            binding.tvNumber.text = "0"
+        } else {
+            binding.tvNumber.text = FormatUtils.formatToShortKMHalfUp(value)
+        }
+    }
+}

app/src/main/java/com/chwl/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt

@@ -3,13 +3,13 @@ package com.chwl.app.avroom.room_album
 import android.annotation.SuppressLint
 import android.os.Bundle
 import com.hjq.toast.ToastUtils
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogLockRoomAlbumPhotoBinding
 import com.chwl.app.ui.utils.ImageLoadUtilsV2
 import com.chwl.core.gift.bean.GiftReceiveInfo
 import com.chwl.core.manager.AvRoomDataManager
 
-class UnlockRoomAlbumPhotoDialog : BaseDialog<DialogLockRoomAlbumPhotoBinding>(){
+class UnlockRoomAlbumPhotoDialog : BaseDialogFragment<DialogLockRoomAlbumPhotoBinding>(){
 
     var onUnlockRoomPhotoListener: OnUnlockRoomPhotoListener? = null
 

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.view.WindowManager
 import androidx.core.view.isVisible
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogSingleRoomPkFinishBinding
 import com.chwl.app.ui.utils.load
 import com.chwl.core.im.custom.bean.RoomPkBean
@@ -14,7 +14,7 @@ import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
 
-class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
+class SingleRoomPkFinishDialog : BaseDialogFragment<DialogSingleRoomPkFinishBinding>() {
 
     companion object {
         @JvmStatic

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt

@@ -4,13 +4,13 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.WindowManager
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogSingleRoomPkForceFinishBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.utils.extension.subAndReplaceDot
 
-class SingleRoomPkForceFinishDialog : BaseDialog<DialogSingleRoomPkForceFinishBinding>() {
+class SingleRoomPkForceFinishDialog : BaseDialogFragment<DialogSingleRoomPkForceFinishBinding>() {
 
     companion object {
         @JvmStatic

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.core.view.isVisible
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogSingleRoomPkReceivedBinding
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.manager.AvRoomDataManager
@@ -17,7 +17,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import java.util.concurrent.TimeUnit
 
-class SingleRoomPkReceivedDialog : BaseDialog<DialogSingleRoomPkReceivedBinding>() {
+class SingleRoomPkReceivedDialog : BaseDialogFragment<DialogSingleRoomPkReceivedBinding>() {
 
     companion object {
 

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt

@@ -1,12 +1,12 @@
 package com.chwl.app.avroom.singleroompk
 
 import android.text.method.ScrollingMovementMethod
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogSingleRoomPkRuleBinding
 import com.chwl.core.room.anotherroompk.SingleRoomPKModel
 import com.chwl.core.utils.extension.toast
 
-class SingleRoomPkRuleDialog : BaseDialog<DialogSingleRoomPkRuleBinding>() {
+class SingleRoomPkRuleDialog : BaseDialogFragment<DialogSingleRoomPkRuleBinding>() {
 
     companion object {
 

app/src/main/java/com/chwl/app/avroom/widget/BottomView.java

@@ -16,11 +16,11 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
-
+import com.chwl.core.manager.AvRoomDataManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.chwl.app.avroom.dialog.RoomGameplayDialog;
+import com.chwl.app.avroom.activity.RoomTypeSwitchActivity;
 import com.chwl.core.utils.extension.StringExtensionKt;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
@@ -29,7 +29,6 @@ import com.netease.nimlib.sdk.uinfo.model.UserInfo;
 import com.chwl.app.R;
 import com.chwl.app.avroom.BottomViewListenerWrapper;
 import com.chwl.app.ui.utils.ImageLoadUtils;
-import com.chwl.app.vip.VipMainActivity;
 import com.chwl.app.room_chat.activity.RoomMsgActivity;
 import com.chwl.core.helper.ImHelperUtils;
 import com.chwl.core.manager.AvRoomDataManager;
@@ -59,6 +58,7 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
      */
     private static final int NEW_OPTION = 1;
     private static final String SH_NEW_OPTION = "sh_new_option";
+    private static final String NEW_OPTION_ROOM_TYPE = "new_option_room_type";
 
     private BottomViewListenerWrapper wrapper;
     private ImageView openMic;
@@ -72,7 +72,10 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
     private LinearLayout micLayout;
     private ImageView iconMicQueue;
     private ImageView iconRoomMsg;
-    private ImageView iconVip;
+
+    private ImageView iconRoomBaiShunGame;
+
+    private ImageView pkGameView;
 
     @Nullable
     private PopupWindow msgTipPopupWindow;
@@ -105,12 +108,12 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
         remoteMute = findViewById(R.id.icon_room_open_remote_mic);
         faceLayout = findViewById(R.id.room_face_layout);
         micLayout = findViewById(R.id.room_mic_layout);
+        iconRoomBaiShunGame = findViewById(R.id.icon_room_baishun_game);
 
         iconMicQueue = (ImageView) findViewById(R.id.icon_mic_queue);
 
         iconRoomMsg = findViewById(R.id.iv_room_message);
-        iconVip = findViewById(R.id.icon_room_vip);
-        ImageView gameView = findViewById(R.id.icon_room_game);
+        pkGameView = findViewById(R.id.icon_room_PK_game);
         openMic.setOnClickListener(this);
         sendMsgInput.setOnClickListener(this);
         sendFace.setOnClickListener(this);
@@ -119,8 +122,8 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
         sendMagic.setOnClickListener(this);
         iconMicQueue.setOnClickListener(this);
         iconRoomMsg.setOnClickListener(this);
-        iconVip.setOnClickListener(this);
-        gameView.setOnClickListener(this);
+        pkGameView.setOnClickListener(this);
+        iconRoomBaiShunGame.setOnClickListener(this);
 
         setMicBtnEnable(false);
         setMicBtnOpen(false);
@@ -158,9 +161,12 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
             int newOption = (int) SharedPreferenceUtils.get(SH_NEW_OPTION, 0);
 
             if (newOption == NEW_OPTION) {
-                sendMagic.setImageResource(R.drawable.icon_send_magic);
+                sendMagic.setImageResource(R.drawable.room_menu_ic_more);
+                if (isRemindOptionForRoomType()) {
+                    sendMagic.setImageResource(R.drawable.room_menu_ic_more_new);
+                }
             } else {
-                sendMagic.setImageResource(R.drawable.icon_send_magic);
+                sendMagic.setImageResource(R.drawable.room_menu_ic_more_new);
             }
             sendMagic.setClickable(true);
             sendMagic.setOnClickListener(this);
@@ -171,6 +177,29 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
         }
     }
 
+    private boolean isRemindOptionForRoomType() {
+        boolean isReminded = (boolean) SharedPreferenceUtils.get(NEW_OPTION_ROOM_TYPE, false);
+        if (isReminded) {
+            return false;
+        }
+        if (RoomTypeSwitchActivity.Companion.isCanSwitch()) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean updateOptionForRoomType() {
+        boolean isReminded = (boolean) SharedPreferenceUtils.get(NEW_OPTION_ROOM_TYPE, false);
+        if (isReminded) {
+            return false;
+        }
+        if (RoomTypeSwitchActivity.Companion.isCanSwitch()) {
+            SharedPreferenceUtils.put(NEW_OPTION_ROOM_TYPE, true);
+            return true;
+        }
+        return false;
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onReceiveRecentContactChanged(List<RecentContact> imMessages) {
         setRoomMessageUnread(IMMessageManager.get().queryUnreadMsg());
@@ -181,11 +210,11 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onFirstRechargeEvent(FirstChargeEvent event) {
-        sendGift.setImageResource(R.drawable.icon_room_send_gift);
+//        sendGift.setImageResource(R.drawable.icon_room_send_gift);
     }
 
     public void setRoomMessageUnread(int count) {
-        iconRoomMsg.setImageResource(count > 0 ? R.drawable.icon_room_send_msg_point : R.drawable.icon_room_send_msg);
+        iconRoomMsg.setImageResource(count > 0 ? R.drawable.room_menu_ic_message_new : R.drawable.room_menu_ic_message);
     }
 
     public void setBottomViewListener(BottomViewListenerWrapper wrapper) {
@@ -204,25 +233,48 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
 
     public void setMicBtnOpen(boolean isOpen) {
         if (isOpen) {
-            openMic.setImageResource(R.drawable.icon_room_open_mic);
+            openMic.setImageResource(R.drawable.room_menu_ic_mic_open);
         } else {
-            openMic.setImageResource(R.drawable.icon_room_close_mic);
+            openMic.setImageResource(R.drawable.room_menu_ic_mic_close);
         }
     }
 
     public void setRemoteMuteOpen(boolean isOpen) {
         if (isOpen) {
-            remoteMute.setImageResource(R.drawable.icon_remote_mute_close);
+            remoteMute.setImageResource(R.drawable.room_menu_ic_vocality_open);
         } else {
-            remoteMute.setImageResource(R.drawable.icon_remote_mute_open);
+            remoteMute.setImageResource(R.drawable.room_menu_ic_vocality_close);
         }
     }
 
+    public void setBaiShunBtnOpen(boolean isOpen) {
+        iconRoomBaiShunGame.setVisibility(isOpen ? VISIBLE : GONE);
+    }
+
+    public void notifyStateChanged() {
+        setMagicBtnEnable(true);
+    }
+
     public void showHomePartyUpMicBottom() {
         faceLayout.setVisibility(VISIBLE);
         micLayout.setVisibility(VISIBLE);
     }
 
+    public void updateGameEntrance() {
+        if (AvRoomDataManager.get().isManager() || SuperAdminUtil.isSuperAdmin()) {
+            if (!AvRoomDataManager.get().isCpRoom()) {
+                pkGameView.setVisibility(VISIBLE);
+                iconRoomBaiShunGame.setVisibility(VISIBLE);
+            }
+        } else {
+            pkGameView.setVisibility(GONE);
+            iconRoomBaiShunGame.setVisibility(GONE);
+        }
+        if (AvRoomDataManager.get().isSingleRoom() || AvRoomDataManager.get().isDatingMode()) {
+            pkGameView.setVisibility(GONE);
+        }
+    }
+
     public void showHomePartyDownMicBottom() {
         faceLayout.setVisibility(GONE);
         micLayout.setVisibility(GONE);
@@ -257,8 +309,8 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
     }
 
     public void setQueuingMicButtonBackground(boolean isEmpty) {
-        iconMicQueue.setImageResource(isEmpty ? R.drawable.icon_room_mic_queue :
-                R.drawable.icon_room_mic_queue_not_empty);
+        iconMicQueue.setImageResource(isEmpty ? R.drawable.room_menu_ic_mic_queue :
+                R.drawable.room_menu_ic_mic_queue_new);
     }
 
 
@@ -298,12 +350,14 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
                 }
                 break;
             case R.id.icon_room_send_magic:
-
                 int newOption = (int) SharedPreferenceUtils.get(SH_NEW_OPTION, 0);
                 if (newOption != NEW_OPTION) {
                     SharedPreferenceUtils.put(SH_NEW_OPTION, NEW_OPTION);
                     setMagicBtnEnable(true);
                 }
+                if (updateOptionForRoomType()) {
+                    setMagicBtnEnable(true);
+                }
 
                 if (wrapper != null) {
                     wrapper.onMoreBtnClick();
@@ -320,12 +374,14 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
                     wrapper.onRoomMessageClick();
                 }
                 break;
-            case R.id.icon_room_vip:
-                VipMainActivity.start(getContext());
-                break;
-            case R.id.icon_room_game:
+            case R.id.icon_room_PK_game:
                 if (wrapper != null) {
-                    wrapper.onRoomGameplayClick();
+                    wrapper.onRoomGameplayClick(true);
+                }
+                break;
+            case R.id.icon_room_baishun_game:
+                if (wrapper != null) {
+                    wrapper.onRoomGameplayClick(false);
                 }
                 break;
             default:

app/src/main/java/com/chwl/app/avroom/widget/EditRoomTitleDialog.java

@@ -109,7 +109,7 @@ public class EditRoomTitleDialog extends AppCompatDialog {
             tvTitle.setText(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_03));
             tvLimit.setVisibility(View.VISIBLE);
             etContent.setHint(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_04));
-            maxLength = 15;
+            maxLength = 25;
             etContent.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
             setLimtText();
         } else if (dialogType == TYPE_EDIT_DESC) {

app/src/main/java/com/chwl/app/avroom/widget/GiftEffectView.java

@@ -1,7 +1,5 @@
 package com.chwl.app.avroom.widget;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.os.Handler;
@@ -11,20 +9,26 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
+import com.chwl.library.utils.PathHelper;
+import com.chwl.library.download.DownloadException;
+import com.chwl.library.download.DownloadManager;
+import com.chwl.library.download.DownloadRequest;
+import com.chwl.library.download.DownloadTask;
+import com.chwl.library.download.FileDownloadListener;
+import com.example.lib_utils.log.LogUtil;
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGACallback;
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
+import com.tencent.qgame.animplayer.AnimConfig;
 import com.tencent.qgame.animplayer.AnimView;
 import com.chwl.app.R;
-import com.chwl.app.common.widget.CircleImageView;
-import com.chwl.app.ui.utils.ImageLoadKt;
 import com.chwl.core.gift.GiftModel;
 import com.chwl.core.gift.bean.GiftEffectInfo;
 import com.chwl.core.gift.bean.GiftInfo;
@@ -33,39 +37,33 @@ import com.chwl.core.initial.bean.InitInfo;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.manager.IMNetEaseManager;
 import com.chwl.core.manager.RoomEvent;
-import com.chwl.library.utils.ResolutionUtils;
+import com.tencent.qgame.animplayer.inter.IAnimListener;
+import com.tencent.qgame.animplayer.util.ScaleType;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.lang.ref.WeakReference;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.annotation.Nullable;
 
 /**
  * @author chenran
  * @date 2017/10/8
  */
 
-public class GiftEffectView extends RelativeLayout implements SVGACallback {
-    private RelativeLayout container;
+public class GiftEffectView extends RelativeLayout {
     private SVGAImageView svgaImageView;
     private AnimView vapAnimView;
     private View svgaBg;
-    private ImageView giftLightBg;
-    private CircleImageView giftImg;
-    private ImageView imgBg;
-    private CircleImageView benefactorAvatar;
-    private CircleImageView receiverAvatar;
-    private TextView benefactorNick;
-    private TextView receiverNick;
-    private TextView giftNumber;
-    private TextView giftName;
     private GiftEffectListener giftEffectListener;
     private EffectHandler effectHandler;
     private boolean isAnim;
     private boolean isPlayAnim;
     private boolean isHideCarEffect;
 
+    private String DOWNLOAD_TAG = "gift_effect_download";
+
+    private SVGAParser.ParseCompletion parseCompletion;
+
     public GiftEffectView(Context context) {
         super(context);
         init();
@@ -96,22 +94,85 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
     private void init() {
         LayoutInflater.from(getContext()).inflate(R.layout.layout_gift_effect, this, true);
         effectHandler = new EffectHandler(this);
-        container = findViewById(R.id.container);
-        imgBg = findViewById(R.id.img_bg);
-        giftLightBg = findViewById(R.id.gift_light_bg);
-        giftImg = findViewById(R.id.gift_img);
-        benefactorAvatar = findViewById(R.id.benefactor_avatar);
-        receiverAvatar = findViewById(R.id.receiver_avatar);
-        benefactorNick = findViewById(R.id.benefactor_nick);
-        receiverNick = findViewById(R.id.receiver_nick);
-        giftNumber = findViewById(R.id.gift_number);
-        giftName = findViewById(R.id.gift_name);
         svgaImageView = findViewById(R.id.svga_imageview);
-        svgaImageView.setCallback(this);
         svgaImageView.setClearsAfterStop(true);
         svgaImageView.setLoops(1);
         svgaBg = findViewById(R.id.svga_imageview_bg);
         vapAnimView = findViewById(R.id.vap_anim_view);
+        parseCompletion = new SVGAParser.ParseCompletion() {
+
+            @Override
+            public void onError() {
+                log("onError");
+                effectHandler.sendEmptyMessage(0);
+            }
+
+            @Override
+            public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) {
+                log("onComplete");
+                SVGADrawable drawable = new SVGADrawable(svgaVideoEntity);
+                svgaImageView.setImageDrawable(drawable);
+                svgaImageView.startAnimation();
+                svgaBg.setVisibility(VISIBLE);
+                ObjectAnimator objectAnimator1 = ObjectAnimator.ofFloat(svgaBg, "alpha", 0.0F, 2.0F).setDuration(1250);
+                objectAnimator1.setInterpolator(new AccelerateDecelerateInterpolator());
+                objectAnimator1.start();
+            }
+        };
+        svgaImageView.setCallback(new SVGACallback() {
+            @Override
+            public void onPause() {
+                log("onPause");
+            }
+
+            @Override
+            public void onFinished() {
+                log("onFinished");
+                effectHandler.sendEmptyMessage(0);
+            }
+
+            @Override
+            public void onRepeat() {
+                log("onRepeat");
+            }
+
+            @Override
+            public void onStep(int i, double v) {
+
+            }
+        });
+        vapAnimView.setScaleType(ScaleType.CENTER_CROP);
+        vapAnimView.setAnimListener(new IAnimListener() {
+            @Override
+            public boolean onVideoConfigReady(@NonNull AnimConfig animConfig) {
+                return true;
+            }
+
+            @Override
+            public void onVideoStart() {
+                log("onVideoStart");
+            }
+
+            @Override
+            public void onVideoRender(int i, @androidx.annotation.Nullable AnimConfig animConfig) {
+            }
+
+            @Override
+            public void onVideoComplete() {
+                log("onVideoComplete");
+                effectHandler.sendEmptyMessage(0);
+            }
+
+            @Override
+            public void onVideoDestroy() {
+                log("onVideoDestroy");
+            }
+
+            @Override
+            public void onFailed(int i, @androidx.annotation.Nullable String s) {
+                log("onFailed i:" + i + " s:" + s);
+            }
+        });
     }
 
     public void startGiftEffect(GiftEffectInfo giftEffectInfo) {
@@ -121,107 +182,98 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
             giftInfo = giftEffectInfo.getGift();
         }
         if (giftInfo != null) {
-            isPlayAnim = false;
-            container.setVisibility(INVISIBLE);
-            effectHandler.sendEmptyMessageDelayed(0, 4000);
-            if (giftInfo.getOtherViewType() == 1 && !TextUtils.isEmpty(giftInfo.getViewUrl())) {
-                drawVAPEffect(giftInfo.getViewUrl());
-            } else if (giftInfo.isHasVggPic() && !StringUtil.isEmpty(giftInfo.getVggUrl())) {
-                try {
-                    drawSvgaEffect(giftInfo.getVggUrl());
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                }
-            }
             InitInfo initInfo = InitialModel.get().getCacheInitInfo();
             if (!isHideCarEffect && initInfo != null && giftInfo.getGoldPrice() >= initInfo.getHideCarEffectGiftPrice()) {
                 isHideCarEffect = true;
                 IMNetEaseManager.get().noticeRoomEvent(null, RoomEvent.ROOM_CAR_EFFECT_HIDE);
             }
+            if (!AvRoomDataManager.get().mIsNeedGiftEffect || AvRoomDataManager.get().isSelfGamePlaying()) {
+                effectHandler.sendEmptyMessage(0);
+                return;
+            }
+            if (giftInfo.getOtherViewType() == 1 && !TextUtils.isEmpty(giftInfo.getViewUrl())) {
+                drawVAPEffect(giftInfo.getViewUrl());
+            } else if (giftInfo.isHasVggPic() && !StringUtil.isEmpty(giftInfo.getVggUrl())) {
+                drawSvgaEffect(giftInfo.getVggUrl());
+            } else {
+                effectHandler.sendEmptyMessage(0);
+            }
+        } else {
+            effectHandler.sendEmptyMessage(0);
         }
     }
 
-    private void drawSvgaEffect(String url) throws MalformedURLException {
-        if (!AvRoomDataManager.get().mIsNeedGiftEffect ||
-                AvRoomDataManager.get().isSelfGamePlaying()) {
-            return;
+    private void drawSvgaEffect(String url) {
+        log("drawSvgaEffect url:" + url);
+        String filePath = PathHelper.INSTANCE.generateResourcesFilePath(url);
+        DownloadRequest request = DownloadRequest.Companion.build(url, filePath, DOWNLOAD_TAG, null, 60000L);
+        DownloadManager.INSTANCE.download(request, new FileDownloadListener() {
+            @Override
+            public void onDownloadCompleted(@NonNull DownloadTask task) {
+                String path = task.getRequest().getPath();
+                log("drawSvgaEffect onDownloadCompleted url:" + url + " path:" + path);
+                drawSvgaEffectFile(path);
+            }
+
+            @Override
+            public void onDownloadError(@NonNull DownloadException exception) {
+                log("drawSvgaEffect onDownloadError url:" + url);
+                effectHandler.sendEmptyMessage(0);
+            }
+        });
+    }
+
+    private void drawSvgaEffectFile(String path) {
+        try {
+            log("drawSvgaEffectFile path:" + path);
+            BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(path));
+            SVGAParser.Companion.shareParser().decodeFromInputStream(inputStream, path, parseCompletion, true, null, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            effectHandler.sendEmptyMessage(0);
         }
-        SVGAParser.Companion.shareParser().decodeFromURL(new URL(url), new SVGAParser.ParseCompletion() {
-            @Override
-            public void onComplete(@Nullable SVGAVideoEntity videoItem) {
-                SVGADrawable drawable = new SVGADrawable(videoItem);
-                svgaImageView.setImageDrawable(drawable);
-                svgaImageView.startAnimation();
-                svgaBg.setVisibility(VISIBLE);
-                ObjectAnimator objectAnimator1 = ObjectAnimator.ofFloat(svgaBg, "alpha", 0.0F, 2.0F).setDuration(1250);
-                objectAnimator1.setInterpolator(new AccelerateDecelerateInterpolator());
-                objectAnimator1.start();
-            }
-
-            @Override
-            public void onError() {
-
-            }
-        }, null);
-
     }
 
     private void drawVAPEffect(String url) {
-        if (!AvRoomDataManager.get().mIsNeedGiftEffect || AvRoomDataManager.get().isSelfGamePlaying()) {
-            return;
-        }
-        ImageLoadKt.loadAnim(vapAnimView, url);
+        log("drawVAPEffect url:" + url);
+        String filePath = PathHelper.INSTANCE.generateResourcesFilePath(url);
+        DownloadRequest request = DownloadRequest.Companion.build(url, filePath, DOWNLOAD_TAG, null, 60000L);
+        DownloadManager.INSTANCE.download(request, new FileDownloadListener() {
+            @Override
+            public void onDownloadCompleted(@NonNull DownloadTask task) {
+                String path = task.getRequest().getPath();
+                log("drawVAPEffect onDownloadCompleted url:" + url + " path:" + path);
+                vapAnimView.startPlay(new File(path));
+            }
+
+            @Override
+            public void onDownloadError(@NonNull DownloadException exception) {
+                log("drawVAPEffect onDownloadError url:" + url);
+                exception.printStackTrace();
+                effectHandler.sendEmptyMessageDelayed(0, 4000);
+            }
+        });
     }
 
     private void deleteAnim() {
-        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(container, "translationX", container.getX(), ResolutionUtils.getScreenWidth(getContext())).setDuration(1250);
-        objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
-        objectAnimator.start();
-
-        ObjectAnimator objectAnimator1 = ObjectAnimator.ofFloat(container, "alpha", 1.0F, 0.0F).setDuration(1250);
-        objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
-        objectAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                if (isHideCarEffect) {
-                    isHideCarEffect = false;
-                    IMNetEaseManager.get().noticeRoomEvent(null, RoomEvent.ROOM_CAR_EFFECT_SHOW);
-                }
-                if (giftEffectListener != null) {
-                    isAnim = false;
-                    isPlayAnim = false;
-                    giftEffectListener.onGiftEffectEnd();
-                }
-            }
-        });
-        objectAnimator1.start();
+        if (isHideCarEffect) {
+            isHideCarEffect = false;
+            IMNetEaseManager.get().noticeRoomEvent(null, RoomEvent.ROOM_CAR_EFFECT_SHOW);
+        }
+        svgaBg.setVisibility(GONE);
+        isAnim = false;
+        isPlayAnim = false;
+        if (giftEffectListener != null) {
+            giftEffectListener.onGiftEffectEnd();
+        }
     }
 
     public void release() {
+        log("release");
+        DownloadManager.INSTANCE.stopTag(DOWNLOAD_TAG);
         effectHandler.removeMessages(0);
     }
 
-    @Override
-    public void onPause() {
-
-    }
-
-    @Override
-    public void onFinished() {
-        svgaBg.setVisibility(GONE);
-    }
-
-    @Override
-    public void onRepeat() {
-
-    }
-
-    @Override
-    public void onStep(int i, double v) {
-
-    }
-
     public interface GiftEffectListener {
         void onGiftEffectEnd();
     }
@@ -246,4 +298,8 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
             }
         }
     }
+
+    private void log(String message) {
+        LogUtil.INSTANCE.d("GiftEffectView", message, false);
+    }
 }

app/src/main/java/com/chwl/app/avroom/widget/MessageView.java

@@ -29,12 +29,9 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.Editable;
 import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
@@ -42,7 +39,6 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -81,11 +77,9 @@ import com.chwl.app.sadmin.utils.SaAttachmentToMsgUtil;
 import com.chwl.app.R;
 import com.chwl.app.UIHelper;
 import com.chwl.app.avroom.activity.AVRoomActivity;
-import com.chwl.app.avroom.dialog.PKResultDialog;
+import com.chwl.app.avroom.dialog.RoomTeamPKResultDialog;
 import com.chwl.app.avroom.room_album.UnlockRoomAlbumPhotoDialog;
 import com.chwl.library.common.util.Utils;
-import com.chwl.app.common.widget.CustomAutoWidthImageSpan;
-import com.chwl.app.common.widget.CustomImageSpan;
 import com.chwl.app.common.widget.OriginalDrawStatusClickSpan;
 import com.chwl.app.ui.utils.ImageLoadUtils;
 import com.chwl.app.ui.utils.ImageLoadUtilsV2;
@@ -95,7 +89,6 @@ import com.chwl.app.ui.widget.RecyclerViewNoViewpagerScroll;
 import com.chwl.app.ui.widget.UserInfoDialog;
 import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 import com.chwl.app.utils.RegexUtil;
-import com.chwl.core.XConstants;
 import com.chwl.core.DemoCache;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
@@ -162,7 +155,6 @@ import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.manager.IMNetEaseManager;
 import com.chwl.core.miniworld.bean.MiniWorldInWorldInfo;
 import com.chwl.core.monsterhunting.bean.MonsterHuntingResult;
-import com.chwl.core.monsterhunting.bean.MonsterProtocol;
 import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.noble.NobleUtil;
 import com.chwl.core.praise.PraiseModel;
@@ -672,7 +664,7 @@ public class MessageView extends FrameLayout {
                         tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_fe5d7f));
                         tvContent.setText(contentText);
                     } else {
-                        tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_92F9E8));
+                        tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_white));
                         tvContent.setText(chatRoomMessage.getContent());
                         tvContent.setBackgroundResource(R.drawable.shape_room_message_tip_bg);
                     }
@@ -2294,7 +2286,7 @@ public class MessageView extends FrameLayout {
                     })
                     .append(ResUtil.getString(R.string.gift_message_01), new ForegroundColorSpan(getResources().getColor(R.color.white)));
 
-            text.append(luckyGiftInfo.getGiftName() + ResUtil.getString(R.string.gift_message_02), new ForegroundColorSpan(getResources().getColor(R.color.white)))
+            text.append(luckyGiftInfo.getFirstGiftName() + ResUtil.getString(R.string.gift_message_02), new ForegroundColorSpan(getResources().getColor(R.color.white)))
                     .append(luckyGiftInfo.getUser().getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
                         @Override
                         public void onClick(@NonNull View widget) {
@@ -2349,7 +2341,7 @@ public class MessageView extends FrameLayout {
                     })
                     .append(ResUtil.getString(R.string.gift_message_01), new ForegroundColorSpan(getResources().getColor(R.color.white)));
 
-            text.append(luckyGiftInfo.getGiftName() + ResUtil.getString(R.string.gift_message_02), new ForegroundColorSpan(getResources().getColor(R.color.white)))
+            text.append(luckyGiftInfo.getFirstGiftName() + ResUtil.getString(R.string.gift_message_02), new ForegroundColorSpan(getResources().getColor(R.color.white)))
                     .append(luckyGiftInfo.getUser().getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
                         @Override
                         public void onClick(@NonNull View widget) {
@@ -2919,7 +2911,7 @@ public class MessageView extends FrameLayout {
                         }
                     } else if (attachment.getFirst() == CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK) {
                         if (attachment.getSecond() == CustomAttachment.CUSTOM_MESS_SUB_ROOM_PK_RESULT) {
-                            PKResultDialog pkResultDialog = new PKResultDialog(getContext(), ((RoomPkAttachment) attachment).getRoomPkData());
+                            RoomTeamPKResultDialog pkResultDialog = new RoomTeamPKResultDialog(getContext(), ((RoomPkAttachment) attachment).getRoomPkData());
                             pkResultDialog.show();
                         }
                     } else if (attachment instanceof RoomFollowOwnerAttachment2 && !AvRoomDataManager.get().isRoomFans) {

app/src/main/java/com/chwl/app/avroom/widget/PKBoardView.java

@@ -1,446 +0,0 @@
-package com.chwl.app.avroom.widget;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.R;
-import com.chwl.app.avroom.dialog.PKScoreBoardDialog;
-import com.chwl.app.avroom.dialog.PKSelectPeopleDialog;
-import com.chwl.app.common.widget.CircleImageView;
-import com.chwl.core.bean.RoomQueueInfo;
-import com.chwl.core.manager.AvRoomDataManager;
-import com.chwl.core.room.pk.bean.PKMemberInfo;
-import com.chwl.core.room.pk.bean.PKTeamInfo;
-import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
-import com.chwl.core.room.pk.bean.RoomPkData;
-import com.chwl.core.room.pk.event.PKDataUpdateEvent;
-import com.chwl.core.room.pk.event.PKTimeFinishEvent;
-import com.chwl.core.room.pk.event.PKTimeTickEvent;
-import com.chwl.core.room.pk.model.PkModel;
-import com.chwl.library.utils.FormatUtils;
-import com.chwl.library.utils.ResUtil;
-import com.chwl.library.utils.SingleToastUtil;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * @author jack
- * @Description
- * @Date 2019/1/8
- */
-public class PKBoardView extends RelativeLayout implements View.OnClickListener {
-
-    public PKBoardView(Context context) {
-        super(context);
-        init();
-    }
-
-    public PKBoardView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public PKBoardView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    private View llPkScoreBoard;
-    private View rlRedTeamAddPeople;
-    private TextView tvRedTeamScore;
-    private View rlBlueTeamAddPeople;
-    private TextView tvBlueTeamScore;
-    private TextView tvPkTimer;
-    private CircleImageView civRedTeamMember1;
-    private CircleImageView civRedTeamMember2;
-    private CircleImageView civRedTeamMember3;
-    private CircleImageView civRedTeamMember4;
-    private CircleImageView ivAddRedTeamMember;
-    private CircleImageView civBlueTeamMember1;
-    private CircleImageView civBlueTeamMember2;
-    private CircleImageView civBlueTeamMember3;
-    private CircleImageView civBlueTeamMember4;
-    private CircleImageView ivAddBlueTeamMember;
-
-    private ProgressBar pbScore;
-    private ImageView ivPkBegin;
-
-    private final List<CircleImageView> civRedAvatars = new ArrayList<>();
-    private final List<CircleImageView> civBlueAvatars = new ArrayList<>();
-
-    private void init() {
-        inflate(getContext(), R.layout.layout_pk_board_view, this);
-
-        llPkScoreBoard = findViewById(R.id.root_view);
-        rlRedTeamAddPeople = findViewById(R.id.fl_left);
-        tvRedTeamScore = this.findViewById(R.id.tv_red_team_score);
-        rlBlueTeamAddPeople = findViewById(R.id.fl_right);
-        tvBlueTeamScore = this.findViewById(R.id.tv_blue_team_score);
-        tvPkTimer = this.findViewById(R.id.tv_pk_timer);
-        pbScore = findViewById(R.id.pb_score);
-        ivPkBegin = findViewById(R.id.iv_pk_begin);
-        civRedTeamMember1 = findViewById(R.id.civ_red_team_member_1);
-        civRedTeamMember2 = findViewById(R.id.civ_red_team_member_2);
-        civRedTeamMember3 = findViewById(R.id.civ_red_team_member_3);
-        civRedTeamMember4 = findViewById(R.id.civ_red_team_member_4);
-        ivAddRedTeamMember = findViewById(R.id.iv_add_red_team_member);
-        civBlueTeamMember1 = findViewById(R.id.civ_blue_team_member_1);
-        civBlueTeamMember2 = findViewById(R.id.civ_blue_team_member_2);
-        civBlueTeamMember3 = findViewById(R.id.civ_blue_team_member_3);
-        civBlueTeamMember4 = findViewById(R.id.civ_blue_team_member_4);
-        ivAddBlueTeamMember = findViewById(R.id.iv_add_blue_team_member);
-
-        civRedAvatars.add(civRedTeamMember1);
-        civRedAvatars.add(civRedTeamMember2);
-        civRedAvatars.add(civRedTeamMember3);
-        civRedAvatars.add(civRedTeamMember4);
-
-        civBlueAvatars.add(civBlueTeamMember1);
-        civBlueAvatars.add(civBlueTeamMember2);
-        civBlueAvatars.add(civBlueTeamMember3);
-        civBlueAvatars.add(civBlueTeamMember4);
-
-        updateView();
-
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        EventBus.getDefault().unregister(this);
-    }
-
-    public void updateView() {
-        if (PkModel.get().isFighting()) {
-            long countDownTime = PkModel.get().getCurPkInfo().getCurPkTimeUntilEnd();
-            tvPkTimer.setText(String.format(Locale.getDefault(), "%1$02d:%2$02d", countDownTime / 60, countDownTime % 60));
-            ivAddRedTeamMember.setVisibility(GONE);
-            ivAddBlueTeamMember.setVisibility(GONE);
-            ivPkBegin.setVisibility(GONE);
-            rlRedTeamAddPeople.setOnClickListener(null);
-            rlBlueTeamAddPeople.setOnClickListener(null);
-            tvPkTimer.setOnClickListener(null);
-            llPkScoreBoard.setOnClickListener(this);
-            showTeamAvatars();
-
-            PKTeamInfo blueTeamInfo = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_BLUE);
-            if (blueTeamInfo != null) {
-                tvBlueTeamScore.setText(FormatUtils.formatPKValue(blueTeamInfo.getScore()));
-            }
-            PKTeamInfo redTeamInfo = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_RED);
-            if (redTeamInfo != null) {
-                tvRedTeamScore.setText(FormatUtils.formatPKValue(redTeamInfo.getScore()));
-            }
-
-            if (redTeamInfo != null && blueTeamInfo != null) {
-                long totalScore = redTeamInfo.getScore() + blueTeamInfo.getScore();
-                if (totalScore > 0) {
-                    int percent = (int) ((float) redTeamInfo.getScore() / (float) totalScore * 100.0f);
-                    pbScore.setProgress(percent);
-                } else {
-                    pbScore.setProgress(50);
-                }
-            }
-
-        } else {
-            tvPkTimer.setText(ResUtil.getString(R.string.avroom_widget_pkboardview_01));
-            if (!isTeamHaveMember(PKTeamInfo.TEAM_RED)) {
-                ivAddRedTeamMember.setVisibility(VISIBLE);
-            } else {
-                ivAddRedTeamMember.setVisibility(GONE);
-            }
-
-            if (!isTeamHaveMember(PKTeamInfo.TEAM_BLUE)) {
-                ivAddBlueTeamMember.setVisibility(VISIBLE);
-            } else {
-                ivAddBlueTeamMember.setVisibility(GONE);
-            }
-
-            pbScore.setProgress(50);
-
-            showTeamAvatars();
-            rlRedTeamAddPeople.setOnClickListener(this);
-            rlBlueTeamAddPeople.setOnClickListener(this);
-            if (AvRoomDataManager.get().isManager()) {
-                ivPkBegin.setVisibility(VISIBLE);
-                ivPkBegin.setOnClickListener(this);
-            } else {
-                ivPkBegin.setVisibility(GONE);
-            }
-            llPkScoreBoard.setOnClickListener(null);
-            RoomPkData roomPkData = PkModel.get().getCurPkInfo();
-            if (roomPkData != null &&
-                    (roomPkData.getPkStatus() == RoomPkData.PK_STATUS_BEFORE_PK || roomPkData.getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK)) {
-                tvBlueTeamScore.setText(FormatUtils.formatPKValue(0));
-                tvRedTeamScore.setText(FormatUtils.formatPKValue(0));
-            }
-        }
-    }
-
-    private boolean isTeamHaveMember(int teamId) {
-        for (PKMemberInfo pkMemberInfo : PkModel.get().getPkMemberInfoList()) {
-            if (pkMemberInfo.getTeamId() == teamId) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void showTeamAvatars() {
-        List<PKMemberInfo> pkMemberInfoList = PkModel.get().getPkMemberInfoList();
-        for (CircleImageView civRedAvatar : civRedAvatars) {
-            civRedAvatar.setVisibility(GONE);
-        }
-        for (CircleImageView civBlueAvatar : civBlueAvatars) {
-            civBlueAvatar.setVisibility(GONE);
-        }
-        int redIndex = 0;
-        int blueIndex = 0;
-        for (int i = 0; i < pkMemberInfoList.size(); i++) {
-            PKMemberInfo pkMemberInfo = pkMemberInfoList.get(i);
-            if (pkMemberInfo.getTeamId() == PKTeamInfo.TEAM_RED) {
-                if (redIndex >= civRedAvatars.size()) {
-                    break;
-                }
-                civRedAvatars.get(redIndex).setVisibility(VISIBLE);
-                GlideApp.with(this)
-                        .load(pkMemberInfo.getUserInfo().getAvatar())
-                        .placeholder(R.drawable.default_avatar)
-                        .dontAnimate()
-                        .into(civRedAvatars.get(redIndex));
-                redIndex++;
-            } else if (pkMemberInfoList.get(i).getTeamId() == PKTeamInfo.TEAM_BLUE) {
-                if (blueIndex >= civBlueAvatars.size()) {
-                    break;
-                }
-                civBlueAvatars.get(blueIndex).setVisibility(VISIBLE);
-                GlideApp.with(this)
-                        .load(pkMemberInfo.getUserInfo().getAvatar())
-                        .placeholder(R.drawable.default_avatar)
-                        .dontAnimate()
-                        .into(civBlueAvatars.get(blueIndex));
-                blueIndex++;
-            }
-        }
-    }
-
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onPKTimeTickEvent(PKTimeTickEvent event) {
-        if (PkModel.get().getCurPkInfo() == null) {
-            return;
-        }
-        long countDownTime = PkModel.get().getCurPkInfo().getCurPkTimeUntilEnd();
-        tvPkTimer.setText(String.format("%1$02d:%2$02d", countDownTime / 60, countDownTime % 60));
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onPKTimeFinishEvent(PKTimeFinishEvent event) {
-        updateView();
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onPKDataUpdateEvent(PKDataUpdateEvent event) {
-        if (PkModel.get().getCurPkInfo() == null) {
-            return;
-        }
-        if (PkModel.get().getCurPkInfo().getPkStatus() == RoomPkData.PK_STATUS_IN_PK) {
-            PKTeamInfo blueTeamInfo = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_BLUE);
-            if (blueTeamInfo != null) {
-                tvBlueTeamScore.setText(FormatUtils.formatPKValue(blueTeamInfo.getScore()));
-            }
-            PKTeamInfo redTeamInfo = PkModel.get().findTeamByTeamId(PKTeamInfo.TEAM_RED);
-            if (redTeamInfo != null) {
-                tvRedTeamScore.setText(FormatUtils.formatPKValue(redTeamInfo.getScore()));
-            }
-
-            if (redTeamInfo != null && blueTeamInfo != null) {
-                long totalScore = redTeamInfo.getScore() + blueTeamInfo.getScore();
-                if (totalScore > 0) {
-                    int percent = (int) ((float) redTeamInfo.getScore() / (float) totalScore * 100.0f);
-                    pbScore.setProgress(percent);
-                } else {
-                    pbScore.setProgress(50);
-                }
-            }
-
-        }
-        if (PkModel.get().getCurPkInfo().getPkStatus() == RoomPkData.PK_STATUS_AFTER_PK) {
-            if (onActionListener != null) {
-                onActionListener.onEndPK();
-            }
-            tvBlueTeamScore.setText(FormatUtils.formatPKValue(0));
-            tvRedTeamScore.setText(FormatUtils.formatPKValue(0));
-        }
-        if (PkModel.get().getCurPkInfo().getPkStatus() == RoomPkData.PK_STATUS_TERMINAL_PK_BEFORE_END) {
-            tvBlueTeamScore.setText(FormatUtils.formatPKValue(0));
-            tvRedTeamScore.setText(FormatUtils.formatPKValue(0));
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.fl_left:
-                //不是管理员或者房主弹出排麦dialog
-                if (!AvRoomDataManager.get().isManager()) {
-                    //已经排麦不操作
-                    if (!PkModel.get().getPkMemberInfoList().isEmpty() && AvRoomDataManager.get().myIsInQueue) {
-//                        Toast.makeText(getContext(), ResUtil.getString(R.string.avroom_widget_pkboardview_02), Toast.LENGTH_SHORT).show();
-                        SingleToastUtil.showToastShort(ResUtil.getString(R.string.avroom_widget_pkboardview_03));
-                        return;
-                    }
-                    if (onActionListener != null) {
-                        onActionListener.onShowPKMicQueueDialog();
-                    }
-
-                    return;
-                }
-                //添加红队人员
-                PKSelectPeopleDialog selectRedDialog = new PKSelectPeopleDialog(getContext(), PKTeamInfo.TEAM_RED, PkModel.get().getPkMemberInfoList());
-                selectRedDialog.setOnSelectPeopleListener(new PKSelectPeopleDialog.OnSelectPeopleListener() {
-                    @Override
-                    public void onSelectPeople(List<PKSelectPeopleDialog.MicEntity> micEntityList) {
-                        //更新队伍,麦序,显示头像
-                        List<RoomPKInvitedUpMicMember> upMicMemberList = new ArrayList<>();
-                        for (PKSelectPeopleDialog.MicEntity micEntity : micEntityList) {
-                            if (TextUtils.isEmpty(micEntity.uid)) {
-                                continue;
-                            }
-                            RoomPKInvitedUpMicMember roomPKInvitedUpMicMember = new RoomPKInvitedUpMicMember();
-                            if (micEntity.isSelect) {
-                                roomPKInvitedUpMicMember.setGroupType(PKTeamInfo.TEAM_RED);
-                            } else {
-                                if (TextUtils.isEmpty(micEntity.uid)) {
-                                    roomPKInvitedUpMicMember.setGroupType(PKTeamInfo.TEAM_NONE);
-                                } else {
-                                    int teamId = PkModel.get().getTeamIdInPKMemberList(micEntity.uid);
-                                    roomPKInvitedUpMicMember.setGroupType(
-                                            teamId == PKTeamInfo.TEAM_RED ? PKTeamInfo.TEAM_NONE : teamId);
-                                }
-                            }
-                            roomPKInvitedUpMicMember.setUid(micEntity.uid);
-                            roomPKInvitedUpMicMember.setNick(micEntity.nick);
-                            SparseArray<RoomQueueInfo> micQueue = AvRoomDataManager.get().mMicQueueMemberMap;
-                            //设置坑位的位置
-                            for (int i = 0; i < micQueue.size(); i++) {
-                                int key = micQueue.keyAt(i);
-                                RoomQueueInfo roomQueueInfo = micQueue.get(key);
-                                if (roomQueueInfo.mChatRoomMember != null
-                                        && roomQueueInfo.mChatRoomMember.getAccount().equals(micEntity.uid)) {
-                                    roomPKInvitedUpMicMember.setPosition(key);
-                                }
-                            }
-                            upMicMemberList.add(roomPKInvitedUpMicMember);
-                        }
-                        PkModel.get().inviteInTeam(upMicMemberList)
-                                .doOnError(throwable -> SingleToastUtil.showToastShort(throwable.getMessage()))
-                                .subscribe();
-
-                    }
-                });
-                selectRedDialog.show();
-                break;
-            case R.id.fl_right:
-                //不是管理员或者房主弹出排麦dialog
-                if (!AvRoomDataManager.get().isManager()) {
-                    //已经排麦不操作
-                    if (!PkModel.get().getPkMemberInfoList().isEmpty() && AvRoomDataManager.get().myIsInQueue) {
-                        return;
-                    }
-                    if (onActionListener != null) {
-                        onActionListener.onShowPKMicQueueDialog();
-                    }
-
-                    return;
-                }
-                //添加蓝队人员
-                PKSelectPeopleDialog selectBlueDialog = new PKSelectPeopleDialog(getContext(), PKTeamInfo.TEAM_BLUE, PkModel.get().getPkMemberInfoList());
-                selectBlueDialog.setOnSelectPeopleListener(micEntityList -> {
-                    //更新队伍,麦序,显示头像
-                    List<RoomPKInvitedUpMicMember> upMicMemberList = new ArrayList<>();
-                    for (PKSelectPeopleDialog.MicEntity micEntity : micEntityList) {
-                        if (TextUtils.isEmpty(micEntity.uid)) {
-                            continue;
-                        }
-                        RoomPKInvitedUpMicMember roomPKInvitedUpMicMember = new RoomPKInvitedUpMicMember();
-                        if (micEntity.isSelect) {
-                            roomPKInvitedUpMicMember.setGroupType(PKTeamInfo.TEAM_BLUE);
-                        } else {
-                            int teamId = PkModel.get().getTeamIdInPKMemberList(micEntity.uid);
-                            roomPKInvitedUpMicMember.setGroupType(
-                                    teamId == PKTeamInfo.TEAM_BLUE ? PKTeamInfo.TEAM_NONE : teamId);
-                        }
-                        roomPKInvitedUpMicMember.setUid(micEntity.uid);
-                        roomPKInvitedUpMicMember.setNick(micEntity.nick);
-                        SparseArray<RoomQueueInfo> micQueue = AvRoomDataManager.get().mMicQueueMemberMap;
-                        //设置坑位的位置
-                        for (int i = 0; i < micQueue.size(); i++) {
-                            int key = micQueue.keyAt(i);
-                            RoomQueueInfo roomQueueInfo = micQueue.get(key);
-                            if (roomQueueInfo.mChatRoomMember != null &&
-                                    roomQueueInfo.mChatRoomMember.getAccount().equals(micEntity.uid)) {
-                                roomPKInvitedUpMicMember.setPosition(key);
-                            }
-                        }
-                        upMicMemberList.add(roomPKInvitedUpMicMember);
-                    }
-                    PkModel.get().inviteInTeam(upMicMemberList)
-                            .doOnError(throwable -> SingleToastUtil.showToastShort(throwable.getMessage()))
-                            .subscribe();
-                });
-                selectBlueDialog.show();
-                break;
-            case R.id.iv_pk_begin:
-                // 开始PK 倒计时
-                if (onActionListener != null) {
-                    onActionListener.onBeginPK();
-                }
-                break;
-            case R.id.root_view:
-                //pk中点击pk 面板
-                if (PkModel.get().isFighting()) {
-                    PKScoreBoardDialog pkScoreBoardDialog = new PKScoreBoardDialog(getContext());
-                    pkScoreBoardDialog.show();
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    private OnActionListener onActionListener;
-
-    public void setOnActionListener(OnActionListener onActionListener) {
-        this.onActionListener = onActionListener;
-    }
-
-    public interface OnActionListener {
-        void onBeginPK();
-
-        void onEndPK();
-
-        void onShowPKMicQueueDialog();
-    }
-
-}

app/src/main/java/com/chwl/app/avroom/widget/TeamPKUserListView.kt

@@ -0,0 +1,46 @@
+package com.chwl.app.avroom.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.chwl.app.R
+import com.chwl.app.databinding.LayoutRoomTeamPkUserListViewBinding
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.core.room.pk.bean.PKMemberInfo
+
+class TeamPKUserListView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    private val binding = LayoutRoomTeamPkUserListViewBinding.inflate(LayoutInflater.from(context))
+    private val ivAvatars = arrayOf(binding.ivAvatar1, binding.ivAvatar2, binding.ivAvatar3)
+
+    init {
+        addView(binding.root)
+    }
+
+    fun showBlueStyle() {
+        binding.ivAvatarSeat1.setImageResource(R.drawable.room_team_pk_bg_seat_blue)
+        binding.ivAvatarSeat2.setImageResource(R.drawable.room_team_pk_bg_seat_blue)
+        binding.ivAvatarSeat3.setImageResource(R.drawable.room_team_pk_bg_seat_blue)
+    }
+
+    fun updateData(data: List<String?>?) {
+        for (i in ivAvatars.indices) {
+            val item = data?.getOrNull(i)
+            if (item.isNullOrEmpty()) {
+                ivAvatars[i].isInvisible = true
+            } else {
+                ivAvatars[i].isVisible = true
+                ImageLoadUtils.loadImage(
+                    context,
+                    item,
+                    ivAvatars[i], R.drawable.default_avatar
+                )
+            }
+        }
+    }
+}

app/src/main/java/com/chwl/app/base/BaseDialogFragment.kt

@@ -7,12 +7,17 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.withResumed
 import androidx.viewbinding.ViewBinding
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import com.trello.rxlifecycle3.components.support.RxDialogFragment
+import kotlinx.coroutines.launch
 import java.lang.reflect.ParameterizedType
 
-abstract class BaseDialog<T : ViewBinding> : RxDialogFragment() {
+abstract class BaseDialogFragment<T : ViewBinding> : RxDialogFragment() {
 
     val isViewLoaded: Boolean get() = _binding != null
     protected var _binding: T? = null
@@ -59,6 +64,46 @@ abstract class BaseDialog<T : ViewBinding> : RxDialogFragment() {
         }
     }
 
+    private var safeShowTask: ((FragmentManager, String?) -> Unit)? = null
+
+    fun safeShow(fragmentManager: FragmentManager, lifecycleOwner: LifecycleOwner, tag: String? = null) {
+        lifecycleOwner.lifecycleScope.launch {
+            safeShowTask = { fm, tag ->
+                try {
+                    show(fm, tag)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+            lifecycleOwner.withResumed {
+                safeShowTask?.invoke(fragmentManager, tag)
+            }
+        }
+    }
+
+    fun safeDismiss() {
+        try {
+            dismissAllowingStateLoss()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        safeShowTask = null
+    }
+
+    override fun dismiss() {
+        super.dismiss()
+        safeShowTask = null
+    }
+
+    override fun dismissAllowingStateLoss() {
+        super.dismissAllowingStateLoss()
+        safeShowTask = null
+    }
+
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
         onDismissListener?.invoke()

app/src/main/java/com/chwl/app/base/BaseFragment.java

@@ -59,6 +59,8 @@ public abstract class BaseFragment extends RxFragment implements KeyEvent.Callba
     private boolean isLoaded = false;
     public Consumer<Boolean> onHiddenChangedListener;
 
+    private DialogManager dialogManager;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -93,6 +95,10 @@ public abstract class BaseFragment extends RxFragment implements KeyEvent.Callba
         mIsViewCreated = false;
         isDestroyView = true;
         isLoaded = false;
+        if (dialogManager != null) {
+            dialogManager.dismissDialog();
+        }
+        dialogManager = null;
         super.onDestroyView();
     }
 
@@ -582,8 +588,14 @@ public abstract class BaseFragment extends RxFragment implements KeyEvent.Callba
         FragmentActivity activity = getActivity();
         if (activity instanceof BaseMvpActivity) {
             return ((BaseMvpActivity) activity).getDialogManager();
-        } else
-            return getBaseActivity().getDialogManager();
+        } else if (activity instanceof BaseActivity) {
+            return ((BaseActivity) activity).getDialogManager();
+        } else {
+            if (dialogManager == null) {
+                dialogManager = new DialogManager(activity);
+            }
+            return dialogManager;
+        }
     }
 
     public BaseActivity getBaseActivity() {

app/src/main/java/com/chwl/app/base/GlobalViewModelOwner.kt

@@ -0,0 +1,22 @@
+package com.chwl.app.base
+
+
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import com.example.lib_utils.ICleared
+
+class GlobalViewModelOwner : ViewModelStoreOwner, ICleared {
+
+    companion object {
+        private val viewModelStore by lazy { ViewModelStore() }
+        val instance by lazy { GlobalViewModelOwner() }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        viewModelStore.clear()
+    }
+
+    override val viewModelStore: ViewModelStore
+        get() = GlobalViewModelOwner.viewModelStore
+}

app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt

@@ -17,7 +17,6 @@ import com.chwl.app.databinding.PhotoDialogBinding
 import com.chwl.app.ui.widget.dialog.CommonTipDialog
 import com.chwl.library.common.base.BaseDialogFragment
 import com.chwl.library.common.photo.PhotoProvider
-import com.chwl.library.common.photo.PhotoProviderNew
 import com.chwl.library.common.util.PhotoCompressCallback
 import com.chwl.library.common.util.PhotoCompressUtil
 import com.chwl.library.common.util.PhotosCompressCallback
@@ -84,7 +83,7 @@ class PhotoDialog : BaseDialogFragment<PhotoDialogBinding>(), EasyPermissions.Pe
                 if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES else Manifest.permission.READ_EXTERNAL_STORAGE
             )
         } else {
-            PhotoProviderNew.photoProvider(this, resultCode = REQUEST_CODE_OPEN_PHOTO_PROVIDER)
+            PhotoProvider.photoProvider(this, resultCode = REQUEST_CODE_OPEN_PHOTO_PROVIDER)
         }
     }
 
@@ -118,7 +117,7 @@ class PhotoDialog : BaseDialogFragment<PhotoDialogBinding>(), EasyPermissions.Pe
                 if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES else Manifest.permission.READ_EXTERNAL_STORAGE
             )
         } else {
-            PhotoProviderNew.photoCamera(this, REQUEST_CODE_OPEN_CAMERA_PROVIDER)
+            PhotoProvider.photoCamera(this, REQUEST_CODE_OPEN_CAMERA_PROVIDER)
         }
     }
 

app/src/main/java/com/chwl/app/decoration/adapter/HeadWearShopAdapter.java

@@ -1,72 +0,0 @@
-package com.chwl.app.decoration.adapter;
-
-import android.view.View;
-
-import com.chwl.app.R;
-import com.chwl.app.bindadapter.BaseAdapter;
-import com.chwl.app.bindadapter.BindingViewHolder;
-import com.chwl.app.databinding.ItemHeadWearBinding;
-import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
-import com.chwl.core.noble.NobleUtil;
-import com.chwl.library.utils.ListUtils;
-
-/**
- * Created by huangmeng1 on 2018/5/10.
- */
-
-public class HeadWearShopAdapter extends BaseAdapter<HeadWearInfo> {
-    private int selectPosition;
-
-    public int getSelectPosition() {
-        return selectPosition;
-    }
-
-    public void setSelectPosition(int selectPosition) {
-        notifyItemChanged(this.selectPosition);
-        this.selectPosition = selectPosition;
-        notifyItemChanged(this.selectPosition);
-    }
-
-    public HeadWearShopAdapter(int layoutResId, int brid) {
-        super(layoutResId, brid);
-    }
-
-    @Override
-    protected void convert(BindingViewHolder helper, HeadWearInfo item) {
-        super.convert(helper, item);
-        ItemHeadWearBinding binding = (ItemHeadWearBinding) helper.getBinding();
-        binding.llRoot.setSelected(selectPosition == helper.getAdapterPosition());
-        NobleUtil.loadHeadWears(item.getPic(), binding.ivHeadWear);
-        binding.setSelectPosition(selectPosition == helper.getAdapterPosition());
-
-        if (item.getLabelType() == HeadWearInfo.LABEL_TYPE_NORMAL) {
-            binding.ivTag.setVisibility(View.GONE);
-
-        } else if (HeadWearInfo.LABEL_TYPE_NEW == item.getLabelType()) {
-            binding.ivTag.setVisibility(View.VISIBLE);
-            binding.ivTag.setImageResource(R.drawable.ic_mark_new);
-
-        } else if (HeadWearInfo.LABEL_TYPE_DISCOUNT == item.getLabelType()) {
-            binding.ivTag.setVisibility(View.VISIBLE);
-            binding.ivTag.setImageResource(R.drawable.ic_mark_discount);
-
-        } else if (HeadWearInfo.LABEL_TYPE_LIMIT == item.getLabelType()) {
-            binding.ivTag.setVisibility(View.VISIBLE);
-            binding.ivTag.setImageResource(R.drawable.ic_mark_limit);
-
-        } else if (HeadWearInfo.LABEL_TYPE_EXCLUSIVE == item.getLabelType()) {
-            binding.ivTag.setVisibility(View.VISIBLE);
-            binding.ivTag.setImageResource(R.drawable.ic_mark_exclusive);
-        }
-
-        binding.tvHeadName.setText(item.getName() + "");
-    }
-
-    public void setCarInfoHasBeenBought(HeadWearInfo carInfo) {
-        if (carInfo.getHeadwearId() <= 0 || ListUtils.isListEmpty(mData)) return;
-        int index = mData.indexOf(carInfo);
-        if (index == -1) return;
-        mData.get(index).setStatus(HeadWearInfo.STATUS_IN_USED);
-        notifyItemChanged(index);
-    }
-}

app/src/main/java/com/chwl/app/decoration/adapter/MyHeadWearAdapter.java

@@ -6,9 +6,11 @@ import com.chwl.app.R;
 import com.chwl.app.bindadapter.BaseAdapter;
 import com.chwl.app.bindadapter.BindingViewHolder;
 import com.chwl.app.databinding.ItemMyHeadWearBinding;
+import com.chwl.app.utils.AvatarHelper;
 import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
 import com.chwl.core.noble.NobleUtil;
 import com.chwl.library.utils.ResUtil;
+import com.chwl.library.widget.SVGAView;
 
 /**
  * Created by huangmeng1 on 2018/5/11.
@@ -20,11 +22,14 @@ public class MyHeadWearAdapter extends BaseAdapter<HeadWearInfo> {
         super(layoutResId, brid);
     }
 
+    private SVGAView.SVGACache svgaCache = SVGAView.newCache(10);
+
     @Override
     protected void convert(BindingViewHolder helper, HeadWearInfo item) {
         super.convert(helper, item);
         ItemMyHeadWearBinding binding = (ItemMyHeadWearBinding) helper.getBinding();
-        NobleUtil.loadHeadWears(item.getPic(), binding.ivCarCover);
+        binding.ivCarCover.bindCache(svgaCache);
+        AvatarHelper.loadAvatarFrame(binding.ivCarCover, item.getFirstUrl(), item.getType());
         helper.addOnClickListener(R.id.tv_used);
 
         if (item.getLabelType() == HeadWearInfo.LABEL_TYPE_NORMAL) {

app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import com.chwl.app.base.BaseViewModel
 import com.chwl.core.earn.bean.*
 import com.chwl.core.earn.model.EarnModel
+import com.chwl.core.pay.PayModel
 import com.chwl.library.utils.TimeUtils
 import java.util.*
 
@@ -145,6 +146,7 @@ class EarnRecordViewModel : BaseViewModel() {
             block = {
                 _exchangeConfirmLiveData.value =
                     EarnModel.exchangeConfirm(goldNum, diamondNum, currency)
+                PayModel.get().refreshWalletInfo(true)
             }
         )
     }

app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt

@@ -43,10 +43,8 @@ class ConvertDiamondActivity : BaseViewBindingActivity<ActivityConvertDiamondBin
         initTitleBar(getString(R.string.convert_diamond))
         val bean = intent.getSerializableExtra(BEAN) as? GoldToDiamondInfo
         bean?.let {
-            binding.tvMyGold.text = getString(R.string.my_gold, it.golds.toString())
-            binding.tvMyDiamond.text = getString(R.string.my_diamond, it.diamonds.toString())
-            binding.edGold.hint = it.minGolds.toString()
-            binding.edDiamond.hint = it.minDiamonds.toString()
+            binding.tvMyGold.text = getString(R.string.my_gold, it.golds?.toPlainString())
+            binding.tvMyDiamond.text = getString(R.string.my_diamond, it.diamonds?.toPlainString())
             binding.edGold.setOnFocusChangeListener { view, b ->
                 isGold = b
             }

app/src/main/java/com/chwl/app/home/HomeMeViewModel.kt

@@ -0,0 +1,45 @@
+package com.chwl.app.home
+
+import androidx.lifecycle.MutableLiveData
+import com.chwl.app.base.BaseViewModel
+import com.chwl.core.bean.response.ListResult
+import com.chwl.core.home.bean.HomeRoomCardInfo
+import com.chwl.core.home.bean.HomeRoomInfo
+import com.chwl.core.home.model.HomeModel
+
+class HomeMeViewModel : BaseViewModel() {
+
+    val roomInfoLiveData = MutableLiveData<HomeRoomCardInfo>()
+    val historyRoomListLiveData = MutableLiveData<ListResult<HomeRoomInfo>?>()
+    val collectRoomListLiveData = MutableLiveData<ListResult<HomeRoomInfo>?>()
+
+    fun getMyRoomInfo() {
+        safeLaunch {
+            roomInfoLiveData.postValue(HomeModel.getMyRoomInfo())
+        }
+    }
+
+    fun getHomeHistoryList(pageNum: Int, pageSize: Int) {
+        safeLaunch(
+            onError = {
+                historyRoomListLiveData.value = ListResult.failed(pageNum)
+            },
+            block = {
+                val result = HomeModel.getHomeHistoryRoomList(pageNum, pageSize)
+                historyRoomListLiveData.value = ListResult.success(result, pageNum)
+            }
+        )
+    }
+
+    fun getHomeCollectList(pageNum: Int, pageSize: Int) {
+        safeLaunch(
+            onError = {
+                collectRoomListLiveData.value = ListResult.failed(pageNum)
+            },
+            block = {
+                val result = HomeModel.getHomeMyCollectRoomList(pageNum, pageSize)
+                collectRoomListLiveData.value = ListResult.success(result, pageNum)
+            }
+        )
+    }
+}

app/src/main/java/com/chwl/app/home/HomeViewModel.kt

@@ -1,76 +1,40 @@
 package com.chwl.app.home
 
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chwl.app.base.BaseViewModel
 import com.chwl.core.bean.response.ListResult
 import com.chwl.core.home.bean.*
 import com.chwl.core.home.model.HomeModel
 import com.chwl.core.room.bean.AnchorInfo
-import com.chwl.core.user.bean.UserInfo
 import com.chwl.core.utils.extension.toast
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableSharedFlow
 
 class HomeViewModel : BaseViewModel() {
 
-    private val _tabHomeLiveData = MutableLiveData<ListResult<HomeRoomInfo>?>()
-    val tabHomeLiveData: MutableLiveData<ListResult<HomeRoomInfo>?> = _tabHomeLiveData
-    private val _bannerLiveData = MutableLiveData<List<BannerInfo>?>()
-    val bannerLiveData: MutableLiveData<List<BannerInfo>?> = _bannerLiveData
+    val tabRoomListLiveData = MutableLiveData<ListResult<HomeRoomInfo>?>()
+    val bannerLiveData = MutableLiveData<List<BannerInfo>?>()
 
-    private val _currentResourceLiveData = MutableLiveData<List<CurrentResourceInfo>?>()
-    val currentResourceLiveData: MutableLiveData<List<CurrentResourceInfo>?> = _currentResourceLiveData
+    val homeResourceLiveData = MutableLiveData<List<CurrentResourceInfo>?>()
 
-    private val _resourceJumpLiveData = MutableLiveData<HomeRoomInfo?>()
-    val resourceJumpLiveData: LiveData<HomeRoomInfo?> = _resourceJumpLiveData
+    val resourceJumpFlow = MutableSharedFlow<HomeRoomInfo?>()
 
-//    private val _homeChatPickLiveData = MutableLiveData<String?>()
-//    val homeChatPickLiveData: LiveData<String?> = _homeChatPickLiveData
+    val pickRoomLiveData = MutableLiveData<HomeRoomInfo?>()
 
-    private val _gameRoomLiveData = MutableLiveData<ListResult<HomeRoomInfo>>()
-    val gameRoomLiveData: LiveData<ListResult<HomeRoomInfo>> = _gameRoomLiveData
+    val openGameRoomLiveData = MutableLiveData<Long?>()
 
-    private val _pickRoomLiveData = MutableLiveData<HomeRoomInfo?>()
-    val pickRoomLiveData: MutableLiveData<HomeRoomInfo?> = _pickRoomLiveData
+    val anchorInfoLiveData = MutableLiveData<AnchorInfo?>()
 
-    private val _openGameRoomLiveData = MutableLiveData<Long?>()
-    val openGameRoomLiveData: MutableLiveData<Long?> = _openGameRoomLiveData
+    val homeTabLiveData: MutableLiveData<List<HomeTagInfo>> = MutableLiveData<List<HomeTagInfo>>()
 
-    private val _concernsLiveData = MutableLiveData<List<HomeRoomInfo>>()
-    val concernsLiveData: LiveData<List<HomeRoomInfo>> = _concernsLiveData
-
-    private val _collectLiveData = MutableLiveData<ListResult<HomeRoomInfo>>()
-    val collectLiveData: LiveData<ListResult<HomeRoomInfo>> = _collectLiveData
-
-    private val _tagLiveData = MutableLiveData<List<HomeTagInfo>>()
-    val tagLiveData: LiveData<List<HomeTagInfo>> = _tagLiveData
-
-    private val _emptyLiveData = MutableLiveData<Boolean>()
-    val emptyLiveData: LiveData<Boolean> = _emptyLiveData
-
-    private val _anchorInfoLiveData = MutableLiveData<AnchorInfo?>()
-    val anchorInfoLiveData: MutableLiveData<AnchorInfo?> = _anchorInfoLiveData
-
-    private val _homePlayInfoLiveData = MutableLiveData<List<HomeRoomInfo>?>()
-    val homePlayInfoData: MutableLiveData<List<HomeRoomInfo>?> = _homePlayInfoLiveData
-
-    private val _homeHotRoomLiveData = MutableLiveData<ListResult<HomeRoomInfo>>()
-    val homeHotRoomLiveData: LiveData<ListResult<HomeRoomInfo>> = _homeHotRoomLiveData
-
-    private val _newFriendLiveData = MutableLiveData<ListResult<UserInfo>>()
-    val newFriendLiveData: LiveData<ListResult<UserInfo>> = _newFriendLiveData
-
-    val homeTagLiveData: MutableLiveData<List<HomeTagInfo>> = MutableLiveData<List<HomeTagInfo>>()
-
-    fun getHomeTabName(tabId: Int, pageNum: Int) {
+    val homeRankListLiveData = MutableLiveData<List<List<HomeRankBean>>>()
+    fun getTabRoomList(tabId: Int, pageNum: Int, pageSize: Int) {
         safeLaunch(
             onError = {
-                _tabHomeLiveData.value = ListResult.failed(pageNum)
+                tabRoomListLiveData.value = ListResult.failed(pageNum)
             },
             block = {
-                val result = HomeModel.getHomeTabHome(tabId, pageNum, 20)
-                _tabHomeLiveData.value = ListResult.success(result, pageNum)
+                val result = HomeModel.getHomeTabHome(tabId, pageNum, pageSize)
+                tabRoomListLiveData.value = ListResult.success(result, pageNum)
             }
         )
     }
@@ -78,13 +42,13 @@ class HomeViewModel : BaseViewModel() {
     /**
      * 首页改版资源位
      */
-    fun getCurrentResourceInfo() {
+    fun getHomeResourceInfo() {
         safeLaunch(
             onError = {
-                _currentResourceLiveData.value = null
+                homeResourceLiveData.value = null
             },
             block = {
-                _currentResourceLiveData.value = HomeModel.getCurrentResource()
+                homeResourceLiveData.value = HomeModel.getCurrentResource()
             }
         )
     }
@@ -92,166 +56,35 @@ class HomeViewModel : BaseViewModel() {
     fun getResourceJumpInfo(id: Int) {
         safeLaunch(
             onError = {
-                _resourceJumpLiveData.value = null
+                resourceJumpFlow.emit(null)
                 it.message.toast()
             },
             block = {
-                _resourceJumpLiveData.value = HomeModel.getResourceJumpInfo(id)
+                resourceJumpFlow.emit(HomeModel.getResourceJumpInfo(id))
             }
         )
     }
-//
-//    fun getHomeChatPick() {
-//        safeLaunch(
-//            onError = {
-//                _homeChatPickLiveData.value = null
-//                it.message.toast()
-//            },
-//            block = {
-//                _homeChatPickLiveData.value = HomeModel.getHomeChatPick()
-//            }
-//        )
-//    }
 
     fun getBannerInfo() {
         safeLaunch(
             onError = {
-                _bannerLiveData.value = null
+                bannerLiveData.value = null
             },
             block = {
-                _bannerLiveData.value = HomeModel.getHomeBanner("1")
+                bannerLiveData.value = HomeModel.getHomeBanner("1")
             }
         )
     }
 
-    fun getTagInfo() {
+    fun getHomeTabInfo() {
         safeLaunch {
-            _tagLiveData.value = HomeModel.getHomeTag()
+            homeTabLiveData.value = HomeModel.getNewHomeTab()
         }
     }
 
-    fun getGameRoom(pageNum: Int, pageSize: Int) {
-        safeLaunch(
-            onError = {
-                it.message.toast()
-                _gameRoomLiveData.value = ListResult.failed(pageNum)
-            },
-            block = {
-                val result = HomeModel.getGameRoom(pageNum, pageSize)
-                _gameRoomLiveData.value = ListResult.success(result, pageNum)
-            }
-        )
-    }
-
-    fun fastPickGameRoom(mgId: Long? = null) {
-        safeLaunch(
-            onError = {
-                it.message.toast()
-            },
-            block = {
-                val homeRoomInfo = HomeModel.fastPickGameRoom(mgId)
-                if (homeRoomInfo?.isPick == true) {
-                    _pickRoomLiveData.value = homeRoomInfo
-                } else if (homeRoomInfo?.isNeedOpenSelfRoom == true) {
-                    _openGameRoomLiveData.value = mgId
-                }
-            }
-        )
-    }
-
-
-    fun getCollectRoom(pageNum: Int, pageSize: Int) {
-        safeLaunch(
-            onError = {
-                _collectLiveData.value = ListResult.failed(pageNum)
-                _emptyLiveData.value = true
-            },
-            block = {
-                if (pageNum == 1) {
-                    val concernsRooms = async(Dispatchers.IO) {
-                        try {
-                            HomeModel.getConcernsRoom()
-                        } catch (e: Throwable) {
-                            null
-                        }
-                    }
-                    val collectRooms = async(Dispatchers.IO) {
-                        try {
-                            HomeModel.getCollectRoom(pageNum, pageSize)
-                        } catch (e: Throwable) {
-                            null
-                        }
-                    }
-                    val data = concernsRooms.await()
-                    data?.let { _concernsLiveData.value = it }
-                    val collectList = collectRooms.await()
-                    if (collectList == null) {
-                        _collectLiveData.value = ListResult.failed(pageNum)
-                    } else {
-                        _collectLiveData.value =
-                            ListResult.success(collectList.fansRoomList, pageNum)
-                    }
-                    _emptyLiveData.value = _concernsLiveData.value.isNullOrEmpty() &&
-                            _collectLiveData.value?.data.isNullOrEmpty()
-                } else {
-                    val result = HomeModel.getCollectRoom(pageNum, pageSize)
-                    _collectLiveData.value = ListResult.success(result?.fansRoomList, pageNum)
-                }
-
-            }
-        )
-    }
-
-    fun requestAnchorInfo() {
-        safeLaunch(
-            onError = {
-                _anchorInfoLiveData.value = null
-            },
-            block = {
-                _anchorInfoLiveData.value = HomeModel.requestAnchorInfo()
-            }
-        )
-    }
-
-    fun getHomePlayV2() {
-        safeLaunch(
-            onError = {
-                _homePlayInfoLiveData.value = null
-            },
-            block = {
-                _homePlayInfoLiveData.value = HomeModel.getHomePlayV2()
-            }
-        )
-    }
-
-    fun getHotRoom() {
-        safeLaunch(
-            onError = {
-                _homeHotRoomLiveData.value = ListResult.failed(1)
-            },
-            block = {
-                val result = HomeModel.getHotRoom()
-                _homeHotRoomLiveData.value = ListResult.success(result, 1)
-            }
-        )
-    }
-
-    fun getNewFriendList(gender: Int? = null) {
-        safeLaunch(
-            onError = {
-                _newFriendLiveData.value = ListResult.failed(1)
-            },
-            block = {
-                val result = HomeModel.getNewFriendList(gender)
-                _newFriendLiveData.value = ListResult.success(result, 1)
-            }
-        )
-    }
-
-    fun getHomeTagInfo() {
+    fun getHomeRankList() {
         safeLaunch {
-            homeTagLiveData.value = HomeModel.getNewHomeTag()
+            homeRankListLiveData.value = HomeModel.getHomeRankList()
         }
     }
-
 }

app/src/main/java/com/chwl/app/home/MeViewModel.kt

@@ -3,98 +3,58 @@ package com.chwl.app.home
 import androidx.lifecycle.MutableLiveData
 import com.chwl.app.R
 import com.chwl.app.base.BaseViewModel
-import com.chwl.core.UriProvider
-import com.chwl.core.home.bean.BannerInfo
 import com.chwl.core.home.model.HomeModel
 import com.chwl.core.im.custom.bean.RouterType
 import com.chwl.core.room.bean.MeCenterInfo
-import com.chwl.core.user.bean.DiamondGiveHistoryInfo
 import com.chwl.library.utils.ResUtil
 
 class MeViewModel : BaseViewModel() {
 
-    private val _meCenterInfoLiveData = MutableLiveData<List<MeCenterInfo>?>()
-    val meCenterInfoLiveData: MutableLiveData<List<MeCenterInfo>?> = _meCenterInfoLiveData
+    private var menuList: List<MeCenterInfo>? = null
 
-//    private val _bannerLiveData = MutableLiveData<List<BannerInfo>?>()
-//    val bannerLiveData: MutableLiveData<List<BannerInfo>?> = _bannerLiveData
+    val menuListLiveData = MutableLiveData<List<MeCenterInfo>?>()
 
-    init {
-        refreshData()
+    private var donationMenuVisible = false
+
+    fun updateDonationMenuVisible(isVisible: Boolean) {
+        donationMenuVisible = isVisible
+        if (!menuList.isNullOrEmpty()) {
+            menuListLiveData.value = transformMenuList(menuList)
+        }
     }
 
-    fun refreshData() {
-//        getBannerInfo()
-        requestMeCenterInfoList()
-    }
-
-//    private fun getBannerInfo() {
-//        safeLaunch(
-//            block = {
-//                _bannerLiveData.value = HomeModel.getHomeBanner("10")
-//            },
-//            onError = {
-//                _bannerLiveData.value = null
-//            }
-//        )
-//    }
-
-    private fun requestMeCenterInfoList() {
-        safeLaunch(
-            block = {
-                _meCenterInfoLiveData.value = requestCenterList()
-            },
-            onError = {
-                _meCenterInfoLiveData.value = null
+    fun requestMenuList() {
+        safeLaunch(onError = {
+            if (menuListLiveData.value.isNullOrEmpty()) {
+                menuListLiveData.postValue(transformMenuList(null))
             }
-        )
+        }) {
+            val value = HomeModel.requestMeCenterInfoList()
+            menuList = value
+            menuListLiveData.postValue(transformMenuList(value))
+        }
     }
 
-    private fun requestCenterList(): List<MeCenterInfo>? {
+    private fun transformMenuList(list: List<MeCenterInfo>?): List<MeCenterInfo> {
+        val finalList = ArrayList<MeCenterInfo>()
+        if (list.isNullOrEmpty()) {
+            finalList.addAll(getDefaultMenuList())
+        } else {
+            finalList.addAll(list)
+        }
+        if (!donationMenuVisible) {
+            val donationMenuPosition = finalList.indexOfFirst {
+                it.skipType == RouterType.MY_DONATION
+            }
+            if (donationMenuPosition >= 0) {
+                finalList.removeAt(donationMenuPosition)
+            }
+        }
+        return finalList
+    }
+
+    private fun getDefaultMenuList(): MutableList<MeCenterInfo> {
         return ArrayList<MeCenterInfo>().apply {
-            add(
-                MeCenterInfo(
-                    icon = R.drawable.me_ic_menu_room,
-                    centerName = ResUtil.getString(R.string.me_my_room),
-                    skipType = RouterType.MY_ROOM
-                )
-            )
-            add(
-                MeCenterInfo(
-                    icon = R.drawable.me_ic_menu_invite_fan,
-                    centerName = ResUtil.getString(R.string.menu_my_invite),
-                    skipType = RouterType.H5,
-                    centerUrl = UriProvider.getInviteFan()
-                )
-            )
-            add(
-                MeCenterInfo(
-                    icon = R.drawable.me_ic_menu_dress_shop,
-                    centerName = ResUtil.getString(R.string.decoration_view_decorationstoreactivity_01),
-                    skipType = RouterType.DECORATION_STORE
-                )
-            )
-            add(
-                MeCenterInfo(
-                    icon = R.drawable.me_ic_menu_revenue,
-                    centerName = ResUtil.getString(R.string.me_gain_recording),
-                    skipType = RouterType.MY_REVENUE
-                )
-            )
-            add(
-                MeCenterInfo(
-                    icon = R.drawable.me_ic_menu_collect,
-                    centerName = ResUtil.getString(R.string.my_collection),
-                    skipType = RouterType.COLLECTION_ROOM
-                )
-            )
-            add(
-                MeCenterInfo(
-                    icon = R.drawable.me_ic_menu_level,
-                    centerName = ResUtil.getString(R.string.menu_my_level),
-                    skipType = RouterType.USER_LEVEL
-                )
-            )
             add(
                 MeCenterInfo(
                     icon = R.drawable.me_ic_menu_setting,

app/src/main/java/com/chwl/app/home/adapter/CommunityNoticeAdapter.java

@@ -1,6 +1,8 @@
 package com.chwl.app.home.adapter;
 
+
 import android.text.TextUtils;
+import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -59,7 +61,8 @@ public class CommunityNoticeAdapter extends BaseQuickAdapter<CommunityNoticeInfo
         }
 
         helper.setGone(R.id.tv_label_community_notice_list, false);
-        helper.setText(R.id.tv_content_community_notice_list, item.getMessage());
+        TextView textView = helper.getView(R.id.tv_content_community_notice_list);
+        textView.setText(item.getMessage());
         switch (item.getActionType()) {
             case 1: // 评论
                 if (item.getTargetUid() == AuthModel.get().getCurrentUid()) {

app/src/main/java/com/chwl/app/home/adapter/HomeHotAdapter.kt

@@ -1,59 +0,0 @@
-package com.chwl.app.home.adapter
-
-import android.view.View
-import android.widget.ImageView
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.chwl.app.R
-import com.chwl.app.ui.utils.ImageLoadUtils
-import com.chwl.app.ui.utils.load
-import com.chwl.core.home.bean.HomeRoomInfo
-
-/**
- * create by lvzebiao @2019/11/13
- */
-class HomeHotAdapter :
-    BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_room_recommend) {
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-        helper.apply {
-            getView<ImageView>(R.id.iv_room_image).load(item.avatar)
-            setText(R.id.tv_online_number, item.onlineNum.toString())
-            setText(R.id.tv_room_title, item.title)
-            setText(R.id.tv_desc, item.introduction)
-        }
-
-        val avatars: Array<ImageView> = arrayOf(
-            helper.getView(R.id.iv_avatar_0),
-            helper.getView(R.id.iv_avatar_1),
-            helper.getView(R.id.iv_avatar_2),
-            helper.getView(R.id.iv_avatar_3),
-            helper.getView(R.id.iv_avatar_4)
-        )
-        for (i in avatars.indices) {
-            val avatarUrl = item.micUsers?.getOrNull(i)?.avatar
-            avatars[i].isInvisible = avatarUrl.isNullOrBlank()
-            avatars[i].load(avatarUrl)
-        }
-        val topView = helper.getView<ImageView>(R.id.iv_top)
-        if (item.isHourTop1 == 1) {
-            topView.setImageResource(R.drawable.home_room_bg_hour_top)
-            topView.visibility = View.VISIBLE
-        } else if (item.isWeekTop1 == 1) {
-            topView.setImageResource(R.drawable.home_room_bg_week_top)
-            topView.visibility = View.VISIBLE
-        } else {
-            topView.visibility = View.INVISIBLE
-        }
-        val tagPict = item.tagPict
-        val tagView = helper.getView<ImageView>(R.id.iv_tag)
-        if (tagPict.isNullOrEmpty()) {
-            tagView.isVisible = false
-        } else {
-            ImageLoadUtils.loadImage(tagView, tagPict)
-            tagView.isVisible = true
-        }
-    }
-}

app/src/main/java/com/chwl/app/home/adapter/HomeIndicatorAdapter.java

@@ -0,0 +1,103 @@
+package com.chwl.app.home.adapter;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+
+import java.util.List;
+
+public class HomeIndicatorAdapter extends CommonNavigatorAdapter {
+    private final Context mContext;
+    private final List<? extends CharSequence> mTitleList;
+
+    private int textSize = 21;
+    private float minScale = 0.857f;
+    private boolean showIndicator = true;
+    private OnItemSelectListener mOnItemSelectListener;
+
+    public HomeIndicatorAdapter(Context context, List<? extends CharSequence> charSequences) {
+        this.mContext = context;
+        this.mTitleList = charSequences;
+    }
+
+    @Override
+    public int getCount() {
+        return mTitleList == null ? 0 : mTitleList.size();
+    }
+
+    @Override
+    public IPagerTitleView getTitleView(Context context, final int i) {
+        ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
+        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_990C1D18));
+        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_0C1D18));
+        scaleTransitionPagerTitleView.setMinScale(minScale);
+        scaleTransitionPagerTitleView.setTextSize(textSize);
+        int padding = UIUtil.dip2px(context, 13);
+        scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0);
+        scaleTransitionPagerTitleView.setText(mTitleList.get(i));
+        scaleTransitionPagerTitleView.setOnClickListener(view -> {
+            if (mOnItemSelectListener != null) {
+                mOnItemSelectListener.onItemSelect(i, scaleTransitionPagerTitleView);
+            }
+
+        });
+        return scaleTransitionPagerTitleView;
+    }
+
+    @Override
+    public IPagerIndicator getIndicator(Context context) {
+        LinePagerIndicator indicator = new LinePagerIndicator(context);
+        indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
+        indicator.setLineHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_4));
+        indicator.setRoundRadius(context.getResources().getDimensionPixelOffset(R.dimen.dp_2));
+        indicator.setLineWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_13));
+        indicator.setColors(context.getResources().getColor(R.color.color_002512));
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+//        lp.bottomMargin = mBottomMargin;
+        indicator.setLayoutParams(lp);
+        return indicator;
+    }
+
+    public int getTextSize() {
+        return textSize;
+    }
+
+    public void setTextSize(int textSize) {
+        this.textSize = textSize;
+    }
+
+    public float getMinScale() {
+        return minScale;
+    }
+
+    public void setMinScale(float minScale) {
+        this.minScale = minScale;
+    }
+
+    public boolean isShowIndicator() {
+        return showIndicator;
+    }
+
+    public void setShowIndicator(boolean showIndicator) {
+        this.showIndicator = showIndicator;
+    }
+
+    public void setOnItemSelectListener(OnItemSelectListener onItemSelectListener) {
+        mOnItemSelectListener = onItemSelectListener;
+    }
+
+    public interface OnItemSelectListener {
+        void onItemSelect(int position, TextView view);
+    }
+}

app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt

@@ -1,89 +0,0 @@
-package com.chwl.app.home.adapter
-
-import android.graphics.Color
-import android.graphics.LinearGradient
-import android.graphics.Shader
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.view.isGone
-import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.makeramen.roundedimageview.RoundedImageView
-import com.chwl.app.R
-import com.chwl.app.home.helper.BannerHelper
-import com.chwl.app.ui.utils.ImageLoadUtilsV2
-import com.chwl.app.ui.utils.load
-import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.CoreTextUtils
-import com.chwl.core.utils.extension.ifNullOrEmpty
-import com.chwl.library.utils.ResUtil
-
-/**
- * create by lvzebiao @2019/11/13
- */
-class HomePlayAdapter : BaseMultiItemQuickAdapter<HomeRoomInfo, BaseViewHolder>(null) {
-
-    init {
-        addItemType(HomeRoomInfo.TYPE_ROOM, R.layout.item_home_play)
-        addItemType(HomeRoomInfo.TYPE_BANNER, R.layout.item_room_banner)
-        addItemType(HomeRoomInfo.TYPE_BROADCAST, R.layout.item_home_play_broadcast)
-    }
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-        if (item.itemType == HomeRoomInfo.TYPE_ROOM ||
-            item.itemType == HomeRoomInfo.TYPE_BROADCAST
-        ) {
-            helper.setText(R.id.tv_room_title, item.title)
-            helper.setVisible(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict))
-            ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict)
-            helper.setText(R.id.tv_online_number, "${item.onlineNum}")
-            val tvMgName = helper.getView<TextView>(R.id.tv_mg_name)
-            tvMgName.text = item.mgName.ifNullOrEmpty { ResUtil.getString(R.string.home_adapter_homeplayadapter_01) }
-            if (item.mgName.isNullOrEmpty()) {
-                setGradient(tvMgName, "#FF8C5FFF", "#FFFF969B")
-            } else {
-                setGradient(tvMgName, "#FF61C4FE", "#FFA979FF")
-            }
-            val avatars: Array<ImageView> = arrayOf(
-                helper.getView(R.id.iv_avatar_0),
-                helper.getView(R.id.iv_avatar_1),
-                helper.getView(R.id.iv_avatar_2),
-                helper.getView(R.id.iv_avatar_3),
-                helper.getView(R.id.iv_avatar_4)
-            )
-            for (i in avatars.indices) {
-                val avatarUrl = item.micUsers?.getOrNull(i)?.avatar
-                avatars[i].isGone = avatarUrl.isNullOrBlank()
-                avatars[i].load(avatarUrl)
-            }
-            val ivRoomImage = helper.getView<RoundedImageView>(R.id.iv_room_image)
-            ImageLoadUtilsV2.loadAvatar(ivRoomImage, item.avatar)
-            ivRoomImage.borderColor =
-                Color.parseColor(if (item.gender == 1) "#CCD7FF" else "#FFD0D0")
-
-            if (item.itemType == HomeRoomInfo.TYPE_BROADCAST) {
-                helper.setText(R.id.tv_broad_msg, item.broadMsg)
-            } else {
-                helper.setBackgroundRes(
-                    R.id.view_bg,
-                    if (item.gender == 1) R.drawable.bg_home_play_item_man else R.drawable.bg_home_play_item_woman
-                )
-            }
-        } else {
-            BannerHelper.setBanner(helper.getView(R.id.roll_view), item.bannerVoList)
-        }
-
-    }
-
-    private fun setGradient(textView: TextView, startColor: String, endColor: String) {
-        val endX = textView.paint.textSize * textView.text.length
-        val linearGradient = LinearGradient(
-            0f, 0f, endX, 0f,
-            Color.parseColor(startColor),
-            Color.parseColor(endColor),
-            Shader.TileMode.CLAMP
-        )
-        textView.paint.shader = linearGradient
-        textView.invalidate()
-    }
-}

app/src/main/java/com/chwl/app/home/adapter/HomeRankViewFlipperAdapter.kt

@@ -0,0 +1,62 @@
+package com.chwl.app.home.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import com.chwl.app.R
+import com.chwl.app.ui.utils.loadAvatar
+import com.chwl.core.home.bean.HomeRankBean
+
+class HomeRankViewFlipperAdapter : BaseAdapter() {
+
+    private val list = ArrayList<List<HomeRankBean>>()
+
+    fun setNewData(newList: List<List<HomeRankBean>>) {
+        list.clear()
+        list.addAll(newList)
+        notifyDataSetChanged()
+    }
+
+    override fun getCount(): Int {
+        return list.size
+    }
+
+    override fun getItem(position: Int): List<HomeRankBean>? {
+        return list.getOrNull(position)
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        val view = convertView ?: LayoutInflater.from(parent.context)
+            .inflate(R.layout.home_recommend_item_rank, parent, false)
+        view.layoutDirection = View.LAYOUT_DIRECTION_LTR
+        val rankView1 = view.findViewById<ImageView>(R.id.iv_rank_1)
+        val rankView2 = view.findViewById<ImageView>(R.id.iv_rank_2)
+        val rankView3 = view.findViewById<ImageView>(R.id.iv_rank_3)
+        val rankBorderView1 = view.findViewById<ImageView>(R.id.iv_rank_border_1)
+        val rankBorderView2 = view.findViewById<ImageView>(R.id.iv_rank_border_2)
+        val rankBorderView3 = view.findViewById<ImageView>(R.id.iv_rank_border_3)
+        val list = getItem(position)
+        loadRankData(rankView1, rankBorderView1, list?.getOrNull(0))
+        loadRankData(rankView2, rankBorderView2, list?.getOrNull(1))
+        loadRankData(rankView3, rankBorderView3, list?.getOrNull(2))
+        return view
+    }
+
+    private fun loadRankData(view: ImageView, borderView: View, data: HomeRankBean?) {
+        if (data == null) {
+            view.isVisible = false
+            borderView.isVisible = false
+        } else {
+            view.isVisible = true
+            borderView.isVisible = true
+            view.loadAvatar(data.avatar)
+        }
+    }
+}

app/src/main/java/com/chwl/app/home/adapter/HomeRoomAdapter.kt

@@ -0,0 +1,109 @@
+package com.chwl.app.home.adapter
+
+import android.graphics.Rect
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chwl.app.R
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.app.ui.utils.load
+import com.chwl.app.ui.utils.loadFromAssets
+import com.chwl.core.home.bean.HomeRoomInfo
+import com.example.lib_utils.AppUtils
+import com.example.lib_utils.UiUtils
+import com.opensource.svgaplayer.SVGADrawable
+import com.opensource.svgaplayer.SVGAImageView
+
+/**
+ * create by lvzebiao @2019/11/13
+ */
+class HomeRoomAdapter : BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.home_item_room) {
+    private var micUserItemViewPool = RecycledViewPool().apply {
+        setMaxRecycledViews(0, 50)
+    }
+
+    private val isRTL = UiUtils.isRtl(AppUtils.getApp())
+
+    override fun onCreateDefViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+        return super.onCreateDefViewHolder(parent, viewType).apply {
+            val micUserRecyclerView = this.getView<RecyclerView>(R.id.recycler_view_users)
+            micUserRecyclerView.setOnTouchListener { v, event -> true }
+            micUserRecyclerView.setRecycledViewPool(micUserItemViewPool)
+            micUserRecyclerView.setHasFixedSize(true)
+            micUserRecyclerView.layoutManager =
+                LinearLayoutManager(parent.context, RecyclerView.HORIZONTAL, false).apply {
+                    this.recycleChildrenOnDetach = true
+                    this.isSmoothScrollbarEnabled
+                }
+            micUserRecyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() {
+                val offset = AppUtils.getApp().resources.getDimensionPixelOffset(R.dimen.dp_4) * -1
+                override fun getItemOffsets(
+                    outRect: Rect,
+                    view: View,
+                    parent: RecyclerView,
+                    state: RecyclerView.State
+                ) {
+                    super.getItemOffsets(outRect, view, parent, state)
+                    val position = parent.getChildAdapterPosition(view)
+                    if (position != 0) {
+                        if (isRTL) {
+                            outRect.right = offset
+                        } else {
+                            outRect.left = offset
+                        }
+                    }
+                }
+            })
+            micUserRecyclerView.adapter = HomeRoomUserAdapter()
+        }
+    }
+
+    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
+        helper.apply {
+            getView<ImageView>(R.id.iv_room_image).load(item.avatar)
+            setText(R.id.tv_online_number, item.onlineNum.toString())
+            setText(R.id.tv_room_title, item.title)
+            setText(R.id.tv_desc, item.roomDesc)
+        }
+
+        val micUserRecyclerView = helper.getView<RecyclerView>(R.id.recycler_view_users)
+        val userAdapter = micUserRecyclerView.adapter as HomeRoomUserAdapter
+        userAdapter.setNewData(item.micUsers)
+
+        val topView = helper.getView<ImageView>(R.id.iv_top)
+        if (item.isHourTop1 == 1) {
+            topView.setImageResource(R.drawable.home_room_bg_hour_top)
+            topView.visibility = View.VISIBLE
+        } else if (item.isWeekTop1 == 1) {
+            topView.setImageResource(R.drawable.home_room_bg_week_top)
+            topView.visibility = View.VISIBLE
+        } else {
+            topView.visibility = View.INVISIBLE
+        }
+        val tagPict = item.tagPict
+        val tagView = helper.getView<ImageView>(R.id.iv_tag)
+        if (tagPict.isNullOrEmpty()) {
+            tagView.isVisible = false
+        } else {
+            ImageLoadUtils.loadImage(tagView, tagPict)
+            tagView.isVisible = true
+        }
+        val pkView = helper.getView<SVGAImageView>(R.id.svga_pk)
+        if (item.isCrossPking) {
+            pkView.isVisible = true
+            if (pkView.drawable !is SVGADrawable) {
+                pkView.loadFromAssets("svga/home_pk.svga")
+            }
+            pkView.startAnimation()
+        } else {
+            pkView.isVisible = false
+            pkView.stopAnimation()
+        }
+    }
+}

app/src/main/java/com/chwl/app/home/adapter/HomeRoomUserAdapter.kt

@@ -0,0 +1,16 @@
+package com.chwl.app.home.adapter
+
+import android.widget.ImageView
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.chwl.app.R
+import com.chwl.app.ui.utils.loadAvatar
+import com.chwl.core.home.bean.MicUsersBean
+
+class HomeRoomUserAdapter :
+    BaseQuickAdapter<MicUsersBean, BaseViewHolder>(R.layout.home_item_room_user) {
+    override fun convert(helper: BaseViewHolder, item: MicUsersBean?) {
+        val avatarView = helper.getView<ImageView>(R.id.iv_avatar)
+        avatarView.loadAvatar(item?.avatar)
+    }
+}

app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt

@@ -1,56 +0,0 @@
-package com.chwl.app.home.adapter
-
-import android.widget.ImageView
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.opensource.svgaplayer.SVGAImageView
-import com.chwl.app.R
-import com.chwl.app.avroom.activity.AVRoomActivity
-import com.chwl.app.ui.utils.ImageLoadUtilsV2
-import com.chwl.app.ui.utils.load
-import com.chwl.app.ui.utils.loadFromAssets
-import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.CoreTextUtils
-
-/**
- * create by lvzebiao @2019/11/13
- */
-class HomeSingleAnchorAdapter :
-    BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_home_single_anchor) {
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-        helper.setText(R.id.tv_nickname, if (!CoreTextUtils.isEmptyText(item.nick)) item.nick else "")
-        helper.setText(
-            R.id.tv_room_name,
-            if (!CoreTextUtils.isEmptyText(item.title)) item.title else ""
-        )
-        ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_avatar), item.avatar)
-        ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_avatar_big), item.avatar, false, 8)
-        val ivPking = helper.getView<SVGAImageView>(R.id.iv_pking)
-        val ivTag = helper.getView<ImageView>(R.id.iv_tag)
-        ivPking.isVisible = item.isCrossPking
-        ivTag.isGone = item.isCrossPking
-        if (item.isCrossPking) {
-            ivPking.loadFromAssets("svga/single_room_pking.svga")
-        } else {
-            ivTag.load(item.tagPict)
-        }
-        helper.setImageResource(
-            R.id.iv_gender,
-            if (item.gender == 1) R.drawable.ic_gender_male else R.drawable.ic_gender_female
-        )
-        helper.setText(
-            R.id.tv_topic,
-            if (!CoreTextUtils.isEmptyText(item.roomDesc)) item.roomDesc else ""
-        )
-        helper.itemView.setOnClickListener {
-            AVRoomActivity.startForFromType(
-                mContext,
-                item.uid,
-                AVRoomActivity.FROM_TYPE_RECOMMEND
-            )
-        }
-    }
-}

app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt

@@ -3,9 +3,9 @@ package com.chwl.app.home.adapter
 import android.widget.ImageView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
+import com.chad.library.adapter.base.diff.BaseQuickDiffCallback
 import com.chwl.app.R
-import com.chwl.app.ui.im.RouterHandler
-import com.chwl.app.ui.utils.load
+import com.chwl.app.ui.utils.loadImage
 import com.chwl.core.room.bean.MeCenterInfo
 
 
@@ -15,8 +15,35 @@ class MeCenterAdapter :
     override fun convert(helper: BaseViewHolder, item: MeCenterInfo) {
         item.icon?.let {
             helper.getView<ImageView>(R.id.iv_pic).setImageResource(it)
+        } ?: let {
+            helper.getView<ImageView>(R.id.iv_pic).loadImage(item.androidCenterPic)
         }
         helper.setText(R.id.tv_name, item.centerName)
     }
 
+    fun updateData(list: List<MeCenterInfo>?) {
+        val newList = ArrayList<MeCenterInfo>()
+        if (list != null) {
+            newList.addAll(list)
+        }
+        setNewDiffData(object : BaseQuickDiffCallback<MeCenterInfo>(newList) {
+            override fun areItemsTheSame(
+                oldItem: MeCenterInfo,
+                newItem: MeCenterInfo
+            ): Boolean {
+                return newItem.centerId == oldItem.centerId
+            }
+
+            override fun areContentsTheSame(
+                oldItem: MeCenterInfo,
+                newItem: MeCenterInfo
+            ): Boolean {
+                return newItem.skipType == oldItem.skipType
+                        && newItem.centerName == oldItem.centerName
+                        && newItem.centerUrl == oldItem.centerUrl
+                        && newItem.androidCenterPic == oldItem.androidCenterPic
+            }
+        }, true)
+    }
+
 }

app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt

@@ -1,47 +0,0 @@
-package com.chwl.app.home.adapter
-
-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.opensource.svgaplayer.SVGAImageView
-import com.chwl.app.R
-import com.chwl.app.avroom.activity.AVRoomActivity
-import com.chwl.app.ui.utils.load
-import com.chwl.app.ui.utils.loadFromAssets
-import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.CoreTextUtils
-
-/**
- * create by lvzebiao @2019/11/13
- * 人气主播更多
- */
-class MoreSingleAnchorAdapter :
-    BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_home_single_anchor_more) {
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-
-        val ivPking = helper.getView<SVGAImageView>(R.id.iv_pking)
-        val ivTag = helper.getView<ImageView>(R.id.iv_tag)
-        ivPking.isVisible = item.isCrossPking
-        ivTag.isVisible = !CoreTextUtils.isEmptyText(item.tagPict) && !item.isCrossPking
-        if (item.isCrossPking) {
-            ivPking.loadFromAssets("svga/single_room_pking.svga")
-        } else {
-            ivTag.load(item.tagPict)
-        }
-        helper.setText(R.id.tv_online_num, item.onlineNum.toString())
-            .setText(R.id.tv_nickname, item.nick)
-            .setText(R.id.tv_room_name, item.title)
-            .setImageResource(
-                R.id.iv_gender,
-                if (item.gender == 1) R.drawable.ic_gender_male else R.drawable.ic_gender_female
-            )
-        helper.getView<ImageView>(R.id.iv_room_avatar)
-            .load(item.avatar, 12f, R.drawable.default_cover)
-
-        helper.itemView.setOnClickListener {
-            AVRoomActivity.start(mContext, item.uid)
-        }
-    }
-}

app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt

@@ -1,58 +0,0 @@
-package com.chwl.app.home.adapter
-
-import android.widget.ImageView
-import androidx.core.view.isGone
-import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.chwl.app.R
-import com.chwl.app.avroom.activity.AVRoomActivity
-import com.chwl.app.home.helper.BannerHelper
-import com.chwl.app.ui.utils.load
-import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.CoreTextUtils
-
-
-class RoomHotAdapter : BaseMultiItemQuickAdapter<HomeRoomInfo, BaseViewHolder>(null) {
-
-    init {
-        addItemType(HomeRoomInfo.TYPE_ROOM, R.layout.item_room_hot)
-        addItemType(HomeRoomInfo.TYPE_BROADCAST, R.layout.item_room_hot)
-        addItemType(HomeRoomInfo.TYPE_BANNER, R.layout.item_room_banner)
-    }
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-        if (item.itemType != HomeRoomInfo.TYPE_BANNER) {
-
-            helper.itemView.setOnClickListener {
-                AVRoomActivity.start(mContext, item.uid)
-            }
-
-            helper.getView<ImageView>(R.id.iv_room_image).load(item.avatar)
-            helper.setText(R.id.tv_online_number, "${item.onlineNum}")
-            helper.setText(R.id.tv_room_title, item.title)
-            helper.setText(R.id.tv_id, "ID:${item.erbanNo}")
-
-            helper.setVisible(R.id.tv_in_pk, item.isCrossPking)
-
-            helper.setVisible(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict))
-            helper.getView<ImageView>(R.id.iv_room_tag).load(item.tagPict)
-
-            val avatars: Array<ImageView> = arrayOf(
-                helper.getView(R.id.iv_avatar_0),
-                helper.getView(R.id.iv_avatar_1),
-                helper.getView(R.id.iv_avatar_2),
-                helper.getView(R.id.iv_avatar_3),
-                helper.getView(R.id.iv_avatar_4)
-            )
-            for (i in avatars.indices) {
-                val avatarUrl = item.micUsers?.getOrNull(i)?.avatar
-                avatars[i].isGone = avatarUrl.isNullOrBlank()
-                avatars[i].load(avatarUrl)
-            }
-        } else {
-            BannerHelper.setBanner(helper.getView(R.id.roll_view), item.bannerVoList)
-        }
-
-    }
-
-}

app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt

@@ -1,55 +0,0 @@
-package com.chwl.app.home.adapter
-
-import android.widget.ImageView
-import androidx.core.view.isGone
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.chwl.app.R
-import com.chwl.app.avroom.activity.AVRoomActivity
-import com.chwl.app.ui.utils.ImageLoadUtilsV2
-import com.chwl.app.ui.utils.load
-import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.CoreTextUtils
-
-
-class RoomLikeAdapter : BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_room_like) {
-
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-        helper.apply {
-            getView<ImageView>(R.id.iv_room_image).load(item.roomAvatar)
-            setText(R.id.tv_online_number, "${item.roomOnlineNum}")
-            setText(R.id.tv_room_title, item.roomName)
-            setText(R.id.tv_id, "ID:${item.erbanNo}")
-        }
-        helper.setVisible(R.id.tv_in_pk, item.isCrossPking)
-        helper.setVisible(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict))
-        ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict)
-
-        val avatars: Array<ImageView> = arrayOf(
-            helper.getView(R.id.iv_avatar_0),
-            helper.getView(R.id.iv_avatar_1),
-            helper.getView(R.id.iv_avatar_2),
-            helper.getView(R.id.iv_avatar_3),
-            helper.getView(R.id.iv_avatar_4)
-        )
-        for (i in avatars.indices) {
-            val avatarUrl = item.micUsers?.getOrNull(i)?.avatar
-            avatars[i].isGone = avatarUrl.isNullOrBlank()
-            avatars[i].load(avatarUrl)
-        }
-        helper.itemView.setOnClickListener {
-            AVRoomActivity.start(mContext, item.roomUid)
-        }
-        if (item.isValid) {
-            helper.setGone(R.id.tv_online_number, true)
-            helper.setBackgroundRes(R.id.view_bg, R.drawable.bg_home_like_item)
-            helper.setBackgroundRes(R.id.view_room_cover, R.drawable.bg_home_common_avatar)
-        } else {
-            helper.setGone(R.id.tv_online_number, false)
-            helper.setBackgroundRes(R.id.view_bg, R.drawable.bg_home_like_item_disable)
-            helper.setBackgroundRes(R.id.view_room_cover, R.drawable.bg_home_common_avatar_disable)
-        }
-    }
-
-}

app/src/main/java/com/chwl/app/home/dialog/HelloMessageDialog.kt

@@ -7,14 +7,14 @@ import android.view.WindowManager
 import android.widget.ImageView
 import androidx.core.view.isGone
 import com.chwl.app.R
-import com.chwl.app.base.BaseDialog
+import com.chwl.app.base.BaseDialogFragment
 import com.chwl.app.databinding.DialogHelloMessageBinding
 import com.chwl.app.ui.utils.load
 import com.chwl.app.room_chat.activity.RoomMsgActivity
 import com.chwl.core.channel_page.bean.HelloMessageInfo
 import com.chwl.library.utils.ResUtil
 
-class HelloMessageDialog : BaseDialog<DialogHelloMessageBinding>() {
+class HelloMessageDialog : BaseDialogFragment<DialogHelloMessageBinding>() {
 
     companion object {