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/HdlUniLogic.java |  183 +++++++++++++++++++++++++++++----------------
 1 files changed, 117 insertions(+), 66 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 1a0c645..47ba0b4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2,8 +2,6 @@
 
 
 import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.text.TextUtils;
@@ -15,15 +13,14 @@
 import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
 import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
 import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
-import com.hdl.linkpm.sdk.ota.bean.DownloadUrlBean;
 import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
 import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
 import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.bean.ModBusBean;
+import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
 import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
@@ -32,6 +29,7 @@
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
 import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.utils.NetworkUtils;
 import com.hdl.photovoltaic.utils.WifiUtils;
 import com.hdl.sdk.link.common.exception.HDLLinkCode;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
@@ -101,9 +99,9 @@
                 switch (type) {
                     //鍒涘缓鐢电珯
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
-
                         //EventBus浜嬩欢鍒嗗彂
                         BaseEventBus baseEventBus = new BaseEventBus();
+                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL);
                         baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION);
                         baseEventBus.setData(getKeyValue("data", data));
                         EventBus.getDefault().post(baseEventBus);
@@ -119,6 +117,16 @@
                         //EventBus浜嬩欢鍒嗗彂
                         BaseEventBus baseEventBus = new BaseEventBus();
                         baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
+                        baseEventBus.setData(getKeyValue("data", data));
+                        EventBus.getDefault().post(baseEventBus);
+                    }
+                    break;
+                    //浣忓畢銆愮數绔欍�戠紪杈�
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT: {
+                        //EventBus浜嬩欢鍒嗗彂
+                        BaseEventBus baseEventBus = new BaseEventBus();
+                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL);
+                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT);
                         baseEventBus.setData(getKeyValue("data", data));
                         EventBus.getDefault().post(baseEventBus);
                     }
@@ -148,7 +156,7 @@
                     break;
                     //鑾峰彇閫嗗彉鍣ㄥ垪琛�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
-                        this.uniGetCurrentHomeLocalAndCloudGatewayList(callback);
+                        this.uniGetCurrentHomeLocalAndCloudGatewayList(data, callback);
                     }
                     break;
                     //modBus鍗忚涓撶敤
@@ -186,7 +194,7 @@
                 }
 
             } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
-                WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
+                WifiUtils wifiUtils = WifiUtils.getInstance();
                 //wifi妯″潡
                 switch (type) {
                     //鑾峰彇wifi鍒楄〃
@@ -271,10 +279,18 @@
                     //璁惧鍙栨秷椹卞姩,鍥轰欢涓嬭浇鍗囩骇鏂囦欢
                     case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD: {
                         this.uniCancelDownloadingUpgradeFile(data, callback);
+//                        HdlThreadLogic.runSubThread(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                HdlLogLogic.print("褰撳墠绾跨▼鍚嶇О鍙栨秷涓嬭浇====" + Thread.currentThread().getName());
+//                                uniCancelDownloadingUpgradeFile(data, callback);
+//                            }
+//                        });
                     }
                     break;
                     //璁惧椹卞姩,鍥轰欢鍙栨秷鍗囩骇
                     case HDLUniMP.UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE: {
+
                         this.uniCancelUpgrade(data, callback);
                     }
                     break;
@@ -305,9 +321,9 @@
                     break;
                 }
             }
-            HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�===澶х被->" + topic + "\r\n" + data, true);
+            HdlLogLogic.print("uni鍙戞潵鐨勬暟鎹�--->澶х被-->" + topic + "\r\n" + data, true);
         } catch (Exception e) {
-            HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�===" + e.getMessage(), true);
+            HdlLogLogic.print("uni鍙戞潵鐨勬暟鎹�--->" + e.getMessage(), true);
         }
 
     }
