From 7fdae87bc3de46b5b012f8987c6902cd8b054323 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 16 五月 2024 18:17:11 +0800 Subject: [PATCH] 2024年05月16日18:17:09 --- app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 62 ++++++++++++++---------------- 1 files changed, 29 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java index ab8ab79..59c99f1 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -44,6 +44,8 @@ import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -76,7 +78,34 @@ public static final String kWh = "kW.h"; public static final String kW = "kW"; + public static final String noValue = "0.00"; + private List<DeviceBean> mListDevice = new ArrayList<>(); + + public static String getConvertDoubleUnit(String value) { + if (TextUtils.isEmpty(value)) { + return noValue + kWh; + } + BigDecimal formattedValue = getBigDecimal(value); + return formattedValue + kWh; + + } + + public static String getConvertDoubleUnit(int value) { + if (value == 0) { + return noValue + kWh; + } + BigDecimal formattedValue = getBigDecimal(value + ""); + return formattedValue + kWh; + } + + private static BigDecimal getBigDecimal(String value) { + if (TextUtils.isEmpty(value)) { + return new BigDecimal(0); + } + double doubleValue = Double.parseDouble(value); + return BigDecimal.valueOf(doubleValue).setScale(2, RoundingMode.HALF_UP); + } public void clearDeviceList() { if (mListDevice == null) { @@ -213,36 +242,6 @@ }); } - /** - * 鐢电珯鐘舵�佹瑙�(瀹夎鍟�) - */ - public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) { - String requestUrl = HttpApi.POST_statusOverview; - JsonObject json = new JsonObject(); -// json.addProperty("zoneType", zoneType);//鍖哄煙 - HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { - @Override - public void onSuccess(String jsonStr) { - if (TextUtils.isEmpty(jsonStr)) { - if (cloudCallBeak != null) { - cloudCallBeak.onSuccess(new StatusOverviewBean()); - } - } - Gson gson = new Gson(); - StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class); - if (cloudCallBeak != null) { - cloudCallBeak.onSuccess(statusOverviewBean); - } - } - - @Override - public void onFailure(HDLException e) { - if (cloudCallBeak != null) { - cloudCallBeak.onFailure(e); - } - } - }); - } /** * 娣诲姞銆愯澶囧垪琛ㄣ�戝埌鏈湴缂撳瓨 @@ -1380,9 +1379,6 @@ } }); } - - - /** -- Gitblit v1.8.0