From 32d1501e6fe6338eb6dc51c26df7fe0808caac0d Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期四, 26 六月 2025 15:05:28 +0800
Subject: [PATCH] feat(general): 优化写卡成功界面并添加开卡功能- 重新设计写卡成功界面布局，增加滚动视图以支持长文本显示 - 添加开卡功能相关的UI和逻辑，包括工本费和充值金额的展示- 增加用户姓名和卡片信息的显示 - 优化打印凭证的内容和格式 -调整NFC连接逻辑，提高连接成功率
---
baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
index fdf558e..e2381cb 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
@@ -1,6 +1,9 @@
package com.dayu.baselibrary.utils;
+import android.text.TextUtils;
+
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.DecimalFormat;
/**
@@ -16,9 +19,24 @@
* @return
*/
public static int changeY2F(String amount) {
+ if (TextUtils.isEmpty(amount)){
+ return 0;
+ }
BigDecimal bigDecimal = new BigDecimal(amount).setScale(2);
return bigDecimal.multiply(new BigDecimal(100)).intValue();
}
+
+
+ /**
+ * 鍏冭浆鍘橈紝纭繚price淇濈暀涓や綅鏈夋晥鏁板瓧
+ *
+ * @return
+ */
+ public static int changeY2L(String amount) {
+ BigDecimal bigDecimal = new BigDecimal(amount).setScale(3);
+ return bigDecimal.multiply(new BigDecimal(1000)).intValue();
+ }
+
/**
* 鍒嗚浆鍏冿紝杞崲涓篵igDecimal鍦╰oString
@@ -31,7 +49,8 @@
/**
- * 绮剧‘闄ゆ硶锛屼繚鐣欎袱浣嶅皬鏁�
+ * 绮剧‘闄ゆ硶锛屼繚鐣欎袱浣嶅皬鏁�
+ *
* @param dividend
* @param divisor
* @return
@@ -43,4 +62,33 @@
return df.format(result);
}
+
+ /**
+ * 绯绘暟鍜屾按浠风浉涔樿幏寰楃數浠蜂繚鐣欎笁浣嶅皬鏁�
+ * @param num1
+ * @param num2
+ * @return
+ */
+ public static String multiplyPrice(float num1, float num2) {
+ BigDecimal bd1 = BigDecimal.valueOf(num1);
+ BigDecimal bd2 = BigDecimal.valueOf(num2);
+ BigDecimal result = bd1.multiply(bd2);
+ return result.setScale(3, RoundingMode.HALF_UP).toString();
+ }
+
+
+ /**
+ *
+ * @param num1
+ * @param num2
+ * @return
+ */
+ public static String sumPrice(float num1, float num2) {
+ BigDecimal bd1 = BigDecimal.valueOf(num1);
+ BigDecimal bd2 = BigDecimal.valueOf(num2);
+ BigDecimal result = bd1.add(bd2);
+ return result.setScale(2, RoundingMode.HALF_UP).toString();
+ }
+
+
}
--
Gitblit v1.8.0