From 0fbb0aa363e304223dafcc7f0ef5871853ae14bf Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 20 Mar 2020 10:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9AppManager=E7=9A=84activity?= =?UTF-8?q?=E5=87=BA=E6=A0=88=E6=96=B9=E5=BC=8F,=E4=BB=A5=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DActivity=E9=94=80=E6=AF=81=E5=90=8E=E4=BC=9A=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=80=E5=87=BAApp=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/base/GHActivityLifecycleCallbacksImpl.java | 4 +++- app/src/main/java/com/gh/common/util/DialogUtils.java | 1 + libraries/LGLibrary | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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