From 329bd632293eaa4d0a51a4ef3ebe921dede47d08 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sun, 2 Apr 2023 16:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/values-en/strings.xml     | 28 ++++++++++++++++++-
 config.gradle                                 |  4 +--
 .../yunbao/live/views/LiveRoomViewHolder.java |  5 ++++
 live/src/main/res/values-en/strings.xml       | 23 +++++++++++++--
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml
index 52ad1db6d..81ad887c4 100644
--- a/common/src/main/res/values-en/strings.xml
+++ b/common/src/main/res/values-en/strings.xml
@@ -1089,5 +1089,31 @@ Limited ride And limited avatar frame</string>
     <string name="live_medal_des4">Get a fan badge for giving gifts</string>
     <string name="clear_unread_messages">Whether to clear unread messages</string>
     <string name="support_login">The application collects location data to support login and registration functions.</string>
-    <string name="layout_live_anchor_say_ready_title">女神說</string>
+    <string name="layout_live_anchor_say_ready_title">Goddess says</string>
+    <string name="say_something3">Say something...</string>
+    <string name="come_hint">%s here comes</string>
+    <string name="day_wish">Daily Wishes</string>
+    <string name="zhou_xin">Weekly Wishes</string>
+    <string name="lunar_wish">Month Wishes</string>
+    <string name="seasonal_wish">Seasonal Wishes</string>
+    <string name="wish_number">Wish%s</string>
+    <string name="aristocrat">aristocrat</string>
+    <string name="aristocrat_determine">sure</string>
+    <string name="replacement_wish_day">Reset Your: Day</string>
+    <string name="replacement_wish_zhou">Reset Wish: Week</string>
+    <string name="replacement_wish_lunar">Reset Wish: Month</string>
+    <string name="replacement_wish_seasonal">Reset Wish: Month</string>
+    <string name="replacement_reset_confirmed">Is reset confirmed</string>
+    <string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string>
+    <string name="replacement_reset_confirmed_sure">Confirm Reset</string>
+    <string name="replacement_reset_confirmed_cancel">Back to list</string>
+    <string name="replacement_reset_confirmed_cancel2">Current wish list not saved</string>
+    <string name="replacement_reset_confirmed_cancel3">Do you keep a current wishlist?</string>
+    <string name="replacement_reset_confirmed_cancel4">Not saved</string>
+
+    <string name="live_use_discount_content">You have a %s, do you want to use it? Use it to open a diamond %s and get %s gold beans back</string>
+    <string name="live_use_discount_no">Not used</string>
+    <string name="live_use_discount_yes">Use</string>
+    <string name="live_use_wish">wish</string>
+    <string name="live_play_setting">Play setting</string>
 </resources>
diff --git a/config.gradle b/config.gradle
index 6f5c50bd0..f6792f141 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //测试
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index cdb485d22..2afed9b38 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1825,6 +1825,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     private void initPkRankView(PkRankBean bean) {
+
         if (pkRankVf.getTag() != null) {
             return;
         }
@@ -1851,6 +1852,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         pkRankVf.addView(hourView);
         pkRankVf.startFlipping();
         pkRankVf.setTag("start");
+        pkRankLayout.setVisibility(View.VISIBLE);
     }
 
     private void initPkRank() {
@@ -1858,6 +1860,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     public void initPkRank(String isLadders) {
+        pkRankLayout.setVisibility(View.GONE);
+        liveRankPk2.setVisibility(View.GONE);
         mRedVal.setVisibility(View.GONE);
         mBlueVal.setVisibility(View.GONE);
         mPkRankTopIcon.setVisibility(View.GONE);
@@ -1897,6 +1901,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                 });
                             }
                             pkRankLayout.setVisibility(View.VISIBLE);
+                            liveRankPk2.setVisibility(View.VISIBLE);
                             mPkRankText.setText(bean.getName());
                             ImgLoader.display(mContext, bean.getImg(), mPkRankIcon);
                             if (StringUtil.isEmpty(bean.getPkTopImgUrl())) {
diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml
index 74c1229ce..cec5d3ca1 100644
--- a/live/src/main/res/values-en/strings.xml
+++ b/live/src/main/res/values-en/strings.xml
@@ -67,6 +67,25 @@
     <string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
     <string name="free_pk_user_pking" >The other team is engaged in a PK</string>
     <string name="free_pk_num_null" >The PK number is used up</string>
-    <string name="live_user_mailbox_top_text">来自%s的信</string>
-    <string name="live_user_mailbox_tip_text">「%s」有更多話對你說</string>
+    <string name="live_user_mailbox_top_text">Letter from %s</string>
+    <string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
+    <string name="live_user_mailbox_more_text">View details</string>
+    <string name="live_user_mailbox_web_title">Letter from[%s]</string>
+    <string name="live_anchor_edit_call_me_title">Editors Contact</string>
+    <string name="live_anchor_edit_call_me_switch">Contact switch</string>
+    <string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
+    <string name="live_anchor_edit_call_me_not_filled">Not filled</string>
+    <string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
+    <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
+    <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
+    <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
+    <string name="live_ready_anchor_call_me">Contact details</string>
+    <string name="live_anchor_say_title">Editors Goddess says</string>
+    <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
+    <string name="live_anchor_say_select_style">Select Style</string>
+    <string name="live_anchor_say_switch">The Goddess Says Switch</string>
+    <string name="live_user_letter_dialog_title">Delete Mail</string>
+    <string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
+    <string name="live_user_letter_dialog_yes">Delete</string>
+    <string name="live_user_letter_dialog_no">Think again</string>
 </resources>
\ No newline at end of file