From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 41 +++++------------------------------------
1 files changed, 5 insertions(+), 36 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..ac4d516 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;
@@ -72,11 +74,11 @@
return sHdlDeviceLogic;
}
- public static final String kWp = "kWp";
- public static final String kWh = "kW.h";
- public static final String kW = "kW";
+
private List<DeviceBean> mListDevice = new ArrayList<>();
+
+
public void clearDeviceList() {
if (mListDevice == null) {
@@ -213,36 +215,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 +1352,6 @@
}
});
}
-
-
-
/**
--
Gitblit v1.8.0