From c13cb54d0b9f9b2c73f213b6cdb163f462fd64c7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 13 十月 2023 18:17:59 +0800
Subject: [PATCH] 2023年10月13日18:17:52

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |  476 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 400 insertions(+), 76 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 f8bcb24..9014c74 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2,27 +2,37 @@
 
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.bean.BaseEventBus;
+import com.hdl.photovoltaic.bean.ModBusBean;
+import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.listener.LinkCallBack;
+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.WifiUtils;
-import com.hdl.sdk.link.HDLLinkLocalSdk;
+import com.hdl.sdk.link.common.exception.HDLLinkCode;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
-import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
-import com.hdl.sdk.link.core.config.HDLLinkConfig;
+import com.hdl.sdk.link.core.callback.ModbusCallBack;
+import com.hdl.sdk.link.core.connect.HDLModBusConnect;
+import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
 
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
 
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -50,6 +60,8 @@
         return sHdlUniLogic;
     }
 
+    //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨�3涓柟娉曞悕 onOtherUniMPEventReceive();openUniMP();sendUni();******
+
     /**
      * 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
      *
@@ -64,97 +76,116 @@
             if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
                 return;
             }
-            org.json.JSONObject jsonObject = getJSONObject(data);
-            String type_value = "";
-            String oid="";
-            if (jsonObject.has("type")) {
-                type_value = jsonObject.getString("type");
-            }
-            if (jsonObject.has("oid")) {
-                oid = jsonObject.getString("oid");
-            }
-
+            String type = getKeyValue("type", data);
             if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
                 //浣忓畢妯″潡
-                switch (type_value) {
+                switch (type) {
+                    //鍒涘缓鐢电珯
                     case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
-                        //鍒涘缓
-                        HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
-                            @Override
-                            public void onSuccess(List<HouseIdBean> list) {
-                                HdlResidenceLogic.getInstance().setHouseIdList(list);
-                            }
 
-                            @Override
-                            public void onFailure(Exception exception) {
-
-                            }
-                        });
+                        //EventBus浜嬩欢鍒嗗彂
+                        BaseEventBus baseEventBus = new BaseEventBus();
+                        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_DETAILS: {
-                        //璇︽儏
+                    //鍏抽棴璇︽儏椤�
+                    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;
 
                 }
                 if (callback != null) {
-                    uniCallbackData(null, "0", "", callback);
+                    uniCallbackData(null, callback);
                 }
             } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
                 //璁惧妯″潡
-                switch (type_value) {
+                switch (type) {
+                    //娣诲姞閫嗗彉鍣ㄥ埌浜戠
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
-                        //娣诲姞
+                        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: {
+                        this.uniSearchGateway(callback);
+                    }
+                    break;
+                    //鑾峰彇閫嗗彉鍣ㄥ垪琛�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
-                        //缃戝叧鎼滅储
-                        HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
-                            @Override
-                            public void onSuccess(List<GatewayBean> gatewayBeanList) {
-                                HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
-                                callBackBaseBean.setTopic(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL);
-                                callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST);
-                                callBackBaseBean.setData(gatewayBeanList);
-                                sendUni(callBackBaseBean);
-                            }
-
-
-                            @Override
-                            public void onError(HDLLinkException e) {
-                                //鍙戦�佸け璐�
-                            }
-                        });
+                        this.uniGetCurrentHomeLocalAndCloudGatewayList(callback);
                     }
                     break;
-                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND:{
-                        //鍙戦�乵odbus鍗忚
-
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
+                        sendModBus(data, callback);
                     }
+                    break;
+                    //鑾峰彇oid鍒楄〃
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
+                        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());
                 //wifi妯″潡
-                switch (type_value) {
+                switch (type) {
+                    //鑾峰彇wifi鍒楄〃
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
-                        //鑾峰彇wifi鍒楄〃
                         if (callback != null) {
-                            uniCallbackData(wifiUtils.getScanResult(), "0", "", callback);
+                            uniCallbackData(wifiUtils.getScanResult(), callback);
                         }
                     }
                     break;
+                    //褰撳墠wifi璇︽儏
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
-                        //褰撳墠wifi璇︽儏
                         if (callback != null) {
-                            uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), "0", "", callback);
+                            uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
                         }
                     }
                     break;
+                    //wifi杩炴帴
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
-                        //wifi杩炴帴
+
                     }
                     break;
 
@@ -166,6 +197,7 @@
         }
 
     }
+
 
     /**
      * 鍘熺敓鎵撳紑uni鎸囧畾椤甸潰
@@ -183,10 +215,13 @@
     /**
      * 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
      * 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
+     *
+     * @param topic            涓婚澶х被(濡�:UNI_EVENT_REPLY_HOME_MODEL)
+     * @param callBackBaseBean 鈥斺��
      */
-    public void sendUni(HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
+    public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
         try {
-            HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_APP_ID, getJSONObject(callBackBaseBean));
+            HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
         } catch (Exception e) {
             HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
         }
@@ -198,6 +233,278 @@
     public void checkRemoveOtherUniMPEventCallBack() {
         HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
     }
