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

Merge branch 'dev_改版主分支' into dev_改版主分支-升级融云SDK&AGP8

Browse Source
This commit is contained in:
zlzw 2024-03-26 13:46:38 +08:00
commit 218b223320
10 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java
View File

@ -77,9 +77,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;
@ -98,7 +98,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());
@ -110,7 +110,7 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow {
,WordUtil.isNewZh()?"歲":"years old"
)
);
showTag();
showTag();*/
}
private void showTag() {

10
common/src/main/res/layout/activity_user_home.xml
View File

@ -206,11 +206,13 @@
<LinearLayout
android:id="@+id/followLayout"
android:layout_width="80dp"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:background="@drawable/bg_main_com_type"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<ImageView
android:id="@+id/followIcon"
@ -223,7 +225,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/follow"
android:text="@string/focus_on"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold" />
@ -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" />

2
common/src/main/res/values-en-rUS/string.xml
View File

@ -146,7 +146,7 @@
<string name="live_blowkiss_time">Free for a limited time</string>
<string name="live_blowkiss_follow">Follow and reply</string>
<string name="following">Followed</string>
<string name="following">Following</string>
<string name="follow_my_follow">My concern</string>
<string name="my_black">My Black List</string>
<string name="follow_ta_follow">TA\'s attention</string>

3
common/src/main/res/values-en-rUS/strings.xml
View File

@ -24,4 +24,7 @@
<string name="_200">Please enter text within 200 words</string>
<string name="time_hour">hour</string>
<string name="time_minute">minute</string>
<string name="focus_on">Focus on</string>
<string name="see_more">See more</string>
<string name="close">close</string>
</resources>

3
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1489,4 +1489,7 @@
<string name="_200">请输入200字以内的文字</string>
<string name="time_hour">時</string>
<string name="time_minute">分</string>
<string name="focus_on">關注</string>
<string name="see_more">查看更多</string>
<string name="close">收起</string>
</resources>

3
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1489,4 +1489,7 @@
<string name="_200">请输入200字以内的文字</string>
<string name="time_hour">時</string>
<string name="time_minute">分</string>
<string name="focus_on">關注</string>
<string name="see_more">查看更多</string>
<string name="close">收起</string>
</resources>

3
common/src/main/res/values-zh/strings.xml
View File

@ -1487,4 +1487,7 @@
<string name="_200">请输入200字以内的文字</string>
<string name="time_hour">時</string>
<string name="time_minute">分</string>
<string name="focus_on">關注</string>
<string name="see_more">查看更多</string>
<string name="close">收起</string>
</resources>

3
common/src/main/res/values/strings.xml
View File

@ -1509,6 +1509,9 @@ Limited ride And limited avatar frame</string>
<string name="_200">请输入200字以内的文字</string>
<string name="time_hour">時</string>
<string name="time_minute">分</string>
<string name="focus_on">關注</string>
<string name="see_more">查看更多</string>
<string name="close">收起</string>
</resources>

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;

6
video/src/main/java/com/yunbao/video/views/VideoPlayWrapViewHolder.java
View File

@ -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 {