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

fix bugs.2

Browse Source
This commit is contained in:
骆召亮
2025-12-03 17:33:30 +08:00
parent 9a4b9b973b
commit 8e9f6fa23c
5 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -938,6 +938,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
case 1035:
mentorShipFragment.event1035(messageEvent);
break;
case 1039:
mentorShipFragment.event1039(messageEvent);
break;
case 1059:
mentorShipFragment.event1059(messageEvent);
break;

41
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
View File

@@ -368,14 +368,14 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
viewList[indexList.indexOf("2")].setData(pitBean)
//当前麦上出价，需要更麦上数据
for (i in 0 until viewList.size) {
if(i == 1 || i == 2){
continue
}
if (viewList[i].pitBean?.user_id != "0" && viewList[i].pitBean?.user_id == pitBean.user_id) {
viewList[i].setData(mRoomInfo?.room_info?.pit_list!![indexList[i].toInt() - 1])
}
}
// for (i in 0 until viewList.size) {
// if(i == 1 || i == 2){
// continue
// }
// if (viewList[i].pitBean?.user_id != "0" && viewList[i].pitBean?.user_id == pitBean.user_id) {
// viewList[i].setData(mRoomInfo?.room_info?.pit_list!![indexList[i].toInt() - 1])
// }
// }
if (dialogMentorShip != null && dialogMentorShip?.isShowing!!) {
@@ -482,6 +482,29 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
}
fun event1039(messageEvent: RoomMessageEvent) {
val fromId = messageEvent.text.from_pit_number
val toId = messageEvent.text.to_pit_number
if (indexList.contains(fromId)) {
val viewPos = indexList.indexOf(fromId)
val pitBean = mRoomInfo?.room_info?.pit_list!![fromId.toInt() - 1]
viewList[viewPos].setData(pitBean)
if (fromId == "1") {
mSignPitBean = pitBean
}
}
if (indexList.contains(toId)) {
val viewPos = indexList.indexOf(toId)
val pitBean = mRoomInfo?.room_info?.pit_list!![toId.toInt() - 1]
viewList[viewPos].setData(pitBean)
if (toId == "1") {
mSignPitBean = pitBean
}
}
showBtn()
}
// TODO: 清除个人魅力
fun event1059(messageEvent: RoomMessageEvent) {
val userId: String? = messageEvent.text.user_id
@@ -656,4 +679,6 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
}
}
}
}

2
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
View File

@@ -427,7 +427,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit");
break;
case 2:
// if ("is_host".equals(key)) return textMap.get("is_host");
if ("is_host".equals(key)) return textMap.get("is_host");
if ("is_mute".equals(key)) return textMap.get("is_mute");
if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit");
break;