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

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

Browse Source
This commit is contained in:
hch
2024-03-22 10:14:07 +08:00
parent e9a3e8aa2f 61dcf0916d
commit 5ebb97cd3c
13 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java
View File

@@ -325,7 +325,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
private void showTag() {
List<String> tags = new ArrayList<>();
tags.add(userInfoBean.getInfo().getAge()+(WordUtil.isNewZh()?"歲":"Age"));
tags.add(userInfoBean.getInfo().getAge()+(WordUtil.isNewZh()?"歲":"years old"));
if (!StringUtil.isEmpty(userInfoBean.getInfo().getCareer())) {
tags.add(userInfoBean.getInfo().getCareer());
}

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

@@ -256,7 +256,7 @@ public class UserHomeActivity extends AbsActivity {
});
tagList = new ArrayList<>();
if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getAge())) {
tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "Age"));
tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "years old"));
}
if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight())) {
tagList.add(userInfo.getUserHomeTopInfo().getHeight());

18
main/src/main/res/values/strings.xml
View File

@@ -18,9 +18,9 @@
<string name="battlepass_exchange_submit_lock">Unlocked</string>
<string name="battlepass_reward_item_lock">Not yet reached level</string>
<string name="battlepass_reward_item_get">Successfully claimed</string>
<string name="top">置頂</string>
<string name="untop">取消置頂</string>
<string name="delete">刪除</string>
<string name="top">TOP</string>
<string name="untop">UnTOP</string>
<string name="delete">Delete</string>
<string name="activity_msg_title">Information</string>
<string name="activity_msg_news_notice">Activities</string>
<string name="activity_msg_system_message">Chats</string>
@@ -37,7 +37,7 @@
<string name="activity_msg_addressbook_tab_fan">Fan</string>
<string name="activity_msg_addressbook_tab_fan2">Return</string>
<string name="activity_msg_addressbook_tab_mutual">Mutual</string>
<string name="activity_msg_chat_top_tip1">Present a gift to accompany him/her~</string>
<string name="activity_msg_chat_top_tip1">Accompany them with gifts~</string>
<string name="dialog_msg_m_config">Message Settings</string>
<string name="dialog_msg_status_config">Order Settings</string>
<string name="dialog_msg_status_online_config">Online</string>
@@ -53,17 +53,17 @@
<string name="dialog_msg_hi_config_audio_tips2">可以是自我介紹，交友意向，唱歌等，最多5秒</string>
<string name="dialog_msg_hi_config_audio_tips3">例如：</string>
<string name="dialog_msg_hi_config_audio_tips4">1.我願變成童話裡，你愛的那個天使 \n2.我還是很喜歡你，像風走了八千裡，不問歸期 \n3.我想吃碗面。什麼面？你的心裡面</string>
<string name="dialog_msg_hi_config_audio_btn">長按錄製</string>
<string name="dialog_msg_hi_config_audio_btn_play">點擊播放</string>
<string name="dialog_msg_hi_config_audio_btn_reset">重錄</string>
<string name="dialog_msg_hi_config_audio_btn_save">保存</string>
<string name="dialog_msg_hi_config_audio_btn">Record</string>
<string name="dialog_msg_hi_config_audio_btn_play">Play</string>
<string name="dialog_msg_hi_config_audio_btn_reset">Rerecord</string>
<string name="dialog_msg_hi_config_audio_btn_save">Save</string>
<string name="dialog_msg_hi_config_audio_refuse_save_image">至少传一张图片</string>
<string name="dialog_msg_hi_config_audio_refuse_save_text">至少传一条文字消息</string>
<string name="dialog_msg_hi_config_audio_refuse_save_audio">至少传一条语音消息</string>
<string name="activity_reg_user_info_title">Personal information</string>
<string name="activity_reg_user_info_sex_title">Nickname</string>
<string name="activity_reg_user_info_sex_sex">Sex</string>
<string name="activity_reg_user_info_sex_sex_tips">*Only one chance to choose gender, choose wisely.</string>
<string name="activity_reg_user_info_sex_sex_tips">*Only one chance to choose gender.</string>
<string name="activity_reg_user_info_sex_man">Boys</string>
<string name="activity_reg_user_info_sex_woman">Girl</string>
<string name="activity_reg_user_info_avatar_change">Replace</string>