修改中英文

common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java

@@ -185,6 +185,14 @@ public class CreateSudGamePopup extends BottomPopupView {
                         }
                         return;
                     }
+                    if (sillNumber%10!=0){
+                        if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                            ToastUtil.show("金豆數量必須為10的倍數");
+                        } else {
+                            ToastUtil.show("The number of golden beans must be a multiple of 10");
+                        }
+                        return;
+                    }
                 }
 
                 LiveNetManager.get(getContext())

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

@@ -65,6 +65,7 @@
             <com.makeramen.roundedimageview.RoundedImageView
                 android:id="@+id/avatar"
                 android:layout_width="35dp"
+                android:visibility="gone"
                 android:layout_height="35dp"
                 android:layout_marginStart="6dp"
                 android:scaleType="centerCrop"

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

@@ -46,7 +46,7 @@
             android:layout_height="52dp"
             android:layout_gravity="bottom|center_horizontal"
             android:layout_marginBottom="22dp"
-            android:background="@drawable/bg_xyd_button" />
+            android:background="@mipmap/bg_xyd_button" />
     </FrameLayout>
 
 </LinearLayout>

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

@@ -144,7 +144,7 @@
     <string name="live_blowkiss_time">Free for a limited time</string>
     <string name="live_blowkiss_follow">Follow and reply</string>
 
-    <string name="following">Following</string>
+    <string name="following">Followed</string>
     <string name="follow_my_follow">My concern</string>
     <string name="my_black">My Black List</string>
     <string name="follow_ta_follow">TA\'s attention</string>
@@ -964,7 +964,7 @@ Limited ride And limited avatar frame</string>
     <string name="more_settings">More Settings</string>
     <string name="moer">view more</string>
     <string name="gift_way">The gift is on the way...</string>
-    <string name="start_pk">The gift is on the way</string>
+    <string name="start_pk">start pk</string>
     <string name="number_of_remaining_times">Remaining count :%s</string>
     <string name="confirmed_to_proceed">Whether to confirm multiple PK (deduct 1 point after confirmation) remaining times on the day: %s</string>
     <string name="invite_anchor">Invite \n anchor</string>

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

@@ -144,7 +144,7 @@
     <string name="live_blowkiss_time">Free for a limited time</string>
     <string name="live_blowkiss_follow">Follow and reply</string>
 
-    <string name="following">Following</string>
+    <string name="following">Followed</string>
     <string name="follow_my_follow">My concern</string>
     <string name="my_black">My Black List</string>
     <string name="follow_ta_follow">TA\'s attention</string>
@@ -964,7 +964,7 @@ Limited ride And limited avatar frame</string>
     <string name="more_settings">More Settings</string>
     <string name="moer">view more</string>
     <string name="gift_way">The gift is on the way...</string>
-    <string name="start_pk">The gift is on the way</string>
+    <string name="start_pk">start pk</string>
     <string name="number_of_remaining_times">Remaining count :%s</string>
     <string name="confirmed_to_proceed">Whether to confirm multiple PK (deduct 1 point after confirmation) remaining times on the day: %s</string>
     <string name="invite_anchor">Invite \n anchor</string>

live/src/main/res/layout/dialog_new_guard_buy.xml

@@ -48,9 +48,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text=""
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
+                android:text=""
                 android:textColor="#F6F7FB"
                 android:textSize="14sp" />
         </LinearLayout>
@@ -107,13 +107,13 @@
 
             <ImageView
                 android:id="@+id/guard_imageView2"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="30dp"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:background="@mipmap/sh_img_title"
 
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/guard_buys_layout"
+                app:layout_constraintTop_toBottomOf="@+id/guard_buys_layout" />
-                app:srcCompat="@drawable/sh_img_title" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/guard_rights"
@@ -155,13 +155,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:marqueeRepeatLimit="marquee_forever"
                     android:scrollHorizontally="true"
                     android:singleLine="true"
-                    android:layout_marginLeft="10dp"
                     android:textColor="#9E7CFD"
                     android:textSize="13sp" />
 
@@ -181,6 +181,7 @@
                     android:id="@+id/guard_btn_buy"
                     android:layout_width="110dp"
                     android:layout_height="30dp"
+                    android:singleLine="true"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:layout_marginEnd="15dp"
@@ -267,8 +268,8 @@
             android:id="@+id/guard_imageView"
             android:layout_width="0dp"
             android:layout_height="58dp"
-            android:layout_marginTop="30dp"
             android:layout_marginStart="136dp"
+            android:layout_marginTop="30dp"
             android:scaleType="centerCrop"
             android:src="@drawable/guardian_img_wings"
             android:visibility="invisible"

live/src/main/res/layout/dialog_new_live_wishlist.xml

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="573dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_xyd"
-    android:paddingRight="5dp"
+    android:orientation="vertical"
     android:paddingLeft="5dp"
-    android:orientation="vertical">
+    android:paddingRight="5dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/rl_add"
         android:layout_width="match_parent"
         android:layout_height="140dp"
-        android:layout_marginTop="150dp"
         android:layout_marginStart="10dp"
+        android:layout_marginTop="150dp"
         android:layout_marginEnd="10dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -71,9 +70,9 @@
         android:layout_width="275dp"
         android:layout_height="52dp"
         android:layout_marginBottom="24dp"
+        android:background="@mipmap/bg_xyd_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
-        app:srcCompat="@drawable/bg_xyd_button" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

live/src/main/res/layout/view_ry_live_anchor.xml

@@ -36,7 +36,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="開始PK"
+                android:text="@string/start_pk"
                 android:textColor="#ffffffff"
                 android:textSize="12sp" />
 
@@ -44,7 +44,7 @@
                 android:id="@+id/btn_dr_pk_nub"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="剩餘次數:0"
+                android:text="@string/number_of_remaining_times"
                 android:textColor="#ffe1e1e1"
                 android:textSize="8sp" />
 
@@ -67,8 +67,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:text="邀請
+                    android:text="@string/invite_anchor"
-                主播"
                     android:textColor="#ffffffff"
                     android:textSize="10sp" />
 
@@ -87,8 +86,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:text="結束
+                    android:text="@string/end_pk"
-PK"
                     android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 

live/src/main/res/values-en/strings.xml

@@ -37,7 +37,7 @@
 
     <string name="buy_guard_info" >Be TA\'s guardian, escort for TA!</string>
     <string name="buy_guard_back_coin" >return</string>
-    <string name="praise">Be praised</string>
+    <string name="praise">Like</string>
     <string name="live_gift_buy_gold" >Open aristocracy</string>
     <string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
     <string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>