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

文字11

Browse Source
This commit is contained in:
hch 2024-03-22 10:13:53 +08:00
parent f2b2c39168
commit e9a3e8aa2f
10 changed files with 76 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,7 +482,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="主播守護團" android:text="@string/fan_group_name"
android:textColor="#333333" android:textColor="#333333"
android:textSize="12dp" android:textSize="12dp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -581,7 +581,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="礼物墙" android:text="@string/gift_wall"
android:textColor="#333333" android:textColor="#333333"
android:textSize="12dp" android:textSize="12dp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -649,7 +649,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="榮譽墻" android:text="@string/wall_honor"
android:textColor="#333333" android:textColor="#333333"
android:textSize="12dp" android:textSize="12dp"
android:textStyle="bold" /> android:textStyle="bold" />

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

@ -966,7 +966,7 @@ Limited ride And limited avatar frame</string>
<string name="already_collected">Already collected</string> <string name="already_collected">Already collected</string>
<string name="image_quality_selection">Image quality selection</string> <string name="image_quality_selection">Image quality selection</string>
<string name="more_settings">More Settings</string> <string name="more_settings">More Settings</string>
<string name="moer">view more</string> <string name="moer">see more</string>
<string name="gift_way">The gift is on the way...</string> <string name="gift_way">The gift is on the way...</string>
<string name="start_pk">start pk</string> <string name="start_pk">start pk</string>
<string name="number_of_remaining_times">Remaining count :%s</string> <string name="number_of_remaining_times">Remaining count :%s</string>

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

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="real_person">真人认证</string> <string name="real_person">Real person</string>
<string name="trade_union">工会</string> <string name="trade_union">tradeUnion</string>
<string name="set_back">已拉黑，无法查看</string> <string name="set_back">Blocked and cannot be viewed</string>
<string name="cancel_back">取消黑名单</string> <string name="cancel_back">Cancel blacklist</string>
<string name="user_home_img_del_dialog">Are you sure you want to delete the picture?</string>
<string name="upload_success">Upload successful</string>
<string name="upload_failed">upload failed</string>
<string name="_9">Add up to 9 pictures</string>
<string name="not_interested">not interested</string>
<string name="person_like">people liked it</string>
<string name="fan_group_name">主播守護團</string>
</resources> </resources>

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

@ -1462,10 +1462,17 @@
<string name="dialog_message_say_hi_btn">打招呼</string> <string name="dialog_message_say_hi_btn">打招呼</string>
<string name="dialog_message_chat_notify_btn">回復</string> <string name="dialog_message_chat_notify_btn">回復</string>
<string name="commen_user_active">個人動態</string> <string name="commen_user_active">個人動態</string>
<string name="real_person">真人认证</string> <string name="real_person">真人認證</string>
<string name="trade_union">工会</string> <string name="trade_union">工会</string>
<string name="activity_msg_chat_top_status_online">在線</string> <string name="activity_msg_chat_top_status_online">在線</string>
<string name="activity_msg_chat_top_status_offline">離線</string> <string name="activity_msg_chat_top_status_offline">離線</string>
<string name="set_back">已拉黑，无法查看</string> <string name="set_back">已拉黑，无法查看</string>
<string name="cancel_back">取消黑名单</string> <string name="cancel_back">取消黑名单</string>
<string name="user_home_img_del_dialog">確定刪除圖片？</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">删除成功</string>
<string name="_9">最多添加9張圖片</string>
<string name="not_interested">不感興趣</string>
<string name="person_like">人觉得很赞</string>
<string name="fan_group_name">主播守護團</string>
</resources> </resources>

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

