Merge branch 'master' into dev_6.5.4_tmp

2023-08-04 16:13:14 +08:00
parent bf8d88608d 0c096dcafc
commit e43fb5e479
6 changed files with 43 additions and 4 deletions
--- a/common/src/main/res/layout/view_live_gift_number.xml
+++ b/common/src/main/res/layout/view_live_gift_number.xml
@@ -15,7 +15,7 @@
    <LinearLayout

        android:layout_width="80dp"
-        android:layout_height="212dp"
+        android:layout_height="190dp"
        android:layout_alignParentEnd="true"
        android:layout_alignParentBottom="true"
        android:layout_marginEnd="48dp"
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1304,5 +1304,6 @@ Limited ride And limited avatar frame</string>
    <string name="title_anchor">冠名主播：</string>
    <string name="the_title_financier">冠名金主：</string>
    <string name="the_title_financier2">冠名</string>
+    <string name="the_title_financier3">请输入自定义数量</string>

 </resources>