From 32b5f366ceaad4aa9a33eccf0b109eef24175495 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 10 十月 2023 14:55:01 +0800
Subject: [PATCH] 2023年10月10日14:54:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 62 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 763a4bf..491e3f0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -5,6 +5,7 @@
import android.util.Log;
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
@@ -23,6 +24,7 @@
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 com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import org.greenrobot.eventbus.EventBus;
@@ -57,7 +59,7 @@
return sHdlUniLogic;
}
- //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();******
+ //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨�3涓柟娉曞悕 onOtherUniMPEventReceive();openUniMP();sendUni();******
/**
* 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
@@ -77,16 +79,28 @@
if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
//浣忓畢妯″潡
switch (type) {
+ //鍒涘缓鐢电珯
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
- //鍒涘缓
+
//EventBus浜嬩欢鍒嗗彂
BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setType(ConstantManage.EVENTBUS_POST_HOME_CREATED);
+ baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION);
+ baseEventBus.setData(getKeyValue("data", data));
EventBus.getDefault().post(baseEventBus);
}
break;
+ //璇诲彇璇︽儏
case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {
- //璇︽儏
+
+ }
+ break;
+ //鍏抽棴璇︽儏椤�
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE: {
+ //EventBus浜嬩欢鍒嗗彂
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
+ baseEventBus.setData(getKeyValue("data", data));
+ EventBus.getDefault().post(baseEventBus);
}
break;
@@ -97,8 +111,8 @@
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
//璁惧妯″潡
switch (type) {
+ //娣诲姞閫嗗彉鍣ㄥ埌浜戠
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
- //娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
@Override
@@ -145,8 +159,8 @@
}
break;
+ //灞�鍩熺綉鎼滅储閫嗗彉鍣ㄥ垪琛�
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NET_LIST: {
- //缃戝叧鎼滅储
HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
@@ -161,13 +175,18 @@
});
}
break;
+ //鑾峰彇閫嗗彉鍣ㄥ垪琛�
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
- //鑾峰彇缃戝叧璁惧鍒楄〃
- HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {
@Override
- public void onSuccess(Boolean obj) {
+ public void onSuccess(List<GatewayBean> list) {
if (callback != null) {
- uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
+ uniCallbackData(list, callback);
+ //EventBus浜嬩欢鍒嗗彂
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
+ baseEventBus.setData(list);
+ EventBus.getDefault().post(baseEventBus);
}
}
@@ -185,10 +204,10 @@
}
break;
+ //鑾峰彇oid鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
- //娣诲姞璁惧鍒颁簯绔�
+
String mac = getKeyValue("mac", getKeyValue("data", data));
- //鑾峰彇oid鍒楄〃
HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
@Override
public void onSuccess(List<OidBean> list) {
@@ -199,33 +218,57 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -2, e.getMessage(), callback);
+ uniCallbackData(null, -2, e.getMsg(), callback);
}
});
}
break;
+ //閫嗗彉鍣ㄦ椂闂磋鍙�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+ }
+ break;
+ //閫嗗彉鍣ㄦ椂闂寸紪杈�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().editGatewayTime(mac, new JsonObject(), null);
+ }
+ break;
+
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
//wifi妯″潡
switch (type) {
+ //鑾峰彇wifi鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
- //鑾峰彇wifi鍒楄〃
if (callback != null) {
uniCallbackData(wifiUtils.getScanResult(), callback);
}
}
break;
+ //褰撳墠wifi璇︽儏
case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
- //褰撳墠wifi璇︽儏
if (callback != null) {
uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
}
}
break;
+ //wifi杩炴帴
case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
- //wifi杩炴帴
+
}
break;
@@ -257,14 +300,14 @@
// if (TextUtils.isEmpty(modBusBean.getOid())) {
// modBusBean.setOid("0101050217BBC400");
// }
- if (modBusBean.getOid() == null || modBusBean.getData() == null) {
- HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
+ if (modBusBean.getMac() == null || modBusBean.getData() == null) {
+ HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getMac() + " data=" + modBusBean.getData());
return;
}
//鍙戦�乵odbus鍗忚
- HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
+ HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
Log.d("data", Arrays.toString(data));
--
Gitblit v1.8.0