From 2e6d3502ead0e80d33ab9374197b1a22ff8e8d71 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Sun, 26 Nov 2023 11:40:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A7=BB=E9=99=A4=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E6=A6=9C=E3=80=81=E5=B0=8F=E6=97=B6=E6=A6=9C=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/avroom/fragment/BaseRoomFragment.kt   |  8 +-
 .../fragment/HomePartyRoomFragment.java       | 12 +--
 .../app/avroom/fragment/SingleRoomFragment.kt | 13 ++-
 .../res/layout/fragment_av_room_game.xml      | 73 ++---------------
 .../res/layout/fragment_game_room.xml         | 46 -----------
 .../res/layout/fragment_single_room.xml       | 82 ++++++-------------
 6 files changed, 44 insertions(+), 190 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
index e601a8757..8e744757b 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
@@ -676,10 +676,10 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                 sendMsg()
             }
 
-            R.id.contribute_list -> {
-                DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking())
-                mvpPresenter?.loadRoomRank()
-            }
+//            R.id.contribute_list -> {
+//                DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking())
+//                mvpPresenter?.loadRoomRank()
+//            }
 
             R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext)
 //            R.id.iv_treasure_box,
diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
index fa322fbd9..ae1afb036 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
@@ -603,12 +603,12 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                     getMvpPresenter().cancelDragon();
                 });
                 break;
-            case R.id.tv_hour_rank:
-                DialogWebViewActivity.start(
-                        mContext,
-                        UriProvider.getRoomHourRankUrl(AvRoomDataManager.get().getRoomUid())
-                );
-                break;
+//            case R.id.tv_hour_rank:
+//                DialogWebViewActivity.start(
+//                        mContext,
+//                        UriProvider.getRoomHourRankUrl(AvRoomDataManager.get().getRoomUid())
+//                );
+//                break;
             default:
                 break;
         }
diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
index 590a03d86..cc9f84581 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
@@ -108,13 +108,12 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                 updateFansTeamInfo(it)
             }
         }
-
-        gameBinding.tvHourRank.setOnClickListener {
-            DialogWebViewActivity.start(
-                mContext,
-                UriProvider.getSingleRoomHourRankUrl(AvRoomDataManager.get().roomUid)
-            )
-        }
+//        gameBinding.tvHourRank.setOnClickListener {
+//            DialogWebViewActivity.start(
+//                mContext,
+//                UriProvider.getSingleRoomHourRankUrl(AvRoomDataManager.get().roomUid)
+//            )
+//        }
     }
 
     @SuppressLint("SetTextI18n")
diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
index 13fb5516f..7cfba0b93 100644
--- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
+++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
@@ -64,44 +64,6 @@
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/contribute_list"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_alignTop="@id/micro_view"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/dp_22"
-            android:layout_marginBottom="@dimen/dp_8"
-            android:background="@drawable/bg_single_room_rank_entrance"
-            android:drawablePadding="@dimen/dp_2"
-            android:gravity="center"
-            android:onClick="@{click}"
-            android:paddingStart="@dimen/dp_8"
-            android:paddingEnd="@dimen/dp_4"
-            android:text="@string/room_contribute_list"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_sing_room_contribute_list" />
-
-        <TextView
-            android:id="@+id/tv_hour_rank"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_below="@+id/contribute_list"
-            android:layout_alignParentEnd="true"
-            android:background="@drawable/bg_single_room_rank_entrance"
-            android:drawablePadding="@dimen/dp_2"
-            android:gravity="center"
-            android:onClick="@{click}"
-            android:paddingStart="@dimen/dp_8"
-            android:paddingEnd="@dimen/dp_4"
-            android:text="@string/room_list_hour"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_single_room_rank" />
-
         <LinearLayout
             android:id="@+id/ll_dating_step"
             android:layout_width="wrap_content"
@@ -205,19 +167,6 @@
             android:layout_marginEnd="16dp"
             app:rollviewpager_hint_gravity="center" />
 
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_treasure_box_cp"-->
-<!--            android:layout_width="55dp"-->
-<!--            android:layout_height="55dp"-->
-<!--            android:layout_below="@id/activity_img"-->
-<!--            android:layout_alignParentEnd="true"-->
-<!--            android:layout_marginTop="@dimen/dp_20"-->
-<!--            android:layout_marginEnd="@dimen/dp_10"-->
-<!--            android:onClick="@{click}"-->
-<!--            android:src="@drawable/icon_room_treasure_box"-->
-<!--            android:visibility="gone"-->
-<!--            tools:contentDescription="@string/layout_fragment_av_room_game_01" />-->
-
         <ImageView
             android:id="@+id/iv_first_charge_enter"
             android:layout_width="65dp"
@@ -257,19 +206,6 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_treasure_box"-->
-<!--            android:layout_width="65dp"-->
-<!--            android:layout_height="65dp"-->
-<!--            android:layout_above="@id/iv_queuing_micro"-->
-<!--            android:layout_alignParentEnd="true"-->
-<!--            android:layout_marginEnd="15dp"-->
-<!--            android:layout_marginBottom="6dp"-->
-<!--            android:onClick="@{click}"-->
-<!--            android:src="@drawable/icon_room_treasure_box"-->
-<!--            android:visibility="gone"-->
-<!--            tools:contentDescription="@string/layout_fragment_av_room_game_04"-->
-<!--            tools:visibility="visible" />-->
 
         <ImageView
             android:id="@+id/iv_queuing_micro"
@@ -356,10 +292,11 @@
         <com.chwl.app.avroom.anotherroompk.RoomPKBoardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/contribute_list"
