From 4e0c05778454d424835330eb6f5c88fca20ac6af Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 27 六月 2023 20:01:43 +0800
Subject: [PATCH] 2023年06月27日20:01:34
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 9cfd1e7..b41b342 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -6,12 +6,16 @@
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;
@@ -52,9 +56,7 @@
if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
return;
}
- String json = data == null ? "{}" : data.toString();
- json = json.equals("") ? "{}" : json;
- org.json.JSONObject jsonObject = new org.json.JSONObject(json);
+ org.json.JSONObject jsonObject = getJSONObject(data);
String type_value = "";
if (jsonObject.has("type")) {
type_value = jsonObject.getString("type");
@@ -65,7 +67,17 @@
switch (type_value) {
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
//鍒涘缓
- HdlResidenceLogic.getInstance().getResidenceList("", "", null);
+ 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;
@@ -204,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());
@@ -236,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