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

房间内部优化。

Browse Source
This commit is contained in:
骆召亮
2025-11-08 17:45:45 +08:00
parent 33c2bf2ffd
commit a1901a130f
25 changed files with 235 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
View File

@@ -367,6 +367,14 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
mBinding.tvBbQs.setTextColor(ColorManager.getInstance().getButtonColorInt());
mBinding.tvBbQs.setOnClickListener(this::onClisk);
mBinding.container.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dismiss();
}
});
}
private void onClisk(View view1) {

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

@@ -336,21 +336,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
contentView.findViewById(R.id.action_set_host).setVisibility(GONE);
contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
}
// if (type != 1) {
// contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
// contentView.findViewById(R.id.action_kick_out).setVisibility(GONE);
// }
// if (type != 1 && type != 2) {
// contentView.findViewById(R.id.action_set_host).setVisibility(GONE);
// contentView.findViewById(R.id.action_kick_out).setVisibility(GONE);
// }
// if (paim==1){
// contentView.findViewById(R.id.action_kick_out).setVisibility(GONE);
// }else {
// contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
// }
}
private String getValue(int type, String key) {
@@ -391,10 +376,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
public void getRoomUserInfo(UserInfo userInfo1) {
this.userInfo = userInfo1;
// if (paim==1){
// userInfo.setAuction_id(isNum+"");
// }
// ImageUtils.loadHeadCC(userInfo.getAvatar(), mBinding.ivAvatar);
mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getSex() + "");
mBinding.tvName.setText(userInfo.getNickname());
mBinding.tvId.setText("ID:" + userInfo.getUser_code());
@@ -410,12 +391,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
}
// if (userInfo.getRoom_id().equals(room_id)){
// mBinding.imGs.setVisibility(GONE);
// }else {
// mBinding.imGs.setVisibility(View.VISIBLE);
// }
if (userInfo.getIs_room_owner().equals("1")) {
close_type = 1;
} else if (userInfo.getIs_manager().equals("1")) {
@@ -426,16 +401,12 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
close_type = 4;
}
// if (user_id.equals(SpUtil.getUserId()+"")){
// mBinding.tvGh.setVisibility(GONE);
// }else {
if (userInfo != null) {
mBinding.tvGh.setVisibility(VISIBLE);
mBinding.tvGh.setText("所属公会：" + ((userInfo.getGuild() != null && !userInfo.getGuild().isEmpty()) ? userInfo.getGuild() : "无"));
} else {
mBinding.tvGh.setVisibility(GONE);
}
// }
mBinding.tvTs.setText(String.format("90天内累计收到 %s 个礼物", userInfo.getGift_num()));
updateUIBasedOnTypeAndUser();
@@ -450,7 +421,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
if (userInfo.getQinmi() != null && !userInfo.getQinmi().equals("")) {
mBinding.ll.setVisibility(VISIBLE);
mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_k);
// mBinding.rlReqit.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.regit_t);
ImageUtils.loadHeadCC(userInfo.getQinmi().getAvatar1(), mBinding.userNav1);
ImageUtils.loadHeadCC(userInfo.getQinmi().getAvatar2(), mBinding.userNav2);
mBinding.tvNickname1.setText(userInfo.getQinmi().getNickname1());
@@ -548,11 +518,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.roomJb.setVisibility(GONE);
mBinding.roomLh.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE);
// if (isNum==1){
// mBinding.roomMCz.setVisibility(View.VISIBLE);
// }else {
// mBinding.roomMCz.setVisibility(GONE);
// }
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
@@ -586,11 +552,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.roomJb.setVisibility(GONE);
mBinding.roomLh.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE);
// if (isNum==1){
// mBinding.roomMCz.setVisibility(View.VISIBLE);
// }else {
// mBinding.roomMCz.setVisibility(GONE);
// }
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");