修复测试反馈问题

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

@@ -54,8 +54,10 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
         android:layout_gravity="center"
         android:layout_marginTop="20dp"
         android:gravity="center">
@@ -83,10 +85,10 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="2"
-                android:gravity="center"
-                android:inputType="number"
-                android:imeOptions="actionSend"
                 android:background="@null"
+                android:gravity="center"
+                android:imeOptions="actionSend"
+                android:inputType="number"
                 android:singleLine="true"
                 android:text="0"
                 android:textColor="#000000"

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

@@ -14,8 +14,8 @@
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="111dp"
+            android:layout_height="62.5dp"
             android:layout_gravity="center"
             android:layout_marginTop="15dp"
             android:layout_marginBottom="15dp"
@@ -23,6 +23,7 @@
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
+            android:layout_marginBottom="15dp"
             android:layout_height="match_parent">
 
             <LinearLayout
@@ -45,6 +46,7 @@
     </LinearLayout>
 
     <ImageView
+        android:id="@+id/close"
         android:layout_width="25dp"
         android:layout_height="25dp"
         android:layout_gravity="center"

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

@@ -1412,11 +1412,13 @@ Limited ride And limited avatar frame</string>
     <string name="unlock_more_gifts2">More Collectible outfits</string>
     <string name="has_reached_level_after_opening">After opened，the rewards that have reached will be automatically unlocked!</string>
     <string name="order_level">My level</string>
-    <string name="buying_experience_point">Purchase experience value：</string>
+    <string name="buying_experience_point">Purchase EXP value：</string>
     <string name="buying_experience">Buy</string>
     <string name="this_activity_is_over">This activity has ended. Please collect the unclaimed rewards as soon as possible.Points can be reserved for future use</string>
     <string name="exchange_particulars">Exchange Details</string>
     <string name="point_exchange">%s(points) exchange</string>
     <string name="point_exchange2">exchange</string>
     <string name="point_exchange_number">Quantity：</string>
+    <string name="battlepass_exchange_buy_integral">Insufficient points</string>
+    <string name="battlepass_exchange_buy_max">The quantity of goods exchanged has reached the upper limit</string>
 </resources>

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

@@ -1415,4 +1415,6 @@
     <string name="point_exchange">%s(積分) 兌換</string>
     <string name="point_exchange2">兌換</string>
     <string name="point_exchange_number">數量：</string>
+    <string name="battlepass_exchange_buy_integral">積分不足</string>
+    <string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
 </resources>

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

@@ -1414,4 +1414,6 @@
     <string name="point_exchange">%s(積分) 兌換</string>
     <string name="point_exchange2">兌換</string>
     <string name="point_exchange_number">數量：</string>
+    <string name="battlepass_exchange_buy_integral">積分不足</string>
+    <string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
 </resources>

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

@@ -1414,4 +1414,6 @@
     <string name="point_exchange">%s(積分) 兌換</string>
     <string name="point_exchange2">兌換</string>
     <string name="point_exchange_number">數量：</string>
+    <string name="battlepass_exchange_buy_integral">積分不足</string>
+    <string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
 </resources>

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

@@ -1413,12 +1413,14 @@ Limited ride And limited avatar frame</string>
     <string name="unlock_more_gifts2">More Collectible outfits</string>
     <string name="has_reached_level_after_opening">After opened，the rewards that have reached will be automatically unlocked!</string>
     <string name="order_level">My level</string>
-    <string name="buying_experience_point">Purchase experience value：</string>
+    <string name="buying_experience_point">Purchase EXP value：</string>
     <string name="buying_experience">Buy</string>
     <string name="this_activity_is_over">This activity has ended. Please collect the unclaimed rewards as soon as possible.Points can be reserved for future use</string>
     <string name="exchange_particulars">Exchange Details</string>
     <string name="point_exchange">%s(points) exchange</string>
     <string name="point_exchange2">exchange</string>
     <string name="point_exchange_number">Quantity：</string>
+    <string name="battlepass_exchange_buy_integral">Insufficient points</string>
+    <string name="battlepass_exchange_buy_max">The quantity of goods exchanged has reached the upper limit</string>
 
 </resources>