diff --git a/appbase/build.properties b/appbase/build.properties index 81d7dd5..ddd961c 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 31 13:31:02 GMT 2025 +#Sun Jun 01 06:01:20 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.1 -buildCount=25 +buildCount=31 baseBetaVersion=15.8.2 diff --git a/libappbase/build.properties b/libappbase/build.properties index 81d7dd5..ddd961c 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 31 13:31:02 GMT 2025 +#Sun Jun 01 06:01:20 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.8 publishVersion=15.8.1 -buildCount=25 +buildCount=31 baseBetaVersion=15.8.2 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java index 7b5d7ca..54144bd 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java @@ -57,7 +57,7 @@ public class WinBoLLActivityManager { * 把Activity添加到管理中 */ public void add(T activity) { - if (isActive(activity.getTag())) { + if (isActivityActive(activity.getTag())) { LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag())); } else { mActivityListMap.put(activity.getTag(), activity); @@ -125,30 +125,22 @@ public class WinBoLLActivityManager { // // 判断 tag 绑定的 Activity 是否已经创建 // - public boolean isActive(String tag) { - Activity activity = getActivityByTag(tag); - if (activity != null) { - //判断是否正在关闭 - if (activity.isFinishing() || activity.isDestroyed()) { - return false; - } else { - return true; - } - } - return false; + public boolean isActivityActive(String tag) { + return mActivityListMap.get(tag) != null; } Activity getActivityByTag(String tag) { return (mActivityListMap.get(tag) == null) ?null: mActivityListMap.get(tag).getActivity(); } + // // 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台 // public boolean resumeActivity(Class clazz) { try { Activity activity = getActivityByTag(clazz.newInstance().getTag()); - if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) { + if (activity != null) { return resumeActivity(activity); } } catch (InstantiationException | IllegalAccessException e) { @@ -157,18 +149,29 @@ public class WinBoLLActivityManager { return false; } + // + // 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台 + // + public boolean resumeActivity(String tag) { + Activity activity = getActivityByTag(tag); + if (activity != null) { + return resumeActivity(activity); + } + return false; + } + // // 找到tag 绑定的 BaseActivity ,通过 getTaskId() 移动到前台 // public boolean resumeActivity(Activity activity) { ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE); //返回启动它的根任务(home 或者 MainActivity) - Intent intent = new Intent(mContext, activity.getClass()); - TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext); - stackBuilder.addNextIntentWithParentStack(intent); - stackBuilder.startActivities(); + //Intent intent = new Intent(mContext, activity.getClass()); + //TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext); + //stackBuilder.addNextIntentWithParentStack(intent); + //stackBuilder.startActivities(); am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION); - ToastUtils.show("resumeActivity"); + //ToastUtils.show("resumeActivity"); return true; }