From df3b0b40d31427b23add8f6a3fa0d134924695e5 Mon Sep 17 00:00:00 2001
From: "sky.min" <bingb511@126.com>
Date: Fri, 19 Dec 2025 13:53:52 +0800
Subject: [PATCH] =?UTF-8?q?google=20play=E5=8D=87=E7=BA=A7--=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E2=80=9C=E7=85=A7=E7=89=87=E5=92=8C=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E2=80=9D=E6=94=BF=E7=AD=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml             | 6 ++++--
 lib/talk/starChart/status/appLifecycle_observer.dart | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 76a4b29b..d4a26926 100755
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -37,8 +37,6 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
     <!--允许麦克风权限，用于录音发送-->
@@ -53,6 +51,10 @@
     <!-- 相册权限 34适配  -->
     <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
 
+    <!-- 移除可能导致Google Play政策问题的权限 -->
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:node="remove" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove" />
+
     <!-- 移除 QUERY_ALL_PACKAGES 权限 -->
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
diff --git a/lib/talk/starChart/status/appLifecycle_observer.dart b/lib/talk/starChart/status/appLifecycle_observer.dart
index b5e30109..cf096257 100644
--- a/lib/talk/starChart/status/appLifecycle_observer.dart
+++ b/lib/talk/starChart/status/appLifecycle_observer.dart
@@ -68,7 +68,8 @@ class AppLifecycleObserver extends WidgetsBindingObserver {
         status == TalkStatus.proactivelyCallWaitingAnswer ||
         status == TalkStatus.answeredSuccessfully ||
         status == TalkStatus.uninitialized) &&
-        Get.currentRoute != '/StarLockRegisterPage') {  // 避免在注册页返回
+        Get.currentRoute != '/StarLockRegisterPage' &&
+        Get.currentRoute != '/StarLockForgetPasswordPage') {  // 避免在注册页/忘记密码页返回
       Get.back();
     }
     StartChartManage().destruction();