@ -1461,11 +1461,18 @@
<string name="dialog_message_say_hi_btn">打招呼</string> <string name="dialog_message_say_hi_btn">打招呼</string>
<string name="dialog_message_chat_notify_btn">回復</string> <string name="dialog_message_chat_notify_btn">回復</string>
<string name="commen_user_active">個人動態</string> <string name="commen_user_active">個人動態</string>
<string name="real_person">真人认证</string> <string name="real_person">真人認證</string>
<string name="trade_union">工会</string> <string name="trade_union">工会</string>
<string name="activity_msg_chat_top_status_online">在線</string> <string name="activity_msg_chat_top_status_online">在線</string>
<string name="activity_msg_chat_top_status_offline">離線</string> <string name="activity_msg_chat_top_status_offline">離線</string>
<string name="set_back">已拉黑，无法查看</string> <string name="set_back">已拉黑，无法查看</string>
<string name="cancel_back">取消黑名单</string> <string name="cancel_back">取消黑名单</string>
<string name="user_home_img_del_dialog">確定刪除圖片？</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">删除成功</string>
<string name="_9">最多添加9張圖片</string>
<string name="not_interested">不感興趣</string>
<string name="person_like">人觉得很赞</string>
<string name="fan_group_name">主播守護團</string>
</resources> </resources>

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

@ -1458,11 +1458,18 @@
<string name="dialog_message_say_hi_btn">打招呼</string> <string name="dialog_message_say_hi_btn">打招呼</string>
<string name="dialog_message_chat_notify_btn">回復</string> <string name="dialog_message_chat_notify_btn">回復</string>
<string name="commen_user_active">個人動態</string> <string name="commen_user_active">個人動態</string>
<string name="real_person">真人认证</string> <string name="real_person">真人認證</string>
<string name="trade_union">工会</string> <string name="trade_union">工会</string>
<string name="activity_msg_chat_top_status_online">在線</string> <string name="activity_msg_chat_top_status_online">在線</string>
<string name="activity_msg_chat_top_status_offline">離線</string> <string name="activity_msg_chat_top_status_offline">離線</string>
<string name="praise">獲讚</string> <string name="praise">獲贊</string>
<string name="set_back">已拉黑，无法查看</string> <string name="set_back">已拉黑，无法查看</string>
<string name="cancel_back">取消黑名单</string> <string name="cancel_back">取消黑名單</string>
<string name="user_home_img_del_dialog">確定刪除圖片？</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">删除成功</string>
<string name="_9">最多添加9張圖片</string>
<string name="not_interested">不感興趣</string>
<string name="person_like">人觉得很赞</string>
<string name="fan_group_name">主播守護團</string>
</resources> </resources>

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

@ -1482,11 +1482,18 @@ Limited ride And limited avatar frame</string>
<string name="activity_msg_chat_top_status_online">Online</string> <string name="activity_msg_chat_top_status_online">Online</string>
<string name="activity_msg_chat_top_status_offline">Offline</string> <string name="activity_msg_chat_top_status_offline">Offline</string>
<string name="commen_user_active">个人动态</string> <string name="commen_user_active">个人动态</string>
<string name="real_person">真人认证</string> <string name="real_person">Real person</string>
<string name="trade_union">工会</string> <string name="trade_union">工会</string>
<string name="praise">Like</string> <string name="praise">Liked</string>
<string name="set_back">已拉黑，无法查看</string> <string name="set_back">已拉黑，无法查看</string>
<string name="cancel_back">取消黑名单</string> <string name="cancel_back">取消黑名单</string>
<string name="user_home_img_del_dialog">確定刪除圖片？</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">删除成功</string>
<string name="_9">最多添加9張圖片</string>
<string name="not_interested">不感興趣</string>
<string name="person_like">人觉得很赞</string>
<string name="fan_group_name">主播守護團</string>
</resources> </resources>

16
main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
View File

