From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index b7160c9..888a2ef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -157,7 +157,7 @@
this.restoreFragment();//鎭㈠fragment椤甸潰
} else {
//
- this.removeAllFragments();
+ this.removeAllFragments(mFragmentManager);
//姝ｅ父鍚姩鏃惰皟鐢�
if (!fragmentList.isEmpty()) {
fragmentList.clear();
@@ -217,17 +217,19 @@
ft.commit();
}
- private void removeAllFragments() {
- if (mFragmentManager == null) return;
+ private void removeAllFragments(FragmentManager manager) {
+ if (manager == null) return;
try {
- final List<Fragment> fragments = mFragmentManager.getFragments();
+ final List<Fragment> fragments = manager.getFragments();
if (fragments.isEmpty()) {
return;
}
- FragmentTransaction transaction = mFragmentManager.beginTransaction();
+ FragmentTransaction transaction = manager.beginTransaction();
for (int i = 0; i < fragments.size(); i++) {
Fragment fragment = fragments.get(i);
if (fragment != null) {
+// FragmentManager childManager = fragment.getChildFragmentManager();
+// removeAllFragments(childManager);
transaction.remove(fragment);
}
}
@@ -280,14 +282,15 @@
}
}
if (!TextUtils.isEmpty(registrationID)) {
- UserConfigManage.getInstance().setRegistrationID(registrationID);
- UserConfigManage.getInstance().Save();
+// UserConfigManage.getInstance().setRegistrationID(registrationID);
+// UserConfigManage.getInstance().Save();
String finalRegistrationID = registrationID;
HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
if (!TextUtils.isEmpty(pushId)) {
+ UserConfigManage.getInstance().setRegistrationID(finalRegistrationID);
UserConfigManage.getInstance().setPushId(pushId);
UserConfigManage.getInstance().Save();
}
@@ -576,6 +579,7 @@
uniCallBackBaseBean.setData(linkResponse.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
+// HdlDeviceLogic.getInstance().searchAllNetworkGateway(null);//閫嗗彉鍣╳ifi鐘舵��-閲嶆柊鎼滅储涓�涓嬮�嗗彉鍣�-閲嶆柊鏇存柊杩炴帴鐘舵��
} else if (linkResponse.getTopic().endsWith("/app/thing/event/appHomeRemoveRefresh/up")) {
String[] topicArray = linkResponse.getTopic().split("/");
//浣忓畢鍒犻櫎閫氱煡
@@ -661,7 +665,7 @@
return;
}
int index = -1;
- List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId(), null);
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId());
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
if (gatewayBean.getGatewayId().equals(topics[2])) {
--
Gitblit v1.8.0