From 44601c74b4b488a1edd04814c1d38dcb8bcb7600 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 23 Dec 2023 16:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=B5=8B=E8=AF=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/values-en-rUS/string.xml           |  2 +-
 common/src/main/res/values/strings.xml                 |  2 +-
 config.gradle                                          |  2 +-
 .../java/com/yunbao/live/views/LiveRoomViewHolder.java | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 802ba27c8..60b6eccca 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -411,7 +411,7 @@
     <string name="live_link_mic_cannot_link_2">Connecting wheat is currently in progress~</string>
     <string name="live_link_mic_cannot_pk">You are already in PK</string>
     <string name="live_link_mic_pk_1">We</string>
-    <string name="live_link_mic_pk_2">Other party</string>
+    <string name="live_link_mic_pk_2">Opponent</string>
     <string name="live_coin_not_enough">The balance is insufficient. Do you want to recharge it?</string>
     <string name="live_online_anchor">Current online anchor</string>
     <string name="link_mic_play_game">The other anchor is in the game</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 37aa1f2ad..a6dc7488e 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -411,7 +411,7 @@
     <string name="live_link_mic_cannot_link_2">Connecting wheat is currently in progress~</string>
     <string name="live_link_mic_cannot_pk">You are already in PK</string>
     <string name="live_link_mic_pk_1">We</string>
-    <string name="live_link_mic_pk_2">Other party</string>
+    <string name="live_link_mic_pk_2">Opponent</string>
     <string name="live_coin_not_enough">The balance is insufficient. Do you want to recharge it?</string>
     <string name="live_online_anchor">Current online anchor</string>
     <string name="link_mic_play_game">The other anchor is in the game</string>
diff --git a/config.gradle b/config.gradle
index fdd060c23..c9e395940 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,7 +9,7 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-            //serverHost       : "https://napi.yaoulive.com",
+//            serverHost       : "https://napi.yaoulive.com",
 //             测试
             serverHost       : " https://ceshi.yaoulive.com",
 
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 61f54a739..c218370bf 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -2513,6 +2513,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                             mPkRankTopIcon.setVisibility(View.VISIBLE);
                             ImgLoader.display(mContext, bean.getPkTopImgUrl(), mPkRankTopIcon);
                         }
+                        if (mRedVal.getVisibility() == View.VISIBLE) {
+                            RelativeLayout.LayoutParams redValLayoutParams = (RelativeLayout.LayoutParams) mRedVal.getLayoutParams();
+                            redValLayoutParams.bottomMargin = DpUtil.dp2px(10);
+                            mRedVal.setLayoutParams(redValLayoutParams);
+                        }
+                        if (mBlueVal.getVisibility() == View.VISIBLE) {
+                            RelativeLayout.LayoutParams blueValLayoutParams = (RelativeLayout.LayoutParams) mBlueVal.getLayoutParams();
+                            blueValLayoutParams.bottomMargin = DpUtil.dp2px(10);
+                            mBlueVal.setLayoutParams(blueValLayoutParams);
+                        }
                     }
 
                     @Override