From 4a209c4c6ef8b4402114ca26b45dd4bbe869190b Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 29 六月 2023 15:31:36 +0800 Subject: [PATCH] 2023年06月29日15:31:33 --- app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 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 3179558..e49931a 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; @@ -51,6 +52,8 @@ return sHdlUniLogic; } + //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();****** + /** * 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹� * @@ -98,21 +101,26 @@ 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); +// HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); +// callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST); +// callBackBaseBean.setData(gatewayBeanList); +// uniCallbackData(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, "", "", callBackBaseBean); } - @Override public void onError(HDLLinkException e) { //鍙戦�佸け璐� + HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); + callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST); + callBackBaseBean.setCode(e.getCode() + ""); + callBackBaseBean.setCode(e.getMsg()); + sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean); } }); } break; case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: { + //鍙戦�乵odbus鍗忚 // HDLModBusConnect.getInstance().Send(uniToAndroidBean.getGatewayOid(), null, ); } @@ -184,6 +192,10 @@ public void checkRemoveOtherUniMPEventCallBack() { HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this); } + //endregion + + + //region ******涓�鑸柟娉�****** /** * 缁勮uni鍙戦�佹暟鎹牸寮� @@ -278,6 +290,7 @@ return ""; } } + //endregion } -- Gitblit v1.8.0