From f8656588595af6cb716341b5daacba26e350a872 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 27 六月 2023 17:42:10 +0800
Subject: [PATCH] 2023年06月27日17:42:08
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 95 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 9 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 245bdbc..b41b342 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,13 +1,21 @@
package com.hdl.photovoltaic.other;
+import android.text.TextUtils;
+
import com.google.gson.Gson;
+import com.hdl.photovoltaic.HDLApp;
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.utils.WifiUtils;
import org.json.JSONObject;
+
+import java.util.List;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -44,18 +52,81 @@
*/
@Override
public void onOtherUniMPEventReceive(String appId, String event, Object data, DCUniMPJSCallback callback) {
- if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
- return;
- }
try {
- org.json.JSONObject jsonObject = null;
- if (data != null) {
- jsonObject = new org.json.JSONObject(data.toString());
+ if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
+ return;
}
- //浣忓畢妯″潡
- if (HDLUniMP.UNI_EVENT_REPLY_HOME_LIST.equals(event)) {
+ org.json.JSONObject jsonObject = getJSONObject(data);
+ String type_value = "";
+ if (jsonObject.has("type")) {
+ type_value = jsonObject.getString("type");
+ }
+
+ if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
+ //浣忓畢妯″潡
+ switch (type_value) {
+ 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) {
+
+ }
+ });
+
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {
+ //璇︽儏
+ }
+ break;
+
+ }
if (callback != null) {
uniCallbackData(null, "0", "", callback);
+ }
+ } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
+ //璁惧妯″潡
+ switch (type_value) {
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
+ //娣诲姞
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
+ //鑾峰彇璁惧鍒楄〃
+ }
+ break;
+
+ }
+
+ } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
+ WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
+ //wifi妯″潡
+ switch (type_value) {
+ case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
+ //鑾峰彇wifi鍒楄〃
+ if (callback != null) {
+ uniCallbackData(wifiUtils.getScanResult(), "0", "", callback);
+ }
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
+ //褰撳墠wifi璇︽儏
+ if (callback != null) {
+ uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), "0", "", callback);
+ }
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
+ //wifi杩炴帴
+ }
+ break;
+
}
}
HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", event + "\r\n" + data);
@@ -145,7 +216,7 @@
uniCallBackBaseBean.setMes(msg);
uniCallBackBaseBean.setData(obj);
if (callback != null) {
- callback.invoke(uniCallBackBaseBean);
+ callback.invoke(getJSONObject(uniCallBackBaseBean));
}
} catch (Exception e) {
HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
@@ -177,6 +248,12 @@
*/
private JSONObject getJSONObject(Object obj) {
try {
+ if (obj == null) {
+ return new JSONObject();
+ }
+ if (TextUtils.isEmpty(obj.toString())) {
+ return new JSONObject();
+ }
String json = new Gson().toJson(obj);
return new JSONObject(json);
} catch (Exception e) {
--
Gitblit v1.8.0