fix bugs.

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

@@ -1010,7 +1010,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         upRoomInfo(resp)
         instView()
         resetFragment()
-//        upHeight()
+        upHeight()
         setupEffectView()
 
         MvpPre?.roomRedPackets(roomId)

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java

@@ -11,6 +11,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -436,18 +437,44 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         }
 
         if (newFragment != null) {
-//            if (currentFragment == null){
-//                performFragmentReplacement(newFragment, R.id.container);
-//            }else {
-                switchFragment(newFragment, R.id.container);
-//            }
+             switchFragment(newFragment, mBinding.container.getId());
         } else {
             LogUtils.e("newFragment==null");
         }
-
+        upHeight();
         setView();
     }
 
+
+    void upHeight() {
+        ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT
+        );
+        mBinding.container.setLayoutParams(params);
+//        if (mRoomInfoResp?.room_info?.type_id == "1" || mRoomInfoResp?.room_info?.type_id == "3" || mRoomInfoResp?.room_info?.type_id == "4"
+//            || mRoomInfoResp?.room_info?.type_id == "8"
+//        ) {
+//            maxHeightDp = if (mRoomInfoResp?.room_info?.label_id == "1") {
+//                333
+//            } else {
+//                287
+//            }
+//        } else if (mRoomInfoResp?.room_info?.type_id == "2") {
+//            maxHeightDp = 297
+//        }
+//        if (mRoomInfoResp?.room_info?.type_id == "6") {
+//            maxHeightDp = 453
+//        } else if (mRoomInfoResp?.room_info?.type_id == "7") {
+//            maxHeightDp = 373
+//        } else if (mRoomInfoResp!!.room_info.type_id == "9") {
+//            maxHeightDp = 373
+//        } else if (mRoomInfoResp!!.room_info.type_id == "10") {
+//            maxHeightDp = 333
+//        }
+//        adjustLayoutHeights()
+    }
+
     /// 这是在进入电影放的时候，隐藏下面的和排麦视图
     public void setviewyc() {
         if (getActivity() instanceof RoomActivity) {

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java

@@ -405,7 +405,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
         this.roomInfoResp = roomInfoResp;
         roomId = roomInfoResp == null ? "" : roomInfoResp.getRoom_info().getRoom_id();
 
-//        setView();
+        setView();
     }
 
     public void setView() {

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

@@ -157,8 +157,9 @@
             <FrameLayout
                 android:id="@+id/vp_room_pager"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 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="@dimen/dp_310">
+        android:layout_height="@dimen/dp_320">
 
 
         <com.xscm.moduleutil.widget.RoomFriendshipWheatView