From 2808e412887d633e58ea327a0beaff7827a897a2 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 23 Dec 2023 14:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActivateEliteBattleOrderPopupWindow.java  |  12 +-
 .../activate_elite_battle_order_popup.xml     | 267 ++++++++++--------
 .../adapter/BattlePassMissionAdapter.java     |   2 +-
 .../main/adapter/BattlePassRewardAdapter.java |   3 +
 .../item_battlepass_mission_type_mission.xml  |  20 +-
 5 files changed, 173 insertions(+), 131 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java
index 7a64b2d97..cfe1e3c4e 100644
--- a/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java
+++ b/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java
@@ -2,6 +2,10 @@ package com.yunbao.common.dialog;
 
 import android.app.Activity;
 import android.content.Context;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ImageSpan;
+import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -18,7 +22,7 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake;
 public class ActivateEliteBattleOrderPopupWindow extends CenterPopupView {
     private boolean elites;//是否精英战令
     private String spendMoney;//花费钱
-    private Button buttonWarOrder;
+    private View buttonWarOrder;
     private LiberalBattlePassPopupWindow.LiberalBattlePassCallback mPassCallback;
     private String mBattlePassTypeId;
 
@@ -65,10 +69,8 @@ public class ActivateEliteBattleOrderPopupWindow extends CenterPopupView {
             }
         });
         //中文按钮文字
