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

Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

Browse Source
This commit is contained in:
zlzw
2024-03-26 13:46:18 +08:00
parent 4337f0bdd6 b90d86d90f
commit 8c0398190e
10 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
View File

@@ -254,7 +254,7 @@ public class UserHomeActivity extends AbsActivity {
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1));
} else {
ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_follow, followIcon);
followName.setText(getResources().getString(R.string.follow));
followName.setText(getResources().getString(R.string.focus_on));
followName.setTextColor(getResources().getColor(R.color.white));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type));
}
@@ -312,10 +312,15 @@ public class UserHomeActivity extends AbsActivity {
});
bannerImgList = new ArrayList<>();
if (isAnchor) {
bannerImgList = userInfo.getUserHomeTopInfo().getUser_home_banner();
if (userInfo.getUserHomeTopInfo().getUser_home_banner() == null || userInfo.getUserHomeTopInfo().getUser_home_banner().size() == 0) {
bannerImgList.add(userInfo.getUserHomeTopInfo().getUser_avatar());
} else {
bannerImgList.addAll(userInfo.getUserHomeTopInfo().getUser_home_banner());
}
} else {
bannerImgList.add(userInfo.getUserHomeTopInfo().getUser_avatar());
}
tempList = new ArrayList<>();
for (int i = 0; i < bannerImgList.size(); i++) {
tempList.add(new UserHomeImgBean(bannerImgList.get(i)));
@@ -501,7 +506,7 @@ public class UserHomeActivity extends AbsActivity {
itemLayout03.setVisibility(View.GONE);
itemLayout04.setVisibility(View.GONE);
}
moreText.setText(getResources().getString(R.string.moer));
moreText.setText(getResources().getString(R.string.see_more));
ImgLoader.display(mContext, R.mipmap.icon_down, moreIcon);
} else {
if (isAnchor) {
@@ -513,7 +518,7 @@ public class UserHomeActivity extends AbsActivity {
itemLayout03.setVisibility(View.VISIBLE);
itemLayout04.setVisibility(View.VISIBLE);
}
moreText.setText(getResources().getString(R.string.video_comment_collapsed));
moreText.setText(getResources().getString(com.yunbao.main.R.string.close));
ImgLoader.display(mContext, R.mipmap.icon_up, moreIcon);
}
isShowcase = !isShowcase;