From b90d86d90fc10dbbc7c7f2e36f656732fce50ca5 Mon Sep 17 00:00:00 2001 From: hch <16607480311@163.com> Date: Tue, 26 Mar 2024 10:43:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/MessageSayHiNotifyDialog.java | 8 ++++---- common/src/main/res/layout/activity_user_home.xml | 10 ++++++---- common/src/main/res/values-en-rUS/string.xml | 2 +- common/src/main/res/values-en-rUS/strings.xml | 3 +++ common/src/main/res/values-zh-rHK/strings.xml | 3 +++ common/src/main/res/values-zh-rTW/strings.xml | 3 +++ common/src/main/res/values-zh/strings.xml | 3 +++ common/src/main/res/values/strings.xml | 3 +++ .../com/yunbao/main/activity/UserHomeActivity.java | 13 +++++++++---- .../yunbao/video/views/VideoPlayWrapViewHolder.java | 6 +++--- 10 files changed, 38 insertions(+), 16 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java b/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java index 3967d1273..9ed0a9691 100644 --- a/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java @@ -76,9 +76,9 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow { @Override protected void onDismiss() { super.onDismiss(); - if (onDismissListener != null) { + /*if (onDismissListener != null) { onDismissListener.onItemClick(userInfoBean.getUser().getId() + "", isSayHi ? 2 : 1); - } + }*/ } boolean isSayHi = false; @@ -93,7 +93,7 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow { sendMsg(userInfoBean.getSayHiMsg()); dismiss(); }); - avatar = findViewById(R.id.avatar); + /* avatar = findViewById(R.id.avatar); anchorName = findViewById(R.id.anchorName); ImgLoader.display(mContext, userInfoBean.getUser().getAvatar(), avatar); anchorName.setText(userInfoBean.getUser().getUserNicename()); @@ -105,7 +105,7 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow { ,WordUtil.isNewZh()?"歲":"years old" ) ); - showTag(); + showTag();*/ } private void showTag() { diff --git a/common/src/main/res/layout/activity_user_home.xml b/common/src/main/res/layout/activity_user_home.xml index 2c6b08ba3..bec172c89 100644 --- a/common/src/main/res/layout/activity_user_home.xml +++ b/common/src/main/res/layout/activity_user_home.xml @@ -206,11 +206,13 @@ + android:orientation="horizontal" + android:paddingStart="10dp" + android:paddingEnd="10dp"> @@ -700,7 +702,7 @@ android:id="@+id/moreText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/moer" + android:text="@string/see_more" android:textColor="#FF4874" android:textSize="13dp" android:textStyle="bold" /> diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index fbff81ad3..d6565d7a0 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -146,7 +146,7 @@ Free for a limited time Follow and reply - Followed + Following My concern My Black List TA\'s attention diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml index a7654cc40..31c5c0d2f 100644 --- a/common/src/main/res/values-en-rUS/strings.xml +++ b/common/src/main/res/values-en-rUS/strings.xml @@ -24,4 +24,7 @@ Please enter text within 200 words hour minute + Focus on + See more + close \ No newline at end of file diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index eaac0bdb9..f75e70513 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1489,4 +1489,7 @@ 请输入200字以内的文字 時 分 + 關注 + 查看更多 + 收起 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 12d76c52c..aaf1ba5a9 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1489,4 +1489,7 @@ 请输入200字以内的文字 時 分 + 關注 + 查看更多 + 收起 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 5b85c8b4b..99f403292 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1487,4 +1487,7 @@ 请输入200字以内的文字 時 分 + 關注 + 查看更多 + 收起 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 15c390d1f..1c7f32e1b 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1509,6 +1509,9 @@ Limited ride And limited avatar frame 请输入200字以内的文字 時 分 + 關注 + 查看更多 + 收起 diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java index 109b08a77..65c6b6aca 100644 --- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java @@ -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; diff --git a/video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java b/video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java index 71fe57c45..9fc47511f 100644 --- a/video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java +++ b/video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java @@ -451,14 +451,14 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli ToastUtil.show(msg); if (mVideoBean.getIs_love().equals("1")) { int loveNum = Integer.parseInt(mVideoBean.getLove_num()); - mVideoBean.setIs_love(String.valueOf(loveNum - 1)); + mVideoBean.setLove_num(String.valueOf(loveNum - 1)); } else { int loveNum = Integer.parseInt(mVideoBean.getLove_num()); - mVideoBean.setIs_love(String.valueOf(loveNum + 1)); + mVideoBean.setLove_num(String.valueOf(loveNum + 1)); } String isLike = mVideoBean.getIs_love().equals("1") ? "0" : "1"; mVideoBean.setIs_love(isLike); - EventBus.getDefault().post(new VideoLikeEvent(mVideoBean.getId(), Integer.parseInt(mVideoBean.getLove_num()), mVideoBean.getLove_num())); + EventBus.getDefault().post(new VideoLikeEvent(mVideoBean.getId(), Integer.parseInt(mVideoBean.getIs_love()), mVideoBean.getLove_num())); if (mVideoBean.getIs_love().equals("1")) { mBtnLike.setImageResource(R.mipmap.icon_video_zan_new02); } else {