MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改点唱页面逻辑

Browse Source 
修改背包展示问题
This commit is contained in:
梁小江
2025-09-06 19:28:18 +08:00
parent 0db678d6a6
commit 77b801cca6
16 changed files with 184 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
View File

@@ -1007,12 +1007,11 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
private void handleMsgType1013(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
if (text == null || mRoomUserBean == null) return;
int userid = text.getFromUserInfo().getUser_id();
int userId2 = SpUtil.getUserId();
if (text.getAction() == 1 && mRoomUserBean.getUser_id().equals(userId2 + "") && mRoomUserBean.getPit_number() == 9) {
queren(text.getFromUserInfo().getNickname());
} else if (text.getAction() == 4 && userid == userId2) {
} else if (text.getAction() == 4 && text.getFromUserInfo().getUser_id() == userId2) {
queren1(text.getFromUserInfo().getNickname());
} else {
roomFragment.KtvFragmentEvent(messageEvent);
@@ -1060,7 +1059,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up);
setBoolean(aBoolean);
if (mRoomInfoResp.getUser_info() != null) {
mRoomInfoResp.getUser_info().setPit_number(pitNumber != null ? Integer.parseInt(pitNumber) : 0);
mRoomInfoResp.getUser_info().setPit_number(pitNumber != null ? Integer.parseInt(pitNumber) :-1);
}
setRoleType(3, Integer.parseInt(pitNumber));
switchMic(2);
@@ -2002,7 +2001,10 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (pit_number == 888) {
rl_mic.setVisibility(View.VISIBLE);
switchMic(2);
} else {
} else if (pit_number== -1) {
switchMic(1);
rl_mic.setVisibility(VISIBLE);
}else {
switchMic(2);
rl_mic.setVisibility(View.GONE);
}

1
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
View File

@@ -662,6 +662,7 @@ private List<GiftLabelBean> giftLabelBeanList;
for (int i = 0; i < this.list.size(); i++) {
this.fragmentList.add(null);
}
this.roomId = roomId;
}
@Override

8
moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
View File

@@ -299,10 +299,10 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
@Override
public void onDestroy() {
// 移除监听器
if (messageListener != null) {
LogUtils.e("移除监听器");
MessageListenerSingleton.getInstance().removePublicScreenMessageListener(messageListener);
}
// if (messageListener != null) {
// LogUtils.e("移除监听器");
// MessageListenerSingleton.getInstance().removePublicScreenMessageListener(messageListener);
// }
super.onDestroy();
}

48
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
View File

@@ -80,9 +80,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
super.onAttach(context);
// roomInfoResp = (RoomInfoResp) getArguments().getSerializable("roomInfo");
}
public void upRoomInfo(RoomInfoResp roomInfoResp) {
this.roomInfoResp = roomInfoResp;
}
public void roomInfoUpdate(RoomInfoResp resp) {
roomInfoResp = resp;
upData();
@@ -424,6 +426,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
mBinding.llJs.setVisibility(View.VISIBLE);
mBinding.llQg.setVisibility(View.VISIBLE);
mBinding.llSz.setVisibility(View.GONE);
}
}
@@ -441,12 +444,16 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
AgoraManager.getInstance(getActivity()).stopMuisc();
MvpPre.changeSong(roomInfoResp.getRoom_info().getRoom_id(), did);
} else if (id == R.id.ll_ds) {
UserInfo userInfo = new UserInfo();
userInfo.setAvatar(roomInfoResp.getSong_user_info().getAvatar());
userInfo.setNickname(roomInfoResp.getSong_user_info().getNickname());
userInfo.setUser_id(Integer.parseInt(roomInfoResp.getSong_user_info().getUser_id()));
userInfo.setPit_number("0");
RoomGiftDialogFragment.show(null, userInfo, roomInfoResp.getRoom_info().getRoom_id(), 0, "", getParentFragmentManager());
if (mBinding.muYc.pitBean.getUser_id() != null && !mBinding.muYc.pitBean.getUser_id().equals("")) {
UserInfo userInfo = new UserInfo();
userInfo.setAvatar(roomInfoResp.getSong_user_info().getAvatar());
userInfo.setNickname(roomInfoResp.getSong_user_info().getNickname());
userInfo.setUser_id(Integer.parseInt(roomInfoResp.getSong_user_info().getUser_id()));
userInfo.setPit_number("0");
RoomGiftDialogFragment.show(null, userInfo, roomInfoResp.getRoom_info().getRoom_id(), 0, "", getParentFragmentManager());
} else {
com.hjq.toast.ToastUtils.show("请等待演唱者上麦");
}
} else if (id == R.id.ll_bz) {
if (isRotate) {
AgoraManager.getInstance(getActivity()).selectAudioTrack(0);
@@ -583,17 +590,32 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
((RoomActivity) getActivity()).switchMic(1);
} else {
if (mBinding.muZc.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
((RoomActivity) getActivity()).setRoleType(2, -1);
((RoomActivity) getActivity()).switchMic(2);
} else {
((RoomActivity) getActivity()).setRoleType(0, 0);
((RoomActivity) getActivity()).switchMic(2);
if (roomInfoResp.getUser_info().getPit_number()>0){
}else {
// if (mBinding.muZc.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
// ((RoomActivity) getActivity()).setRoleType(2, -1);
// ((RoomActivity) getActivity()).switchMic(2);
// } else {
((RoomActivity) getActivity()).setRoleType(0, 0);
((RoomActivity) getActivity()).switchMic(2);
// }
}
}
}
} else {
RoomPitBean pitBean = mBinding.muYc.pitBean;
pitBean.setAvatar("");
pitBean.setUser_id("");
pitBean.setNickname("");
pitBean.setCharm("");
pitBean.setDress("");
pitBean.setUser_code("");
mBinding.muYc.setData(pitBean);
((RoomActivity) getActivity()).setRoleType(0, 0);
did = "";
mBinding.muName.setText("无");
}
@@ -638,7 +660,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
} else {
RoomPitBean pitBean = new RoomPitBean();
pitBean.setPit_number(messageEvent.getText().getPit_number());
pitBean.setPit_number(messageEvent.getText().getPit_number()!=null ? messageEvent.getText().getPit_number() : "9999");
pitBean.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());

3
moduleroom/src/main/res/layout/fragment_room_ktv.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/cl_bj"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@drawable/bg_r8_tm"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1.4:1.5"
app:layout_constraintStart_toStartOf="parent"
@@ -31,7 +31,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/default_avatar"
android:alpha="0.3"
android:background="#40000000"
app:layout_constraintStart_toStartOf="parent"