From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_google
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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 b16a231..6167ff6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -5,6 +5,7 @@
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
import android.Manifest;
import android.content.Context;
@@ -16,6 +17,7 @@
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -53,6 +55,7 @@
import com.hdl.photovoltaic.ui.powerstation.HouseAndDeviceFragment;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.utils.FragmentUtils;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
@@ -67,6 +70,7 @@
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
+//import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -104,7 +108,7 @@
setStatusBarTranslucent();
getWindow().setNavigationBarColor(getColor(R.color.text_FF1C1C1E));
//鍒濆鍖栫鐗�
- initFragment(savedInstanceState);
+ initFragment(null);
//鍒濆鍖�
this.initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -150,16 +154,31 @@
fragmentList.add(mFragmentManager.findFragmentByTag(1 + ""));
fragmentList.add(mFragmentManager.findFragmentByTag(2 + ""));
fragmentList.add(mFragmentManager.findFragmentByTag(3 + ""));
- restoreFragment();//鎭㈠fragment椤甸潰
+ this.restoreFragment();//鎭㈠fragment椤甸潰
} else {
+ //
+ this.removeAllFragments(mFragmentManager);
//姝ｅ父鍚姩鏃惰皟鐢�
+ if (!fragmentList.isEmpty()) {
+ fragmentList.clear();
+ }
fragmentList.add(mHomePageFragment);
fragmentList.add(mHouseAndDeviceFragment);
fragmentList.add(mMessageFragment);
fragmentList.add(mMeFragment);
- showFragment();
+ this.showFragment();
}
+
+// if (!fragmentList.isEmpty()) {
+// fragmentList.clear();
+// }
+// // 姝ｅ父鍚姩鏃惰皟鐢�
+// fragmentList.add(mHomePageFragment);
+// fragmentList.add(mHouseAndDeviceFragment);
+// fragmentList.add(mMessageFragment);
+// fragmentList.add(mMeFragment);
+// FragmentUtils.loadMultipleFragment(R.id.module_fcv, mFragmentManager, fragmentList.toArray(new Fragment[0]));
}
@@ -168,6 +187,7 @@
* 鏄剧ずfragment
*/
private void showFragment() {
+// FragmentUtils.showHideFragment(mFragmentManager, fragmentList.toArray(new Fragment[0])[currentFragmentIndex]);
FragmentTransaction ft = mFragmentManager.beginTransaction();
//濡傛灉涔嬪墠娌℃湁娣诲姞杩�
if (!fragmentList.get(currentFragmentIndex).isAdded()) {
@@ -176,12 +196,10 @@
} else {
ft.hide(currentFragment).show(fragmentList.get(currentFragmentIndex));
}
+ //鎶婂綋鍓嶆樉绀虹殑fragment璁板綍涓嬫潵
currentFragment = fragmentList.get(currentFragmentIndex);
ft.commit();
//鎶婂綋鍓嶆樉绀虹殑fragment璁板綍涓嬫潵
- currentFragment = fragmentList.get(currentFragmentIndex);
-
-
}
/**
@@ -197,6 +215,28 @@
}
}
ft.commit();
+ }
+
+ private void removeAllFragments(FragmentManager manager) {
+ if (manager == null) return;
+ try {
+ final List<Fragment> fragments = manager.getFragments();
+ if (fragments.isEmpty()) {
+ return;
+ }
+ 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);
+ }
+ }
+ transaction.commit();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@@ -538,6 +578,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("/");
//浣忓畢鍒犻櫎閫氱煡
@@ -784,7 +825,10 @@
return;
} else {
AppManagerUtils.getAppManager().finishAllActivity();
+// //鍙嬬洘sdk濡傛灉寮�鍙戣�呰皟鐢╧ill鎴栬�卐xit涔嬬被鐨勬柟娉曟潃姝昏繘绋嬶紝鎴栬�呭弻鍑籦ack閿細鏉�姝昏繘绋嬶紝璇峰姟蹇呭湪姝や箣鍓嶈皟鐢∕obclickAgent.onKillProcess鏂规硶锛岀敤鏉ヤ繚瀛樼粺璁℃暟鎹��
+// MobclickAgent.onKillProcess(_mActivity);
Process.killProcess(Process.myPid());
+
}
}
super.onBackPressed();
--
Gitblit v1.8.0