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

69 1

Browse Source
This commit is contained in:
骆召亮
2025-12-07 16:08:13 +08:00
parent aeac7a9735
commit 233c6926ad
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -283,19 +283,23 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
// 提前获取相关对象引用，避免多次调用 getter // 提前获取相关对象引用，避免多次调用 getter
MusicSongBean songUserInfo = roomInfoResp.getSong_user_info(); MusicSongBean songUserInfo = roomInfoResp.getSong_user_info();
if (songUserInfo != null) { try {
//演唱者and主持 if (songUserInfo != null && songUserInfo.getUser_id() != null) {
if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)) { //演唱者and主持
setVisibilityView(1); if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)) {
} else if (roomDefaultWheatView.getUserId().equals(userIdStr)) {//主持 非演唱者 setVisibilityView(1);
setVisibilityView(2); } else if (roomDefaultWheatView.getUserId().equals(userIdStr)) {//主持 非演唱者
} else if (songUserInfo.getUser_id().equals(userIdStr)) {//演唱者 setVisibilityView(2);
setVisibilityView(3); } else if (songUserInfo.getUser_id().equals(userIdStr)) {//演唱者
} else {//观众 setVisibilityView(3);
} else {//观众
setVisibilityView(4);
}
} else {
setVisibilityView(4); setVisibilityView(4);
} }
} else { }catch (Exception e){
setVisibilityView(5); LogUtils.e("RoomKtvFragment","sv()"+e.getMessage());
} }
} }
@@ -720,7 +724,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
pitBean.setDress(""); pitBean.setDress("");
pitBean.setUser_code(""); pitBean.setUser_code("");
mBinding.muYc.setData(pitBean); mBinding.muYc.setData(pitBean);
roomInfoResp.setSong_user_info(new MusicSongBean()); roomInfoResp.setSong_user_info(null);
((RoomActivity) getActivity()).setRoleType(0, 0); ((RoomActivity) getActivity()).setRoleType(0, 0);
did = ""; did = "";
mBinding.muName.setText("无"); mBinding.muName.setText("无");

4
gradle.properties
View File

@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false #org.gradle.deamon=false
android.injected.testOnly=false android.injected.testOnly=false
APP_VERSION_NAME=1.0.7.8 APP_VERSION_NAME=1.0.7.9
APP_VERSION_CODE=68 APP_VERSION_CODE=69
org.gradle.jvm.toolchain.useLegacyAdapters=false org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15