diff --git a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
index 90b6630dc..bb29c3695 100644
--- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
+++ b/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())
diff --git a/common/src/main/res/layout/activity_sud_game.xml b/common/src/main/res/layout/activity_sud_game.xml
index 66db5e2e0..bc192ae65 100644
--- a/common/src/main/res/layout/activity_sud_game.xml
+++ b/common/src/main/res/layout/activity_sud_game.xml
@@ -65,6 +65,7 @@
+ android:background="@mipmap/bg_xyd_button" />
\ No newline at end of file
diff --git a/common/src/main/res/drawable/bg_xyd_button.png b/common/src/main/res/mipmap-xxhdpi/bg_xyd_button.png
similarity index 100%
rename from common/src/main/res/drawable/bg_xyd_button.png
rename to common/src/main/res/mipmap-xxhdpi/bg_xyd_button.png
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 98fe2a90c..59bec0600 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -144,7 +144,7 @@
Free for a limited time
Follow and reply
- Following
+ Followed
My concern
My Black List
TA\'s attention
@@ -964,7 +964,7 @@ Limited ride And limited avatar frame
More Settings
view more
The gift is on the way...
- The gift is on the way
+ start pk
Remaining count :%s
Whether to confirm multiple PK (deduct 1 point after confirmation) remaining times on the day: %s
Invite \n anchor
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 5a177b269..dff975be6 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -144,7 +144,7 @@
Free for a limited time
Follow and reply
- Following
+ Followed
My concern
My Black List
TA\'s attention
@@ -964,7 +964,7 @@ Limited ride And limited avatar frame
More Settings
view more
The gift is on the way...
- The gift is on the way
+ start pk
Remaining count :%s
Whether to confirm multiple PK (deduct 1 point after confirmation) remaining times on the day: %s
Invite \n anchor
diff --git a/live/src/main/res/drawable/guardian_img_wings.png b/live/src/main/res/drawable/guardian_img_wings.png
index 528316f28..4e8e9632f 100644
Binary files a/live/src/main/res/drawable/guardian_img_wings.png and b/live/src/main/res/drawable/guardian_img_wings.png differ
diff --git a/live/src/main/res/drawable/guardian_img_wings_p.png b/live/src/main/res/drawable/guardian_img_wings_p.png
index c853dc47d..184131f0f 100644
Binary files a/live/src/main/res/drawable/guardian_img_wings_p.png and b/live/src/main/res/drawable/guardian_img_wings_p.png differ
diff --git a/live/src/main/res/drawable/img_guardian_online.png b/live/src/main/res/drawable/img_guardian_online.png
index b61e3303c..0a9c66a8e 100644
Binary files a/live/src/main/res/drawable/img_guardian_online.png and b/live/src/main/res/drawable/img_guardian_online.png differ
diff --git a/live/src/main/res/layout/dialog_new_guard_buy.xml b/live/src/main/res/layout/dialog_new_guard_buy.xml
index 2142b4c36..5c5f139d2 100644
--- a/live/src/main/res/layout/dialog_new_guard_buy.xml
+++ b/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" />
@@ -107,13 +107,13 @@
+ app:layout_constraintTop_toBottomOf="@+id/guard_buys_layout" />
@@ -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"
diff --git a/live/src/main/res/layout/dialog_new_live_wishlist.xml b/live/src/main/res/layout/dialog_new_live_wishlist.xml
index ff9fc2afe..85eb86b67 100644
--- a/live/src/main/res/layout/dialog_new_live_wishlist.xml
+++ b/live/src/main/res/layout/dialog_new_live_wishlist.xml
@@ -1,20 +1,19 @@
+ android:paddingRight="5dp">
+ app:layout_constraintStart_toStartOf="parent" />
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_ry_live_anchor.xml b/live/src/main/res/layout/view_ry_live_anchor.xml
index 51c1b3c32..b49c46d2c 100644
--- a/live/src/main/res/layout/view_ry_live_anchor.xml
+++ b/live/src/main/res/layout/view_ry_live_anchor.xml
@@ -36,7 +36,7 @@
@@ -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="結束
-PK"
+ android:text="@string/end_pk"
android:textColor="#ffb1b1b1"
android:textSize="10sp" />
diff --git a/live/src/main/res/mipmap-b+en+us/drpkend.gif b/live/src/main/res/mipmap-b+en+us/drpkend.gif
new file mode 100644
index 000000000..ccf401151
Binary files /dev/null and b/live/src/main/res/mipmap-b+en+us/drpkend.gif differ
diff --git a/live/src/main/res/mipmap-b+en+us/sh_img_title.png b/live/src/main/res/mipmap-b+en+us/sh_img_title.png
new file mode 100644
index 000000000..526999bb6
Binary files /dev/null and b/live/src/main/res/mipmap-b+en+us/sh_img_title.png differ
diff --git a/live/src/main/res/drawable/sh_img_title.png b/live/src/main/res/mipmap-xxxhdpi/sh_img_title.png
similarity index 100%
rename from live/src/main/res/drawable/sh_img_title.png
rename to live/src/main/res/mipmap-xxxhdpi/sh_img_title.png
diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml
index 9f77112c2..a931b8288 100644
--- a/live/src/main/res/values-en/strings.xml
+++ b/live/src/main/res/values-en/strings.xml
@@ -37,7 +37,7 @@
Be TA\'s guardian, escort for TA!
return
- Be praised
+ Like
Open aristocracy
Enjoy exclusive privileges!
Head to the noble Center