From c7d670d50c68fc77bfb58acd9abcde31fd341537 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 10 Feb 2022 10:08:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=84=E7=90=86=20AppManager=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9C=80=E4=B8=8A=E5=B1=82=E9=A1=B5=E9=9D=A2=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/base/GlobalActivityLifecycleObserver.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index b68c785357..06d70403e7 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -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 } } \ No newline at end of file From 6b3079343e5774735377210e885fe9923c51cf18 Mon Sep 17 00:00:00 2001 From: axen Date: Thu, 10 Feb 2022 17:02:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8(0127UI?= =?UTF-8?q?=E6=B5=8B=E8=AF=95BUG=E4=BF=AE=E5=A4=8D)https://git.shanqu.cc/p?= =?UTF-8?q?m/halo-app-issues/-/issues/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant_flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assistant_flutter b/assistant_flutter index 31d27bb502..cebf07ea57 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit 31d27bb50277f021f3ad0c1edc6eac2f6bd8625b +Subproject commit cebf07ea573ff3e2a33fe8ebbdc1ba8e8f095d68 From 08b281c4288806717591e6e449478a138f1b1a0f Mon Sep 17 00:00:00 2001 From: axen Date: Thu, 10 Feb 2022 17:06:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.4.0=E3=80=91=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=86=85?= =?UTF-8?q?=E9=83=A8=E9=9C=80=E6=B1=82(=E5=BC=B9=E7=AA=97=E9=98=B4?= =?UTF-8?q?=E5=BD=B1=E4=BF=AE=E5=A4=8D)https://git.shanqu.cc/pm/halo-app-i?= =?UTF-8?q?ssues/-/issues/1567?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant_flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assistant_flutter b/assistant_flutter index cebf07ea57..1b8a5b0c65 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit cebf07ea573ff3e2a33fe8ebbdc1ba8e8f095d68 +Subproject commit 1b8a5b0c65eec2d3aaef94a4a338dedeb7e85a19 From d43f7240b8249a2d85b0ab793a3af5d792c68c82 Mon Sep 17 00:00:00 2001 From: axen Date: Fri, 11 Feb 2022 18:31:49 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B5.6.0=E3=80=91=E3=80=90=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E5=86=85=E9=83=A8=E9=9C=80=E6=B1=82=E3=80=91=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20flutter=20=E5=AE=9E=E7=8E=B0=E5=8F=8D=E9=A6=88=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2(=E4=BF=AE=E5=A4=8Dmumu=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F=E5=99=A8=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98)https://?= =?UTF-8?q?git.shanqu.cc/pm/halo-app-issues/-/issues/1684?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant_flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assistant_flutter b/assistant_flutter index 1b8a5b0c65..b582e7bc55 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit 1b8a5b0c65eec2d3aaef94a4a338dedeb7e85a19 +Subproject commit b582e7bc555c1a1379339f467131314bd4c639d4 From 4643197fb43dff359b009d0c51eb99c4757b05ed Mon Sep 17 00:00:00 2001 From: axen Date: Tue, 15 Feb 2022 12:07:12 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8(0215UI?= =?UTF-8?q?=E8=B0=83=E6=95=B4)https://git.shanqu.cc/pm/halo-app-issues/-/i?= =?UTF-8?q?ssues/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant_flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assistant_flutter b/assistant_flutter index b582e7bc55..b87b396230 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit b582e7bc555c1a1379339f467131314bd4c639d4 +Subproject commit b87b396230c7a0afcf67067406d6e268bb9b2c89 From de68d5e3f26acefd7543009e9cbb363d45298a0d Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 15 Feb 2022 14:47:42 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8=20=EF=BC=88012?= =?UTF-8?q?7UI=E6=B5=8B=E8=AF=95=EF=BC=89=20https://git.shanqu.cc/pm/halo-?= =?UTF-8?q?app-issues/-/issues/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_info_concern.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_info_concern.xml b/app/src/main/res/layout/fragment_info_concern.xml index 5fb2f16bde..9078197c91 100644 --- a/app/src/main/res/layout/fragment_info_concern.xml +++ b/app/src/main/res/layout/fragment_info_concern.xml @@ -3,8 +3,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + + Date: Tue, 15 Feb 2022 15:43:49 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8(02151505UI?= =?UTF-8?q?=E8=B0=83=E6=95=B4)https://git.shanqu.cc/pm/halo-app-issues/-/i?= =?UTF-8?q?ssues/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant_flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assistant_flutter b/assistant_flutter index b87b396230..c5a0c6b625 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit b87b396230c7a0afcf67067406d6e268bb9b2c89 +Subproject commit c5a0c6b625c8e27ee6d3d7c599e431efcb9e5b7d From e47e1d67477959edabad232103d59a8d5cbade5c Mon Sep 17 00:00:00 2001 From: axen Date: Wed, 16 Feb 2022 09:31:08 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8(0216UI?= =?UTF-8?q?=E8=B0=83=E6=95=B4)https://git.shanqu.cc/pm/halo-app-issues/-/i?= =?UTF-8?q?ssues/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant_flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assistant_flutter b/assistant_flutter index c5a0c6b625..e86c508923 160000 --- a/assistant_flutter +++ b/assistant_flutter @@ -1 +1 @@ -Subproject commit c5a0c6b625c8e27ee6d3d7c599e431efcb9e5b7d +Subproject commit e86c5089238f4168cb98bcc15241eb49625c5db3 From d77533a4211ff9e88e7334a6c20b22f9d73c58c4 Mon Sep 17 00:00:00 2001 From: juntao Date: Wed, 16 Feb 2022 10:04:05 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8(0215UI?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98)=20https://git.shanqu.cc/p?= =?UTF-8?q?m/halo-app-issues/-/issues/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_help_and_feedback.xml | 2 +- app/src/main/res/layout/fragment_libao_wrapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_help_and_feedback.xml b/app/src/main/res/layout/activity_help_and_feedback.xml index bf87cf5aab..38deea8cb7 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -15,7 +15,7 @@ diff --git a/app/src/main/res/layout/fragment_libao_wrapper.xml b/app/src/main/res/layout/fragment_libao_wrapper.xml index 505b266a43..c2f44291c3 100644 --- a/app/src/main/res/layout/fragment_libao_wrapper.xml +++ b/app/src/main/res/layout/fragment_libao_wrapper.xml @@ -28,7 +28,7 @@