From 4e59e31d1eff03798eabae43e3062be9fe61218c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 17:55:34 +0800
Subject: [PATCH] 2023年06月29日17:55:11

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 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 b0e1592..5914e25 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -91,13 +91,14 @@
 
                 }
                 if (callback != null) {
-                    uniCallbackData(null, "0", "", callback);
+                    uniCallbackData(null, callback);
                 }
             } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
                 //璁惧妯″潡
                 switch (type) {
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                         //娣诲姞
+
                     }
                     break;
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
@@ -105,23 +106,19 @@
                         HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
                             @Override
                             public void onSuccess(List<GatewayBean> gatewayBeanList) {
-                                HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
-                                callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST);
-                                callBackBaseBean.setData(gatewayBeanList);
-//                                sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
-                                uniCallbackData(callBackBaseBean, callback);
+                                uniCallbackData(gatewayBeanList, callback);
                             }
 
                             @Override
                             public void onError(HDLLinkException e) {
                                 //鍙戦�佸け璐�
-                                uniCallbackData(null, e.getCode()+"", "", callback);
+                                uniCallbackData(null, e.getCode(), "", callback);
                             }
                         });
                     }
                     break;
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
-                        sendModBus(data,callback);
+                        sendModBus(data, callback);
                     }
                 }
 
@@ -132,14 +129,14 @@
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
                         //鑾峰彇wifi鍒楄〃
                         if (callback != null) {
-                            uniCallbackData(wifiUtils.getScanResult(), "0", "", callback);
+                            uniCallbackData(wifiUtils.getScanResult(), callback);
                         }
                     }
                     break;
                     case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
                         //褰撳墠wifi璇︽儏
                         if (callback != null) {
-                            uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), "0", "", callback);
+                            uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
                         }
                     }
                     break;
@@ -159,32 +156,32 @@
 
     /**
      * 鍙戦�乵odbus鍗忚鏁版嵁
-     * @param data modbus鏁版嵁
+     *
+     * @param data     modbus鏁版嵁
      * @param callback 鍥炶皟
      */
-    void sendModBus(Object data,DCUniMPJSCallback callback)
-    {
+    void sendModBus(Object data, DCUniMPJSCallback callback) {
         String tempData = getKeyValue("data", data);
-        if(tempData==null){
+        if (tempData == null) {
             LogUtils.i("data鍐呭涓虹┖");
             return;
         }
         ModBusBean modBusBean = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(tempData), ModBusBean.class);
-        if(modBusBean.getOid()==null || modBusBean.getData()==null) {
-            LogUtils.i("鍐呭涓虹┖,oid="+modBusBean.getOid()+" data="+modBusBean.getData());
+        if (modBusBean.getOid() == null || modBusBean.getData() == null) {
+            LogUtils.i("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
             return;
         }
 
         //鍙戦�乵odbus鍗忚
         HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
             @Override
-            public void onSuccess(byte []data) {
+            public void onSuccess(byte[] data) {
                 uniCallbackData(data, callback);
             }
 
             @Override
             public void onError(HDLLinkException e) {
-                uniCallbackData(null,e.getCode()+"","澶辫触",callback);
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
             }
         });
     }
@@ -263,7 +260,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);
@@ -280,7 +277,7 @@
     }
 
     private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
-        uniCallbackData(obj,HDLLinkCode.HDL_SUCCESS+"",HDLLinkCode.HDL_SUCCESS.getMsg(),callback);
+        uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
     }
 
     /**

--
Gitblit v1.8.0