diff --git a/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java b/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java index 24f633123b..d3ce26fe9a 100644 --- a/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java +++ b/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java @@ -65,7 +65,9 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba @Override public void onActivityDestroyed(Activity activity) { - AppManager.getInstance().finishActivity(activity); + if (activity.isFinishing()) { + AppManager.getInstance().finishActivity(activity); + } } } diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 2804cb43c3..4fb56feb9e 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -1237,6 +1237,7 @@ public class DialogUtils { return context; } + // currentActivity 是否存在 isDestroyed 的情况? return AppManager.getInstance().currentActivity(); } diff --git a/libraries/LGLibrary b/libraries/LGLibrary index f260f470cb..77aaf960df 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit f260f470cb1e7a5b216e8cec95715c88eb9c91fc +Subproject commit 77aaf960df9f8682e8c91931cf54f14b334f0a2f