@ -148,12 +148,12 @@ public class CommunityDetailsActivity extends AbsActivity {
public void callback(Integer isAttention) { public void callback(Integer isAttention) {
if (isAttention == 1) { if (isAttention == 1) {
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_followed, followIcon); ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_followed, followIcon);
followName.setText("已关注"); followName.setText(getResources().getString(R.string.following));
followName.setTextColor(Color.parseColor("#777777")); followName.setTextColor(Color.parseColor("#777777"));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1)); followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1));
} else { } else {
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_follow, followIcon); ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_follow, followIcon);
followName.setText("关注"); followName.setText(getResources().getString(R.string.follow));
followName.setTextColor(getResources().getColor(R.color.white)); followName.setTextColor(getResources().getColor(R.color.white));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type)); followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type));
} }
@ -173,11 +173,11 @@ public class CommunityDetailsActivity extends AbsActivity {
if (activeBean.getIs_love().equals("1")) { if (activeBean.getIs_love().equals("1")) {
activeBean.setIs_love("0"); activeBean.setIs_love("0");
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like01, like); ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like01, like);
likeCount.setText(Integer.parseInt(activeBean.getLove_num()) - 1 + "人觉得很赞"); likeCount.setText(Integer.parseInt(activeBean.getLove_num()) - 1 + getResources().getString(com.yunbao.main.R.string.person_like));
} else { } else {
activeBean.setIs_love("1"); activeBean.setIs_love("1");
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like, like); ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like, like);
likeCount.setText(Integer.parseInt(activeBean.getLove_num()) + 1 + "人觉得很赞"); likeCount.setText(Integer.parseInt(activeBean.getLove_num()) + 1 + getResources().getString(com.yunbao.main.R.string.person_like));
} }
} }
} }
@ -189,8 +189,8 @@ public class CommunityDetailsActivity extends AbsActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
SparseArray<String> array = new SparseArray<>(); SparseArray<String> array = new SparseArray<>();
array.append(0, "举报"); array.append(0, getResources().getString(R.string.report));
array.append(1, "不感兴趣"); array.append(1, getResources().getString(R.string.not_interested));
DialogUitl.showStringArrayDialog(CommunityDetailsActivity.this, array, new DialogUitl.StringArrayDialogCallback() { DialogUitl.showStringArrayDialog(CommunityDetailsActivity.this, array, new DialogUitl.StringArrayDialogCallback() {
@Override @Override
public void onItemClick(String text, int tag) { public void onItemClick(String text, int tag) {
@ -365,12 +365,12 @@ public class CommunityDetailsActivity extends AbsActivity {
} }
if (activeBean.getIs_attention().equals("1")) {//关注 if (activeBean.getIs_attention().equals("1")) {//关注
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_followed, followIcon); ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_followed, followIcon);
followName.setText("已关注"); followName.setText(getResources().getString(R.string.following));
followName.setTextColor(Color.parseColor("#777777")); followName.setTextColor(Color.parseColor("#777777"));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1)); followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1));
} else { } else {
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_follow, followIcon); ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_follow, followIcon);
followName.setText("关注"); followName.setText(getResources().getString(R.string.follow));
followName.setTextColor(getResources().getColor(R.color.white)); followName.setTextColor(getResources().getColor(R.color.white));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type)); followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type));
} }

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

