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 | 1254 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 1,098 insertions(+), 156 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 763a4bf..47ba0b4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,24 +1,39 @@
 package com.hdl.photovoltaic.other;
 
 
+import android.content.ComponentName;
+import android.content.ServiceConnection;
+import android.os.IBinder;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
+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.GatewayDriverBean;
+import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
 import com.hdl.photovoltaic.HDLApp;
-import com.hdl.photovoltaic.bean.BaseEventBus;
+import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.bean.ModBusBean;
-import com.hdl.photovoltaic.config.ConstantManage;
+import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
+import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
 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;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
 import com.hdl.sdk.link.core.callback.ModbusCallBack;
@@ -29,10 +44,14 @@
 import org.json.JSONObject;
 
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import io.dcloud.feature.unimp.DCUniMPJSCallback;
+import okhttp3.ResponseBody;
 
 /**
  * uni灏忕▼搴忕殑閫昏緫
@@ -57,36 +76,59 @@
         return sHdlUniLogic;
     }
 
-    //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();******
+
+    //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨�3涓柟娉曞悕 onOtherUniMPEventReceive();openUniMP();sendUni();******
 
     /**
      * 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
      *
      * @param appId    -uni灏忕▼搴忔寚瀹氱殑appId
-     * @param event    -uni灏忕▼搴忓彂鏉ユ暟鎹�
+     * @param topic    -uni灏忕▼搴忓彂鏉ヤ富棰�(澶х被)
      * @param data     JSONObject com.alibaba.fastjson瑙f瀽澶勭悊
      * @param callback callback.invoke(JSONObject) 鐢╟om.alibaba.fastjson
      */
     @Override
-    public void onOtherUniMPEventReceive(String appId, String event, Object data, DCUniMPJSCallback callback) {
+    public void onOtherUniMPEventReceive(String appId, String topic, Object data, DCUniMPJSCallback callback) {
         try {
             if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
                 return;
             }
-            String type = getKeyValue("type", data);
-            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
+            String type = getKeyValue("type", data);//灏忕被
+            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(topic)) {
                 //浣忓畢妯″潡
                 switch (type) {
+                    //鍒涘缓鐢电珯
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
-                        //鍒涘缓
                         //EventBus浜嬩欢鍒嗗彂
                         BaseEventBus baseEventBus = new BaseEventBus();
-                        baseEventBus.setType(ConstantManage.EVENTBUS_POST_HOME_CREATED);
+                        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);
                     }
                     break;
+                    //璇诲彇璇︽儏
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {
-                        //璇︽儏
+
+                    }
+                    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);
+                    }
+                    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);
                     }
                     break;
 
@@ -94,160 +136,1089 @@
                 if (callback != null) {
                     uniCallbackData(null, callback);
                 }
-            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
+            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
                 //璁惧妯″潡
                 switch (type) {
+                    //娣诲姞閫嗗彉鍣ㄥ埌浜戠
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
-                        //娣诲姞璁惧鍒颁簯绔�
-                        String mac = getKeyValue("mac", getKeyValue("data", data));
-                        HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
-                            @Override
-                            public void onSuccess(Boolean obj) {
-                                HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
-                                    @Override
-                                    public void onSuccess(Boolean obj) {
-                                        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>() {
-                                                    @Override
-                                                    public void onSuccess(Boolean obj) {
-                                                        uniCallbackData(null, callback);
-                                                    }
-
-                                                    @Override
-                                                    public void onFailure(HDLException e) {
-                                                        uniCallbackData(null, -100, e.getMessage(), callback);
-                                                    }
-                                                });
-                                    }
-
-                                    @Override
-                                    public void onError(HDLLinkException e) {
-                                        uniCallbackData(null, -100, e.getMessage(), callback);
-                                    }
-                                });
-                            }
-
-                            @Override
-                            public void onError(HDLLinkException e) {
-                                uniCallbackData(null, -100, e.getMessage(), callback);
-                            }
-                        });
-
-
+                        this.uniAddInverterDeviceToCloud(data, callback);
                     }
                     break;
