From 0c1949984e4c59d4ae5f2d96c6b7438364642a08 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 12 十二月 2024 17:25:18 +0800
Subject: [PATCH] 2024年12月12日17:25:15
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 9316532..c369bc7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -244,16 +244,15 @@
}
}
break;
- //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
- case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
- uniGetDeliveryUrlQrcode(type, data, callback);
- }
- break;
+// //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+// case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
+// uniGetDeliveryUrlQrcode(type, data, callback);
+// }
+// break;
//鐢电珯鐨勪氦浠楿RL(瀹夎鍟�)
- case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
uniGetDeliveryUrl(type, data, callback);
}
-
break;
//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
@@ -996,7 +995,14 @@
HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
@Override
public void onSuccess(String obj) {
- uniSuccessCallback(type, obj, callback);
+ try {
+ Gson g = new Gson();
+ JsonObject jObject = g.fromJson(obj, JsonObject.class);
+ String deliveryUrl = jObject.get("deliveryUrl").toString();
+ uniSuccessCallback(type, deliveryUrl, callback);
+ } catch (Exception ignored) {
+ uniSuccessCallback(type, obj, callback);
+ }
}
@Override
@@ -2359,8 +2365,9 @@
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> list) {
+ List<GatewayBean> newList = sortLogic(list);
if (callback != null) {
- uniSuccessCallback(type, list, callback);
+ uniSuccessCallback(type, newList, callback);
}
//EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
BaseEventBus baseEventBus = new BaseEventBus();
@@ -2369,7 +2376,7 @@
baseEventBus.setData(homeId);
EventBus.getDefault().post(baseEventBus);
//杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
- HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
+ HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, newList, false, null);
}
@Override
@@ -2383,6 +2390,31 @@
}
/**
+ * 杩涜鎺掑簭锛堥�嗗彉鍣�-璐熻浇涓績锛�
+ *
+ * @param list 婧愭暟鎹�
+ * @return 杩斿洖鍒楄〃
+ */
+ private List<GatewayBean> sortLogic(List<GatewayBean> list) {
+ if (list == null || list.size() == 0) {
+ return new ArrayList<>();
+ }
+ List<GatewayBean> newList = new ArrayList<>();
+ List<GatewayBean> inverterList = new ArrayList<>();
+ List<GatewayBean> lcList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
+ inverterList.add(list.get(i));
+ } else {
+ lcList.add(list.get(i));
+ }
+ }
+ newList.addAll(inverterList);
+ newList.addAll(lcList);
+ return newList;
+ }
+
+ /**
* link spk 灞炴�х紪杈�
*
* @param data uni鏁版嵁
--
Gitblit v1.8.0