From 92ed82ea2a02ea5e2b79aca259126a9e8265b798 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Fri, 11 Aug 2023 13:59:54 +0800
Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/layout/fragment_gift_already_wall.xml      | 2 +-
 common/src/main/res/layout/item_codex_item.xml                 | 2 +-
 common/src/main/res/layout/view_tsak_center_child.xml          | 2 +-
 common/src/main/res/values-en-rUS/string.xml                   | 2 +-
 common/src/main/res/values/strings.xml                         | 2 +-
 .../java/com/yunbao/live/views/GiftAlreadyWallFragment.java    | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/src/main/res/layout/fragment_gift_already_wall.xml b/common/src/main/res/layout/fragment_gift_already_wall.xml
index 9721fe0bc..886e7dac5 100644
--- a/common/src/main/res/layout/fragment_gift_already_wall.xml
+++ b/common/src/main/res/layout/fragment_gift_already_wall.xml
@@ -82,7 +82,7 @@
             android:layout_marginTop="40dp"
             android:background="@drawable/background_skip_button"
             android:gravity="center"
-            android:text="@string/been_sent_must"
+            android:text="@string/instant_light"
             android:visibility="gone"
             android:textColor="#F16D00"
             android:textSize="14sp" />
diff --git a/common/src/main/res/layout/item_codex_item.xml b/common/src/main/res/layout/item_codex_item.xml
index 9b24732aa..ca36c06d9 100644
--- a/common/src/main/res/layout/item_codex_item.xml
+++ b/common/src/main/res/layout/item_codex_item.xml
@@ -26,7 +26,7 @@
         android:layout_width="50dp"
         android:layout_height="20dp"
         android:layout_marginTop="6dp"
-        android:textSize="11sp"
+        android:textSize="8sp"
         android:background="@drawable/background_codex_item_btn"
         android:gravity="center" />
 </LinearLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/view_tsak_center_child.xml b/common/src/main/res/layout/view_tsak_center_child.xml
index 987063fdb..0299b3c4c 100644
--- a/common/src/main/res/layout/view_tsak_center_child.xml
+++ b/common/src/main/res/layout/view_tsak_center_child.xml
@@ -45,7 +45,7 @@
             android:gravity="center"
             android:text="领取"
             android:textColor="#15151D"
-            android:textSize="12sp" />
+            android:textSize="10sp" />
     </FrameLayout>
 
     <TextView
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index c90d12894..68a1ac9cf 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -958,7 +958,7 @@ Limited ride And limited avatar frame</string>
     <string name="lucky_100">Congratulations on %s winning %s in Luck 100 %%! Go pass on the good luck!</string>
     <string name="user_card_guard">Guardian  %s</string>
     <string name="to_receive">receive</string>
-    <string name="to_complete">To complete</string>
+    <string name="to_complete">To finish</string>
     <string name="already_collected">Already collected</string>
     <string name="image_quality_selection">Image quality selection</string>
     <string name="more_settings">More Settings</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index ebf612352..8dbd6785c 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -958,7 +958,7 @@ Limited ride And limited avatar frame</string>
     <string name="lucky_100">Congratulations on %s winning %s in Luck 100 %%! Go pass on the good luck!</string>
     <string name="user_card_guard">Guardian  %s </string>
     <string name="to_receive">receive</string>
-    <string name="to_complete">To complete</string>
+    <string name="to_complete">To finish</string>
     <string name="already_collected">Already collected</string>
     <string name="image_quality_selection">Image quality selection</string>
     <string name="more_settings">More Settings</string>
diff --git a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
index 01da0350a..8ece8c2f4 100644
--- a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
+++ b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
@@ -1,6 +1,7 @@
 package com.yunbao.live.views;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -60,7 +61,7 @@ public class GiftAlreadyWallFragment extends BaseFragment {
         alreadyWallAdapter = new GiftAlreadyWallAdapter(sbWy);
         alreadyList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
         alreadyList.setAdapter(alreadyWallAdapter);
-        if (mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
+        if (sbWy && TextUtils.equals(mLiveUid, toUid)) {
             instantLight.setVisibility(View.VISIBLE);
         } else {
             instantLight.setVisibility(View.GONE);