+                    //鍒犻櫎浜戠閫嗗彉鍣�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_DEL: {
+                        this.uniDelInverterDevice(data, callback);
+                    }
+                    break;
+                    //灞�鍩熺綉鎼滅储閫嗗彉鍣ㄥ垪琛�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NET_LIST: {
-                        //缃戝叧鎼滅储
-                        HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
-                            @Override
-                            public void onSuccess(List<GatewayBean> gatewayBeanList) {
-                                uniCallbackData(gatewayBeanList, callback);
-                            }
-
-                            @Override
-                            public void onError(HDLLinkException e) {
-                                //鍙戦�佸け璐�
-                                uniCallbackData(null, e.getCode(), "", callback);
-                            }
-                        });
+                        this.uniSearchGateway(callback);
                     }
                     break;
+                    //鑾峰彇閫嗗彉鍣ㄥ垪琛�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
-                        //鑾峰彇缃戝叧璁惧鍒楄〃
-                        HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
-                            @Override
-                            public void onSuccess(Boolean obj) {
-                                if (callback != null) {
-                                    uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(HDLException e) {
-                                if (callback != null) {
-                                    uniCallbackData(null, -2, e.getMessage(), callback);
-                                }
-                            }
-                        });
+                        this.uniGetCurrentHomeLocalAndCloudGatewayList(data, callback);
                     }
                     break;
+                    //modBus鍗忚涓撶敤
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
                         sendModBus(data, callback);
-
                     }
                     break;
+                    //鑾峰彇oid鍒楄〃
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
-                        //娣诲姞璁惧鍒颁簯绔�
-                        String mac = getKeyValue("mac", getKeyValue("data", data));
-                        //鑾峰彇oid鍒楄〃
-                        HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
-                            @Override
-                            public void onSuccess(List<OidBean> list) {
-                                if (callback != null) {
-                                    uniCallbackData(list, callback);
-                                }
-                            }
-
-                            @Override
-                            public void onError(HDLLinkException e) {
-                                uniCallbackData(null, -2, e.getMessage(), callback);
-                            }
-                        });
+                        this.uniGetInverterOidList(data, callback);
                     }
                     break;
+                    //閫嗗彉鍣ㄦ椂闂磋鍙�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
+                        this.uniGetInverterTime(data, callback);
+                    }
+
+                    break;
+                    //閫嗗彉鍣ㄦ椂闂寸紪杈�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
+                        this.uniEditInverterTime(data, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_UPLOADING_DATA: {
+                        this.uniUploadDataToCloud(data, callback);
+                    }
+                    break;
+                    //閫嗗彉鍣ㄦ竻绌轰綇瀹卛d
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_CLEAR_DATA: {
+                        this.uniClearInverterHomeId(data, callback);
+                    }
+                    break;
+
                 }
 
-            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
-                WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
+            } 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鍒楄〃
                         if (callback != null) {
                             uniCallbackData(wifiUtils.getScanResult(), callback);
                         }
                     }
                     break;
+                    //褰撳墠wifi璇︽儏
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
-                        //褰撳墠wifi璇︽儏
                         if (callback != null) {
                             uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
                         }
                     }
                     break;
+                    //wifi杩炴帴
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
-                        //wifi杩炴帴
+
                     }
                     break;
 
                 }
