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 | 122 +++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 45 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 b41b342..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,17 +1,27 @@
package com.hdl.photovoltaic.other;
+import android.content.Intent;
import android.text.TextUtils;
+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.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
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.HDLLinkException;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.callback.GatewayCallBack;
+import com.hdl.sdk.link.core.connect.HDLModBusConnect;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -42,6 +52,8 @@
return sHdlUniLogic;
}
+ //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();******
+
/**
* 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
*
@@ -56,29 +68,16 @@
if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
return;
}
- org.json.JSONObject jsonObject = getJSONObject(data);
- String type_value = "";
- if (jsonObject.has("type")) {
- type_value = jsonObject.getString("type");
- }
-
+ String type = getKeyValue("type", data);
if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
//浣忓畢妯″潡
- switch (type_value) {
+ 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: {
@@ -92,22 +91,45 @@
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
//璁惧妯″潡
- switch (type_value) {
+ switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
//娣诲姞
}
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.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, );
+ }
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
//wifi妯″潡
- switch (type_value) {
+ switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
//鑾峰彇wifi鍒楄〃
if (callback != null) {
@@ -153,15 +175,12 @@
* 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
*
- * @param topic 涓婚
- * @param body 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ * @param topic 涓婚澶х被(濡�:UNI_EVENT_REPLY_HOME_MODEL)
+ * @param callBackBaseBean 鈥斺��
*/
- public void sendUni(String topic, String body) {
+ public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
try {
- HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
- callBackBaseBean.setTopic(topic);
- callBackBaseBean.setData(body);
- 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());
}
@@ -173,6 +192,10 @@
public void checkRemoveOtherUniMPEventCallBack() {
HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
}
+ //endregion
+
+
+ //region ******涓�鑸柟娉�******
/**
* 缁勮uni鍙戦�佹暟鎹牸寮�
@@ -225,22 +248,6 @@
}
-
- /**
- * 鑾峰彇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;
- }
-
/**
* 褰撳墠瀵硅薄杞� JSONObject
*
@@ -254,11 +261,36 @@
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 "";
+ }
+ }
+ //endregion
+
}
--
Gitblit v1.8.0