-        StringBuffer stringBuffer = new StringBuffer();
-        stringBuffer.append(spendMoney)
-                .append(WordUtil.isNewZh()?"鑽開通":"Activate ");
-        buttonWarOrder.setText(stringBuffer.toString());
+
+        ((TextView)findViewById(R.id.button_war_order_text)).setText(spendMoney);
 
         ViewClicksAntiShake.clicksAntiShake(buttonWarOrder, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
diff --git a/common/src/main/res/layout/activate_elite_battle_order_popup.xml b/common/src/main/res/layout/activate_elite_battle_order_popup.xml
index 8eccea3fd..19e1e0051 100644
--- a/common/src/main/res/layout/activate_elite_battle_order_popup.xml
+++ b/common/src/main/res/layout/activate_elite_battle_order_popup.xml
@@ -1,145 +1,176 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
-    android:layout_height="291dp"
+    android:layout_height="wrap_content"
     android:layout_marginStart="17dp"
-    android:layout_marginEnd="17dp"
-    android:background="@drawable/background_order_dialog"
-    android:orientation="vertical">
-
+    android:layout_marginEnd="17dp">
     <ImageView
-        android:id="@+id/war_order_close"
-        android:layout_width="19dp"
-        android:layout_height="19dp"
-        android:layout_gravity="end"
-        android:layout_marginTop="14dp"
-        android:layout_marginEnd="14dp"
-        android:src="@mipmap/icon_sud_rule_close" />
-
-    <ImageView
-        android:id="@+id/elites_image"
-        android:layout_width="211dp"
-        android:layout_height="27dp"
-        android:layout_gravity="center"
-        android:layout_marginTop="3dp"
-        android:src="@mipmap/icon_activate_the_elite_battle_order"
-        android:visibility="gone" />
-
-    <ImageView
-        android:id="@+id/enjoy_image"
-        android:layout_width="211dp"
-        android:layout_height="27dp"
-        android:layout_gravity="center"
-        android:layout_marginTop="3dp"
-        android:src="@mipmap/icon_enjoy_image"
-        android:visibility="visible" />
-
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@drawable/background_order_dialog"
+        android:layout_width="0dp"
+        android:layout_height="0dp"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="15dp">
+        android:orientation="vertical"
+        android:layout_marginBottom="15dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/war_order_close"
+            android:layout_width="19dp"
+            android:layout_height="19dp"
+            android:layout_gravity="end"
+            android:layout_marginTop="14dp"
+            android:layout_marginEnd="14dp"
+            android:src="@mipmap/icon_sud_rule_close" />
+
+        <ImageView
+            android:id="@+id/elites_image"
+            android:layout_width="211dp"
+            android:layout_height="27dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="3dp"
+            android:src="@mipmap/icon_activate_the_elite_battle_order"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/enjoy_image"
+            android:layout_width="211dp"
+            android:layout_height="27dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="3dp"
+            android:src="@mipmap/icon_enjoy_image"
+            android:visibility="visible" />
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="15dp">
 
-            <ImageView
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:src="@mipmap/icon_war_order_diamond" />
-
-            <TextView
-                android:id="@+id/gift_overvalue"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/gift_overvalue"
-                android:textColor="#CE2BFF"
-                android:textSize="14sp"
-                android:visibility="gone" />
+                android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/gift_overvalue3"
-                android:layout_width="wrap_content"
+                <ImageView
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:src="@mipmap/icon_war_order_diamond" />
+
+                <TextView
+                    android:id="@+id/gift_overvalue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:text="@string/gift_overvalue"
+                    android:textColor="#CE2BFF"
+                    android:textSize="14sp"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/gift_overvalue3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:text="@string/gift_overvalue3"
+                    android:textColor="#CE2BFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/gift_overvalue3"
-                android:textColor="#CE2BFF"
-                android:textSize="14sp" />
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:src="@mipmap/icon_order_score" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/more_integral"
+                    android:textColor="#CE2BFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:src="@mipmap/icon_war_order_gift" />
+
+                <TextView
+                    android:id="@+id/gift3_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:text="@string/unlock_more_gifts"
+                    android:textColor="#CE2BFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:src="@mipmap/icon_order_score" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/more_integral"
-                android:textColor="#CE2BFF"
-                android:textSize="14sp" />
-        </LinearLayout>
+            android:layout_gravity="center"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/has_reached_level_after_opening"
+            android:textColor="#0D21B2"
+            android:textSize="13sp" />
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:src="@mipmap/icon_war_order_gift" />
+            android:id="@+id/button_war_order"
+            android:layout_width="150dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:background="@mipmap/button_war_order"
+            android:gravity="center">
 
             <TextView
-                android:id="@+id/gift3_text"
+                android:id="@+id/button_war_order_text"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="@string/unlock_more_gifts"
-                android:textColor="#CE2BFF"
-                android:textSize="14sp" />
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold"
+                tools:text="123" />
+
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/diamond" />
         </LinearLayout>
     </LinearLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_gravity="center"
-        android:layout_marginTop="12dp"
-        android:text="@string/has_reached_level_after_opening"
-        android:textColor="#0D21B2"
-        android:textSize="13sp" />
-
-    <Button
-        android:id="@+id/button_war_order"
-        android:layout_width="150dp"
-        android:layout_height="48dp"
-        android:textSize="15sp"
-        android:textColor="@color/white"
-        android:textStyle="bold"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:layout_marginTop="10dp"
-        android:background="@mipmap/button_war_order" />
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/main/src/main/java/com/yunbao/main/adapter/BattlePassMissionAdapter.java b/main/src/main/java/com/yunbao/main/adapter/BattlePassMissionAdapter.java
index 4bd010f67..c677a586d 100644
--- a/main/src/main/java/com/yunbao/main/adapter/BattlePassMissionAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/BattlePassMissionAdapter.java
@@ -185,7 +185,7 @@ public class BattlePassMissionAdapter extends RecyclerView.Adapter<BattlePassMis
                     .getBattlePassTaskOver(String.valueOf(task.getId()), new HttpCallback<HttpCallbackModel>() {
                         @Override
                         public void onSuccess(HttpCallbackModel data) {
-                            ToastUtil.show(data.getCode() + "|" + data.getMsg());
+                            ToastUtil.show( data.getMsg());
                             if (onItemClickListener != null) {
                                 onItemClickListener.onItemClick(task, data.getCode());
                             }
diff --git a/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java b/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java
index f96b9ff06..c123cf1f8 100644
--- a/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java
@@ -192,6 +192,9 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
                 //ToastUtil.show("锁了");
                 return;
             }
+            if(reward.getReceived()==2){
+                return;
+            }
             switch (reward.getLiveBattlePassTypeId()){
                 case 1:
                     if(userType.getBattlePassUserRecords1()==1){
diff --git a/main/src/main/res/layout/item_battlepass_mission_type_mission.xml b/main/src/main/res/layout/item_battlepass_mission_type_mission.xml
index 820190c5e..72ac06512 100644
--- a/main/src/main/res/layout/item_battlepass_mission_type_mission.xml
+++ b/main/src/main/res/layout/item_battlepass_mission_type_mission.xml
@@ -22,15 +22,15 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="18dp"
-        android:text="每日簽到（0/1）"
+        android:layout_marginTop="10dp"
+        android:text="每日簽到（0/1）\nnn123"
         android:textColor="#F2F9FF"
         android:textStyle="bold"
         app:autoSizeMaxTextSize="14sp"
         app:autoSizeMinTextSize="5sp"
         app:autoSizeStepGranularity="1sp"
         app:autoSizeTextType="uniform"
-        android:maxLines="1"
+        android:maxLines="2"
         app:layout_constraintEnd_toStartOf="@+id/submit"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toTopOf="parent" />
@@ -38,13 +38,19 @@
     <TextView
         android:id="@+id/content"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="10dp"
-        android:text="獎勵100經驗值/次"
+        android:layout_marginTop="2dp"
+        android:text="獎勵100經驗值/次\n123"
         android:textColor="#F2F9FF"
         android:textSize="12sp"
-        app:layout_constraintEnd_toStartOf="@+id/submit"
+        app:autoSizeMaxTextSize="14sp"
+        app:autoSizeMinTextSize="5sp"
+        app:autoSizeStepGranularity="1sp"
+        app:autoSizeTextType="uniform"
+        android:maxLines="2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/submit"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toBottomOf="@+id/title" />