+    //endregion
+
+    //region ******uni閫昏緫鏂规硶******
+
+    /**
+     * 閫嗗彉鍣ㄦ竻绌轰綇瀹卛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.getMessage(), callback);
+            }
+        });
+    }
+
+    /**
+     * 閫嗗彉鍣ㄣ�愪笂浼犳暟鎹�戝埌浜戠
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniUploadDataToCloud(Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().uploadDataToCloud(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));
+        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, e.getCode(), e.getMessage(), callback);
+                                    }
+                                });
+                    }
+
+                    @Override
+                    public void onError(HDLLinkException e) {
+                        uniCallbackData(null, e.getCode(), e.getMessage(), callback);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMessage(), callback);
+            }
+        });
+    }
+
+    /**
+     * 鍒犻櫎浜戠涓婇�嗗彉鍣�
+     *
+     * @param data     uni鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    private void uniDelInverterDevice(Object data, DCUniMPJSCallback callback) {
+        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().delInverterDevice(deviceId, new CloudCallBeak<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniCallbackData(null, callback);
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                uniCallbackData(null, e.getCode(), e.getMessage(), callback);
+            }
+        });
+    }
+
+
+    /**
+     * 灞�鍩熺綉鎼滅储閫嗗彉鍣ㄥ垪琛�
+     *
+     * @param callback uni鍥炶皟
+     */
+    private void uniSearchGateway(DCUniMPJSCallback callback) {
+        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(), e.getMessage(), callback);
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇閫嗗彉鍣ㄥ垪琛�
+     *
+     * @param callback uni鍥炶皟
+     */
+    private void uniGetCurrentHomeLocalAndCloudGatewayList(DCUniMPJSCallback callback) {
+        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {
+            @Override
+            public void onSuccess(List<GatewayBean> list) {
+                if (callback != null) {
+                    uniCallbackData(list, callback);
+                    //EventBus浜嬩欢鍒嗗彂
+                    BaseEventBus baseEventBus = new BaseEventBus();
+                    baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
+                    baseEventBus.setData(list);
+                    EventBus.getDefault().post(baseEventBus);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (callback != null) {
+                    uniCallbackData(null, e.getCode(), e.getMessage(), callback);
+                }
+            }
+        });
+
+    }
+
+
+    /**
+     * 鍙戦�乵odbus鍗忚鏁版嵁
+     *
+     * @param data     modbus鏁版嵁
+     * @param callback 鍥炶皟
+     */
+    void sendModBus(Object data, DCUniMPJSCallback callback) {
+        String tempData = getKeyValue("data", data);
+        if (TextUtils.isEmpty(tempData)) {
+            HdlLogLogic.print("data鍐呭涓虹┖");
+            return;
+        }
+        ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
+//        ModBusBean modBusBean = new ModBusBean();
+//        modBusBean.setOid("0101050219D44A00");
+//        modBusBean.setData(new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01});
+//        if (TextUtils.isEmpty(modBusBean.getOid())) {
+//            modBusBean.setOid("0101050217BBC400");
+//        }
+        if (modBusBean.getMac() == null || modBusBean.getData() == null) {
+            HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getMac() + " data=" + Arrays.toString(modBusBean.getData()));
+            return;
+        }
+
+
+        //鍙戦�乵odbus鍗忚
+        HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
+            @Override
+            public void onSuccess(int[] data) {
+                Log.d("data", Arrays.toString(data));
+                uniCallbackData(data, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
+    //endregion
+
+    //region ******涓�鑸柟娉�******
 
     /**
      * 缁勮uni鍙戦�佹暟鎹牸寮�
@@ -234,7 +541,7 @@
      * @param msg      缁撴灉鎻忚堪鐨勪俊鎭�
      * @param callback 鍥炶皟
      */
-    private void uniCallbackData(Object obj, String code, String msg, DCUniMPJSCallback callback) {
+    private void uniCallbackData(Object obj, int code, String msg, DCUniMPJSCallback callback) {
         HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
         try {
             uniCallBackBaseBean.setCode(code);
@@ -242,6 +549,8 @@
             uniCallBackBaseBean.setData(obj);
             if (callback != null) {
                 callback.invoke(getJSONObject(uniCallBackBaseBean));
+//                callback.invoke(uniCallBackBaseBean);
+
             }
         } catch (Exception e) {
             HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
@@ -250,20 +559,8 @@
 
     }
 
-
-    /**
-     * 鑾峰彇uni鍙戦�佸璞�
-     *
-     * @param obj  闄勫姞鏁版嵁
-     * @param code 鐘舵�佺爜
-     * @param msg  缁撴灉鎻忚堪鐨勪俊鎭�
-     */
-    private HDLUniMP.UniCallBackBaseBean getUniCallBackBaseBean(Object obj, String code, String msg) {
-        HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
-        uniCallBackBaseBean.setCode(code);
-        uniCallBackBaseBean.setMes(msg);
-        uniCallBackBaseBean.setData(obj);
-        return uniCallBackBaseBean;
+    private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
+        uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
     }
 
     /**
@@ -279,12 +576,39 @@
             if (TextUtils.isEmpty(obj.toString())) {
                 return new JSONObject();
             }
+            if (obj.toString().startsWith("{") && obj.toString().endsWith("}")) {
+                return new JSONObject(obj.toString());
+            }
+            if (obj instanceof JSONObject) {
+                return (JSONObject) obj;
+            }
             String json = new Gson().toJson(obj);
-
             return new JSONObject(json);
         } catch (Exception e) {
             return new JSONObject();
         }
     }
+
+
+    /**
+     * 鑾峰彇 KeyValue
+     *
+     * @param key -
+     * @param obj -
+     * @return value
+     */
+    private String getKeyValue(String key, Object obj) {
+        try {
+            JSONObject jsonObject = this.getJSONObject(obj);
+            if (jsonObject.has(key)) {
+                return jsonObject.getString(key);
+            }
+            return "";
+        } catch (Exception e) {
+            return "";
+        }
+    }
+    //endregion
+
 }
 

--
Gitblit v1.8.0