From 562ea59026c221ba2499c8b5cf70e838e44005dd Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 20 五月 2024 18:49:11 +0800 Subject: [PATCH] 2024年05月20日18:49:00 --- app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 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 8569903..730f630 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java @@ -15,6 +15,7 @@ import com.google.zxing.qrcode.QRCodeWriter; import com.hdl.linkpm.sdk.user.HDLLinkPMUser; import com.hdl.photovoltaic.config.UserConfigManage; +import com.hdl.photovoltaic.enums.UnitType; import com.hdl.photovoltaic.utils.GlideUtils; import org.json.JSONObject; @@ -54,19 +55,47 @@ public static String getConvertDoubleUnit(String value) { if (TextUtils.isEmpty(value)) { - return HdlDeviceLogic.noValue ; + return UnitType.noValue; } BigDecimal formattedValue = getBigDecimal(value); - return formattedValue.toString() ; + return formattedValue.toString(); } public static String getConvertDoubleUnit(int value) { if (value == 0) { - return HdlDeviceLogic.noValue ; + return UnitType.noValue; } BigDecimal formattedValue = getBigDecimal(value + ""); - return formattedValue.toString() ; + return formattedValue.toString(); + } + + + /** + * @param value 鍊� + * @param unit 渚嬪:UnitType.kWh + * @return 甯﹀崟浣嶅�艰繑鍥� + */ + public static String getConvertDoubleUnit(String value, String unit) { + if (TextUtils.isEmpty(value)) { + return UnitType.noValue + unit; + } + BigDecimal formattedValue = getBigDecimal(value); + return formattedValue.toString() + unit; + + } + + /** + * @param value 鍊� + * @param unit 渚嬪:UnitType.kWh + * @return 甯﹀崟浣嶅�艰繑鍥� + */ + public static String getConvertDoubleUnit(int value, String unit) { + if (value == 0) { + return UnitType.noValue + unit; + } + BigDecimal formattedValue = getBigDecimal(value + ""); + return formattedValue.toString() + unit; } -- Gitblit v1.8.0