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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-09-28 14:08:14 +08:00
commit c9895781d5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -1244,7 +1244,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
.getNobleRankHideUserList(new com.yunbao.common.http.base.HttpCallback<NobleRankHideUserListModel>() {
@Override
public void onSuccess(NobleRankHideUserListModel data) {
outRankHide = data.getOutRankHide();
outRankHide = data.getInRankHide();
LiveUserMoreDialogFragment fragment = new LiveUserMoreDialogFragment();
fragment.setLiveGuardInfo(mLiveGuardInfo);
Bundle bundle = new Bundle();

8
live/src/main/java/com/yunbao/live/bean/LiveBean.java
View File

@ -64,14 +64,14 @@ public class LiveBean implements Parcelable {
}
public String getRecommendCardIcon() {
if (TextUtils.isEmpty(recommendCardIconSizeTwo)) {
if (!TextUtils.isEmpty(recommendCardIconSizeThree)) {
return recommendCardIconSizeThree;
if (TextUtils.isEmpty(recommendCardIconSizeThree)) {
if (!TextUtils.isEmpty(recommendCardIconSizeTwo)) {
return recommendCardIconSizeTwo;
} else {
return null;
}
} else {
return recommendCardIconSizeTwo;
return recommendCardIconSizeThree;
}
}