yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/新改版_poyo' into 新改版_poyo

Browse Source 
# Conflicts:
#	config.gradle
This commit is contained in:
老皮 2024-11-13 10:39:25 +08:00
commit 1b85806f81
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
live/src/main/java/com/yunbao/live/bean/LivePkBean.java
View File

@ -22,7 +22,27 @@ public class LivePkBean {
private int levelAnchor;
private int sex;
private String attention;
private String pk_avatar_thumb;
private String is_shengwang;
public String getPk_avatar_thumb() {
if (pk_avatar_thumb == null) {
pk_avatar_thumb = "0";
}
return pk_avatar_thumb;
}
public String getIs_shengwang() {
return is_shengwang;
}
public void setIs_shengwang(String is_shengwang) {
this.is_shengwang = is_shengwang;
}
public void setPk_avatar_thumb(String pk_avatar_thumb) {
this.pk_avatar_thumb = pk_avatar_thumb;
}
@JSONField(name = "isattention")
public String getAttention() {
if(StringUtil.isEmpty(attention)){

6
live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java
View File

@ -343,13 +343,15 @@ public class FreePkDialogFragment extends AbsDialogFragment implements View.OnCl
userBean.setId(bean.getUid());
userBean.setUserNiceName(bean.getUserNiceName());
userBean.setAvatar(bean.getAvatar());
if(bean.getPkUid().equals("0")||bean.getDrpkStatus().equals("0")){
if(bean.getPk_avatar_thumb().equals("0")&&bean.getDrpkStatus().equals("0")){
userBean.setPk(0);
}else{
userBean.setPk(1);
}
userBean.setAttention("1");
list.add(userBean);
if("1".equals(bean.getIs_shengwang())){
list.add(userBean);
}
}
return list;
}