From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 1231 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 1,076 insertions(+), 155 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 f9d9993..33d8ebc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -10,14 +10,16 @@
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.IBinder;
+import android.os.SystemClock;
+import android.print.PageRange;
+import android.provider.Settings;
 import android.text.TextUtils;
-import android.view.View;
-import android.widget.TextView;
 
 import androidx.core.app.ActivityCompat;
 
-import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
@@ -25,22 +27,36 @@
 import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
 import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
 import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
 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.bean.PageNumberObject;
 import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.LowerTagType;
 import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
+import com.hdl.photovoltaic.internet.TcpClient;
+import com.hdl.photovoltaic.internet.api.HttpApi;
+import com.hdl.photovoltaic.internet.api.TopicApi;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.ui.bean.BUserInfo;
 import com.hdl.photovoltaic.ui.bean.CUserInfo;
 import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
 import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
 import com.hdl.photovoltaic.ui.bean.Geolocation;
+import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.bean.LinkBean;
+import com.hdl.photovoltaic.ui.bean.MemberBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.StaffBean;
+import com.hdl.photovoltaic.ui.bean.UnCountBean;
+import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
 import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
-import com.hdl.photovoltaic.ui.me.PersonalDataActivity;
+import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
 import com.hdl.photovoltaic.ui.me.SetActivity;
 import com.hdl.photovoltaic.ui.newC.MessageCenterList;
 import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
@@ -48,30 +64,37 @@
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
 import com.hdl.photovoltaic.utils.NetworkUtils;
 import com.hdl.photovoltaic.utils.WifiUtils;
-import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.sdk.link.common.exception.HDLLinkCode;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
+import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
 import com.hdl.sdk.link.core.callback.ModbusCallBack;
 import com.hdl.sdk.link.core.connect.HDLModBusConnect;
+import com.hdl.sdk.link.core.connect.HDLUdpConnect;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
+import com.huawei.hms.api.Api;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
 
 
 import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.InetSocketAddress;
+import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.dcloud.feature.sdk.DCUniMPSDK;
 import io.dcloud.feature.unimp.DCUniMPJSCallback;
 import okhttp3.ResponseBody;
 