@@ -322,7 +338,7 @@
     public void openUniMP(String path, JSONObject jsonObject) {
         JSONObject json = this.createdJSONObject(jsonObject, true);
         HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
-        HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + json, false);
+        HdlLogLogic.print("uni--->缁勮uni鍙戦�佹暟鎹牸寮�--->" + json, false);
     }
 
     /**
@@ -336,7 +352,7 @@
         try {
             HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
         } catch (Exception e) {
-            HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢===" + e.getMessage(), false);
+            HdlLogLogic.print("uni--->鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢--->" + e.getMessage(), false);
         }
     }
 
@@ -458,21 +474,28 @@
         HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
             @Override
             public void onSuccess(ResponseBody responseBody) {
-                String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
-                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
-                if (isBoolean) {
-                    HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃у浐浠舵枃浠�;
-                } else {
-                    HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣鍥轰欢鏂囦欢;
-                }
+                HdlThreadLogic.runSubThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
+                        //涓嶅湪瀛愮嚎绋嬭娴佷細鍗℃涓荤嚎绋�
+                        boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
+                        if (isBoolean) {
+                            HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃у浐浠舵枃浠�;
+                        } else {
+                            HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣鍥轰欢鏂囦欢;
+                        }
 
-                if (isBoolean) {
-                    HdlLogLogic.print("鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.", true);
-                    uniCallbackData(null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
-                } else {
-                    HdlLogLogic.print("鐢ㄦ埛鍙栨秷涓嬭浇鍥轰欢鍗囩骇鏂囦欢.", true);
-                    uniCallbackData(null, -2, "鐢ㄦ埛鍙栨秷涓嬭浇椹卞姩鍗囩骇鏂囦欢", callback);
-                }
+                        if (isBoolean) {
+                            HdlLogLogic.print("鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.", true);
+                            uniCallbackData(null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
+                        } else {
+                            HdlLogLogic.print("涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.", true);
+                            uniCallbackData(null, -2, "涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触", callback);
+                        }
+                    }
+                });
+
             }
 
             @Override
@@ -487,6 +510,7 @@
      * 鍚戜簯绔彂璧枫�愯澶囧浐浠躲�戝崌绾TA鎸囦护
      */
     private void uniUpgradeDeviceFirmware(Object data, DCUniMPJSCallback callback) {
+        String homeId = UserConfigManage.getInstance().getHomeId();
         String deviceMac = getKeyValue("mac", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噈ac锛堟煡鎵緎ocket锛�
         String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
         String oid = getKeyValue("oid", getKeyValue("data", data));//鍗囩骇鍥轰欢鐨刼id
@@ -501,6 +525,7 @@
             @Override
             public void onSuccess(Boolean b) {
                 if (b) {
+                    HdlLogLogic.print("鏈湴鍗囩骇--->", true);
                     //鏈湴
                     //1,寤虹珛鏈湴鏈嶅姟锛�
                     //2,鍛婅瘔缃戝叧鎵嬫満ip鍜岀鍙o紱
@@ -517,7 +542,7 @@
                             }
                             String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧鍥轰欢闇�瑕�
                             //鍗囩骇鍥轰欢鏂囦欢鍦板潃
-                            String upgradeFileLocalPathUrl = "http://" + AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;
+                            String upgradeFileLocalPathUrl = "http://" + NetworkUtils.getInstance().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;
                             //閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�绛変俊鎭�
                             HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, module, version, data.length + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
                                 @Override
@@ -539,8 +564,9 @@
                         }
                     });
                 } else {
+                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
                     //杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
-                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                         @Override
                         public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                             //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
@@ -577,8 +603,9 @@
 
             @Override
             public void onFailure(HDLException e) {
+                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
                 //杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
-                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                     @Override
                     public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                         //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
@@ -692,6 +719,7 @@
      * 鍚戜簯绔彂璧枫�愯澶囬┍鍔ㄤ笅杞姐�戞寚浠�
      */
     private void uniGatewayDriverDownload(Object data, DCUniMPJSCallback callback) {
+
         String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
         String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//椹卞姩缂栫爜
         String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
@@ -703,20 +731,28 @@
         HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
             @Override
             public void onSuccess(ResponseBody responseBody) {
-                String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
-                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
-                if (isBoolean) {
-                    HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃ч┍鍔ㄦ枃浠�;
-                } else {
-                    HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
-                }
-                if (isBoolean) {
-                    HdlLogLogic.print("鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.", true);
-                    uniCallbackData(null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
-                } else {
-                    HdlLogLogic.print("鐢ㄦ埛鍙栨秷涓嬭浇椹卞姩鍗囩骇鏂囦欢.", true);
-                    uniCallbackData(null, -2, "鐢ㄦ埛鍙栨秷涓嬭浇椹卞姩鍗囩骇鏂囦欢", callback);
-                }
+                HdlThreadLogic.runSubThread(new Runnable() {
+                    @Override
+                    public void run() {
+
+                        String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
+                        //涓嶅湪瀛愮嚎绋嬭娴佷細鍗℃涓荤嚎绋�
+                        boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
+                        if (isBoolean) {
+                            HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃ч┍鍔ㄦ枃浠�;
+                        } else {
+                            HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
+                        }
+                        if (isBoolean) {
+                            HdlLogLogic.print("鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.", true);
+                            uniCallbackData(null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
+                        } else {
+                            HdlLogLogic.print("涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触.", true);
+                            uniCallbackData(null, -2, "涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触", callback);
+                        }
+                    }
+                });
+
             }
 
             @Override
@@ -732,6 +768,7 @@
      */
     private void uniUpgradeGatewayDriver(Object data, DCUniMPJSCallback callback) {
 
+        String homeId = UserConfigManage.getInstance().getHomeId();
         String deviceMac = getKeyValue("mac", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噈ac锛堟煡鎵緎ocket锛�
         String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
         String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
@@ -744,6 +781,7 @@
             @Override
             public void onSuccess(Boolean b) {
                 if (b) {
+                    HdlLogLogic.print("鏈湴鍗囩骇--->", true);
                     //鏈湴
                     //1,寤虹珛鏈湴鏈嶅姟锛�
                     // 2锛屽憡璇夌綉鍏虫墜鏈篿p鍜岀鍙o紱
@@ -760,7 +798,7 @@
                             }
                             String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕�
                             //鍗囩骇椹卞姩鏂囦欢鍦板潃
-                            String upgradeFileLocalPathUrl = "http://" + AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + drivePathFileName;
+                            String upgradeFileLocalPathUrl = "http://" + NetworkUtils.getInstance().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + drivePathFileName;
                             //閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�绛変俊鎭�
                             HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, deviceOid, module, version, data.length + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
                                 @Override
@@ -782,8 +820,9 @@
                         }
                     });
                 } else {
+                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
                     //杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
-                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                         @Override
                         public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                             //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
@@ -820,8 +859,9 @@
 
             @Override
             public void onFailure(HDLException e) {
+                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
                 //杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
-                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                     @Override
                     public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                         //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
@@ -957,7 +997,7 @@
      */
     private void uniUploadDataToCloud(Object data, DCUniMPJSCallback callback) {
         String mac = getKeyValue("mac", getKeyValue("data", data));
-        HdlDeviceLogic.getInstance().uploadDataToCloud(mac, null);
+        HdlDeviceLogic.getInstance().uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
     }
 
     /**
@@ -1027,6 +1067,7 @@
                 uniCallbackData(null, e.getCode(), e.getMsg(), callback);
             }
         });
+
     }
 
     /**
@@ -1037,7 +1078,8 @@
      */
     private void uniAddInverterDeviceToCloud(Object data, DCUniMPJSCallback callback) {
         String mac = getKeyValue("mac", getKeyValue("data", data));
-        HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
+        String homeId = UserConfigManage.getInstance().getHomeId();
+        HdlDeviceLogic.getInstance().setGatewayRemoteParam(homeId, mac, new LinkCallBack<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
                 HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
@@ -1046,9 +1088,10 @@
                         GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
                         if (gatewayBean == null) {
                             uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback);
+
                             return;
                         }
-                        HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
+                        HdlDeviceLogic.getInstance().addInverterDeviceToCloud(homeId, mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
                             @Override
                             public void onSuccess(Boolean obj) {
                                 uniCallbackData(null, callback);
@@ -1083,7 +1126,8 @@
      */
     private void uniDelInverterDevice(Object data, DCUniMPJSCallback callback) {
         String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
-        HdlDeviceLogic.getInstance().delInverterDevice(deviceId, new CloudCallBeak<Boolean>() {
+        String homeId = UserConfigManage.getInstance().getHomeId();
+        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
                 uniCallbackData(null, callback);
@@ -1123,25 +1167,27 @@
      *
      * @param callback uni鍥炶皟
      */
-    private void uniGetCurrentHomeLocalAndCloudGatewayList(DCUniMPJSCallback callback) {
-        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {
+    private void uniGetCurrentHomeLocalAndCloudGatewayList(Object data, DCUniMPJSCallback callback) {
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
             @Override
             public void onSuccess(List<GatewayBean> list) {
+                GatewayBean gatewayBean = HdlDeviceLogic.getInstance().queryCurrentHomeMainGateway(list, homeId);
+                if (gatewayBean != null) {
+                    //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
+                    HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, gatewayBean.getDevice_mac(), null);
+                }
+                //EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
+                BaseEventBus baseEventBus = new BaseEventBus();
+                baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
+                baseEventBus.setData(list);
+
+                EventBus.getDefault().post(baseEventBus);
                 if (callback != null) {
                     uniCallbackData(list, callback);
-                    //EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
-                    BaseEventBus baseEventBus = new BaseEventBus();
-                    baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
-                    baseEventBus.setData(list);
-                    EventBus.getDefault().post(baseEventBus);
-                    GatewayBean gatewayBean = HdlDeviceLogic.getInstance().queryCurrentHomeMainGateway(list);
-                    if (gatewayBean != null) {
-                        //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
-                        HdlDeviceLogic.getInstance().uploadDataToCloud(gatewayBean.getDevice_mac(), null);
-                    }
-
-
                 }
+
+
             }
 
             @Override
@@ -1221,13 +1267,17 @@
                 data = new JSONObject();
             }
             if (isTokenAndRefreshToken) {
+                //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,闇�瑕佽繖浜涙暟鎹�
                 data.put("token", UserConfigManage.getInstance().getToken());
                 data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+                data.put("serverAddress", AppConfigManage.getUserRegionUrl());
+                data.put("appKey", AppConfigManage.getAppKey());
+                data.put("appSecret", AppConfigManage.getAppSecret());
             }
             uniCallBackBaseBean.setData(data);
             return getJSONObject(uniCallBackBaseBean);
         } catch (Exception e) {
-            HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + e.getMessage(), false);
+            HdlLogLogic.print("uni--->缁勮uni鍙戦�佹暟鎹牸寮忔湁寮傚父--->" + e.getMessage(), false);
         }
         return new JSONObject();
     }
@@ -1251,6 +1301,7 @@
             if (callback != null) {
                 callback.invoke(getJSONObject(uniCallBackBaseBean));
 //                callback.invoke(uniCallBackBaseBean);
+                HdlLogLogic.print("uni--->缁勮uni鍙戦�佹暟鎹牸寮�--->" + new Gson().toJson(uniCallBackBaseBean), false);
 
             }
         } catch (Exception e) {
@@ -1269,7 +1320,7 @@
      *
      * @return JSONObject
      */
-    private JSONObject getJSONObject(Object obj) {
+    public JSONObject getJSONObject(Object obj) {
         try {
             if (obj == null) {
                 return new JSONObject();
@@ -1298,7 +1349,7 @@
      * @param obj -
      * @return value
      */
-    private String getKeyValue(String key, Object obj) {
+    public String getKeyValue(String key, Object obj) {
         try {
             JSONObject jsonObject = this.getJSONObject(obj);
             if (jsonObject.has(key)) {

--
Gitblit v1.8.0