From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 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 bbe7790..6175ea4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -63,7 +63,7 @@
     /**
      * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
      */
-    public List<GatewayBean> getCurrentHomeGatewayList() {
+    public List<GatewayBean> getCurrentHomeGatewayList(String homeId) {
         List<GatewayBean> newList = new ArrayList<>();
         List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
         if (list.size() > 0) {
@@ -73,7 +73,7 @@
                     continue;
                 }
                 //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
-                if (gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+                if (gatewayBean.getHomeId().equals(homeId)) {
                     newList.add(gatewayBean);
                 }
             }
@@ -84,21 +84,21 @@
     /**
      * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣�
      */
-    public GatewayBean getCurrentHomeMainGateway() {
-        return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
+    public GatewayBean getCurrentHomeMainGateway(String homeId) {
+        return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList(homeId), homeId);
     }
 
     /**
      * 鏌ヨ褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣�
      */
-    public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
+    public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list, String homeId) {
         if (list == null || list.size() == 0) {
             return null;
         }
         GatewayBean findGatewayBean = null;
         for (int i = 0; i < list.size(); i++) {
             GatewayBean gatewayBean = list.get(i);
-            if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+            if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(homeId)) {
                 //鎵惧埌杩斿洖
                 findGatewayBean = gatewayBean;
                 break;
@@ -152,11 +152,11 @@
      * @param name          -
      * @param cloudCallBeak -
      */
-    public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void addInverterDeviceToCloud(String homeId, String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
 
         String requestUrl = HttpApi.POST_Device_Add;
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+        json.addProperty("homeId", homeId);
         json.addProperty("mac", mac);
         json.addProperty("spk", spk);
         json.addProperty("sid", sid);
@@ -227,10 +227,10 @@
      * @param deviceId      璁惧id
      * @param cloudCallBeak 鍥炶皟
      */
-    public void delInverterDevice(String deviceId, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void delInverterDevice(String homeId, String deviceId, CloudCallBeak<Boolean> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Device_Remove;
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+        json.addProperty("homeId", homeId);
         json.addProperty("deviceId", deviceId);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
@@ -257,10 +257,10 @@
      * @param parentOid     涓婄骇璁惧鐨凮id
      * @param cloudCallBeak 鍥炶皟
      */
-    public void getInverterDeviceChildDeviceList(String parentOid, CloudCallBeak<List<CloudInverterChildDeviceBean>> cloudCallBeak) {
+    public void getInverterDeviceChildDeviceList(String homeId, String parentOid, CloudCallBeak<List<CloudInverterChildDeviceBean>> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Device_ChildDevices_List;
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+        json.addProperty("homeId", homeId);
         json.addProperty("parentOid", parentOid);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
@@ -409,10 +409,10 @@
      * @param mac          璁惧mac
      * @param linkCallBack 鍥炶皟update
      */
-    public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+    public void setGatewayRemoteParam(String homeId, String mac, LinkCallBack<Boolean> linkCallBack) {
         String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+        json.addProperty("homeId", homeId);
         json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
         json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
         //瑙e瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
@@ -632,7 +632,7 @@
                         if (list == null || list.size() == 0) {
                             //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
                             if (cloudCallBeak != null) {
-                                cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                             }
                             return;
                         }
@@ -646,7 +646,7 @@
                                 public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                                     atomicInteger.set(atomicInteger.get() + 1);
                                     //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
-                                    refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo);
+                                    refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
                                     //鏈�鍚庝竴鏉℃墠鍋氬垹闄ら�嗗彉鍣ㄩ�昏緫澶勭悊
                                     if (atomicInteger.get() == list.size()) {
                                         //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
@@ -667,7 +667,7 @@
                                             removeLocalInverter(removeSidList.get(i));
                                         }
                                         if (cloudCallBeak != null) {
-                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                         }
                                     }
                                 }
@@ -695,7 +695,7 @@
                                             removeLocalInverter(removeSidList.get(i));
                                         }
                                         if (cloudCallBeak != null) {
-                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                         }
                                     }
                                     HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -711,7 +711,7 @@
                         ///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
                         //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
                         if (cloudCallBeak != null) {
-                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                         }
                     }
                 });
@@ -745,11 +745,11 @@
                                 public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                                     atomicInteger.set(atomicInteger.get() + 1);
                                     //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
-                                    refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo);
+                                    refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
                                     //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
                                     if (atomicInteger.get() == list.size()) {
                                         if (cloudCallBeak != null) {
-                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                         }
                                     }
                                 }
@@ -760,7 +760,7 @@
                                     //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
                                     if (atomicInteger.get() == list.size()) {
                                         if (cloudCallBeak != null) {
-                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                         }
                                     }
                                     HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -954,8 +954,8 @@
      *
      * @param deviceMac 璁惧mac
      */
-    public void checkInverterConnectedCloud(String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
-        this.getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+    public void checkInverterConnectedCloud(String homeId, String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
+        this.getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
             @Override
             public void onSuccess(List<CloudInverterDeviceBean> list) {
                 CloudInverterDeviceBean cloudInverterDeviceBean = null;
@@ -992,7 +992,7 @@
      * @param deviceRemoteInfo        璁惧杩滅▼閫氳淇℃伅
      * @param cloudInverterDeviceBean 閫嗗彉鍣�
      */
-    private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
+    private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo, String homeId) {
         //鏈湴鏌ユ壘閫嗗彉鍣�
         GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
         if (gatewayBean == null) {
@@ -1009,7 +1009,7 @@
             HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
 
         }
-        gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
+        gatewayBean.setHomeId(homeId);//浣忓畢id
         gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
         gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
         gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac

--
Gitblit v1.8.0