From 1dd75fb35eab53befc522c262b12aca4230172ac Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 15:57:53 +0800
Subject: [PATCH] 可以使用

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 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 2fa728f..c0bca81 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,6 +1,7 @@
 package com.hdl.photovoltaic.other;
 
 
+import android.content.Intent;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
@@ -55,6 +56,8 @@
         return sHdlUniLogic;
     }
 
+    //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();******
+
     /**
      * 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
      *
@@ -102,24 +105,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);
                     }
                 }
 
@@ -130,14 +128,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;
@@ -157,32 +155,35 @@
 
     /**
      * 鍙戦�乵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());
+//        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 (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() + "", "澶辫触", callback);
             }
         });
     }
@@ -221,6 +222,10 @@
     public void checkRemoveOtherUniMPEventCallBack() {
         HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
     }
+    //endregion
+
+
+    //region ******涓�鑸柟娉�******
 
     /**
      * 缁勮uni鍙戦�佹暟鎹牸寮�
@@ -274,7 +279,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);
     }
 
     /**
@@ -319,6 +324,7 @@
             return "";
         }
     }
+    //endregion
 
 }
 

--
Gitblit v1.8.0