+            android:layout_alignTop="@id/micro_view"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="80dp"
-            android:visibility="@{(roomInfo.roomModeType==7) ? View.VISIBLE : View.GONE}" />
+            android:visibility="@{(roomInfo.roomModeType==7) ? View.VISIBLE : View.GONE}"
+            tools:visibility="visible" />
 
         <RelativeLayout
             android:id="@+id/input_layout"
@@ -407,8 +344,8 @@
             android:id="@+id/vs_music_player"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/tv_hour_rank"
-            android:layout_marginTop="@dimen/dp_8"
+            android:layout_alignTop="@id/micro_view"
+            android:layout_marginTop="@dimen/dp_22"
             android:layout="@layout/avroom_music_player_layout" />
 
         <com.chwl.app.vip.view.VipBroadcastView
diff --git a/app/src/module_mini_world/res/layout/fragment_game_room.xml b/app/src/module_mini_world/res/layout/fragment_game_room.xml
index 288daec4f..28a9a76d0 100644
--- a/app/src/module_mini_world/res/layout/fragment_game_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_game_room.xml
@@ -30,52 +30,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <LinearLayout
-            android:id="@+id/contribute_list"
-            android:layout_width="wrap_content"
-            android:layout_height="22dp"
-            android:layout_marginTop="80dp"
-            android:background="@drawable/bg_contribute_entrance"
-            android:gravity="center_vertical"
-            android:onClick="@{click}"
-            android:visibility="gone"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/iv_rank_0"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@drawable/default_avatar" />
-
-            <ImageView
-                android:id="@+id/iv_rank_1"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@drawable/default_avatar" />
-
-            <ImageView
-                android:id="@+id/iv_rank_2"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@drawable/default_avatar" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:text="@string/layout_fragment_game_room_01"
-                android:textColor="@color/white"
-                android:textSize="12dp" />
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="5dp"
-                android:scaleType="center"
-                android:src="@drawable/arrow_right_white" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml
index f6f6f1254..8b4c7a3d8 100644
--- a/app/src/module_mini_world/res/layout/fragment_single_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml
@@ -45,10 +45,11 @@
             android:id="@+id/fl_fans_team"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="85dp"
             android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/contribute_list">
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible">
 
             <FrameLayout
                 android:id="@+id/fl_fans_team_join_tip"
@@ -96,53 +97,16 @@
 
         </FrameLayout>
 
-        <TextView
-            android:id="@+id/contribute_list"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_marginTop="85dp"
-            android:background="@drawable/bg_single_room_rank_entrance"
-            android:drawablePadding="@dimen/dp_2"
-            android:gravity="center"
-            android:onClick="@{click}"
-            android:paddingStart="@dimen/dp_8"
-            android:paddingEnd="@dimen/dp_4"
-            android:text="@string/room_host_list"
-            android:visibility="gone"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
-            app:drawableStartCompat="@drawable/ic_sing_room_contribute_list"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_hour_rank"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_marginTop="@dimen/dp_8"
-            android:background="@drawable/bg_single_room_rank_entrance"
-            android:drawablePadding="@dimen/dp_2"
-            android:gravity="center"
-            android:paddingStart="@dimen/dp_8"
-            android:paddingEnd="@dimen/dp_4"
-            android:text="@string/room_list_hour"
-            android:visibility="gone"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
-            app:drawableStartCompat="@drawable/ic_single_room_rank"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/contribute_list" />
-
         <ViewStub
             android:id="@+id/vs_music_player"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dp_8"
+            android:layout_marginTop="85dp"
             android:layout="@layout/avroom_music_player_layout"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_hour_rank" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <FrameLayout
             android:id="@+id/fl_speedy_message"
@@ -203,35 +167,35 @@
             android:onClick="@{click}"
             android:src="@drawable/ic_radish_entrance"
             android:visibility="gone"
-            tools:visibility="visible"
             app:layout_constraintBottom_toTopOf="@id/red_package_widget"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:contentDescription="@string/layout_fragment_single_room_06" />
+            tools:contentDescription="@string/layout_fragment_single_room_06"
+            tools:visibility="visible" />
 
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_treasure_box"-->
-<!--            android:layout_width="65dp"-->
-<!--            android:layout_height="65dp"-->
-<!--            android:layout_marginEnd="15dp"-->
-<!--            android:layout_marginBottom="6dp"-->
-<!--            android:onClick="@{click}"-->
-<!--            android:src="@drawable/icon_room_treasure_box"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            tools:contentDescription="@string/layout_fragment_single_room_07"-->
-<!--            tools:visibility="visible" />-->
+        <!--        <ImageView-->
+        <!--            android:id="@+id/iv_treasure_box"-->
+        <!--            android:layout_width="65dp"-->
+        <!--            android:layout_height="65dp"-->
+        <!--            android:layout_marginEnd="15dp"-->
+        <!--            android:layout_marginBottom="6dp"-->
+        <!--            android:onClick="@{click}"-->
+        <!--            android:src="@drawable/icon_room_treasure_box"-->
+        <!--            android:visibility="gone"-->
+        <!--            app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            tools:contentDescription="@string/layout_fragment_single_room_07"-->
+        <!--            tools:visibility="visible" />-->
 
         <com.chwl.app.avroom.redpackage.RedPackageWidget
             android:id="@+id/red_package_widget"
-            android:layout_marginEnd="15dp"
             android:layout_width="58dp"
             android:layout_height="58dp"
+            android:layout_marginEnd="15dp"
             android:layout_marginBottom="6dp"
             android:visibility="gone"
-            tools:visibility="visible"
             app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:visibility="visible" />
 
         <com.chwl.app.avroom.widget.MessageView
             android:id="@+id/message_view"