YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'branch_new' into branch_new_83

Browse Source
This commit is contained in:
骆召亮
2025-12-10 18:12:01 +08:00
parent 3c59e8bbce b5b443e188
commit a593acba07
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
View File

@@ -359,9 +359,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (checkWeather(pitBean.getPit_number())) { if (checkWeather(pitBean.getPit_number())) {
showPopupMenu(wheatView); // v 是点击的按钮视图 showPopupMenu(wheatView); // v 是点击的按钮视图
} else if (pitBean.getPit_number().equals("10")) { } else if (pitBean.getPit_number().equals("10")) {
if (ActivityUtils.getTopActivity() instanceof RoomActivity) { if (getActivity() != null && getActivity() instanceof RoomActivity) {
if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4) { if (((RoomActivity) getActivity()).getHostUser() < 4) {
if (((RoomActivity) ActivityUtils.getTopActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) { if (((RoomActivity) getActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) {
return; return;
} }
RoomOnlineDialogFragment.show(roomId, "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager()); RoomOnlineDialogFragment.show(roomId, "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());

6
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
View File

@@ -183,8 +183,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
roomPitBean = pitBean; roomPitBean = pitBean;
showPopupMenu(view); // v 是点击的按钮视图 showPopupMenu(view); // v 是点击的按钮视图
} else if (pitNumber1 == 10) { } else if (pitNumber1 == 10) {
if (ActivityUtils.getTopActivity() instanceof RoomActivity){ if (getActivity() != null && getActivity() instanceof RoomActivity){
if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4){ if (((RoomActivity) getActivity()).getHostUser() < 4){
if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) { if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager()); RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
} }
@@ -715,7 +715,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) { if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager()); RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
} }
// RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
} else { } else {
MvpPre.applyPit(roomId, pitNumber1 + ""); MvpPre.applyPit(roomId, pitNumber1 + "");
} }
@@ -785,7 +784,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) { if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager()); RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
} }
// RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
} else { } else {
MvpPre.applyPit(roomId, pitNumber1 + ""); MvpPre.applyPit(roomId, pitNumber1 + "");
} }

3
MainModule/src/main/res/layout/fragment_revenue.xml
View File

@@ -74,6 +74,7 @@
android:id="@+id/smart_refresh_layout" android:id="@+id/smart_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/dp_30"
app:srlEnableLoadMore="true" app:srlEnableLoadMore="true"
app:srlEnableRefresh="true"> app:srlEnableRefresh="true">
@@ -89,7 +90,7 @@
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="0dp" android:paddingBottom="@dimen/dp_100"
android:background="@color/color_FFF5F5F5" android:background="@color/color_FFF5F5F5"
android:clipToPadding="false" android:clipToPadding="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

11
MainModule/src/main/res/layout/room_details_list.xml
View File

@@ -23,13 +23,12 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
android:ellipsize="end"
android:maxEms="8"
android:singleLine="true" android:singleLine="true"
android:text="阿斯蒂芬就" tools:text=""
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintStart_toEndOf="@id/riv" app:layout_constraintStart_toEndOf="@id/riv"
app:layout_constraintEnd_toStartOf="@id/tv_go_to_room"
app:layout_constraintTop_toTopOf="@id/riv" /> app:layout_constraintTop_toTopOf="@id/riv" />
<TextView <TextView
android:id="@+id/tv_1" android:id="@+id/tv_1"
@@ -45,7 +44,7 @@
android:id="@+id/tv_2" android:id="@+id/tv_2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="摸鱼" tools:text="摸鱼"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:layout_marginStart="@dimen/dp_5" android:layout_marginStart="@dimen/dp_5"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_10"
@@ -56,7 +55,7 @@
android:id="@+id/tv_3" android:id="@+id/tv_3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="功夫熊猫*1" tools:text="功夫熊猫*1"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:layout_marginStart="@dimen/dp_5" android:layout_marginStart="@dimen/dp_5"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_10"
@@ -70,7 +69,7 @@
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_3" android:padding="@dimen/dp_3"
android:text="+12.5" tools:text="+12.5"
android:textColor="@color/_000000" android:textColor="@color/_000000"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"