+            } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(topic)) {
+                //OTA鍗囩骇妯″潡
+                switch (type) {
+                    //鍚戜簯绔幏鍙杘id鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_CLOUD_OID_LIST: {
+                        this.uniGetCloudOidList(data, callback);
+                    }
+                    break;
+                    //褰撳墠璁惧鍥轰欢鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_LIST: {
+                        this.uniGetCurrentDeviceFirmwares(data, callback);
+                    }
+                    break;
+                    //璁惧鏂板浐浠跺垪琛�
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_NEW_LIST: {
+                        this.uniGetNewDeviceFirmwares(data, callback);
+                    }
+                    break;
+                    //璁惧鏈湴鍥轰欢鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_LOCAL: {
+                        this.uniGetLocalFirmwares(data, callback);
+                    }
+                    break;
+                    //璁惧鍥轰欢涓嬭浇
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_DOWNLOAD: {
+                        this.uniDeviceFirmwareDownload(data, callback);
+                    }
+                    break;
+                    //璁惧鍥轰欢鍗囩骇
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_UPGRADE: {
+                        this.uniUpgradeDeviceFirmware(data, callback);
+                    }
+                    break;
+                    //褰撳墠璁惧椹卞姩鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_LIST: {
+                        this.uniGetCurrentGatewayDrivers(data, callback);
+                    }
+                    break;
+                    //璁惧鏂伴┍鍔ㄥ垪琛�
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_NEW: {
+                        this.uniGetNewGatewayDrivers(data, callback);
+                    }
+                    break;
+                    //璁惧鏈湴椹卞姩鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_LOCAL: {
+                        this.uniGetLocalDrivers(data, callback);
+                    }
+                    break;
+                    //璁惧椹卞姩涓嬭浇
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_DOWNLOAD: {
+                        this.uniGatewayDriverDownload(data, callback);
+                    }
+                    break;
+                    //璁惧椹卞姩鍗囩骇
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_UPGRADE: {
+                        this.uniUpgradeGatewayDriver(data, callback);
+                    }
+                    break;
+                    //璁惧鍙栨秷椹卞姩,鍥轰欢涓嬭浇鍗囩骇鏂囦欢
+                    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;
+                    //鎵撳紑鏈嶅姟
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_OPEN_SERVICE: {
+                        this.uniOpenService(data, callback);
+                    }
+                    break;
+                    //鍏抽棴鏈嶅姟
+                    case HDLUniMP.UNI_EVENT_REPLY_OTA_CLOSE_SERVICE: {
+                        this.uniCloseService(data, callback);
+                    }
+                    break;
+
+                }
+            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
+                //鍏跺畠妯″潡
+                switch (type) {
+                    //鑾峰彇娓╁害鍗曚綅
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
+                        uniCallbackData(UserConfigManage.getInstance().getTemperature_unit(), callback);
+                    }
+                    break;
+                    //鑾峰彇褰撳墠app璇█
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
+                        uniCallbackData(UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
+                    }
+                    break;
+                }
             }
