From 99bc815e07e39354f51421b77f4012ffd35594d8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 18:03:00 +0800
Subject: [PATCH] 2023年06月28日18:02:58
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 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 f362488..eb7ec13 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -11,17 +11,15 @@
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.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.gateway.HDLLinkLocalGateway;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
+
+import java.util.List;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -64,7 +62,7 @@
}
org.json.JSONObject jsonObject = getJSONObject(data);
String type_value = "";
- String oid="";
+ String oid = "";
if (jsonObject.has("type")) {
type_value = jsonObject.getString("type");
}
@@ -106,10 +104,9 @@
@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);
+ sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
}
@@ -120,7 +117,7 @@
});
}
break;
- case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND:{
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
//鍙戦�乵odbus鍗忚
}
@@ -175,15 +172,11 @@
* 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
*
- * @param topic 涓婚澶х被
- * @param type 鍔熻兘绫�
- * @param body 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ * @param topic 涓婚澶х被
+ * @param callBackBaseBean _
*/
- public void sendUni(String topic, String type, String body) {
+ public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
try {
- HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
- callBackBaseBean.setType(type);
- callBackBaseBean.setData(body);
HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
} catch (Exception e) {
HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
--
Gitblit v1.8.0