From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java
index e9866da..b04e5bc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java
@@ -1,25 +1,17 @@
package com.hdl.photovoltaic.utils;
import android.app.Activity;
+import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.LoadingDialog;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.Stack;
/**
@@ -123,6 +115,26 @@
}
/**
+ * Activity鏄惁鍦ㄩ《閮�
+ */
+ public boolean existsTopActivity(Class<?>... args) {
+ try {
+ if (activityStack == null || activityStack.size() == 0) {
+ return false;
+ }
+ final int index = activityStack.size() - 1;
+ for (Class<?> cls : args) {
+ if (activityStack.get(index).getClass().equals(cls)) {
+ return true;
+ }
+ }
+ } catch (Exception e) {
+ return false;
+ }
+ return false;
+ }
+
+ /**
* 鎸囧畾涓�涓被鍚�,浠庢寚瀹氱被鍚嶅紑濮嬬Щ闄ゅ悗闈㈡墍鏈堿ctivity
*
* @param className Activity-绫诲悕(activity.getClass().getName())
@@ -161,10 +173,32 @@
// }
}
+
+ public boolean existsActivity(Context activity, String className) {
+ boolean isLoginActivity = false;
+ // 鑾峰彇褰撳墠Activity鐨勫垪琛�
+ ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
+ List<ActivityManager.RunningTaskInfo> taskInfo = activityManager.getRunningTasks(1);
+ // 閬嶅巻Activity鍒楄〃锛屽垽鏂洰鏍嘇ctivity鏄惁鍦ㄥ垪琛ㄤ腑
+ for (ActivityManager.RunningTaskInfo info : taskInfo) {
+ if (info.topActivity.getClassName().equals("com.hdl.photovoltaic.ui.LoginActivity")) {
+ // 鐩爣Activity瀛樺湪
+ // 鍦ㄨ繖閲屽彲浠ヨ繘琛岀浉搴斿鐞�
+ isLoginActivity = true;
+ break;
+ }
+ }
+ return isLoginActivity;
+ }
+
+
/**
* 缁撴潫鎵�鏈堿ctivity
*/
public void finishAllActivity() {
+ if (activityStack == null) {
+ return;
+ }
for (int i = 0, size = activityStack.size(); i < size; i++) {
if (null != activityStack.get(i)) {
Activity activity = activityStack.get(i);
--
Gitblit v1.8.0