-            HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", event + "\r\n" + data);
+            HdlLogLogic.print("uni鍙戞潵鐨勬暟鎹�--->澶х被-->" + topic + "\r\n" + data, true);
         } catch (Exception e) {
-            HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", e.getMessage());
+            HdlLogLogic.print("uni鍙戞潵鐨勬暟鎹�--->" + e.getMessage(), true);
+        }
+
+    }
+
+
+    /**
+     * 鍘熺敓銆愭墦寮�銆憉ni鎸囧畾椤甸潰
+     *
+     * @param path       鎵撳紑璺緞
+     * @param jsonObject 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+     */
+    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);
+    }
+
+    /**
+     * 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
+     * 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
+     *
+     * @param topic            涓婚澶х被(濡�:UNI_EVENT_REPLY_HOME_MODEL)
+     * @param callBackBaseBean 鑷畾涔夊疄浣撶被
+     */
+    public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
+        try {
+            HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
+        } catch (Exception e) {
+            HdlLogLogic.print("uni--->鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢--->" + e.getMessage(), false);
+        }
+    }
+
+    /**
+     * 妫�娴嬫槸鍚﹀綋鍓嶉〉闈㈡敞鍐岀殑callback,鏄殑璇濆垯绉婚櫎
+     */
+    public void checkRemoveOtherUniMPEventCallBack() {
+        HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
+    }
+    //endregion
+
+    //region ******uni鎺ュ彛鏂规硶******
+
+    /**
+     * 鍚戜簯绔幏鍙栭�嗗彉鍣╫id鍒楄〃
+     * 鍓嶆彁鏉′欢:瑕佷笂浼犻�嗗彉鍣╫id鍒楄〃缁欎簯绔�
+     *
+     * @param callback -
+     */
+    private void uniGetCloudOidList(Object data, DCUniMPJSCallback callback) {
+        HdlOtaLogic.getInstance().getCloudOidList(new CloudCallBeak<List<DeviceOidInfoBean>>() {
+            @Override
+            public void onSuccess(List<DeviceOidInfoBean> obj) {
+                uniCallbackData(obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍚戜簯绔幏鍙栥�愬綋鍓嶈澶囧浐浠躲�戝垪琛�
+     * 鍓嶆彁鏉′欢:璁惧鑷姩涓婃姤oid淇℃伅缁欎簯绔�
+     */
+    private void uniGetCurrentDeviceFirmwares(Object data, DCUniMPJSCallback callback) {
+        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
+        HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
+            @Override
+            public void onSuccess(List<DeviceFirmwareBean> obj) {
+                uniCallbackData(obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍚戜簯绔幏鍙栥�愯澶囨柊鍥轰欢銆戝垪琛�
+     * 鍓嶆彁鏉′欢:瑕侀�氳繃骞冲彴杞欢涓婁紶鏂板浐浠�
+     */
+    private void uniGetNewDeviceFirmwares(Object data, DCUniMPJSCallback callback) {
+        String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//纭欢鍨嬪彿
+        String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//绯荤粺闀滃儚id
+        HdlOtaLogic.getInstance().getNewDeviceFirmwares(hardwareModel, osImageId, new CloudCallBeak<List<CloudDeviceFirmwaresBean>>() {
+            @Override
+            public void onSuccess(List<CloudDeviceFirmwaresBean> obj) {
+                uniCallbackData(obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇銆愯澶囨湰鍦板浐浠躲�戝垪琛�
+     */
+    private void uniGetLocalFirmwares(Object data, DCUniMPJSCallback callback) {
+        try {
+            String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//纭欢鍨嬪彿
+            String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//绯荤粺闀滃儚id
+            String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
+//            String oid = getKeyValue("oid", getKeyValue("data", data));//鍥轰欢oid
+            List<DeviceFirmwareBean> list = new ArrayList<>();
+            String driverFileList = HdlFileLogic.getInstance().getFirmwareRootPath();
+            File file = new File(driverFileList);
+            if (file.list() != null) {
+                for (int i = 0; i < Objects.requireNonNull(file.list()).length; i++) {
+                    String path = Objects.requireNonNull(file.list())[i];
+                    if (!path.contains(osImageId)) {
+                        continue;
+                    }
+                    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()));
+                    list.add(deviceFirmwareBean);
+                }
+            }
+            if (callback != null) {
+                this.uniCallbackData(list, callback);
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    /**
+     * 鍚戜簯绔彂璧枫�愯澶囧浐浠朵笅杞姐�戞寚浠�
+     */
+    private void uniDeviceFirmwareDownload(Object data, DCUniMPJSCallback callback) {
+        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
+        String oid = getKeyValue("oid", getKeyValue("data", data));//璇ュ浐浠剁殑oid
+        String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
+        String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
+        String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦板浐浠舵枃浠惰矾寰�
+        String url = getKeyValue("url", getKeyValue("data", data));//浜戠涓婃枃浠跺湴鍧�
+        String md5 = getKeyValue("md5", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
+        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
+            @Override
+            public void onSuccess(ResponseBody responseBody) {
+                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);
+                        }
+                    }
+                });
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                HdlLogLogic.print("涓嬭浇鍥轰欢鏂囦欢鍒板唴瀛樺け璐�.", true);
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍚戜簯绔彂璧枫�愯澶囧浐浠躲�戝崌绾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
+        String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
+        String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
+        String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
+        String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
+        String module = "FW#" + imageId;
+
+        //鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
+        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean b) {
+                if (b) {
+                    HdlLogLogic.print("鏈湴鍗囩骇--->", true);
+                    //鏈湴
+                    //1,寤虹珛鏈湴鏈嶅姟锛�
+                    //2,鍛婅瘔缃戝叧鎵嬫満ip鍜岀鍙o紱
+                    //瀹炰緥鍖� 鑾峰彇ip 鍦板潃
+                    HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
+                        @Override
+                        public void onServiceConnected(ComponentName name, IBinder service) {
+                            //鏈湴鍗囩骇鍥轰欢鏂囦欢璺緞
+                            String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
+                            byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
+                            if (data == null || data.length == 0) {
+                                uniCallbackData(null, -2, "鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.", callback);
+                                return;
+                            }
+                            String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧鍥轰欢闇�瑕�
+                            //鍗囩骇鍥轰欢鏂囦欢鍦板潃
+                            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
+                                public void onSuccess(String obj) {
+                                    HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�鎴愬姛.", true);
+                                }
+
+                                @Override
+                                public void onError(HDLLinkException e) {
+                                    HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.", true);
+                                    uniCallbackData(null, -2, "閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void onServiceDisconnected(ComponentName name) {
+                            uniCallbackData(null, -2, "鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇,", callback);
+                        }
+                    });
+                } else {
+                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                    //杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
+                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                        @Override
+                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
+                            //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
+                            if (cloudInverterDeviceBean == null) {
+                                uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+                                return;
+                            }
+                            if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+                                uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+                                return;
+                            }
+                            //4:杩愯
+                            HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
+                                @Override
+                                public void onSuccess(Boolean obj) {
+                                    uniCallbackData(obj, callback);
+                                }
+
+                                @Override
+                                public void onFailure(HDLException e) {
+                                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                                }
+                            });
+
+                        }
+
+                        @Override
+                        public void onFailure(HDLException e) {
+                            uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                //杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
+                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                    @Override
+                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
+                        //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
+                        if (cloudInverterDeviceBean == null) {
+                            uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+                            return;
+                        }
+                        if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+                            uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+                            return;
+                        }
+                        //4:杩愯
+                        HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
+                            @Override
+                            public void onSuccess(Boolean obj) {
+                                uniCallbackData(obj, callback);
+                            }
+
+                            @Override
+                            public void onFailure(HDLException e) {
+                                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                            }
+                        });
+
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                    }
+                });
+            }
+        });
+
+    }
+
+    /**
+     * 鍚戜簯绔幏鍙栥�愬綋鍓嶈澶囬┍鍔ㄣ�戝垪琛�
+     * 鍓嶆彁鏉′欢:璁惧鑷姩涓婃姤oid淇℃伅缁欎簯绔�
+     */
+    private void uniGetCurrentGatewayDrivers(Object data, DCUniMPJSCallback callback) {
+        String deviceOid = getKeyValue("oid", getKeyValue("data", data));
+        HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
+            @Override
+            public void onSuccess(List<GatewayDriverBean> obj) {
+                uniCallbackData(obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍚戜簯绔幏鍙栥�愯澶囨柊椹卞姩銆戝垪琛�
+     * 鍓嶆彁鏉′欢:瑕侀�氳繃骞冲彴杞欢涓婁紶鏂伴┍鍔�
+     */
+    private void uniGetNewGatewayDrivers(Object data, DCUniMPJSCallback callback) {
+        String driveCode = getKeyValue("driveCode", getKeyValue("data", data));//椹卞姩缂栧彿鎴栭┍鍔ㄥ悕绉�
+        String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+        HdlOtaLogic.getInstance().getNewGatewayDrivers(driveCode, osImageId, new CloudCallBeak<CloudGatewayDriversBean>() {
+            @Override
+            public void onSuccess(CloudGatewayDriversBean obj) {
+                uniCallbackData(obj, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇銆愯澶囨湰鍦伴┍鍔ㄣ�戝垪琛�
+     */
+    private void uniGetLocalDrivers(Object data, DCUniMPJSCallback callback) {
+        try {
+            String driveCode = getKeyValue("driveCode", getKeyValue("data", data));//椹卞姩缂栧彿鎴栭┍鍔ㄥ悕绉�
+            String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+            String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+            List<GatewayDriverBean> list = new ArrayList<>();
+            String driverFileList = HdlFileLogic.getInstance().getDriveRootPath();
+            File file = new File(driverFileList);
+            if (file.list() != null) {
+                for (int i = 0; i < Objects.requireNonNull(file.list()).length; i++) {
+                    String fileName = Objects.requireNonNull(file.list())[i];
+                    if (!fileName.contains(driveCode)) {
+                        continue;
+                    }
+                    String[] driverInfoAry = fileName.split("_");
+                    GatewayDriverBean gatewayDriverBean = new GatewayDriverBean();
+                    gatewayDriverBean.setDriverCode(driverInfoAry[0]);
+                    gatewayDriverBean.setVersion(driverInfoAry[1].replace(".zip", ""));
+                    gatewayDriverBean.setLocalUrl(HdlFileLogic.getInstance().getDrivePathFileName(gatewayDriverBean.getDriverCode(), gatewayDriverBean.getVersion()));
+                    list.add(gatewayDriverBean);
+                }
+            }
+            if (callback != null) {
+                this.uniCallbackData(list, callback);
+            }
+        } catch (Exception exception) {
+            this.uniCallbackData(new ArrayList<>(), callback);
         }
 
     }
 
     /**
+     * 鍚戜簯绔彂璧枫�愯澶囬┍鍔ㄤ笅杞姐�戞寚浠�
+     */
+    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
+        String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
+        String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
+        String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦伴┍鍔ㄦ枃浠惰矾寰�
+        String url = getKeyValue("url", getKeyValue("data", data));//浜戠涓婃枃浠跺湴鍧�
+        String md5 = getKeyValue("md5", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
+        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
+            @Override
+            public void onSuccess(ResponseBody responseBody) {
+                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
+            public void onFailure(HDLException e) {
+                HdlLogLogic.print("涓嬭浇椹卞姩鏂囦欢鍒板唴瀛樺け璐�.", true);
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍚戜簯绔彂璧枫�愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
+     */
+    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
+        String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰鍙�
+        String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//椹卞姩缂栫爜
+        String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
+        String module = driverCode + "#" + imageId;
+        //鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
+        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean b) {
+                if (b) {
+                    HdlLogLogic.print("鏈湴鍗囩骇--->", true);
+                    //鏈湴
+                    //1,寤虹珛鏈湴鏈嶅姟锛�
+                    // 2锛屽憡璇夌綉鍏虫墜鏈篿p鍜岀鍙o紱
+                    //瀹炰緥鍖� 鑾峰彇ip 鍦板潃
+                    HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
+                        @Override
+                        public void onServiceConnected(ComponentName name, IBinder service) {
+                            //鏈湴鍗囩骇椹卞姩鏂囦欢璺緞
+                            String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
+                            byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
+                            if (data == null || data.length == 0) {
+                                uniCallbackData(null, -2, "鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.", callback);
+                                return;
+                            }
+                            String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕�
+                            //鍗囩骇椹卞姩鏂囦欢鍦板潃
+                            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
+                                public void onSuccess(String obj) {
+                                    HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�鎴愬姛.", true);
+                                }
+
+                                @Override
+                                public void onError(HDLLinkException e) {
+                                    HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.", true);
+                                    uniCallbackData(null, -2, "閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void onServiceDisconnected(ComponentName name) {
+                            uniCallbackData(null, -2, "鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇,", callback);
+                        }
+                    });
+                } else {
+                    HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                    //杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
+                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                        @Override
+                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
+                            //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
+                            if (cloudInverterDeviceBean == null) {
+                                uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+                                return;
+                            }
+                            if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+                                uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+                                return;
+                            }
+                            //4:杩愯
+                            HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
+                                @Override
+                                public void onSuccess(Boolean obj) {
+                                    uniCallbackData(obj, callback);
+                                }
+
+                                @Override
+                                public void onFailure(HDLException e) {
+                                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                                }
+                            });
+
+                        }
+
+                        @Override
+                        public void onFailure(HDLException e) {
+                            uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+                //杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
+                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
+                    @Override
+                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
+                        //1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
+                        if (cloudInverterDeviceBean == null) {
+                            uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+                            return;
+                        }
+                        if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+                            uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+                            return;
+                        }
+                        //4:杩愯
+                        HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
+                            @Override
+                            public void onSuccess(Boolean obj) {
+                                uniCallbackData(obj, callback);
+                            }
+
+                            @Override
+                            public void onFailure(HDLException e) {
+                                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                            }
+                        });
+
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                    }
+                });
+            }
+        });
+
+    }
+
+    /**
+     * 鍙栨秷涓嬭浇銆愰┍鍔�,鍥轰欢銆戝崌绾ф枃浠�
+     */
+    private void uniCancelDownloadingUpgradeFile(Object data, DCUniMPJSCallback callback) {
+        HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
+        uniCallbackData(null, 0, "鍙栨秷涓嬭浇鎴愬姛.", callback);
+    }
+
+    /**
+     * 鍙栨秷銆愰┍鍔�,鍥轰欢銆戝崌绾�
+     */
+    private void uniCancelUpgrade(Object data, DCUniMPJSCallback callback) {
+        HdlOtaLogic.getInstance().cancelUpgrade("", new LinkCallBack<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+
+            }
+        });
+    }
+
+    /**
+     * 寮�鍚湇鍔�
+     */
+    private void uniOpenService(Object data, DCUniMPJSCallback callback) {
+        HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                HdlOtaLogic.getInstance().mServiceStart = false;
+            }
+        });
+    }
+
+    /**
+     * 鍏抽棴鏈嶅姟
+     */
+    private void uniCloseService(Object data, DCUniMPJSCallback callback) {
+        HdlOtaLogic.getInstance().unLocalService();
+    }
+
+
+    /**
+     * @param deviceStatus 閫嗗彉鍣ㄨ繛鎺ヤ簯绔姸鎬佸�硷紙 1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾匡級
+     * @return 杩斿洖鏂囨湰
+     */
+    public String getDeviceStatusString(int deviceStatus) {
+        switch (deviceStatus) {
+            case 1: {
+                return HDLApp.getInstance().getString(R.string.my_power_station_connecting);
+            }
+            case 2: {
+                return HDLApp.getInstance().getString(R.string.my_power_station_malfunction);
+            }
+            case 4: {
+                return HDLApp.getInstance().getString(R.string.my_power_station_off_line);
+            }
+            default:
+                return "";
+        }
+
+    }
+
+    /**
+     * 閫嗗彉鍣ㄦ竻绌轰綇瀹卛d
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniClearInverterHomeId(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().clearInverterHomeId(mac, new LinkCallBack<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniCallbackData(null, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 閫嗗彉鍣ㄣ�愪笂浼犳暟鎹�戝埌浜戠
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniUploadDataToCloud(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
+    }
+
+    /**
+     * 缂栬緫閫嗗彉鍣ㄦ椂闂�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniEditInverterTime(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        String date = getKeyValue("date", getKeyValue("data", data));
+        String time = getKeyValue("time", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, new LinkCallBack<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniCallbackData(true, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇閫嗗彉鍣ㄦ椂闂�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniGetInverterTime(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<DeviceTimeBean>() {
+            @Override
+            public void onSuccess(DeviceTimeBean deviceTimeBean) {
+                if (callback != null) {
+                    uniCallbackData(deviceTimeBean, callback);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇oid鍒楄〃
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniGetInverterOidList(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
+            @Override
+            public void onSuccess(List<OidBean> list) {
+                if (callback != null) {
+                    uniCallbackData(list, callback);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+
+    }
+
+    /**
+     * 閫嗗彉鍣ㄦ坊鍔犲埌浜戠涓�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniAddInverterDeviceToCloud(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        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>() {
+                    @Override
+                    public void onSuccess(Boolean obj) {
+                        GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+                        if (gatewayBean == null) {
+                            uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback);
+
+                            return;
+                        }
+                        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);
+                            }
+
+                            @Override
+                            public void onFailure(HDLException e) {
+                                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onError(HDLLinkException e) {
+                        uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍒犻櫎浜戠涓婇�嗗彉鍣�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniDelInverterDevice(Object data, DCUniMPJSCallback callback) {
+        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
+        String homeId = UserConfigManage.getInstance().getHomeId();
+        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniCallbackData(null, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+
+    /**
+     * 灞�鍩熺綉鎼滅储閫嗗彉鍣ㄥ垪琛�
+     *
+     * @param callback uni鍥炶皟
+     */
+    private void uniSearchGateway(DCUniMPJSCallback callback) {
+        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
+            @Override
+            public void onSuccess(List<GatewayBean> gatewayBeanList) {
+                uniCallbackData(gatewayBeanList, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                //鍙戦�佸け璐�
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇閫嗗彉鍣ㄥ垪琛�
+     *
+     * @param callback uni鍥炶皟
+     */
+    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);
+                }
+
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (callback != null) {
+                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+                }
+            }
+        });
+
+    }
+
+
+    /**
      * 鍙戦�乵odbus鍗忚鏁版嵁
+     * 閫忎紶鍗忚
+     * 涓嬪彂涓婚锛�/user/${gw_id}/custom/native/${driver}/down;
+     * 閫嗗彉鍣ㄥ洖澶嶄富棰橈細/user/${gw_id}/custom/native/${driver}/down_reply;
+     * Modbus ECU鍗忚锛氫簨浠禝D(2涓猙yte)->鍗忚[鍥哄畾:0,0](2涓猙yte)->闀垮害(2byte)->鏍囪瘑绗oid鐨刟ddresses鍊糫(4涓猙yte)->鍔熻兘鐮�(1涓猙yte)->璐熻浇鏁版嵁(N涓猙yte);
+     * 闀垮害(2涓猙yte)=鏍囪瘑绗�(4涓猙yte)+鍔熻兘鐮�(1涓猙yte)+璐熻浇鏁版嵁(N涓猙yte);
+     * 璐熻浇鏁版嵁=瀵勫瓨鍣ㄥ湴鍧�(2涓猙yte)+瀵勫瓨鍣ㄩ暱搴�(2涓猙yte)+鍐呭闀垮害(1涓猙yte)+鍐呭鏁版嵁(N涓猙yte)銆愭敞鎰�:鍗曚釜鍐欏叆瀵勫瓨鍣�-->鍘绘帀<瀵勫瓨鍣ㄩ暱搴�>鍜�<鍐呭闀垮害>銆�;
+     * 瀵勫瓨鍣ㄩ暱搴�=(鍐呭鏁版嵁/2);
+     * 渚嬪瓙:new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01};
      *
      * @param data     modbus鏁版嵁
      * @param callback 鍥炶皟
      */
