From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 05 六月 2025 10:37:28 +0800 Subject: [PATCH] 2025年06月05日10:37:26 --- app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 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..216a922 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java @@ -208,8 +208,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 +407,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; @@ -916,7 +932,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