引导

module/room/src/main/java/com/adealink/weparty/room/chatroom/page/dispatchcenter/DispatchCenterRoomPageFragment.kt

@@ -57,12 +57,16 @@ class DispatchCenterRoomPageFragment :
     private val howToOrderGuide by fastLazy {
         HowToOrderGuide(
             onBeforeShowPageListener = { label ->
-                if (label == RoomGuideLabel.HOW_TO_ORDER_4) {
+                if (label == RoomGuideLabel.HOW_TO_ORDER_1) {
+                    bottomOperateFragment.showJoinGuideButton(true)
+                } else if (label == RoomGuideLabel.HOW_TO_ORDER_4) {
                     binding.vGuide4.root.show()
                 }
             },
             pageDismissListener = { label ->
-                if (label == RoomGuideLabel.HOW_TO_ORDER_4) {
+                if (label == RoomGuideLabel.HOW_TO_ORDER_1) {
+                    bottomOperateFragment.showJoinGuideButton(false)
+                } else if (label == RoomGuideLabel.HOW_TO_ORDER_4) {
                     binding.vGuide4.root.gone()
                 }
             }

module/room/src/main/java/com/adealink/weparty/room/chatroom/page/dispatchcenter/DispatchRoomBottomOperateFragment.kt

@@ -326,4 +326,11 @@ open class DispatchRoomBottomOperateFragment : BaseFragment(R.layout.fragment_di
         }
         return binding.operateBox.findItem(itemId)
     }
+
+    fun showJoinGuideButton(show: Boolean) {
+        if (!isViewBindingValid()) {
+            return
+        }
+        binding.btnApplyMicGuide.show(show)
+    }
 }

module/room/src/main/java/com/adealink/weparty/room/member/RoomMemberDialog.kt

@@ -52,6 +52,7 @@ class RoomMemberDialog : BottomDialogFragment(R.layout.dialog_room_member) {
 
     override fun initViews() {
         super.initViews()
+        binding.btnReport.show(!isSelf)
         binding.btnReport.onClick {
             clickReport()
         }

module/room/src/main/java/com/adealink/weparty/room/member/comp/MemberBottomComp.kt

@@ -34,15 +34,15 @@ class MemberBottomComp(
     override fun initViews() {
         super.initViews()
         if (isSelf) {
-            binding.btnFollow.gone()
-        } else {
-            binding.btnFollow.show()
-            binding.btnFollow.onClick {
-                if (isFollow) {
-                    unFollow()
-                } else {
-                    follow()
-                }
+            binding.root.gone()
+            return
+        }
+        binding.root.show()
+        binding.btnFollow.onClick {
+            if (isFollow) {
+                unFollow()
+            } else {
+                follow()
             }
         }
         binding.btnChat.onClick {

module/room/src/main/res/layout/fragment_dispatch_room_bottom_operate.xml

@@ -98,7 +98,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingHorizontal="12dp"
-            android:tag="@string/tag_how_to_order_guide_1"
             app:button_left_drawable="@drawable/room_operate_apply_mic_ic"
             app:button_left_drawable_margin="4dp"
             app:button_left_drawable_width="16dp"
@@ -128,4 +127,21 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <com.adealink.weparty.commonui.widget.CommonButton
+        android:id="@+id/btn_apply_mic_guide"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:paddingHorizontal="12dp"
+        android:tag="@string/tag_how_to_order_guide_1"
+        android:visibility="gone"
+        app:button_left_drawable="@drawable/room_operate_apply_mic_ic"
+        app:button_left_drawable_margin="4dp"
+        app:button_left_drawable_width="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/cl_right"
+        app:layout_constraintTop_toTopOf="parent"
+        app:text="@string/room_apply_mic"
+        app:textSize="12sp"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

module/room/src/main/res/layout/layout_how_to_guide_1.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/all_seats_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:background="@color/black">

module/room/src/main/res/layout/layout_how_to_guide_2.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/all_seats_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:background="@color/black">
@@ -11,7 +10,7 @@
         android:id="@+id/iv_arrow"
         android:layout_width="15dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginEnd="32dp"
         app:layout_constraintDimensionRatio="45:200"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"

module/room/src/main/res/layout/layout_how_to_guide_3.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/all_seats_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:background="@color/black">
@@ -11,7 +10,6 @@
         android:id="@+id/iv_arrow"
         android:layout_width="15dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="24dp"
         app:layout_constraintDimensionRatio="45:200"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

module/room/src/main/res/layout/layout_how_to_guide_4.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/all_seats_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:background="@color/black">
@@ -10,10 +9,10 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="15dp"
         android:layout_height="0dp"
+        android:layout_marginStart="80dp"
         android:layout_marginTop="-16dp"
-        android:layout_marginEnd="24dp"
         app:layout_constraintDimensionRatio="45:200"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/cl_guide"
         app:srcCompat="@drawable/room_guide_arrow_down_ic" />