同步PD整蛊内容

同步PD修复内容
调整进游戏房就关掉小窗

common/src/main/res/drawable/live_room_menu_red.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="320dp" />
+    <solid android:color="#FD2D48" />
+</shape>

common/src/main/res/layout/dialog_live_new_function.xml

@@ -182,10 +182,34 @@
                     android:gravity="center"
                     android:orientation="vertical">
 
-                    <ImageView
+                    <RelativeLayout
                         android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@mipmap/icon_zhenggu" />
+                        android:layout_height="40dp">
+
+                        <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:src="@mipmap/icon_zhenggu" />
+
+                        <TextView
+                            android:id="@+id/red_menu"
+                            android:layout_width="6dp"
+                            android:layout_height="6dp"
+                            android:layout_marginTop="5dp"
+                            android:layout_alignParentEnd="true"
+                            android:background="@drawable/live_room_menu_red"
+                            android:gravity="center"
+                            android:includeFontPadding="false"
+                            android:minWidth="14dp"
+                            android:paddingLeft="3dp"
+                            android:paddingRight="3dp"
+                            android:textColor="#fff"
+                            android:textSize="10sp"
+                            android:translationY="-4dp"
+                            android:visibility="gone" />
+                    </RelativeLayout>
+
+
 
                     <TextView
                         android:layout_width="wrap_content"

common/src/main/res/values-en-rUS/string.xml

@@ -1359,11 +1359,11 @@ Limited ride And limited avatar frame</string>
     <string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string>
     <string name="interactive_game_search_room_bhe_game">No，only enter the game</string>
     <string name="interactive_game_rooms_oin">There are currently no rooms to join</string>
-    <string name="prank_switch">Turntable prank switch</string>
-    <string name="see_the_contents_of">After closing, all users will not be able to see the contents of the turntable</string>
-    <string name="diamonds_every_time">The turntable consumes diamonds every time</string>
-    <string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
-    <string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
+    <string name="prank_switch">Turntable Trick Switch</string>
+    <string name="see_the_contents_of">After turning it on, all users will not be able to see the content of the carousel.</string>
+    <string name="diamonds_every_time">Each turn of the wheel consumes diamonds</string>
+    <string name="diamonds_every_time_requirement_of">Starting with at least 1000 diamonds</string>
+    <string name="diamonds_every_time_requirement_of_hint">Choose a gift</string>
     <string name="prank_content_yet_hint">You have not set up the prank content yet</string>
     <string name="choose_a_prank_gift">Choose a prank gift</string>
     <string name="choose_a_prank_gift_hint">Enter the prank content...</string>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1549,4 +1549,5 @@
     <string name="main_type_theater">短劇</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
     <string name="guard_buy_tips_1">您將花費%s鑽石，為主播開通</string>
+    <string name="prank_complete">完成*1</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1549,4 +1549,5 @@
     <string name="main_type_theater">短劇</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
     <string name="guard_buy_tips_1">您將花費%s鑽石，為主播開通</string>
+    <string name="prank_complete">完成*1</string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -1547,4 +1547,5 @@
     <string name="main_type_theater">短劇</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
     <string name="guard_buy_tips_1">您將花費%s鑽石，為主播開通</string>
+    <string name="prank_complete">完成*1</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -1360,11 +1360,11 @@ Limited ride And limited avatar frame</string>
     <string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string>
     <string name="interactive_game_search_room_bhe_game">No，only enter the game</string>
     <string name="interactive_game_rooms_oin">There are currently no rooms to join</string>
-    <string name="prank_switch">Turntable prank switch</string>
-    <string name="see_the_contents_of">After closing, all users will not be able to see the contents of the turntable</string>
-    <string name="diamonds_every_time">The turntable consumes diamonds every time</string>
-    <string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
-    <string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
+    <string name="prank_switch">Turntable Trick Switch</string>
+    <string name="see_the_contents_of">After turning it on, all users will not be able to see the content of the carousel.</string>
+    <string name="diamonds_every_time">Each turn of the wheel consumes diamonds</string>
+    <string name="diamonds_every_time_requirement_of">Starting with at least 1000 diamonds</string>
+    <string name="diamonds_every_time_requirement_of_hint">Choose a gift</string>
     <string name="prank_content_yet_hint">You have not set up the prank content yet</string>
     <string name="choose_a_prank_gift">Choose a prank gift</string>
     <string name="choose_a_prank_gift_hint">Enter the prank content...</string>
@@ -1571,4 +1571,5 @@ Limited ride And limited avatar frame</string>
     <string name="dragon_rule7">3.The final interpretation of this activity belongs to PDLIVE.</string>
     <string name="main_type_theater" >Theater</string>
     <string name="pking_over">The anchor is in PK, please try again later</string>
+    <string name="prank_complete">once</string>
 </resources>

common/src/main/res/values/style.xml

@@ -141,4 +141,10 @@
     <declare-styleable name="MainMessageChatListItem_Layout">
         <attr format="reference|enum"  name="autoTextEllipsize"/>
     </declare-styleable>
+
+
+    <style name="PrankTabLayoutTextStyle" parent="TextAppearance.Design.Tab">
+        <item name="textAllCaps">false</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
 </resources>