From ce85ef39594b9ba6066751eda310468fb2bccbda Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 12 六月 2025 15:11:12 +0800
Subject: [PATCH] 2025年06月12日15:11:09
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 e71edf3..d2cb2d5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -9,9 +9,7 @@
import android.content.pm.PackageManager;
import android.location.Location;
import android.location.LocationManager;
-import android.net.wifi.ScanResult;
import android.os.IBinder;
-import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -51,7 +49,6 @@
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
-import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
@@ -63,8 +60,8 @@
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
-import com.hdl.photovoltaic.ui.newC.MessageCenterList;
-import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
+import com.hdl.photovoltaic.ui.newC.MessageCenterListActivity;
+import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.NetworkUtils;
@@ -83,7 +80,6 @@
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import org.greenrobot.eventbus.EventBus;
-import org.json.JSONArray;
import org.json.JSONObject;
@@ -208,8 +204,22 @@
break;
//鍒涘缓鐢电珯
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
+ //uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡
+// HdlResidenceLogic.getInstance().getResidenceIdList("","","","","","",1,50,null);
+ try {
+ String dataJsonStr = getKeyValue("data", data);
+ if (!TextUtils.isEmpty(dataJsonStr)) {
+ Gson gson = new Gson();
+ HouseIdBean houseIdBean = gson.fromJson(dataJsonStr, HouseIdBean.class);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
+ }
+ HdlLogLogic.print("uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡---"+dataJsonStr, true);
+ } catch (Exception e) {
+ HdlLogLogic.print("uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡---" + e.getMessage(), true);
+ }
+
//EventBus浜嬩欢鍒嗗彂
- HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION, getKeyValue("data", data));
+// HdlCommonLogic.getInstance().postEventBusSticky(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION, getKeyValue("data", data));
if (callback != null) {
uniSuccessCallback(type, null, callback);
}
@@ -393,7 +403,9 @@
case HDLUniMP.UNI_EVENT_REPLY_AUTHORIZATION_GET: {
boolean isLocalAuthor = PermissionUtils.checkPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION);
if (callback != null) {
- uniSuccessCallback(mode_type, isLocalAuthor, callback);
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("localAuthor", isLocalAuthor);
+ uniSuccessCallback(mode_type, jsonObject, callback);
}
}
break;
@@ -547,7 +559,7 @@
case HDLUniMP.UNI_EVENT_REPLY_MINE_SELECTED_POWERSTATION: {
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), PowerStationsListEdit.class);
+ intent.setClass(HDLApp.getInstance(), PowerStationsListActivity.class);
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -557,7 +569,7 @@
String isShowFault = getKeyValue("isShowFault", getKeyValue("data", data));
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), MessageCenterList.class);
+ intent.setClass(HDLApp.getInstance(), MessageCenterListActivity.class);
if (!TextUtils.isEmpty(homeId)) {
intent.putExtra("homeId", homeId);
}
@@ -916,7 +928,7 @@
if (callback != null) {
uniSuccessCallback(type, null, callback);
}
- List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId, null);
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), null);
--
Gitblit v1.8.0