1：修改酒吧房不显示清除魅力按钮

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -2612,7 +2612,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     }
 
     fun changeBackground(bjId: Int) {
-        mBinding!!.ivBg.setImageDrawable(resources.getDrawable(bjId))
+//        mBinding!!.ivBg.setImageDrawable(ContextCompat.getDrawable(bjId))
+        ImageUtils.loadRes(bjId, mBinding!!.ivBg)
     }
 
     fun setOnlineNumber(number: Int) {
@@ -3654,6 +3655,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         MvpPre?.getTasksMessage()
         val labelId = mRoomInfoResp?.room_info?.label_id
         if (labelId == "11") {
+            LogUtils.e("RoomActivity", "labelId == 11")
             changeBackground(R.mipmap.icon_pri_bg)
         }
     }
@@ -4434,6 +4436,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     private fun userMakeVisibility() {
         if (mRoomInfoResp?.room_info?.type_id == "11") {
             mBinding?.roomTop?.rl2?.visibility = View.VISIBLE
+            mBinding?.roomTop?.rl?.visibility = View.GONE
         } else {
             mBinding?.roomTop?.rl2?.visibility = View.GONE
         }

MainModule/src/main/res/layout/room_top.xml

@@ -249,7 +249,7 @@
                 android:layout_centerInParent="true"
                 android:layout_marginStart="@dimen/dp_4"
                 android:layout_marginEnd="@dimen/dp_7"
-                android:layout_toEndOf="@+id/im_qc"
+                android:layout_toEndOf="@+id/im_make"
                 android:gravity="center"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_12"