高度写死

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

@@ -102,7 +102,6 @@ import com.xscm.modulemain.service.ForegroundService
 import com.xscm.modulemain.service.RoomPlayService
 import com.xscm.moduleutil.BaseEvent
 import com.xscm.moduleutil.adapter.LikeUser2Adapter
-import com.xscm.moduleutil.adapter.LikeUserAdapter
 import com.xscm.moduleutil.base.AppStateListener
 import com.xscm.moduleutil.base.AppStateManager
 import com.xscm.moduleutil.base.CommonAppContext
@@ -1011,7 +1010,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         upRoomInfo(resp)
         instView()
         resetFragment()
-        upHeight()
+//        upHeight()
         setupEffectView()
 
         MvpPre?.roomRedPackets(roomId)
@@ -1676,6 +1675,13 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         roomSettingEvent.type = messageEvent.msgType
 
         mRoomInfoResp?.room_info?.room_up_pit_type = text.room_up_pit_type.toString() + ""
+
+        if (mRoomInfoResp?.room_info?.room_up_pit_type == "1" && mRoomInfoResp?.room_info?.type_id != "6") {
+            clFirstCharge(true)
+        } else {
+            clFirstCharge(false)
+        }
+
         EventBus.getDefault().post(mRoomInfoResp?.room_info)
 
         EventBus.getDefault().post(roomSettingEvent)

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

@@ -157,9 +157,8 @@
             <FrameLayout
                 android:id="@+id/vp_room_pager"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/dp_10"
-                app:layout_constraintDimensionRatio="1:0.88"
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -6,7 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="@dimen/dp_310">
 
 
         <com.xscm.moduleutil.widget.RoomFriendshipWheatView

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

@@ -7,7 +7,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dp_300"
         android:paddingHorizontal="@dimen/dp_10">
 
         <androidx.constraintlayout.widget.Guideline

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

@@ -10,7 +10,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dp_310"
         android:clipChildren="false"
         android:clipToPadding="false">
 

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

@@ -10,7 +10,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dp_320"
         android:layout_marginTop="@dimen/dp_12">