@@ -80,6 +103,8 @@
  */
 public class HdlUniLogic implements HDLUniMPSDKManager.IOnOtherUniMPEventCallBack {
     private static volatile HdlUniLogic sHdlUniLogic;
+
+    public final static String separator = "---";
 
     /**
      * 鑾峰彇褰撳墠瀵硅薄
@@ -117,8 +142,8 @@
             }
             String type = getKeyValue("type", data);//灏忕被
             String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
-            String mode_type = "澶х被->" + topic + "--->" + "灏忕被->" + type;//鐢ㄦ潵鎵撳嵃鐨�
-            HdlLogLogic.print(logTag + ":" + "uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
+            String mode_type = "澶х被-" + topic + "---" + "灏忕被-" + type;//鐢ㄦ潵鎵撳嵃鐨�
+            HdlLogLogic.print(logTag + ":" + "uni---鍙戦��---" + mode_type + "\r\n" + data, true);
             if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
                 //鐢ㄦ埛妯″潡
                 switch (type) {
@@ -132,62 +157,129 @@
                         uniGetImageKey(mode_type, data, callback);
                     }
                     break;
+                    //鐢ㄦ埛鏈湴缂撳瓨淇℃伅
+                    case HDLUniMP.UNI_EVENT_REPLY_USER_LOCAL_INFO: {
+                        JsonObject jsonObject = new JsonObject();
+                        jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
+                        jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
+                        jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
+                        uniSuccessCallback(mode_type, jsonObject, callback);
+                    }
+                    break;
                 }
 
             } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(topic)) {
                 //浣忓畢妯″潡
                 switch (type) {
+                    //鎵爜娣诲姞鐢电珯
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_ADD: {
+                        String url = getKeyValue("url", getKeyValue("data", data));
+                        //EventBus浜嬩欢鍒嗗彂
+                        HdlCommonLogic.getInstance().postEventBusSticky(
+                                HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
+                                HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
+                                url);
+
+                        if (callback != null) {
+                            uniSuccessCallback(type, null, callback);
+                        }
+                    }
+                    break;
+                    //璐﹀彿涓嬫槸鍚︽湁鐢电珯鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_LIST: {
+                        if (callback != null) {
+                            uniSuccessCallback(type, HdlResidenceLogic.getInstance().getHouseIdList().size(), callback);
+                        }
+                    }
+                    break;
                     //鍒涘缓鐢电珯
                     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);
+                        HdlCommonLogic.getInstance().postEventBus(
+                                HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL,
+                                HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION,
+                                getKeyValue("data", data));
+                        if (callback != null) {
+                            uniSuccessCallback(type, null, callback);
+                        }
                     }
+
                     break;
                     //璇诲彇璇︽儏
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {
-
+                        if (callback != null) {
+                            uniSuccessCallback(type, null, callback);
+                        }
+                    }
+                    break;
+                    //鐢电珯鍒犻櫎
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DEl: {
+                        this.uniGetDelResidence(mode_type, data, callback);
                     }
                     break;
                     //鍏抽棴璇︽儏椤�
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE: {
                         //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);
+                        // todo 鍦℉DLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀劧鍚庡彂甯冭皟鐢‥ventBus鍙戝竷鍑哄幓;
+//                        HdlCommonLogic.getInstance().postEventBus(
+//                                HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE,
+//                                LowerTagType.power_station.toString(),
+//                                getKeyValue("data", data));
+                        if (callback != null) {
+                            uniSuccessCallback(type, null, callback);
+                        }
                     }
                     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);
+                        HdlCommonLogic.getInstance().postEventBus(
+                                HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL,
+                                HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT,
+                                getKeyValue("data", data));
+                        if (callback != null) {
+                            uniSuccessCallback(type, null, callback);
+                        }
+                    }
+                    break;
+                    //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
+                        uniGetDeliveryUrlQrcode(type, data, callback);
+                    }
+                    break;
+                    //鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
+                        uniGetDeliverToAccount(type, data, callback);
+
+                    }
+                    break;
+                    //鐢电珯鎺堟潈瀹夎鍟�(C绔�)
+                    case HDLUniMP.UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM: {
+                        uniHomeUpdateDebugPerm(type, data, callback);
+
                     }
                     break;
 
+
                 }
-                if (callback != null) {
-                    uniCallbackData(type, null, callback);
-                }
+
             } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
                 //璁惧妯″潡
                 switch (type) {
+                    //modBus鍗忚涓撶敤
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
+                        sendModBus(mode_type, data, callback);
+                    }
+                    break;
                     //娣诲姞閫嗗彉鍣ㄥ埌浜戠
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                         this.uniAddInverterDeviceToCloud(mode_type, data, callback);
                     }
+                    break;
                     //娣诲姞澶氫釜閫嗗彉鍣ㄥ埌浜戠
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD_All: {
                         this.uniAddAllInverterDeviceToCloud(mode_type, data, callback);
                     }
-
                     break;
                     //鍒犻櫎浜戠閫嗗彉鍣�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_DEL: {
@@ -204,11 +296,6 @@
                         this.uniGetCurrentHomeLocalAndCloudGatewayList(mode_type, data, callback);
                     }
                     break;
-                    //modBus鍗忚涓撶敤
-                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
-                        sendModBus(mode_type, data, callback);
-                    }
-                    break;
                     //鑾峰彇oid鍒楄〃
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
                         this.uniGetInverterOidList(mode_type, data, callback);
@@ -218,7 +305,6 @@
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
                         this.uniGetInverterTime(mode_type, data, callback);
                     }
-
                     break;
                     //閫嗗彉鍣ㄦ椂闂寸紪杈�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
@@ -235,35 +321,90 @@
                         this.uniClearInverterHomeId(mode_type, data, callback);
                     }
                     break;
+                    //spk灞炴�х紪杈�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_Link_edit_SEND: {
+                        this.uniLinkSpkAttributeEdit(mode_type, data, callback);
+                    }
+                    break;
+                    //spk灞炴�ц鍙�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_Link_read_SEND: {
+                        this.uniLinkSpkAttributeRead(mode_type, data, callback);
+                    }
+                    break;
                     //鑾峰彇鏈鐞�/鏈娑堟伅鏁伴噺
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MESSAGE_NUMBER: {
                         this.uniGetMessageNumber(mode_type, data, callback);
                     }
                     break;
-
+                    //鍒濆鍖栭�嗗彉鍣�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER: {
+                        this.setInitializeGateway(mode_type, data, callback);
+                    }
+                    break;
+                    //璇诲彇璁惧杩滅▼淇℃伅
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_REMOTEINFO: {
+                        this.setInverterDeviceRemoteInfo(mode_type, data, callback);
+                    }
+                    break;
+                    //璁惧鍚嶇О淇敼(淇敼鏄簯绔痮id鍚嶇О锛岃澶囦娇鐢╩odbus鍗忚淇敼)
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
+                        this.uniOidEditName(mode_type, data, callback);
+                    }
+                    break;
                 }
 
             } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
                 WifiUtils wifiUtils = WifiUtils.getInstance();
                 //wifi妯″潡
                 switch (type) {
-                    //鑾峰彇wifi鍒楄〃
-                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
+                    //鑾峰彇鎵嬫満wifi鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_LIST: {
                         if (callback != null) {
-                            uniCallbackData(mode_type, wifiUtils.getScanResult(), callback);
+                            uniSuccessCallback(mode_type, wifiUtils.getScanResult(), callback);
                         }
                     }
                     break;
-                    //褰撳墠wifi璇︽儏
-                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
+                    //鑾峰彇鎵嬫満褰撳墠wifi璇︽儏
+                    case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_INFO: {
                         if (callback != null) {
-                            uniCallbackData(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
+                            uniSuccessCallback(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
                         }
                     }
                     break;
-                    //wifi杩炴帴
-                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
-
+                    //鎵撳紑鎵嬫満Wifi璁剧疆鐣岄潰
+                    case HDLUniMP.UNI_EVENT_REPLY_PHONE_OPEN_WIFI_SETTINGS: {
+                        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        HDLApp.getInstance().startActivity(intent);
+                    }
+                    //閫嗗彉鍣╓iFi淇℃伅閰嶇疆
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_WIFI_SET: {
+                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_WIFI_EDIT, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣╓iFi淇℃伅鑾峰彇
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_WIFI_GET: {
+                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_WIFI_GET, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣ㄧ儹鐐归厤缃�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_HOTSPOT_SET: {
+                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_HOTSPOT_EDIT, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣ㄧ儹鐐硅幏鍙�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_HOTSPOT_GET: {
+                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_HOTSPOT_GET, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣ㄤ互澶綉閰嶇疆
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_SET: {
+                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣ㄤ互澶綉鑾峰彇
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_GET: {
+                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
                     }
                     break;
 
@@ -348,29 +489,6 @@
                     break;
 
                 }
-            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
-                //鍏跺畠妯″潡
-                switch (type) {
-                    //鑾峰彇娓╁害鍗曚綅
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
-                        uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
-                    }
-                    break;
-                    //鑾峰彇褰撳墠app璇█
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
-                        uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
-                    }
-                    break;
-                    //鑾峰彇浣嶇疆淇℃伅
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
-                        this.uniGetLocationInfo(mode_type, data, callback);
-                    }
-                    //涓撻棬鏀堕泦uni鏃ュ織
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
-                        String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
-                        HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
-                    }
-                }
             } else if (HDLUniMP.UNI_EVENT_REPLY_MINE_MODEL.equals(topic)) {
                 //鎴戠殑妯″潡
                 switch (type) {
@@ -378,7 +496,7 @@
                     case HDLUniMP.UNI_EVENT_REPLY_MINE_EDIT_USER_INFO: {
                         Intent intent = new Intent();
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.setClass(HDLApp.getInstance(), PersonalDataActivity.class);
+                        intent.setClass(HDLApp.getInstance(), CPersonalDataActivity.class);
                         HDLApp.getInstance().startActivity(intent);
                     }
                     break;
@@ -412,15 +530,126 @@
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         intent.setClass(HDLApp.getInstance(), SetActivity.class);
                         HDLApp.getInstance().startActivity(intent);
+
+                    }
+                    break;
+                    //涓嬭浇鎴愬憳锛堝瓙璐﹀彿锛夊ご鍍�
+                    case HDLUniMP.UNI_EVENT_REPLY_DOWNLOAD_MEMBER_AVATAR: {
+                        uniGetHeadPIortrait(type, data, callback);
+
+                    }
+                    break;
+                    //鎴愬憳鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {
+                        uniGetMemberList(type, data, callback);
+                    }
+                    break;
+                    //鎴愬憳娣诲姞
+                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_ADD: {
+                        uniGetMemberAdd(type, data, callback);
+                    }
+                    break;
+                    //鎴愬憳鍒犻櫎
+                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_DELETE: {
+                        uniGetMemberDelete(type, data, callback);
+                    }
+                    break;
+                    //鎴愬憳缂栬緫
+                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_EDIT: {
+                        uniGetMemberEdit(type, data, callback);
+
+                    }
+                    break;
+                    //鑾峰彇鍛樺伐鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_LIST: {
+                        uniGetStaffList(type, data, callback);
+
+                    }
+                    break;
+                    //鍛樺伐娣诲姞
+                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_ADD: {
+                        uniGetStaffAdd(type, data, callback);
+
+                    }
+                    break;
+                    //鍛樺伐璇︽儏鑾峰彇
+                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_DETAIL: {
+                        uniGetStaffInfo(type, data, callback);
+
+                    }
+
+                    break;
+                    //鍛樺伐鍒犻櫎
+                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_DELETE: {
+
+                        uniGetStaffDelete(type, data, callback);
+
+                    }
+                    break;
+                    //鍛樺伐缂栬緫
+                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_EDIT: {
+                        uniGetStaffEdit(type, data, callback);
+
+                    }
+                    break;
+                    //鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
+                    case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYP: {
+                        uniGetUserRightType(type, data, callback);
+
                     }
                     break;
 
 
                 }
+            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
+                //鍏跺畠妯″潡
+                switch (type) {
+                    //鑾峰彇娓╁害鍗曚綅
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
+                        uniSuccessCallback(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
+                    }
+                    break;
+                    //鑾峰彇褰撳墠app璇█
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
+                        uniSuccessCallback(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
+                    }
+                    break;
+                    //鑾峰彇浣嶇疆淇℃伅
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
+                        this.uniGetLocationInfo(mode_type, data, callback);
+                    }
+                    break;
+                    //搴旂敤鍐茬獊
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
+                        if (callback != null) {
+                            uniSuccessCallback(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
+                        }
+                    }
+                    break;
+                    //涓撻棬鏀堕泦uni鏃ュ織
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
+                        String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
+                        HdlLogLogic.print("uni---log---" + customizeContentFormat, true);
+
+                    }
+                    break;
+                    //uni涓婚〉鐐瑰嚮杩斿洖閫氱煡
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
+                        //EventBus浜嬩欢鍒嗗彂
+                        HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL, HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
+
+                    }
+                    break;
+                    //uni閫氱煡鍘熺敓閫�鍑虹櫥褰�
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
+                        HDLLinkPMUser.getInstance().logout(0);
+                    }
+                    break;
+                }
             }
 
         } catch (Exception e) {
-            HdlLogLogic.print("uni--->鍙戦��--->" + e.getMessage(), true);
+            HdlLogLogic.print("uni---鍙戦��---" + e.getMessage(), true);
         }
 
     }
@@ -435,7 +664,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);
     }
 
     /**
@@ -449,7 +678,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);
         }
     }
 
@@ -462,6 +691,416 @@
     //endregion
 
     //region ******uni鎺ュ彛鏂规硶******
+
+    /**
+     * 鐢电珯鍒犻櫎
+     */
+    private void uniGetDelResidence(String type, Object data, DCUniMPJSCallback callback) {
+
+
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                if (callback != null) {
+                    uniSuccessCallback(type, null, callback);
+                }
+                List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
+                for (int i = 0; i < list.size(); i++) {
+                    GatewayBean gatewayBean = list.get(i);
+                    HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), null);
+                }
+                list.clear();//娓呯┖缂撳瓨;
+//              HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+                HdlResidenceLogic.getInstance().delHouseId(homeId);//鍒犻櫎鐢电珯缂撳瓨
+                if (UserConfigManage.getInstance().isBAccount()) {
+                    //B绔�
+                    //鏀跺埌鎴愬姛缁撴灉鍝嶅簲鍚�,浼氳嚜鍔ㄥ叧闂皬绋嬪簭锛屽湪HDLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀洃鍚埌灏忕▼搴忓叧闂簨浠跺悗锛屼細閲嶆柊鑾峰彇鐢电珯鍒楄〃杩涜鍒风晫闈紱
+                    if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+                        HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+                    }
+                } else {
+                    //C绔�
+                    List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
+                    if (HouseIdList.size() == 0) {
+                        String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
+                        HdlUniLogic.getInstance().openUniMP(path, null);
+                    } else {
+                        HouseIdBean houseIdBean = HouseIdList.get(0);//榛樿鎷跨涓�涓�
+                        HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+                        JsonObject jsonObject = new JsonObject();
+                        jsonObject.addProperty("homeId", houseIdBean.getHomeId());
+                        jsonObject.addProperty("homeName", houseIdBean.getHomeName());
+                        jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
+                        HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+                        uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
+                        uniCallBackBaseBean.setData(jsonObject);
+                        HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+                    }
+
+
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鐢电珯鎺堟潈瀹夎鍟�(C绔�)
+     */
+    private void uniHomeUpdateDebugPerm(String type, Object data, DCUniMPJSCallback callback) {
+
+
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        boolean debugPerm = Boolean.parseBoolean(getKeyValue("debugPerm", getKeyValue("data", data)));
+        HdlResidenceLogic.getInstance().homeUpdateDebugPerm(homeId, debugPerm, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+
+    }
+
+    /**
+     * 鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+     */
+    private void uniGetDeliverToAccount(String type, Object data, DCUniMPJSCallback callback) {
+
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        String account = getKeyValue("account", getKeyValue("data", data));
+        HdlResidenceLogic.getInstance().getDeliverToAccount(homeId, account, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+                //鏀跺埌鎴愬姛缁撴灉鍝嶅簲鍚�,浼氳嚜鍔ㄥ叧闂皬绋嬪簭锛屽湪HDLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀洃鍚埌灏忕▼搴忓叧闂簨浠跺悗锛屼細閲嶆柊鑾峰彇鐢电珯鍒楄〃杩涜鍒风晫闈紱
+                if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+                    HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+
+    }
+
+    /**
+     * 鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+     */
+    private void uniGetDeliveryUrlQrcode(String type, Object data, DCUniMPJSCallback callback) {
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        HdlResidenceLogic.getInstance().getDeliveryUrlQrcode(homeId, new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
+     */
+    private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
+        HdlMemberLogic.getInstance().getUserRightType(new CloudCallBeak<UserRightTypeBean>() {
+            @Override
+            public void onSuccess(UserRightTypeBean userRightTypeBean) {
+                uniSuccessCallback(type, userRightTypeBean, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鍛樺伐缂栬緫
+     */
+    private void uniGetStaffEdit(String type, Object data, DCUniMPJSCallback callback) {
+        StaffBean staffBean = new StaffBean();
+        String staffInfo = getKeyValue("staffInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(staffInfo)) {
+            try {
+                staffBean = new Gson().fromJson(staffInfo, StaffBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+        HdlMemberLogic.getInstance().getStaffEdit(staffBean, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鍛樺伐鍒犻櫎
+     */
+    private void uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
+        StaffBean staffBean = new StaffBean();
+        String staffInfo = getKeyValue("staffInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(staffInfo)) {
+            try {
+                staffBean = new Gson().fromJson(staffInfo, StaffBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+        HdlMemberLogic.getInstance().getStaffDelete(staffBean, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鍛樺伐娣诲姞
+     */
+    private void uniGetStaffAdd(String type, Object data, DCUniMPJSCallback callback) {
+        StaffBean staffBean = new StaffBean();
+        String staffInfo = getKeyValue("staffInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(staffInfo)) {
+            try {
+                staffBean = new Gson().fromJson(staffInfo, StaffBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+        HdlMemberLogic.getInstance().getStaffAdd(staffBean, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇鍛樺伐璇︽儏
+     */
+    private void uniGetStaffInfo(String type, Object data, DCUniMPJSCallback callback) {
+        String userId = getKeyValue("userId", getKeyValue("data", data));
+        HdlMemberLogic.getInstance().getStaffInfo(userId, new CloudCallBeak<StaffBean>() {
+            @Override
+            public void onSuccess(StaffBean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇鍛樺伐鍒楄〃
+     */
+    private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
+        long pageNo = Long.parseLong(getKeyValue("pageNo", getKeyValue("data", data)));
+        long pageSize = Long.parseLong(getKeyValue("pageSize", getKeyValue("data", data)));
+        HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<StaffBean>>() {
+            @Override
+            public void onSuccess(PageNumberObject<StaffBean> obj) {
+                uniSuccessCallback(type, obj.getList(), callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+
+    /**
+     * 鎴愬憳缂栬緫
+     */
+    private void uniGetMemberEdit(String type, Object data, DCUniMPJSCallback callback) {
+        MemberBean memberBean = new MemberBean();
+        String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(memberInfo)) {
+            try {
+                memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+        HdlMemberLogic.getInstance().getMemberEdit(memberBean, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鎴愬憳鍒犻櫎
+     */
+    private void uniGetMemberDelete(String type, Object data, DCUniMPJSCallback callback) {
+        MemberBean memberBean = new MemberBean();
+        String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(memberInfo)) {
+            try {
+                memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+        HdlMemberLogic.getInstance().getMemberDelete(memberBean, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鎴愬憳娣诲姞
+     */
+    private void uniGetMemberAdd(String type, Object data, DCUniMPJSCallback callback) {
+        MemberBean memberBean = new MemberBean();
+        String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(memberInfo)) {
+            try {
+                memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+        HdlMemberLogic.getInstance().getMemberAdd(memberBean, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 涓嬭浇鎴愬憳锛堝瓙璐﹀彿锛夊ご鍍�
+     */
+    private void uniGetHeadPIortrait(String type, Object data, DCUniMPJSCallback callback) {
+        MemberBean memberBean = new MemberBean();
+        String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(memberInfo)) {
+            try {
+                memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
+            } catch (Exception ignored) {
+            }
+        }
+
+        HdlMemberLogic.getInstance().getHeadPIortrait(memberBean, new CloudCallBeak<byte[]>() {
+            @Override
+            public void onSuccess(byte[] obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇鎴愬憳鍒楄〃
+     */
+    private void uniGetMemberList(String type, Object data, DCUniMPJSCallback callback) {
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        MemberBean memberBean = new MemberBean();
+        memberBean.setHomeId(homeId);
+        HdlMemberLogic.getInstance().getMemberList(memberBean, new CloudCallBeak<List<MemberBean>>() {
+            @Override
+            public void onSuccess(List<MemberBean> list) {
+                uniSuccessCallback(type, list, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniExceptionCallback(type, e, callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇鎴栬�呴厤缃�嗗彉鍣ㄧ綉缁滐紙鍖呮嫭閫嗗彉鍣ㄧ儹鐐癸紝wifi锛屼互澶綉锛変俊鎭�
+     */
+    private void uniGetAndSetNetwork(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        JsonArray jsonArray = new JsonArray();
+        JsonObject jObject = null;
+        String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
+        if (!TextUtils.isEmpty(attribute_data)) {
+            try {
+                jObject = new Gson().fromJson(attribute_data, JsonObject.class);
+            } catch (Exception ignored) {
+                jObject = new JsonObject();
+            }
+        }
+        jsonArray.add(jObject);
+        //瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
+        TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                if (callback != null) {
+                    uniSuccessCallback(type, msg, callback);
+                }
+
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (callback != null) {
+                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+                }
+            }
+        });
+    }
+
 
     /**
      * 鑾峰彇浣嶇疆淇℃伅,鍖呮嫭缁忕含搴�
@@ -477,7 +1116,7 @@
             if (ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 geolocation.setResult(-2);
                 geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_no_location_information_permission));
-                uniCallbackData(type, geolocation, callback);
+                uniSuccessCallback(type, geolocation, callback);
                 return;
             }
             // 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
@@ -485,14 +1124,14 @@
                 geolocation.setResult(-1);
                 geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
                 //todo 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
-                uniCallbackData(type, geolocation, callback);
+                uniSuccessCallback(type, geolocation, callback);
                 return;
             }
             Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
             if (location == null) {
                 geolocation.setResult(-3);
                 geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_unable_location_move10_meters_later));
-                uniCallbackData(type, geolocation, callback);
+                uniSuccessCallback(type, geolocation, callback);
                 return;
             }
             geolocation.setResult(0);
@@ -503,12 +1142,12 @@
             double lon = longitude.setScale(6, RoundingMode.HALF_DOWN).doubleValue();
             geolocation.setLatitude(lat);//缁忓害
             geolocation.setLongitude(lon);//绾害
-            uniCallbackData(type, geolocation, callback);
+            uniSuccessCallback(type, geolocation, callback);
         } catch (Exception e) {
             Geolocation geolocation = new Geolocation();
             geolocation.setResult(-4);
             geolocation.setDes(e.getMessage());
-            uniCallbackData(type, geolocation, callback);
+            uniSuccessCallback(type, geolocation, callback);
         }
     }
 
@@ -522,7 +1161,7 @@
         HdlOtaLogic.getInstance().getCloudOidList(new CloudCallBeak<List<DeviceOidInfoBean>>() {
             @Override
             public void onSuccess(List<DeviceOidInfoBean> obj) {
-                uniCallbackData(type, obj, callback);
+                uniSuccessCallback(type, obj, callback);
             }
 
             @Override
@@ -541,7 +1180,7 @@
         HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
             @Override
             public void onSuccess(List<DeviceFirmwareBean> obj) {
-                uniCallbackData(type, obj, callback);
+                uniSuccessCallback(type, obj, callback);
             }
 
             @Override
@@ -561,7 +1200,7 @@
         HdlOtaLogic.getInstance().getNewDeviceFirmwares(hardwareModel, osImageId, new CloudCallBeak<List<CloudDeviceFirmwaresBean>>() {
             @Override
             public void onSuccess(List<CloudDeviceFirmwaresBean> obj) {
-                uniCallbackData(type, obj, callback);
+                uniSuccessCallback(type, obj, callback);
             }
 
             @Override
@@ -592,15 +1231,14 @@
                     String[] ary = path.split("/");
                     String[] driverInfoAry = ary[ary.length - 1].split("_");
                     DeviceFirmwareBean deviceFirmwareBean = new DeviceFirmwareBean();
-                    deviceFirmwareBean.setOid(driverInfoAry[0]);
-                    deviceFirmwareBean.setImageId(driverInfoAry[1]);
-                    deviceFirmwareBean.setVersion(driverInfoAry[2].replace(".zip", ""));
-                    deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), osImageId, deviceFirmwareBean.getVersion()));
+                    deviceFirmwareBean.setImageId(driverInfoAry[0]);
+                    deviceFirmwareBean.setVersion(driverInfoAry[1].replace(".zip", ""));
+                    deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(osImageId, deviceFirmwareBean.getVersion()));
                     list.add(deviceFirmwareBean);
                 }
             }
             if (callback != null) {
-                this.uniCallbackData(type, list, callback);
+                this.uniSuccessCallback(type, list, callback);
             }
         } catch (Exception ignored) {
         }
@@ -623,7 +1261,7 @@
                 HdlThreadLogic.runSubThread(new Runnable() {
                     @Override
                     public void run() {
-                        String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
+                        String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
                         //涓嶅湪瀛愮嚎绋嬭娴佷細鍗℃涓荤嚎绋�
                         boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
                         if (isBoolean) {
@@ -633,9 +1271,9 @@
                         }
 
                         if (isBoolean) {
-                            uniCallbackData(type, null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
+                            uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.writing_firmware_upgrade_memory_succeeded), callback);
                         } else {
-                            uniCallbackData(type, null, -2, "涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.download_firmware_upgrade_file_failed), callback);
                         }
                     }
                 });
@@ -664,11 +1302,11 @@
         String module = "FW#" + imageId;//妯″潡淇℃伅(HW锛氱‖浠�)
 
         //鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
-        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+        HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean b) {
                 if (b) {
-                    HdlLogLogic.print("鏈湴鍗囩骇--->", true);
+                    HdlLogLogic.print("鏈湴鍗囩骇---", true);
                     //鏈湴
                     //1,寤虹珛鏈湴鏈嶅姟锛�
                     //2,鍛婅瘔缃戝叧鎵嬫満ip鍜岀鍙ｏ紱
@@ -677,10 +1315,10 @@
                         @Override
                         public void onServiceConnected(ComponentName name, IBinder service) {
                             //鏈湴鍗囩骇鍥轰欢鏂囦欢璺緞
-                            String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
+                            String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
                             byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
                             if (data == null || data.length == 0) {
-                                uniCallbackData(type, null, -2, "鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.", callback);
+                                uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_firmware_upgrade_file), callback);
                                 return;
                             }
                             String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧鍥轰欢闇�瑕�
@@ -695,18 +1333,18 @@
 
                                 @Override
                                 public void onError(HDLLinkException e) {
-                                    uniCallbackData(type, null, -2, "閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
+                                    uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.notify_gateway_firmware_upgrade_failed), callback);
                                 }
                             });
                         }
 
                         @Override
                         public void onServiceDisconnected(ComponentName name) {
-                            uniCallbackData(type, null, -2, "鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇,", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.local_service_fails), callback);
                         }
                     });
                 } else {
-                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
                     //杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
                     HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                         @Override
@@ -724,7 +1362,7 @@
                             HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                                 @Override
                                 public void onSuccess(Boolean obj) {
-                                    uniCallbackData(type, obj, callback);
+                                    uniSuccessCallback(type, obj, callback);
                                 }
 
                                 @Override
@@ -745,7 +1383,7 @@
 
             @Override
             public void onFailure(HDLException e) {
-                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
                 //杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
                 HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                     @Override
@@ -763,7 +1401,7 @@
                         HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                             @Override
                             public void onSuccess(Boolean obj) {
-                                uniCallbackData(type, obj, callback);
+                                uniSuccessCallback(type, obj, callback);
                             }
 
                             @Override
@@ -793,7 +1431,7 @@
         HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
             @Override
             public void onSuccess(List<GatewayDriverBean> obj) {
-                uniCallbackData(type, obj, callback);
+                uniSuccessCallback(type, obj, callback);
             }
 
             @Override
@@ -813,7 +1451,7 @@
         HdlOtaLogic.getInstance().getNewGatewayDrivers(driveCode, osImageId, new CloudCallBeak<CloudGatewayDriversBean>() {
             @Override
             public void onSuccess(CloudGatewayDriversBean obj) {
-                uniCallbackData(type, obj, callback);
+                uniSuccessCallback(type, obj, callback);
             }
 
             @Override
@@ -849,10 +1487,10 @@
                 }
             }
             if (callback != null) {
-                this.uniCallbackData(type, list, callback);
+                this.uniSuccessCallback(type, list, callback);
             }
         } catch (Exception exception) {
-            this.uniCallbackData(type, new ArrayList<>(), callback);
+            this.uniSuccessCallback(type, new ArrayList<>(), callback);
         }
 
     }
@@ -886,9 +1524,9 @@
                             HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
                         }
                         if (isBoolean) {
-                            uniCallbackData(type, null, 0, "鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛", callback);
+                            uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.writing_drive_memory_succeeded), callback);
                         } else {
-                            uniCallbackData(type, null, -2, "涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.download_drive_file_failed), callback);
                         }
                     }
                 });
@@ -916,11 +1554,11 @@
         String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
         String module = driverCode + "#" + imageId;
         //鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
-        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+        HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean b) {
                 if (b) {
-                    HdlLogLogic.print("鏈湴鍗囩骇--->", true);
+                    HdlLogLogic.print("鏈湴鍗囩骇---", true);
                     //鏈湴
                     //1,寤虹珛鏈湴鏈嶅姟锛�
                     // 2锛屽憡璇夌綉鍏虫墜鏈篿p鍜岀鍙ｏ紱
@@ -932,7 +1570,7 @@
                             String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                             byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
                             if (data == null || data.length == 0) {
-                                uniCallbackData(type, null, -2, "鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.", callback);
+                                uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_drive_file), callback);
                                 return;
                             }
                             String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕�
@@ -947,18 +1585,18 @@
 
                                 @Override
                                 public void onError(HDLLinkException e) {
-                                    uniCallbackData(type, null, -2, "閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
+                                    uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.notify_gateway_drive_failed), callback);
                                 }
                             });
                         }
 
                         @Override
                         public void onServiceDisconnected(ComponentName name) {
-                            uniCallbackData(type, null, -2, "鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇,", callback);
+                            uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.local_service_fails), callback);
                         }
                     });
                 } else {
-                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
                     //杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
                     HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                         @Override
@@ -976,7 +1614,7 @@
                             HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                                 @Override
                                 public void onSuccess(Boolean obj) {
-                                    uniCallbackData(type, obj, callback);
+                                    uniSuccessCallback(type, obj, callback);
                                 }
 
                                 @Override
@@ -997,7 +1635,7 @@
 
             @Override
             public void onFailure(HDLException e) {
-                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
                 //杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
                 HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                     @Override
@@ -1015,7 +1653,7 @@
                         HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                             @Override
                             public void onSuccess(Boolean obj) {
-                                uniCallbackData(type, obj, callback);
+                                uniSuccessCallback(type, obj, callback);
                             }
 
                             @Override
@@ -1041,7 +1679,7 @@
      */
     private void uniCancelDownloadingUpgradeFile(String type, Object data, DCUniMPJSCallback callback) {
         HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
-        uniCallbackData(type, null, 0, "鍙栨秷涓嬭浇鎴愬姛.", callback);
+        uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.cancel_download_successfully), callback);
     }
 
     /**
@@ -1126,19 +1764,19 @@
                 if (cUserInfo.getMemberHeadIcon().contains("http")) {
                     UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                     //鏇存柊鐢ㄦ埛澶村儚
-                    uniCallbackData(type, cUserInfo, callback);
+                    uniSuccessCallback(type, cUserInfo, callback);
                 } else {
                     HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
                         @Override
                         public void onSuccess(String url) {
                             cUserInfo.setMemberHeadIcon(url);
                             UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
-                            uniCallbackData(type, cUserInfo, callback);
+                            uniSuccessCallback(type, cUserInfo, callback);
                         }
 
                         @Override
                         public void onFailure(HDLException e) {
-                            uniCallbackData(type, cUserInfo, callback);
+                            uniSuccessCallback(type, cUserInfo, callback);
                         }
                     });
                 }
@@ -1163,7 +1801,7 @@
         HdlAccountLogic.getInstance().getImageKey_C(imageKey, new CloudCallBeak<String>() {
             @Override
             public void onSuccess(String url) {
-                uniCallbackData(type, url, callback);
+                uniSuccessCallback(type, url, callback);
             }
 
             @Override
@@ -1185,7 +1823,7 @@
         HdlDeviceLogic.getInstance().clearInverterHomeId(mac, new LinkCallBack<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
-                uniCallbackData(type, null, callback);
+                uniSuccessCallback(type, null, callback);
             }
 
             @Override
@@ -1203,10 +1841,10 @@
      */
     private void uniGetMessageNumber(String type, Object data, DCUniMPJSCallback callback) {
         String homeId = getKeyValue("homeId", getKeyValue("data", data));
-        HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<String>() {
+        HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<UnCountBean>() {
             @Override
-            public void onSuccess(String data) {
-                uniCallbackData(type, data, callback);
+            public void onSuccess(UnCountBean data) {
+                uniSuccessCallback(type, data, callback);
             }
 
             @Override
@@ -1228,7 +1866,7 @@
         GatewayBean gatewayBean = new GatewayBean();
         gatewayBean.setDevice_mac(mac);
         list.add(gatewayBean);
-        HdlDeviceLogic.getInstance().uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), list, null);
+        HdlDeviceLogic.getInstance().uploadOidDataToCloud(UserConfigManage.getInstance().getHomeId(), list, true, null);
     }
 
     /**
@@ -1245,7 +1883,7 @@
         HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, timezone, new LinkCallBack<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
-                uniCallbackData(type, true, callback);
+                uniSuccessCallback(type, true, callback);
             }
 
             @Override
@@ -1267,7 +1905,7 @@
             @Override
             public void onSuccess(DeviceTimeBean deviceTimeBean) {
                 if (callback != null) {
-                    uniCallbackData(type, deviceTimeBean, callback);
+                    uniSuccessCallback(type, deviceTimeBean, callback);
                 }
             }
 
@@ -1290,7 +1928,7 @@
             @Override
             public void onSuccess(List<OidBean> list) {
                 if (callback != null) {
-                    uniCallbackData(type, list, callback);
+                    uniSuccessCallback(type, list, callback);
                 }
             }
 
@@ -1327,7 +1965,7 @@
                         HdlDeviceLogic.getInstance().addInverterDeviceToCloud(homeId, mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
                             @Override
                             public void onSuccess(Boolean obj) {
-                                uniCallbackData(type, null, callback);
+                                uniSuccessCallback(type, null, callback);
                             }
 
                             @Override
@@ -1361,6 +1999,7 @@
 //        com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
         try {
             String devices = getKeyValue("devices", getKeyValue("data", data));
+            String homeId = getKeyValue("homeId", getKeyValue("data", data));
             Gson gson = new Gson();
             Type typeOfT = new TypeToken<List<GatewayBean>>() {
             }.getType();
@@ -1369,7 +2008,6 @@
                 uniCallbackData(type, null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);
                 return;
             }
-            String homeId = UserConfigManage.getInstance().getHomeId();
             //璁板綍鏉℃暟
             AtomicInteger atomicInteger = new AtomicInteger(0);
             final boolean[] is_boolean = {false};
@@ -1387,11 +2025,27 @@
                                     HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
                                         @Override
                                         public void onSuccess(Boolean obj) {
-                                            uniCallbackData(type, null, callback);
+                                            uniSuccessCallback(type, null, callback);
                                         }
 
                                         @Override
                                         public void onFailure(HDLException e) {
+                                            //娣诲姞閫嗗彉鍣ㄥけ璐ュ悗鍒濆鍖栭�嗗彉鍣�
+                                            HdlLogLogic.print("娣诲姞閫嗗彉鍣ㄥけ璐ュ悗寮�濮嬪垵濮嬪寲閫嗗彉鍣�-->", true);
+                                            for (int i = 0; i < list.size(); i++) {
+                                                GatewayBean gatewayBean = list.get(i);
+                                                HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
+                                                    @Override
+                                                    public void onSuccess(Boolean obj) {
+                                                        HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + gatewayBean.getDevice_mac(), true);
+                                                    }
+
+                                                    @Override
+                                                    public void onError(HDLLinkException e) {
+                                                        HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + gatewayBean.getDevice_mac(), true);
+                                                    }
+                                                });
+                                            }
                                             uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                                         }
                                     });
@@ -1430,16 +2084,39 @@
      */
     private void uniDelInverterDevice(String type, Object data, DCUniMPJSCallback callback) {
         String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
-        String homeId = UserConfigManage.getInstance().getHomeId();
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        String mac = getKeyValue("mac", getKeyValue("data", data));
         HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
-                uniCallbackData(type, null, callback);
+                //鍒濆鍖栭�嗗彉鍣ㄨ澶�
+                HdlDeviceLogic.getInstance().initializeInverter(mac, null);
+                //绉婚櫎鏈湴缂撳瓨
+                HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
+                uniSuccessCallback(type, null, callback);
             }
 
             @Override
             public void onFailure(HDLException e) {
-                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+                if (e.getCode() == 121005) {
+                    //璁惧涓嶅瓨鍦紙121005锛夌姸鎬佺爜
+                    //鍒濆鍖栭�嗗彉鍣ㄨ澶�
+                    HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+                        @Override
+                        public void onSuccess(Boolean obj) {
+                            //绉婚櫎鏈湴缂撳瓨
+                            HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
+                            uniSuccessCallback(type, null, callback);
+                        }
+
+                        @Override
+                        public void onError(HDLLinkException e) {
+                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+                        }
+                    });
+                } else {
+                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+                }
             }
         });
     }
@@ -1456,7 +2133,7 @@
         HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
             @Override
             public void onSuccess(List<GatewayBean> gatewayBeanList) {
-                uniCallbackData(type, gatewayBeanList, callback);
+                uniSuccessCallback(type, gatewayBeanList, callback);
             }
 
             @Override
@@ -1479,22 +2156,17 @@
         HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
             @Override
             public void onSuccess(List<GatewayBean> list) {
-                if (list == null || list.size() == 0) {
-                    if (callback != null) {
-                        uniCallbackData(type, list, callback);
-                    }
-                    return;
-                }
                 if (callback != null) {
-                    uniCallbackData(type, list, callback);
+                    uniSuccessCallback(type, list, callback);
                 }
                 //EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
                 BaseEventBus baseEventBus = new BaseEventBus();
+                baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
                 baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
-                baseEventBus.setData(list);
+                baseEventBus.setData(homeId);
                 EventBus.getDefault().post(baseEventBus);
                 //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
-                HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, list, null);
+                HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
             }
 
             @Override
@@ -1505,6 +2177,249 @@
             }
         });
 
+    }
+
+    /**
+     * link spk 灞炴�х紪杈�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniLinkSpkAttributeEdit(String type, Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
+        JsonArray jay = new JsonArray();
+        if (!TextUtils.isEmpty(attribute_data)) {
+            try {
+                Gson gson = new Gson();
+                JsonObject jObject = gson.fromJson(attribute_data, JsonObject.class);
+                String objects = jObject.get("objects").toString();
+                jay = gson.fromJson(objects, JsonArray.class);
+            } catch (Exception ignored) {
+            }
+        }
+        TcpClient.getInstance().sendDataToLinkGateway(mac, TopicApi.PROPERTY_DOWN, jay, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                uniSuccessCallback(type, msg, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * link spk 灞炴�ц鍙�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniLinkSpkAttributeRead(String type, Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
+        JsonArray jay = new JsonArray();
+        if (!TextUtils.isEmpty(attribute_data)) {
+            try {
+                Gson gson = new Gson();
+                JsonObject jObject = gson.fromJson(attribute_data, JsonObject.class);
+                String objects = jObject.get("objects").toString();
+                jay = gson.fromJson(objects, JsonArray.class);
+            } catch (Exception ignored) {
+            }
+
+        }
+        TcpClient.getInstance().sendDataToLinkGateway(mac, TopicApi.PROPERTY_READ, jay, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                try {
+                    Gson gson = new Gson();
+                    Type typeOfT = new TypeToken<BaseLocalResponse<List<LinkBean>>>() {
+                    }.getType();
+                    BaseLocalResponse<List<LinkBean>> baseLocalResponse = gson.fromJson(msg, typeOfT);
+                    uniSuccessCallback(type, baseLocalResponse, callback);
+                } catch (Exception e) {
+                    uniCallbackData(type, msg, -2, "", callback);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+
+    /**
+     * 鍙戦�佽处鍙峰拰瀵嗙爜缁欓�嗗彉鍣�
+     *
+     * @param ssid     璐﹀彿
+     * @param password 瀵嗙爜
+     * @param callback uni鍥炶皟
+     */
+    public void startTcpThreadSendAccountAndPassword(String type, String ssid, String password, DCUniMPJSCallback callback) {
+        new Thread(() -> {
+            Socket socket = null;
+            OutputStream outputStreamTcp = null;
+            InputStream inputStreamTcp = null;
+            try {
+                socket = new Socket();
+                socket.setTcpNoDelay(true);
+                socket.setSoTimeout(10 * 1000);//10绉掕秴鏃�
+                socket.connect(new InetSocketAddress("192.168.8.1", 8586));
+                socket.setKeepAlive(true);
+//                        logMessage("tcp杩炴帴鐘舵�佹垚鍔�", 0, "");
+                outputStreamTcp = socket.getOutputStream();
+                JsonObject jsonObject = new JsonObject();
+                jsonObject.addProperty("id", "102030");
+                jsonObject.addProperty("ssid", ssid);
+                jsonObject.addProperty("password", password);
+                jsonObject.addProperty("server_addr", HDLLinkPMUser.getInstance().getHomeRegionUrl());
+                jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+                String sendData = "Topic:/user/id/custom/wifi/set\r\n";
+                sendData += "Length:" + jsonObject.toString().getBytes().length + "\r\n\r\n";
+                sendData += jsonObject.toString();
+                outputStreamTcp.write(sendData.getBytes());
+                outputStreamTcp.flush();
+                Thread.sleep(200);
+                inputStreamTcp = socket.getInputStream();
+                byte[] bytes = new byte[1204 * 2];
+                int len = inputStreamTcp.read(bytes);
+                if (len != -1) {
+                    String str = new String(bytes, 0, bytes.length);
+                    String[] strings = str.split("\r\n\r\n");
+                    String[] topicAndLength = strings[0].split("\r\n");
+                    String topic = topicAndLength[0];
+                    JSONObject json = new JSONObject(strings[1]);
+//                            logMessage("tcp鍥炲鏁版嵁", 0, strings[0] + "\r\n" + json.toString());
+                    if (topic.endsWith("wifi/set_reply") || topic.endsWith("wifi/result/notify")) {
+                        if (callback != null) {
+                            uniSuccessCallback(type, json, callback);
+                        }
+                        if (json.has("mac")) { //鍥炲鎴愬姛鍐嶆嬁璁惧mac
+//                                    this.device_mac = json.getString("mac");
+//                                    this.isSucceedTcp = true;//琛ㄧず鎴愬姛
+                        }
+                    }
+                }
+
+            } catch (Exception ignored) {
+            } finally {
+                try {
+                    if (outputStreamTcp != null) {
+                        outputStreamTcp.close();
+                        outputStreamTcp = null;
+                    }
+                    if (inputStreamTcp != null) {
+                        inputStreamTcp.close();
+                        inputStreamTcp = null;
+                    }
+                    if (socket != null) {
+                        socket.close();
+                        socket = null;
+                    }
+
+                } catch (Exception ignored) {
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * 鍒濆鍖栭�嗗彉鍣�
+     *
+     * @param type     璐﹀彿
+     * @param data     uni璇锋眰鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    public void setInitializeGateway(String type, Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍒濆鍖栭�嗗彉鍣�
+     *
+     * @param type     璐﹀彿
+     * @param data     uni璇锋眰鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    public void setInverterDeviceRemoteInfo(String type, Object data, DCUniMPJSCallback callback) {
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        String json = getKeyValue("list", getKeyValue("data", data));
+        List<CloudInverterDeviceBean> newList = new ArrayList<>();
+        try {
+            List<GatewayBean> list = new Gson().fromJson(json, new TypeToken<List<GatewayBean>>() {
+            }.getType());
+            if (list != null && list.size() > 0) {
+                for (int i = 0; i < list.size(); i++) {
+                    GatewayBean gatewayBean = list.get(i);
+                    CloudInverterDeviceBean inverterDeviceBean = new CloudInverterDeviceBean();
+                    inverterDeviceBean.setCategorySecondName(gatewayBean.getCategorySecondName());
+                    inverterDeviceBean.setOsn(gatewayBean.getDevice_mac());
+                    inverterDeviceBean.setOmodel(gatewayBean.getDevice_model());
+                    inverterDeviceBean.setOid(gatewayBean.getOid());
+                    inverterDeviceBean.setAddresses(gatewayBean.getAddresses());
+                    inverterDeviceBean.setSid(gatewayBean.getSid());
+                    inverterDeviceBean.setDeviceId(gatewayBean.getDeviceId());
+                    inverterDeviceBean.setName(gatewayBean.getDevice_name());
+                    inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
+                    inverterDeviceBean.setSpk(gatewayBean.getSpk());
+                    inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
+                    newList.add(inverterDeviceBean);
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, homeId, new CloudCallBeak<List<GatewayBean>>() {
+            @Override
+            public void onSuccess(List<GatewayBean> obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
+     *
+     * @param type     璐﹀彿
+     * @param data     uni璇锋眰鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    public void uniOidEditName(String type, Object data, DCUniMPJSCallback callback) {
+        String homeId = getKeyValue("homeId", getKeyValue("data", data));
+        String deviceType = getKeyValue("deviceType", getKeyValue("data", data));
+        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
+        String name = getKeyValue("name", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().setRename(homeId, deviceType, deviceId, name, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniSuccessCallback(type, obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+            }
+        });
     }
 
 
@@ -1526,7 +2441,7 @@
         String tempData = getKeyValue("data", data);
         if (TextUtils.isEmpty(tempData)) {
             uniCallbackData(type, null, -2, "data鍐呭涓虹┖", callback);
-            //HdlLogLogic.print("data鍐呭涓虹┖--->", false);
+            //HdlLogLogic.print("data鍐呭涓虹┖---", false);
             return;
         }
         ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
@@ -1538,24 +2453,24 @@
 //        }
         if (modBusBean.getMac() == null || modBusBean.getData() == null) {
             uniCallbackData(type, null, -2, "鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖", callback);
-            //HdlLogLogic.print("uni--->鍙戦��--->ModBus--->鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖." + Arrays.toString(modBusBean.getData()), true);
+            //HdlLogLogic.print("uni---鍙戦��---ModBus---鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖." + Arrays.toString(modBusBean.getData()), true);
             return;
         }
 
-        //HdlLogLogic.print("uni--->鍙戦��--->ModBus--->" + Arrays.toString(modBusBean.getData()), true);
+        //HdlLogLogic.print("uni---鍙戦��---ModBus---" + Arrays.toString(modBusBean.getData()), true);
         //鍙戦�乵odbus鍗忚
         HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
             @Override
             public void onSuccess(int[] data) {
-                uniCallbackData(type, data, callback);
-//                HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + Arrays.toString(data), true);
+                uniSuccessCallback(type, data, callback);
+//                HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + Arrays.toString(data), true);
 
             }
 
             @Override
             public void onError(HDLLinkException e) {
                 uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
-//                HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
+//                HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + e.getMsg() + "(" + e.getCode() + ")", true);
             }
         });
     }
@@ -1578,9 +2493,12 @@
                 data = new JSONObject();
             }
             if (isTokenAndRefreshToken) {
-                //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,闇�瑕佽繖浜涙暟鎹�
+                //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
                 data.put("token", UserConfigManage.getInstance().getToken());
                 data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+                if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
+                    AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+                }
                 data.put("serverAddress", AppConfigManage.getUserRegionUrl());
                 data.put("appKey", AppConfigManage.getAppKey());
                 data.put("appSecret", AppConfigManage.getAppSecret());
@@ -1588,11 +2506,18 @@
             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();
     }
 
+    private void uniSuccessCallback(String type, Object obj, DCUniMPJSCallback callback) {
+        uniCallbackData(type, obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
+    }
+
+    private void uniExceptionCallback(String type, HDLException hdlException, DCUniMPJSCallback callback) {
+        uniCallbackData(type, null, hdlException.getCode(), hdlException.getMsg(), callback);
+    }
 
     /**
      * 缁勮uni鍙戦�佹暟鎹牸寮�
@@ -1608,23 +2533,19 @@
         HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
         try {
             uniCallBackBaseBean.setCode(code);
-            uniCallBackBaseBean.setMes(msg);
+            uniCallBackBaseBean.setMsg(msg);
             uniCallBackBaseBean.setData(obj);
             if (callback != null) {
                 callback.invoke(getJSONObject(uniCallBackBaseBean));
 //                callback.invoke(uniCallBackBaseBean);
-                HdlLogLogic.print("uni--->鎺ユ敹--->" + type + "--->" + new Gson().toJson(uniCallBackBaseBean), true);
+                HdlLogLogic.print("鍥炲---uni---" + type + "---" + new Gson().toJson(uniCallBackBaseBean), true);
             }
         } catch (Exception e) {
-            HdlLogLogic.print("uni--->鎺ユ敹--->" + type + "--->" + e.getMessage(), true);
+            HdlLogLogic.print("鍥炲---uni---" + type + "---" + e.getMessage(), true);
         }
 
-
     }
 
-    private void uniCallbackData(String type, Object obj, DCUniMPJSCallback callback) {
-        uniCallbackData(type, obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
-    }
 
     /**
      * 褰撳墠瀵硅薄杞� JSONObject

--
Gitblit v1.8.0