From 4e4f605f481af8a8f0ad9e13ae9ab4dbe73eecfd Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 六月 2023 15:25:34 +0800
Subject: [PATCH] 调整了搜索网关回调
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 122 +++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 39 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 445dc0c..2fa728f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -6,6 +6,9 @@
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.bean.BaseEventBus;
+import com.hdl.photovoltaic.bean.ModBusBean;
+import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
@@ -13,11 +16,15 @@
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.uni.UniToAndroidBean;
import com.hdl.photovoltaic.utils.WifiUtils;
+import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
+import com.hdl.sdk.link.common.utils.LogUtils;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
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 org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -62,25 +69,16 @@
if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
return;
}
- UniToAndroidBean uniToAndroidBean = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(data), UniToAndroidBean.class);
-
+ String type = getKeyValue("type", data);
if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
//浣忓畢妯″潡
- switch (uniToAndroidBean.getType()) {
+ switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
//鍒涘缓
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> list) {
- HdlResidenceLogic.getInstance().setHouseIdList(list);
- }
-
- @Override
- public void onFailure(Exception exception) {
-
- }
- });
-
+ //EventBus浜嬩欢鍒嗗彂
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setType(ConstantManage.EVENTBUS_POST_HOME_CREATED);
+ EventBus.getDefault().post(baseEventBus);
}
break;
case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {
@@ -94,7 +92,7 @@
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
//璁惧妯″潡
- switch (uniToAndroidBean.getType()) {
+ switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
//娣诲姞
}
@@ -105,30 +103,30 @@
@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);
+ uniCallbackData(callBackBaseBean, callback);
}
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
+ uniCallbackData(null, e.getCode()+"", "", callback);
}
});
}
break;
- case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND:{
- //鍙戦�乵odbus鍗忚
- HDLModBusConnect.getInstance().Send(uniToAndroidBean.getGatewayOid(),null,);
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
+ sendModBus(data,callback);
}
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
//wifi妯″潡
- switch (uniToAndroidBean.getType()) {
+ switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
//鑾峰彇wifi鍒楄〃
if (callback != null) {
@@ -158,6 +156,38 @@
}
/**
+ * 鍙戦�乵odbus鍗忚鏁版嵁
+ * @param data modbus鏁版嵁
+ * @param callback 鍥炶皟
+ */
+ void sendModBus(Object data,DCUniMPJSCallback callback)
+ {
+ String tempData = getKeyValue("data", data);
+ 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());
+ return;
+ }
+
+ //鍙戦�乵odbus鍗忚
+ HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
+ @Override
+ public void onSuccess(byte []data) {
+ uniCallbackData(data, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null,e.getCode()+"","澶辫触",callback);
+ }
+ });
+ }
+
+ /**
* 鍘熺敓鎵撳紑uni鎸囧畾椤甸潰
*
* @param path 鎵撳紑璺緞
@@ -173,10 +203,13 @@
/**
* 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
+ *
+ * @param topic 涓婚澶х被(濡�:UNI_EVENT_REPLY_HOME_MODEL)
+ * @param callBackBaseBean 鈥斺��
*/
- public void sendUni(HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
+ public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
try {
- HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_APP_ID, getJSONObject(callBackBaseBean));
+ HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
} catch (Exception e) {
HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
}
@@ -240,20 +273,8 @@
}
-
- /**
- * 鑾峰彇uni鍙戦�佸璞�
- *
- * @param obj 闄勫姞鏁版嵁
- * @param code 鐘舵�佺爜
- * @param msg 缁撴灉鎻忚堪鐨勪俊鎭�
- */
- private HDLUniMP.UniCallBackBaseBean getUniCallBackBaseBean(Object obj, String code, String msg) {
- HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
- uniCallBackBaseBean.setCode(code);
- uniCallBackBaseBean.setMes(msg);
- uniCallBackBaseBean.setData(obj);
- return uniCallBackBaseBean;
+ private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
+ uniCallbackData(obj,HDLLinkCode.HDL_SUCCESS+"",HDLLinkCode.HDL_SUCCESS.getMsg(),callback);
}
/**
@@ -269,12 +290,35 @@
if (TextUtils.isEmpty(obj.toString())) {
return new JSONObject();
}
+ if (obj instanceof JSONObject) {
+ return (JSONObject) obj;
+ }
String json = new Gson().toJson(obj);
-
return new JSONObject(json);
} catch (Exception e) {
return new JSONObject();
}
}
+
+
+ /**
+ * 鑾峰彇 KeyValue
+ *
+ * @param key -
+ * @param obj -
+ * @return value
+ */
+ private String getKeyValue(String key, Object obj) {
+ try {
+ JSONObject jsonObject = this.getJSONObject(obj);
+ if (jsonObject.has(key)) {
+ return jsonObject.getString(key);
+ }
+ return "";
+ } catch (Exception e) {
+ return "";
+ }
+ }
+
}
--
Gitblit v1.8.0