From 44822e2a916485e12d73e03926dc583abd561642 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 17:11:51 +0800
Subject: [PATCH] Revert "Merge branch 'hxb' into wjc"
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 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..367cfb5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -11,13 +11,6 @@
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;
@@ -64,12 +57,8 @@
}
org.json.JSONObject jsonObject = getJSONObject(data);
String type_value = "";
- String oid="";
if (jsonObject.has("type")) {
type_value = jsonObject.getString("type");
- }
- if (jsonObject.has("oid")) {
- oid = jsonObject.getString("oid");
}
if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
@@ -101,29 +90,10 @@
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
- //缃戝叧鎼滅储
- HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
- @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);
- }
-
-
- @Override
- public void onError(HDLLinkException e) {
- //鍙戦�佸け璐�
- }
- });
+ //鑾峰彇璁惧鍒楄〃
}
break;
- case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND:{
- //鍙戦�乵odbus鍗忚
- }
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -262,7 +232,6 @@
return new JSONObject();
}
String json = new Gson().toJson(obj);
-
return new JSONObject(json);
} catch (Exception e) {
return new JSONObject();
--
Gitblit v1.8.0