From 7bb1c6a82b35290b4b28d53977fad2fe4080d3db Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 31 五月 2024 12:01:58 +0800
Subject: [PATCH] 2024年05月31日12:01:45
---
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
index 5be54bf..ecef028 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
@@ -88,10 +88,30 @@
if (TextUtils.isEmpty(value)) {
return UnitType.noValue + unit;
}
- BigDecimal formattedValue = getBigDecimal(value);
- return formattedValue.toString() + unit;
+ if (unit.equals(UnitType.kW)) {
+ return divideByOneThousandAndFormat(value).toString() + unit;
+ }
+ return getBigDecimal(value).toString() + unit;
}
+
+ /**
+ * @param value 鍊�
+ * @param unitValue 渚嬪:UnitType.kWh
+ * @param isUnit true琛ㄧず鏈夊崟浣嶈繑鍥�
+ * @return 甯﹀崟浣嶅�艰繑鍥�
+ */
+ public static String getConvertDoubleUnit(String value, String unitValue, boolean isUnit) {
+ if (TextUtils.isEmpty(value)) {
+ return UnitType.noValue + (isUnit ? unitValue : "");
+ }
+ if (unitValue.equals(UnitType.kW)) {
+ return divideByOneThousandAndFormat(value).toString() + (isUnit ? unitValue : "");
+ }
+ return getBigDecimal(value).toString() + (isUnit ? unitValue : "");
+
+ }
+
/**
* @param value 鍊�
@@ -120,6 +140,18 @@
return BigDecimal.valueOf(doubleValue).setScale(2, RoundingMode.HALF_UP);
}
+ /**
+ * 闄や互涓�鍗冨拰鏍煎紡
+ *
+ * @param value 鍊�
+ * @return BigDecimal
+ */
+ public static BigDecimal divideByOneThousandAndFormat(String value) {
+ double doubleValue = Double.parseDouble(value);
+ BigDecimal bigDecimal = new BigDecimal(doubleValue);
+ return bigDecimal.divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN);
+ }
+
/**
* 鐢熸垚浜岀淮鐮�
--
Gitblit v1.8.0