From 4e4f605f481af8a8f0ad9e13ae9ab4dbe73eecfd Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 六月 2023 15:25:34 +0800
Subject: [PATCH] 调整了搜索网关回调

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 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 2d40f33..2fa728f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -7,6 +7,7 @@
 import com.google.gson.Gson;
 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;
@@ -15,9 +16,12 @@
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
 import com.hdl.photovoltaic.uni.UniToAndroidBean;
 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.common.utils.LogUtils;
 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;
 import com.hdl.sdk.link.core.connect.HDLModBusConnect;
 
 import org.greenrobot.eventbus.EventBus;
@@ -101,21 +105,21 @@
                                 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);
+//                                sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
+                                uniCallbackData(callBackBaseBean, callback);
                             }
 
 
                             @Override
                             public void onError(HDLLinkException e) {
                                 //鍙戦�佸け璐�
+                                uniCallbackData(null, e.getCode()+"", "", callback);
                             }
                         });
                     }
                     break;
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
-
-                        //鍙戦�乵odbus鍗忚
-//                        HDLModBusConnect.getInstance().Send(uniToAndroidBean.getGatewayOid(), null, );
+                        sendModBus(data,callback);
                     }
                 }
 
@@ -149,6 +153,38 @@
             HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", e.getMessage());
         }
 
+    }
+
+    /**
+     * 鍙戦�乵odbus鍗忚鏁版嵁
+     * @param data modbus鏁版嵁
+     * @param callback 鍥炶皟
+     */
+    void sendModBus(Object data,DCUniMPJSCallback callback)
+    {
+        String tempData = getKeyValue("data", data);
+        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());
+            return;
+        }
+
+        //鍙戦�乵odbus鍗忚
+        HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
+            @Override
+            public void onSuccess(byte []data) {
+                uniCallbackData(data, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null,e.getCode()+"","澶辫触",callback);
+            }
+        });
     }
 
     /**
@@ -237,6 +273,10 @@
 
     }
 
+    private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
+        uniCallbackData(obj,HDLLinkCode.HDL_SUCCESS+"",HDLLinkCode.HDL_SUCCESS.getMsg(),callback);
+    }
+
     /**
      * 褰撳墠瀵硅薄杞� JSONObject
      *

--
Gitblit v1.8.0