From 01362f00a59fc342c26ac025c7767cb0f3a089bc Mon Sep 17 00:00:00 2001
From: ivan <ivan@qq.com>
Date: Thu, 16 Apr 2026 22:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E6=94=AF=E4=BB=98=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E6=81=A2=E5=A4=8D=E9=A1=B5=E9=9D=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml   |  1 -
 assets/skin_config.json                    |  2 +-
 lib/features/purchase/purchase_screen.dart | 49 +++++++++++++++-------
 pubspec.yaml                               |  2 +-
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6eef413..0ed668c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,7 +4,6 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
diff --git a/assets/skin_config.json b/assets/skin_config.json
index 7b3a3e3..7584e71 100644
--- a/assets/skin_config.json
+++ b/assets/skin_config.json
@@ -54,7 +54,7 @@
     ]
   },
   "analytics": {
-    "debugLogs": false,
+    "debugLogs": true,
     "adjust": {
       "appToken": "chflzzr4x5hc",
       "environment": "sandbox",
diff --git a/lib/features/purchase/purchase_screen.dart b/lib/features/purchase/purchase_screen.dart
index af4b806..07f9710 100644
--- a/lib/features/purchase/purchase_screen.dart
+++ b/lib/features/purchase/purchase_screen.dart
@@ -27,7 +27,8 @@ class PurchaseScreen extends StatefulWidget {
   State<PurchaseScreen> createState() => _PurchaseScreenState();
 }
 
-class _PurchaseScreenState extends State<PurchaseScreen> {
+class _PurchaseScreenState extends State<PurchaseScreen>
+    with WidgetsBindingObserver {
   List<PaymentProductItem> _products = [];
   bool _loading = true;
   String? _loadError;
@@ -35,8 +36,17 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
   int? _selectedIndex;
   ThirdPartyPaymentWatch? _thirdPartyWatch;
 
+  void _resetPayingState() {
+    if (!mounted) return;
+    setState(() {
+      _paying = false;
+      _selectedIndex = null;
+    });
+  }
+
   @override
   void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
     _thirdPartyWatch?.dispose();
     super.dispose();
   }
@@ -44,6 +54,7 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     // Defer network + setState until after first frame so the route can paint and
     // the main isolate stays responsive (avoids input ANR when opening this screen).
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -53,6 +64,14 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
     });
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    // 对齐 app_client：从 Google Play 返回时先解锁支付按钮，避免取消/失败后长时间转圈等待超时。
+    if (state == AppLifecycleState.resumed && _paying && mounted) {
+      _resetPayingState();
+    }
+  }
+
   Future<void> _loadProducts({bool isInitial = false}) async {
     if (!isInitial) {
       setState(() {
@@ -243,7 +262,10 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
     });
 
     final picked = await _pickPaymentMethod(methods);
-    if (!mounted || picked == null) return;
+    if (!mounted || picked == null) {
+      _resetPayingState();
+      return;
+    }
 
     final pm = picked.paymentMethod?.trim() ?? '';
     if (pm.isEmpty) {
@@ -339,6 +361,7 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
         createResponse: created,
         createPaymentApp: currentBackendAppType(),
       );
+      _resetPayingState();
       return;
     }
 
@@ -418,18 +441,16 @@ class _PurchaseScreenState extends State<PurchaseScreen> {
       analyticsProduct: item,
     );
 
-    await NativeIapCoordinator.purchaseGooglePlay(
-      sink: sink,
-      userId: uid,
-      activityId: aid,
-      storeProductId: pid,
-      createPaymentApp: currentBackendAppType(),
-    );
-
-    if (mounted) {
-      setState(() {
-        _paying = false;
-      });
+    try {
+      await NativeIapCoordinator.purchaseGooglePlay(
+        sink: sink,
+        userId: uid,
+        activityId: aid,
+        storeProductId: pid,
+        createPaymentApp: currentBackendAppType(),
+      );
+    } finally {
+      _resetPayingState();
     }
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 3f462b8..fdbb3be 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: funymee_ai
 description: "FunyMee AI Application."
 publish_to: 'none'
 
-version: 1.0.0+1
+version: 1.0.14+14
 
 environment:
   sdk: ^3.11.1