fix

module_base/src/main/java/com/yc/module_base/Constans.kt

@@ -2,6 +2,7 @@ package com.yc.module_base
 
 /** Created by yc on 2021/9/11
  **/
+const val PRIVACY_DIALOG_CHECK= "privacy_dialog_check"
 const val USER_PRIVACY= "user_privacy"
 const val USER_INFO = "user_info"
 const val USER_TOKEN= "user_token"

module_live/src/main/java/com/yc/module_live/view/RoomActivity.kt

@@ -2543,7 +2543,13 @@ class RoomActivity : BaseActivity<RoomVm>(), LiveDialogFragmentListener, VoicePr
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            showFloat()
+//            showFloat()
+            if (roomLiveMainFragment != null && roomLiveMainFragment!!.isShowScreen) {
+                roomLiveMainFragment?.closeRoom()
+            }
+            if (roomMainFragment != null && roomMainFragment!!.isShowScreen) {
+                roomMainFragment?.clickClose()
+            }
             return true
         }
         return super.onKeyDown(keyCode, event)

module_live/src/main/java/com/yc/module_live/view/dialog/RoomChatDialog.kt

@@ -55,6 +55,7 @@ import com.yc.module_base.db.entity.MessageReqData
 import com.yc.module_base.db.entity.ReadMessageData
 import com.yc.module_base.db.entity.SendStatus
 import com.yc.module_base.db.entity.TextMessage
+import com.yc.module_base.dialog.ReportDialog
 import com.yc.module_base.dialog.gift.LiveGiftVIewDialog
 import com.yc.module_base.ext.navigationTo
 import com.yc.module_base.ext.userId
@@ -153,7 +154,9 @@ class RoomChatDialog(
             followUser()
         }
         tvChatRoomReport.setOnClickListener {
-            toast("举报成功")
+            parentActivity()?.showDialogBottom(
+                ReportDialog(context, user!!)
+            )
         }
 
         onReceiveLiveEvent()

module_live/src/main/java/com/yc/module_live/view/live/livetop/TopLiveLayerFragment.kt

@@ -425,6 +425,7 @@ class TopLiveLayerFragment : TopLiveLayerClickFragment<TopLayerVm>(),
                 val anchorUser: User? = nobelUsers.find {
                     it.userId == viewModel.room?.anchorId
                 }
+                viewModel.nobelUserList.clear()
                 if (viewModel.room?.isLive == true) {
                     val filterNobelUsers = nobelUsers.filterNot {
                         it.userId == anchorUser?.userId
@@ -473,6 +474,7 @@ class TopLiveLayerFragment : TopLiveLayerClickFragment<TopLayerVm>(),
                 val anchorUser: User? = list.find {
                     it.userId == viewModel.room?.anchorId
                 }
+                viewModel.userList.clear()
                 if (viewModel.room?.isLive == true) {
                     val userList = list.filterNot {
                         it.userId == anchorUser?.userId
@@ -841,7 +843,7 @@ class TopLiveLayerFragment : TopLiveLayerClickFragment<TopLayerVm>(),
             it.giftId == gift.giftId
         }
         gift.giftName = curGift?.giftName
-            smallBarrageLayout?.startBarrage(barrage)
+        smallBarrageLayout?.startBarrage(barrage)
         if (gift.roomId != viewModel.room?.roomId) {
             startVideoAnimation(gift)//播放特效的，全站，或者大礼物有中奖动画的
         }

module_live/src/main/java/com/yc/module_live/view/main/RoomMainFragment.kt

@@ -48,29 +48,7 @@ class RoomMainFragment : BaseFragment<RoomMainVm>(), CountAnimatorListener, OnUs
     override fun initView() {
         isPwdRoom()
         ivClose.setOnClickListener {
-            if (viewModel.room?.videoMicUser != null && viewModel.room?.videoMicUser?.userId == userId) {
-                //说明自己在直播
-                showDialogSample(
-                    "是否结束表演，并退出房间？"
-                ) {
-                    confirm {
-                        (activity as? RoomActivity)?.exit()
-                    }
-                }
-            } else {
-                showDialogSample(
-                    "是否最小化窗口"
-                ) {
-                    confirmText("最小化")
-                    cancelText("退出")
-                    confirm {
-                        (activity as? RoomActivity)?.showFloat()
-                    }
-                    cancel {
-                        closeRoom()
-                    }
-                }
-            }
+            clickClose()
         }
         iniTopLayerFragment()
     }
@@ -386,4 +364,30 @@ class RoomMainFragment : BaseFragment<RoomMainVm>(), CountAnimatorListener, OnUs
         (activity as RoomActivity).exit()
     }
 
+
+    fun clickClose() {
+        if (viewModel.room?.videoMicUser != null && viewModel.room?.videoMicUser?.userId == userId) {
+            //说明自己在直播
+            showDialogSample(
+                "是否结束表演，并退出房间？"
+            ) {
+                confirm {
+                    (activity as? RoomActivity)?.exit()
+                }
+            }
+        } else {
+            showDialogSample(
+                "是否最小化窗口"
+            ) {
+                confirmText("最小化")
+                cancelText("退出")
+                confirm {
+                    (activity as? RoomActivity)?.showFloat()
+                }
+                cancel {
+                    closeRoom()
+                }
+            }
+        }
+    }
 }

module_live/src/main/java/com/yc/module_live/view/toplayer/TopLayerFragment.kt

@@ -408,6 +408,7 @@ class TopLayerFragment : TopLayerMicFragment<TopLayerVm>(), GiftChannelLayout.On
             }
 
             BaseRoomVm.LOAD_MORE_USER_LIST -> {
+                viewModel.userList.clear()
                 val list = data as ArrayList<User>
                 viewModel.updateUserList(list)
             }

