moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:移除房间榜、小时榜相关入口代码

Browse Source
This commit is contained in:
Max
2023-11-26 11:40:33 +08:00
parent 84b6a40e93
commit 2e6d3502ea
6 changed files with 44 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -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,

12
app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -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;
}

13
app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
View File

@@ -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")

73
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -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

46
app/src/module_mini_world/res/layout/fragment_game_room.xml
View File

@@ -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"

82
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -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"