-    void sendModBus(Object data, DCUniMPJSCallback callback) {
+    private void sendModBus(Object data, DCUniMPJSCallback callback) {
         String tempData = getKeyValue("data", data);
         if (TextUtils.isEmpty(tempData)) {
-            HdlLogLogic.print("data鍐呭涓虹┖");
+            HdlLogLogic.print("data鍐呭涓虹┖", false);
             return;
         }
         ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
@@ -257,14 +1228,14 @@
 //        if (TextUtils.isEmpty(modBusBean.getOid())) {
 //            modBusBean.setOid("0101050217BBC400");
 //        }
-        if (modBusBean.getOid() == null || modBusBean.getData() == null) {
-            HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
+        if (modBusBean.getMac() == null || modBusBean.getData() == null) {
+            HdlLogLogic.print("鍐呭涓虹┖===oid=" + modBusBean.getMac() + " data=" + Arrays.toString(modBusBean.getData()), false);
             return;
         }
 
 
         //鍙戦�乵odbus鍗忚
-        HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
+        HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
             @Override
             public void onSuccess(int[] data) {
                 Log.d("data", Arrays.toString(data));
@@ -278,66 +1249,35 @@
         });
     }
 
-    /**
-     * 鍘熺敓鎵撳紑uni鎸囧畾椤甸潰
-     *
-     * @param path       鎵撳紑璺緞
-     * @param jsonObject 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
-     */
-    public void openUniMP(String path, JSONObject jsonObject) {
-
-        JSONObject json = this.createdJsonDate(jsonObject, true);
-        HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", json.toString());
-        HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
-    }
-
-    /**
-     * 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
-     * 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
-     *
-     * @param topic            涓婚澶х被(濡�:UNI_EVENT_REPLY_HOME_MODEL)
-     * @param callBackBaseBean 鈥斺��
-     */
-    public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
-        try {
-            HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
-        } catch (Exception e) {
-            HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
-        }
-    }
-
-    /**
-     * 妫�娴嬫槸鍚﹀綋鍓嶉〉闈㈡敞鍐岀殑callback,鏄殑璇濆垯绉婚櫎
-     */
-    public void checkRemoveOtherUniMPEventCallBack() {
-        HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
-    }
     //endregion
