From 4a5e5819785c21997aa7b224984afe68a45e3f74 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 5 Jan 2024 13:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=98=E4=BB=A4=E8=B4=AD?=
=?UTF-8?q?=E4=B9=B0=E7=BB=8F=E9=AA=8C=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=BB=8F?=
=?UTF-8?q?=E9=AA=8C=E6=9D=A1=E4=B8=8A=E5=8A=A0=E5=85=A5=E7=BB=8F=E9=AA=8C?=
=?UTF-8?q?=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/dialog/OrderLevelPopupWindow.java | 4 +-
.../src/main/res/layout/order_level_popup.xml | 43 ++++++++++++++-----
.../fragment/BattlePassMissionFragment.java | 2 +-
3 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java
index f8641471d..e9d0ae11c 100644
--- a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java
+++ b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
* 战令等级 经验
*/
public class OrderLevelPopupWindow extends CenterPopupView {
- private TextView orderLevel, orderLevelDiamond, balanceDiamond, current;
+ private TextView orderLevel, orderLevelDiamond, balanceDiamond, current,expText;
private int currentExperience, totalExperience;//当前经验,全部经验
private String buyExp = "100", currentLevel, balance;
private ProgressBar progressBar;
@@ -55,9 +55,11 @@ public class OrderLevelPopupWindow extends CenterPopupView {
balanceDiamond = findViewById(R.id.balance_diamond);
current = findViewById(R.id.current);
progressBar = findViewById(R.id.progressBar);
+ expText = findViewById(R.id.exp_text);
orderLevel.setText(buyExp);
progressBar.setMax(totalExperience);
progressBar.setProgress(currentExperience);
+ expText.setText(String.format("%s/%s", currentExperience, totalExperience));
current.setText(String.format("Lv%s", currentLevel));
balanceDiamond.setText(balance);
findViewById(R.id.sub).setOnClickListener(new OnClickListener() {
diff --git a/common/src/main/res/layout/order_level_popup.xml b/common/src/main/res/layout/order_level_popup.xml
index 435ecde21..987c2ae67 100644
--- a/common/src/main/res/layout/order_level_popup.xml
+++ b/common/src/main/res/layout/order_level_popup.xml
@@ -1,5 +1,7 @@
-
+ android:layout_height="wrap_content"
+ android:layout_marginStart="7dp">
+
+
+
+