Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev-5.7.0'

Browse Source 
合并调整

See merge request halo/android/assistant-android!210
This commit is contained in:
陈君陶
2022-02-16 10:08:37 +08:00
parent 2922878163 77e1df1bb0
commit 42a958a9cc
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
View File

@ -76,6 +76,10 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
DataUtils.onPause(activity)
}
if (activity.isFinishing) {
AppManager.getInstance().finishActivity(activity)
}
}
override fun onActivityStopped(activity: Activity) {
@ -87,9 +91,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
}
override fun onActivityDestroyed(activity: Activity) {
if (activity.isFinishing) {
AppManager.getInstance().finishActivity(activity)
}
// do nothing
}
}