-
 
     //region ******涓�鑸柟娉�******
 
     /**
      * 缁勮uni鍙戦�佹暟鎹牸寮�
      *
-     * @param data                   -闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+     * @param data                   闄勫姞鏁版嵁(娌℃湁鏁版嵁濉玭ull)
      * @param isTokenAndRefreshToken (true=搴曞眰榛樿娣诲姞token鍜宺efreshToken;false=涓嶅姞)
-     * @return JSONObject
+     * @return JSONObject            uni鏂规硶鍚嶉噷闈㈠弬鏁伴渶瑕佺殑JSONObject瀵硅薄
      */
-    private JSONObject createdJsonDate(JSONObject data, boolean isTokenAndRefreshToken) {
+    private JSONObject createdJSONObject(JSONObject data, boolean isTokenAndRefreshToken) {
         HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
         try {
             if (data == null) {
                 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());
+            HdlLogLogic.print("uni--->缁勮uni鍙戦�佹暟鎹牸寮忔湁寮傚父--->" + e.getMessage(), false);
         }
         return new JSONObject();
     }
@@ -361,10 +1301,11 @@
             if (callback != null) {
                 callback.invoke(getJSONObject(uniCallBackBaseBean));
 //                callback.invoke(uniCallBackBaseBean);
+                HdlLogLogic.print("uni--->缁勮uni鍙戦�佹暟鎹牸寮�--->" + new Gson().toJson(uniCallBackBaseBean), false);
 
             }
         } catch (Exception e) {
-            HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
+            HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + e.getMessage(), false);
         }
 
 
@@ -379,7 +1320,7 @@
      *
      * @return JSONObject
      */
-    private JSONObject getJSONObject(Object obj) {
+    public JSONObject getJSONObject(Object obj) {
         try {
             if (obj == null) {
                 return new JSONObject();
@@ -408,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)) {
@@ -418,6 +1359,7 @@
         } catch (Exception e) {
             return "";
         }
+
     }
     //endregion
 

--
Gitblit v1.8.0