module_live/src/main/res/layout/module_room_user_chat_dialog.xml

@@ -41,9 +41,9 @@
         <TextView
             android:id="@+id/tvChatRoomReport"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_24"
+            android:layout_height="@dimen/dp_26"
             android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginRight="@dimen/dp_4"
             android:background="@drawable/sp_r28_stoke_e4dee7"
             android:drawablePadding="@dimen/dp_2"
             android:gravity="center"
@@ -51,7 +51,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/tvFollow"
             android:layout_toLeftOf="@+id/tvFollow"
-            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_12"
             android:text="举报"
             android:textColor="@color/black2"
             android:textSize="@dimen/sp_12" />
@@ -68,8 +68,7 @@
             android:gravity="center"
             android:visibility="gone"
             tools:visibility="visible"
-            android:paddingLeft="@dimen/dp_16"
-            android:paddingRight="@dimen/dp_16"
+            android:paddingHorizontal="@dimen/dp_12"
             android:text="关注"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"

module_main/src/main/java/com/mita/module_main/view/splash/SplashActivity.kt

@@ -8,7 +8,6 @@ import com.mita.module_main.R
 import com.mita.module_main.utils.SDKTaskInit
 import com.mita.module_main.view.dialog.UserPrivacyProtocolDialog
 import com.mita.module_main.view.login.LoginHomeActivity
-import com.mita.module_main.view.login.id.IdLoginActivity
 import com.mita.module_main.view.login.phonecode.PhoneCodeActivity
 import com.xueyu.kotlinextlibrary.deviceWidth
 import com.yc.baselibrary.cache.Cache
@@ -18,6 +17,7 @@ import com.yc.baselibrary.ext.parseObj
 import com.yc.baselibrary.view.base.BaseActivity
 import com.yc.baselibrary.view.webview.WebViewInit
 import com.yc.module_base.LiveSession
+import com.yc.module_base.PRIVACY_DIALOG_CHECK
 import com.yc.module_base.USER_INFO
 import com.yc.module_base.USER_PRIVACY
 import com.yc.module_base.arouter.MainRouter
@@ -38,7 +38,8 @@ class SplashActivity : BaseActivity<SplashViewModel>() {
             finish()
             return
         }
-        if (Cache.getBoolean(USER_PRIVACY, false) == false) {
+        if (Cache.getBoolean(USER_PRIVACY, false) == false
+            || Cache.getBoolean(PRIVACY_DIALOG_CHECK, false) == false) {
             showDialogCustomer(
                 UserPrivacyProtocolDialog(
                     onCancel = {
@@ -46,7 +47,7 @@ class SplashActivity : BaseActivity<SplashViewModel>() {
 
                     },
                     onConfirm = {
-                        Cache.put(USER_PRIVACY, true)
+                        Cache.put(PRIVACY_DIALOG_CHECK, true)
                         iniUser()
                     })
             ) {