修复测试反馈问题

main/src/main/res/layout/activity_battlepass.xml

@@ -80,11 +80,13 @@
                 android:layout_height="wrap_content"
                 android:src="@mipmap/ic_zl_tab3_unselect" />
         </LinearLayout>
+
         <include
             layout="@layout/view_battlepass_user"
-            android:layout_marginTop="32dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp" />
+
         <androidx.viewpager2.widget.ViewPager2
             android:layout_marginTop="26dp"
             android:id="@+id/context_layout"

main/src/main/res/layout/item_battlepass_exchange.xml

@@ -3,7 +3,7 @@
     android:orientation="vertical"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="95dp"
+    android:layout_width="100dp"
     android:gravity="center"
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
@@ -67,12 +67,14 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="彩鑽之翼(92天)"
+        android:gravity="center"
+        android:layout_gravity="center"
         android:textColor="#0D21B2"
         android:textSize="14sp"
         android:textStyle="bold"
         android:maxLines="1"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="5dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tab_1_layout" />
@@ -95,6 +97,7 @@
         android:layout_height="31dp"
         android:layout_marginTop="10dp"
         android:autoSizeTextType="uniform"
+        android:textAllCaps="false"
         android:background="@mipmap/bg_zl_battlepass_exchange_btn_exchange"
         android:text="兌換\n(0/10)"
         android:textColor="#FFF"

main/src/main/res/layout/item_battlepass_mission_type_mission.xml

@@ -37,13 +37,14 @@
 
     <TextView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="10dp"
+        android:text="獎勵100經驗值/次"
         android:textColor="#F2F9FF"
         android:textSize="12sp"
-        android:text="獎勵100經驗值/次"
+        app:layout_constraintEnd_toStartOf="@+id/submit"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toBottomOf="@+id/title" />
 
@@ -53,6 +54,7 @@
         android:layout_height="30dp"
         android:layout_marginEnd="12dp"
         android:text="@string/battlepass_mission_submit_btn_unfinished"
+        android:textAllCaps="false"
         android:textColor="#FFFFFF"
         android:background="@drawable/bg_battlepass_mission_btn_unfinished"
         android:textSize="14sp"

main/src/main/res/layout/view_battlepass_user.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="210dp">
@@ -21,12 +23,14 @@
             android:textStyle="bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
+
         <ImageView
             android:id="@+id/imageView10"
+            android:layout_width="110dp"
+            android:layout_height="28dp"
             android:layout_marginStart="15.5dp"
-            android:layout_width="101dp"
-            android:layout_height="19dp"
             android:src="@mipmap/zl_user_pass" />
+
         <TextView
             android:id="@+id/time"
             android:layout_marginTop="11.5dp"
@@ -62,15 +66,39 @@
                 android:layout_width="wrap_content"
                 android:layout_marginEnd="6dp"
                 android:layout_height="wrap_content"/>
-
-            <ProgressBar
-                android:id="@+id/level_progress"
-                style="?android:attr/progressBarStyleHorizontal"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="0dp"
-                android:layout_height="7dp"
+                android:layout_height="14dp"
                 android:layout_weight="1"
                 android:layout_gravity="center"
-                android:progressDrawable="@drawable/bg_zl_user_level_progres" />
+                >
+
+                <ProgressBar
+                    android:id="@+id/level_progress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="0dp"
+                    android:layout_height="7dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="1dp"
+                    android:layout_weight="1"
+                    android:progressDrawable="@drawable/bg_zl_user_level_progres"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+                <TextView
+                    android:id="@+id/exp_text"
+                    tools:text="100/2500"
+                    android:textSize="12sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:textColor="#41048F"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </LinearLayout>
     </LinearLayout>
     <LinearLayout
@@ -106,6 +134,7 @@
             android:layout_width="94dp"
             android:layout_height="31dp"
             android:layout_marginEnd="15dp"
+            android:textAllCaps="false"
             android:background="@mipmap/bg_zl_user_button"
             android:text="@string/battlepass_user_more_integral"
             android:textColor="#FFFFFF"

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

@@ -19,5 +19,6 @@
     <string name="battlepass_reward_item_lock">暫未達到等級</string>
     <string name="battlepass_reward_item_get">領取成功</string>
     <string name="battlepass_zl_get">開通成功</string>
+    <string name="battlepass_buy_max">您已購買該戰令</string>
 
 </resources>

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

@@ -19,4 +19,5 @@
     <string name="battlepass_reward_item_lock">Not yet reached level</string>
     <string name="battlepass_reward_item_get">Successfully claimed</string>
     <string name="battlepass_zl_get">Successfully opened</string>
+    <string name="battlepass_buy_max">You have purchased the BattlePass</string>
 </resources>