@ -2,6 +2,7 @@ package com.yunbao.main.activity;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
@ -326,8 +327,13 @@ public class UserHomeActivity extends AbsActivity {
@Override @Override
public void onImgDel(UserHomeImgBean activeBean, int position) { public void onImgDel(UserHomeImgBean activeBean, int position) {
bannerImgList.remove(position); DialogUitl.showSimpleDialog(mContext, getResources().getString(com.yunbao.main.R.string.user_home_img_del_dialog), new DialogUitl.SimpleCallback() {
uploadImg(false); @Override
public void onConfirmClick(Dialog dialog, String content) {
bannerImgList.remove(position);
uploadImg(false);
}
});
} }
}); });
mBanner.setAutoPlay(false).setPages(bannerImgList, new UserHomeImgsViewHolder()).setOnPageChangeListener(new ViewPager.OnPageChangeListener() { mBanner.setAutoPlay(false).setPages(bannerImgList, new UserHomeImgsViewHolder()).setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@ -452,12 +458,12 @@ public class UserHomeActivity extends AbsActivity {
public void callback(Integer isAttention) { public void callback(Integer isAttention) {
if (isAttention == 1) { if (isAttention == 1) {
ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_followed, followIcon); ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_followed, followIcon);
followName.setText("已关注"); followName.setText(getResources().getString(R.string.following));
followName.setTextColor(Color.parseColor("#777777")); followName.setTextColor(Color.parseColor("#777777"));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1)); followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1));
} else { } else {
ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_follow, followIcon); ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_follow, followIcon);
followName.setText("关注"); followName.setText(getResources().getString(R.string.follow));
followName.setTextColor(getResources().getColor(R.color.white)); followName.setTextColor(getResources().getColor(R.color.white));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type)); followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type));
} }
@ -478,7 +484,7 @@ public class UserHomeActivity extends AbsActivity {
itemLayout03.setVisibility(View.GONE); itemLayout03.setVisibility(View.GONE);
itemLayout04.setVisibility(View.GONE); itemLayout04.setVisibility(View.GONE);
} }
moreText.setText("查看更多"); moreText.setText(getResources().getString(R.string.moer));
ImgLoader.display(mContext, R.mipmap.icon_down, moreIcon); ImgLoader.display(mContext, R.mipmap.icon_down, moreIcon);
} else { } else {
if (isAnchor) { if (isAnchor) {
@ -490,7 +496,7 @@ public class UserHomeActivity extends AbsActivity {
itemLayout03.setVisibility(View.VISIBLE); itemLayout03.setVisibility(View.VISIBLE);
itemLayout04.setVisibility(View.VISIBLE); itemLayout04.setVisibility(View.VISIBLE);
} }
moreText.setText("收起"); moreText.setText(getResources().getString(R.string.video_comment_collapsed));
ImgLoader.display(mContext, R.mipmap.icon_up, moreIcon); ImgLoader.display(mContext, R.mipmap.icon_up, moreIcon);
} }
isShowcase = !isShowcase; isShowcase = !isShowcase;
@ -535,6 +541,8 @@ public class UserHomeActivity extends AbsActivity {
public void onClick(View v) { public void onClick(View v) {
if (bannerImgList.size() < 9) { if (bannerImgList.size() < 9) {
selectImg(); selectImg();
}else{
ToastUtil.show(getResources().getString(com.yunbao.main.R.string._9));
} }
} }
}); });
@ -549,7 +557,7 @@ public class UserHomeActivity extends AbsActivity {
public void onClick(View v) { public void onClick(View v) {
String temp = userInfo.getCheckBlack().get(0).getU2t().equals("0") ? getResources().getString(R.string.black_add) : getResources().getString(com.yunbao.main.R.string.cancel_back); String temp = userInfo.getCheckBlack().get(0).getU2t().equals("0") ? getResources().getString(R.string.black_add) : getResources().getString(com.yunbao.main.R.string.cancel_back);
SparseArray<String> array = new SparseArray<>(); SparseArray<String> array = new SparseArray<>();
array.append(1, "不感興趣"); array.append(1, getResources().getString(com.yunbao.main.R.string.not_interested));
array.append(0, getResources().getString(R.string.report)); array.append(0, getResources().getString(R.string.report));
array.append(2, temp); array.append(2, temp);
DialogUitl.showStringArrayDialog(UserHomeActivity.this, array, new DialogUitl.StringArrayDialogCallback() { DialogUitl.showStringArrayDialog(UserHomeActivity.this, array, new DialogUitl.StringArrayDialogCallback() {
@ -736,9 +744,9 @@ public class UserHomeActivity extends AbsActivity {
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info != null) { if (code == 0 && info != null) {
if (isUp) { if (isUp) {
ToastUtil.show("上传成功"); ToastUtil.show(getResources().getString(com.yunbao.main.R.string.upload_success));
} else { } else {
ToastUtil.show("删除成功"); ToastUtil.show(getResources().getString(com.yunbao.main.R.string.upload_failed));
} }
mBanner.setPages(bannerImgList, new UserHomeImgsViewHolder()).start(); mBanner.setPages(bannerImgList, new UserHomeImgsViewHolder()).start();
tempList = new ArrayList<>(); tempList = new ArrayList<>();

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

@ -143,7 +143,7 @@ public class VideoPlayWrapViewHolder extends AbsViewHolder implements View.OnCli
@Override @Override
public void onClick(View v) { public void onClick(View v) {
SparseArray<String> array = new SparseArray<>(); SparseArray<String> array = new SparseArray<>();
array.append(0, "举报"); array.append(0, mContext.getResources().getString(com.yunbao.common.R.string.report));
array.append(1, "不感兴趣"); array.append(1, "不感兴趣");
DialogUitl.showStringArrayDialog(mContext, array, new DialogUitl.StringArrayDialogCallback() { DialogUitl.showStringArrayDialog(mContext, array, new DialogUitl.StringArrayDialogCallback() {
@Override @Override