From 6172b5ea9a4d4640bde8b6fda4b9101d390efecb Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 29 Mar 2024 14:51:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[=E8=B0=83=E6=95=B4=E7=BF=BB=E8=AF=91]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Share/src/main/res/values-en/strings.xml               | 10 +++++-----
 common/src/main/res/values-en-rUS/string.xml           |  2 +-
 .../com/yunbao/main/activity/EditProfileActivity.java  |  3 ++-
 .../com/yunbao/main/views/MainMessageViewHolder.java   |  4 ++--
 main/src/main/res/layout/activity_edit_user_hobby.xml  |  4 +++-
 main/src/main/res/layout/activity_user_info.xml        |  1 +
 main/src/main/res/values/strings.xml                   |  2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Share/src/main/res/values-en/strings.xml b/Share/src/main/res/values-en/strings.xml
index bb68d28..30573a8 100644
--- a/Share/src/main/res/values-en/strings.xml
+++ b/Share/src/main/res/values-en/strings.xml
@@ -5,12 +5,12 @@
     <string name="dialog_invite_title">Invite Friends</string>
     <string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
     <string name="dialog_share_copy">Copy</string>
-    <string name="dialog_share_app_internal">Friend</string>
+    <string name="dialog_share_app_internal">Site friends</string>
     <string name="dialog_share_internal_title">Share To</string>
     <string name="dialog_share_internal_cancel">cancel</string>
-    <string name="dialog_share_internal_search">Search</string>
-    <string name="dialog_share_internal_list_btn">Share</string>
-    <string name="dialog_share_success">Success</string>
-    <string name="dialog_share_success_btn">Chat</string>
+    <string name="dialog_share_internal_search">Search nickname</string>
+    <string name="dialog_share_internal_list_btn">Send</string>
+    <string name="dialog_share_success">Share success</string>
+    <string name="dialog_share_success_btn">Go chat</string>
     <string name="dialog_share_failure_not_select">Please select friends</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index d6565d7..cd08f2d 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1462,7 +1462,7 @@ Limited ride And limited avatar frame</string>
     <string name="not_data_message_address_book_list">The current list is empty ~</string>
     <string name="not_data_message_address_book_list_search">There are no search results yet. Try using another word~</string>
     <string name="dialog_message_say_hi_age">Age:</string>
-    <string name="dialog_message_say_hi_btn">Say Hi</string>
+    <string name="dialog_message_say_hi_btn">Greet</string>
     <string name="dialog_message_chat_notify_btn">Reply</string>
     <string name="activity_msg_chat_top_status_online">Online</string>
     <string name="activity_msg_chat_top_status_offline">Offline</string>
diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
index 47fbc56..a5f38b8 100644
--- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
@@ -491,8 +491,8 @@ public class EditProfileActivity extends AbsActivity {
                         .setUserHeight(height, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
                             @Override
                             public void onSuccess(HttpCallbackModel data) {
-                                ToastUtil.show(data.getMsg());
                                 ((TextView) findViewById(R.id.height)).setText(height + "cm");
+                                ((TextView) findViewById(R.id.height)).setVisibility(View.VISIBLE);
                             }
 
                             @Override
@@ -502,6 +502,7 @@ public class EditProfileActivity extends AbsActivity {
                         });
             }
         }).setSelectOptions(120)
+                .setSubmitText(WordUtil.getNewString(R.string.back_community_sure))
                 .build();
         pickerView.setPicker(height);
         pickerView.show();
diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
index 3eb16e9..529ed2a 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
@@ -136,8 +136,8 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         search = findViewById(R.id.search);
         contacts.setOnClickListener(view -> {
             //通讯录
-            RouteUtil.forwardActivity(RouteUtil.PATH_ADDRESSBOOK);
-            // mContext.startActivity(new Intent(mContext, com.yunbao.main.activity.CompleteUserInfoActivity.class));
+            //RouteUtil.forwardActivity(RouteUtil.PATH_ADDRESSBOOK);
+             mContext.startActivity(new Intent(mContext, com.yunbao.main.activity.CompleteUserInfoActivity.class));
             // mContext.startActivity(new Intent(mContext, MessageHiConfigRecordActivity.class));
         });
         search.addTextChangedListener(new TextWatcher() {
diff --git a/main/src/main/res/layout/activity_edit_user_hobby.xml b/main/src/main/res/layout/activity_edit_user_hobby.xml
index fa9b42b..ebdbb9c 100644
--- a/main/src/main/res/layout/activity_edit_user_hobby.xml
+++ b/main/src/main/res/layout/activity_edit_user_hobby.xml
@@ -56,7 +56,8 @@
         android:layout_marginEnd="21dp"
         android:layout_marginBottom="112dp"
         android:background="@drawable/bg_msg_address_book_user_btn_fan"
-        android:text="@string/edit_profile_hobby_save"
+        android:textAllCaps="false"
+        android:text="@string/back_community_sure"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -64,6 +65,7 @@
         android:id="@+id/btn_cancel"
         android:layout_width="122dp"
         android:layout_height="54dp"
+        android:textAllCaps="false"
         android:layout_marginStart="21dp"
         android:layout_marginBottom="112dp"
         android:background="@drawable/dialog_bg_chat_status_config"
diff --git a/main/src/main/res/layout/activity_user_info.xml b/main/src/main/res/layout/activity_user_info.xml
index 8e64dfd..80ad5e8 100644
--- a/main/src/main/res/layout/activity_user_info.xml
+++ b/main/src/main/res/layout/activity_user_info.xml
@@ -58,6 +58,7 @@
                 android:maxLines="2"
                 android:text="@string/activity_reg_user_info_avatar_change"
                 android:textSize="13sp"
+                android:textAllCaps="false"
                 app:autoSizeMaxTextSize="13sp"
                 app:autoSizeMinTextSize="5sp"
                 app:autoSizeStepGranularity="1sp"
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 2035bbf..65ce9bc 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
     <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">Gender</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>