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

1：修改点歌房出现的错误

Browse Source 
2：修改进入家族详情页面
This commit is contained in:
梁小江
2025-12-03 20:02:14 +08:00
parent 8e9f6fa23c
commit 0d5e64e31a
12 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java
View File

@@ -64,7 +64,7 @@ public class RoomPitBean implements Serializable {
private String dress_picture;
private RankInfo rank_info;
private int ball_state;//1开球0未开球
private int is_online;//是否在线 : 1在线 2离线
private int is_online=1;//是否在线 : 1在线 2离线
private String to_pit_number;
private boolean is_pk;//是否是在pk模式中
private boolean isMute;//是否打开麦圈

20
BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
View File

@@ -179,7 +179,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
setCardiac(pitBean.getCharm(), getTzbl());
if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE);
if (bean.getIs_online()==1){
iv_on_line.setVisibility(GONE);
}else if (bean.getIs_online()==2){
if (!bean.getUser_id().equals(SpUtil.getUserId()+"")) {
iv_on_line.setVisibility(VISIBLE);
}
}else {
iv_on_line.setVisibility(GONE);
}
} else {
iv_on_line.setVisibility(GONE);
}
@@ -420,7 +428,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
public void setOnlineStatus() {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE);
if (pitBean.getIs_online()==1){
iv_on_line.setVisibility(GONE);
}else if (pitBean.getIs_online()==2){
if (!pitBean.getUser_id().equals(SpUtil.getUserId()+"")) {
iv_on_line.setVisibility(VISIBLE);
}
}else {
iv_on_line.setVisibility(GONE);
}
} else {
iv_on_line.setVisibility(GONE);
}

2
BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
View File

@@ -152,7 +152,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
}
});
} else {
mBinding.tvGiveCoinNum.setText(giftNumBean.getNumber());
mBinding.tvGiveCoinNum.setText(giftNumBean.getText());
}
mSelectGiftNumPopupWindow.dismiss();
});