From a788c347de5778fd7c89ff67547b2aaf03111648 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 7 Oct 2023 15:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F=E7=9A=84ne?=
 =?UTF-8?q?w=E5=9B=BE=E6=A0=87=E5=B1=95=E7=A4=BA=EF=BC=8C=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=AD=E8=8B=B1=E6=96=87=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/layout/dialog_open_center_ad.xml           | 3 +--
 common/src/main/res/values-en-rUS/string.xml                   | 1 -
 common/src/main/res/values/strings.xml                         | 1 -
 .../main/java/com/yunbao/live/views/LivePushRyViewHolder.java  | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/common/src/main/res/layout/dialog_open_center_ad.xml b/common/src/main/res/layout/dialog_open_center_ad.xml
index 217d47e2b..d32b5e485 100644
--- a/common/src/main/res/layout/dialog_open_center_ad.xml
+++ b/common/src/main/res/layout/dialog_open_center_ad.xml
@@ -16,8 +16,7 @@
         android:scaleType="fitEnd"
         app:layout_constraintBottom_toTopOf="@+id/close"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/type1" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/close"
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 8f01aacca..2f5fadb4b 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1211,7 +1211,6 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_info_residue_none">None</string>
     <string name="red_packet_info_residue_back">Return to account</string>
     <string name="red_packet_user_tips2">Popularity Red packet</string>
-    <string name="main_tabs_red_packet">Earn Cash</string>
     <string name="main_tabs_red_packet">Game</string>
     <string name="save_popular_red_packets">Popular red packets</string>
     <string name="amount">amount</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index e8f767b91..47df7b844 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1212,7 +1212,6 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_info_residue_none">None</string>
     <string name="red_packet_info_residue_back">Return to account</string>
     <string name="red_packet_user_tips2">Popularity Red packet</string>
-    <string name="main_tabs_red_packet">Earn Cash</string>
     <string name="main_tabs_red_packet">Game</string>
     <string name="save_popular_red_packets">Popular red packets</string>
     <string name="amount">amount</string>
diff --git a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
index 36b819374..a8f129a94 100644
--- a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
@@ -723,7 +723,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
                             public void onLocalVideoEventNotify(RCRTCVideoEventCode event) {
                                 super.onLocalVideoEventNotify(event);
                                 Log.i("摄像头", "onLocalVideoEventNotify: 本地视频事件" + event.code);
-                                if (event == RCRTCVideoEventCode.END_CAMERA_ERROR_UNKNOWN) {
+                                if (event.code == 3) {
                                     isNeedOpenCamera = true;
                                 }
                             }