fix: 崩溃修复

吴启风
1 parent 46385ad0
Showing 10 changed files with 199 additions and 90 deletions
lib/app/splash_page.dart
lib/common/permission/permissionRequestPage.dart
lib/common/permission/permissionRequester.dart
lib/common/request/api_response/api_response_entity.dart
lib/pages/home/widgets/ShakeImage.dart
lib/pages/reading/bloc/reading_bloc.dart
lib/pages/section/section_page.dart
lib/pages/unit/view.dart
lib/pages/video/lookvideo/widgets/video_widget.dart
lib/utils/audio_player_util.dart
@@ -140,19 +140,22 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
               actions: <Widget>[
                 TextButton(
                     child: const Text('退出'),
-                    onPressed: () => {
-                          // 关闭对话框并重试
-                          Navigator.of(context).pop(),
-                          AppConfigHelper.exitApp(),
-                          completer?.complete(),
-                        }),
+                    onPressed: () {
+                      // 关闭对话框并退出应用
+                      Navigator.of(context).pop();
+                      AppConfigHelper.exitApp();
+                      // 只有在 completer 还没有完成时才完成它
+                      if (completer != null && !completer.isCompleted) {
+                        completer.complete();
+                      }
+                    }),
                 TextButton(
                   child: const Text('重试'),
                   onPressed: () async {
                     // 关闭对话框并重试
                     Navigator.of(context).pop();
                     await fetchNecessaryData(userToken, completer: completer);
-                    completer?.complete();
+                    // 不需要再次调用 completer.complete()，因为 fetchNecessaryData 内部已经处理了
                   },
                 ),
               ],
@@ -30,6 +30,7 @@ class _PermissionRequestPageState extends State&lt;PermissionRequestPage&gt;
   bool _isGoSetting = false;
   late final List<String> msgList;
   bool _isDialogShowing = false;
+  bool _isRequestingPermission = false;
  
   @override
   void initState() {
@@ -107,6 +108,11 @@ class _PermissionRequestPageState extends State&lt;PermissionRequestPage&gt;
  
   /// 校验权限
   void _handlePermission(List<Permission> permissions) async {
+    if (_isRequestingPermission) {
+      Log.d('_handlePermission already in progress, skipping');
+      return;
+    }
+    
     ///一个新待申请权限列表
     List<Permission> intentPermissionList = [];
  
@@ -129,37 +135,51 @@ class _PermissionRequestPageState extends State&lt;PermissionRequestPage&gt;
  
   ///实际触发请求权限
   Future<void> _requestPermission(List<Permission> permissions) async {
-    Log.d('_requestPermission permissions=$permissions');
-    MapEntry<Permission, PermissionStatus>? statusEntry =
-        await requestPermissionsInner(permissions);
-    if (statusEntry == null) {
-      ///都手动同意授予了
-      _popPage(true);
+    if (_isRequestingPermission) {
+      Log.d('_requestPermission already in progress, skipping');
       return;
     }
+    
+    _isRequestingPermission = true;
+    Log.d('_requestPermission permissions=$permissions');
+    
+    try {
+      MapEntry<Permission, PermissionStatus>? statusEntry =
+          await requestPermissionsInner(permissions);
+      if (statusEntry == null) {
+        ///都手动同意授予了
+        _popPage(true);
+        return;
+      }
  
-    Permission permission = statusEntry.key;
-    PermissionStatus status = statusEntry.value;
+      Permission permission = statusEntry.key;
+      PermissionStatus status = statusEntry.value;
  
-    // 还未申请权限或之前拒绝了权限(在 iOS 上为首次申请权限，拒绝后将变为 `永久拒绝权限`)
-    if (status.isDenied) {
-      showAlert(
-          permission, msgList[0], msgList[3], _isGoSetting ? "前往系统设置" : "继续");
-    }
-    // 权限已被永久拒绝
-    /// 在 Android 上：Android 11+ （API 30+）：用户是否第二次拒绝权限。低于 Android 11 （API 30）：用户是否拒绝访问请求的功能，并选择不再显示请求。
-    /// 在 iOS 上：如果用户拒绝访问所请求的功能。
-    if (status.isPermanentlyDenied) {
-      _isGoSetting = true;
-      showAlert(
-          permission, msgList[2], msgList[3], _isGoSetting ? "前往系统设置" : "继续");
-    }
-    // isLimited：拥有部分权限（受限，仅在 iOS （iOS14+） 上受支持）
-    // isRestricted：拥有部分权限，活动限制（例如，设置了家长///控件，仅在iOS以上受支持。(仅限 iOS)
-    if (status.isLimited || status.isRestricted) {
-      if (Platform.isIOS || Platform.isMacOS) _isGoSetting = true;
-      showAlert(
-          permission, msgList[1], msgList[3], _isGoSetting ? "前往系统设置" : "继续");
+      // 还未申请权限或之前拒绝了权限(在 iOS 上为首次申请权限，拒绝后将变为 `永久拒绝权限`)
+      if (status.isDenied) {
+        showAlert(
+            permission, msgList[0], msgList[3], _isGoSetting ? "前往系统设置" : "继续");
+      }
+      // 权限已被永久拒绝
+      /// 在 Android 上：Android 11+ （API 30+）：用户是否第二次拒绝权限。低于 Android 11 （API 30）：用户是否拒绝访问请求的功能，并选择不再显示请求。
+      /// 在 iOS 上：如果用户拒绝访问所请求的功能。
+      if (status.isPermanentlyDenied) {
+        _isGoSetting = true;
+        showAlert(
+            permission, msgList[2], msgList[3], _isGoSetting ? "前往系统设置" : "继续");
+      }
+      // isLimited：拥有部分权限（受限，仅在 iOS （iOS14+） 上受支持）
+      // isRestricted：拥有部分权限，活动限制（例如，设置了家长///控件，仅在iOS以上受支持。(仅限 iOS)
+      if (status.isLimited || status.isRestricted) {
+        if (Platform.isIOS || Platform.isMacOS) _isGoSetting = true;
+        showAlert(
+            permission, msgList[1], msgList[3], _isGoSetting ? "前往系统设置" : "继续");
+      }
+    } catch (e) {
+      Log.d('_requestPermission error: $e');
+      _popPage(false);
+    } finally {
+      _isRequestingPermission = false;
     }
   }
  
@@ -35,12 +35,13 @@ Future&lt;bool&gt; requestPermissions(
   if (allGranted) {
     return true;
   } else {
-    return await Navigator.of(context).push(PageRouteBuilder(
+    final result = await Navigator.of(context).push(PageRouteBuilder(
         opaque: false,
         pageBuilder: ((context, animation, secondaryAnimation) {
           return PermissionRequestPage(permissions, permissionNames, permissionDesc,
               isRequiredPermission: isRequiredPermission);
         })));
+    return result ?? false;
   }
 }
  
 import 'dart:convert';
  
-import 'api_response_entity.g.dart';
+import 'package:json_annotation/json_annotation.dart';
  
+import 'api_response_entity.g.dart';
  
+@JsonSerializable(genericArgumentFactories: true)
 class ApiResponse<T> {
   int? code;
   String? msg;
@@ -20,7 +20,7 @@ class _ShakeImageState extends State&lt;ShakeImage&gt;
     with SingleTickerProviderStateMixin, WidgetsBindingObserver, RouteAware {
   late AnimationController _controller;
   late Animation<double> _animation;
-  late Timer _timer;
+  Timer? _timer;
   late final AppLifecycleListener appLifecycleListener;
   static const TAG = 'ShakeImage';
  
@@ -43,7 +43,11 @@ class _ShakeImageState extends State&lt;ShakeImage&gt;
     );
  
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
+    try {
+      WidgetsBinding.instance.addObserver(this);
+    } catch (e) {
+      printLog('Add observer error: $e');
+    }
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final route = ModalRoute.of(context);
       if (route is PageRoute) {
@@ -100,16 +104,32 @@ class _ShakeImageState extends State&lt;ShakeImage&gt;
  
   void _startAnimation() {
     Timer(const Duration(seconds: 1), () {
-      _controller.forward(from: 0.0);
-      _timer = Timer.periodic(const Duration(seconds: 4), (Timer timer) {
-        _controller.forward(from: 0.0);
-      });
+      // 检查widget是否还存在且controller是否有效
+      if (mounted) {
+        try {
+          _controller.forward(from: 0.0);
+          _timer = Timer.periodic(const Duration(seconds: 4), (Timer timer) {
+            // 每次执行前都检查widget状态和controller状态
+            if (mounted) {
+              try {
+                _controller.forward(from: 0.0);
+              } catch (e) {
+                printLog('Timer callback error: $e');
+                timer.cancel();
+              }
+            }
+          });
+        } catch (e) {
+          printLog('Initial animation error: $e');
+        }
+      }
     });
     printLog('_startAnimation');
   }
  
   void _stopAnimation() {
-    _timer.cancel();
+    _timer?.cancel();
+    _timer = null;
     printLog('_stopAnimation');
   }
  
@@ -162,9 +182,21 @@ class _ShakeImageState extends State&lt;ShakeImage&gt;
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.paused) {
-      _controller.stop();
+      if (mounted) {
+        try {
+          _controller.stop();
+        } catch (e) {
+          printLog('Stop animation error: $e');
+        }
+      }
     } else if (state == AppLifecycleState.resumed) {
-      _controller.forward();
+      if (mounted) {
+        try {
+          _controller.forward();
+        } catch (e) {
+          printLog('Resume animation error: $e');
+        }
+      }
     }
   }
  
@@ -172,9 +204,13 @@ class _ShakeImageState extends State&lt;ShakeImage&gt;
   void dispose() {
     printLog('dispose');
     customerRouteObserver.unsubscribe(this);
-    WidgetsBinding.instance.removeObserver(this);
+    try {
+      WidgetsBinding.instance.removeObserver(this);
+    } catch (e) {
+      printLog('Remove observer error: $e');
+    }
     _controller.dispose();
-    _timer.cancel();
+    _timer?.cancel();
     super.dispose();
   }
  
@@ -293,9 +293,13 @@ class ReadingPageBloc
   }
  
   Future<void> _playAudio(String? audioUrl) async {
-    if (audioUrl!.isNotEmpty) {
-      await audioPlayer.play(UrlSource(audioUrl),
-          balance: 0.0, ctx: AudioContext());
+    if (audioUrl != null && audioUrl.isNotEmpty) {
+      try {
+        await audioPlayer.play(UrlSource(audioUrl),
+            balance: 0.0, ctx: AudioContext());
+      } catch (e) {
+        Log.d('_playAudio error: $e');
+      }
     }
   }
  
@@ -321,10 +325,10 @@ class ReadingPageBloc
     }
     List<SingsoundResultDetailEntity> resultDetails;
     if (currentPageData()?.resultDetails != null) {
-      resultDetails = currentPageData()!.resultDetails!;
+      resultDetails = currentPageData()?.resultDetails ?? [];
     } else {
       List<String>? wordList = currentPageData()?.word?.split(RegExp(r'\s+'));
-      resultDetails = wordList!
+      resultDetails = (wordList ?? [])
           .map(
               (word) => SingsoundResultDetailEntity.withCharAndScore(word, 0))
           .toList();
@@ -85,13 +85,17 @@ class _SectionPageView extends StatelessWidget {
                   'courseLessonId': courseLessonId,
                   'isTopic': true
                 }).then((value) {
-                  if (value != null) {
+                  if (value != null && !bloc.isClosed) {
                     Map<String, dynamic> dataMap =
                         value as Map<String, dynamic>;
-                    bloc.add(RequestEndClassEvent(
-                        dataMap['courseLessonId']!, dataMap['isCompleted'],
-                        currentTime: dataMap['currentTime'],
-                        autoNextSection: dataMap['nextSection']));
+                    try {
+                      bloc.add(RequestEndClassEvent(
+                          dataMap['courseLessonId']!, dataMap['isCompleted'],
+                          currentTime: dataMap['currentTime'],
+                          autoNextSection: dataMap['nextSection']));
+                    } catch (e) {
+                      print('BLoC add event error: $e');
+                    }
                   }
                   AudioPlayerUtil.getInstance()
                       .playAudio(AudioPlayerUtilType.countWithMe);
@@ -111,15 +115,19 @@ class _SectionPageView extends StatelessWidget {
                   'courseLessonId': courseLessonId,
                   'moduleColor': ModuleCache.instance.getCurrentThemeColor()
                 }).then((value) {
-                  if (value != null) {
+                  if (value != null && !bloc.isClosed) {
                     Map<String, dynamic> dataMap =
                         value as Map<String, dynamic>;
-                    bloc.add(RequestEndClassEvent(
-                      dataMap['courseLessonId']!,
-                      dataMap['isCompleted'],
-                      currentStep: dataMap['currentStep'],
-                      autoNextSection: dataMap['nextSection'],
-                    ));
+                    try {
+                      bloc.add(RequestEndClassEvent(
+                        dataMap['courseLessonId']!,
+                        dataMap['isCompleted'],
+                        currentStep: dataMap['currentStep'],
+                        autoNextSection: dataMap['nextSection'],
+                      ));
+                    } catch (e) {
+                      print('BLoC add event error: $e');
+                    }
                     AudioPlayerUtil.getInstance()
                         .playAudio(AudioPlayerUtilType.countWithMe);
                   }
@@ -138,13 +146,17 @@ class _SectionPageView extends StatelessWidget {
                   'courseLessonId': courseLessonId,
                   'moduleColor': ModuleCache.instance.getCurrentThemeColor()
                 }).then((value) {
-                  if (value != null) {
+                  if (value != null && !bloc.isClosed) {
                     Map<String, dynamic> dataMap =
                         value as Map<String, dynamic>;
-                    bloc.add(RequestEndClassEvent(
-                        dataMap['courseLessonId']!, dataMap['isCompleted'],
-                        currentStep: dataMap['currentStep'],
-                        autoNextSection: dataMap['nextSection']));
+                    try {
+                      bloc.add(RequestEndClassEvent(
+                          dataMap['courseLessonId']!, dataMap['isCompleted'],
+                          currentStep: dataMap['currentStep'],
+                          autoNextSection: dataMap['nextSection']));
+                    } catch (e) {
+                      print('BLoC add event error: $e');
+                    }
                   }
                   AudioPlayerUtil.getInstance()
                       .playAudio(AudioPlayerUtilType.countWithMe);
@@ -183,7 +195,9 @@ class _SectionPageView extends StatelessWidget {
                         itemCount: bloc.unlockPageCount(),
                         controller: bloc.pageController,
                         onPageChanged: (int index) {
-                          bloc.add(CurrentUnitIndexChangeEvent(index));
+                          if (!bloc.isClosed) {
+                            bloc.add(CurrentUnitIndexChangeEvent(index));
+                          }
                         },
                         itemBuilder: (context, index) {
                           return ScrollConfiguration(
@@ -78,7 +78,7 @@ class UnitPage extends StatelessWidget {
                                   if (value != null) {
                                     Map<String, dynamic> dataMap =
                                         value as Map<String, dynamic>;
-                                    bool needRefresh = dataMap['needRefresh'];
+                                    bool needRefresh = dataMap['needRefresh'] ?? false;
                                     if (needRefresh) {
                                       bloc.add(RequestUnitDataEvent(
                                           courseModuleEntity?.id));
@@ -81,7 +81,9 @@ class _VideoWidgetState extends State&lt;VideoWidget&gt; {
                   'nextSection': widget.isTopic
                 });
               } as VoidCallback, againSectionTap: (() {
-            lookVideoBloc.add(SectionAgainEvent());
+            if (mounted && !lookVideoBloc.isClosed) {
+              lookVideoBloc.add(SectionAgainEvent());
+            }
           }), context: context);
         }
       }
@@ -30,7 +30,7 @@ enum AudioPlayerUtilType {
  
 class AudioPlayerUtil extends WidgetsBindingObserver {
   static AudioPlayerUtil? _instance;
-  late AudioPlayer _audioPlayer;
+  AudioPlayer? _audioPlayer;
   late AudioPlayerUtilType currentType;
   bool _wasPlaying = false;
   static const TAG = "AudioPlayerUtil";
@@ -43,7 +43,7 @@ class AudioPlayerUtil extends WidgetsBindingObserver {
     if (!BasicConfig.isEnvProd()) {
       AudioLogger.logLevel = AudioLogLevel.info;
     }
-    _audioPlayer.onPlayerStateChanged.listen((event) async {
+    _audioPlayer?.onPlayerStateChanged.listen((event) async {
       Log.d("$TAG onPlayerStateChanged $event _wasPlaying=$_wasPlaying");
       if (event == PlayerState.completed) {
         // 播放结束再次播放
@@ -70,42 +70,66 @@ class AudioPlayerUtil extends WidgetsBindingObserver {
 // 播放音频
   Future<void> playAudio(AudioPlayerUtilType type) async {
     Log.d('$TAG playAudio begin $type');
+    if (_audioPlayer == null) {
+      Log.d('$TAG playAudio _audioPlayer is null, creating new one');
+      _audioPlayer = AudioPlayer();
+    }
     currentType = type;
     String path = type.path;
-    await _audioPlayer.play(AssetSource(path.assetMp3), volume: 0.5);
-    await _audioPlayer.onPlayerComplete.first;
+    try {
+      await _audioPlayer!.play(AssetSource(path.assetMp3), volume: 0.5);
+      await _audioPlayer!.onPlayerComplete.first;
+    } catch (e) {
+      Log.d('$TAG playAudio error: $e');
+    }
     Log.d('$TAG playAudio end $type');
   }
  
   // stop
   Future<void> stop() async {
-    Log.d("$TAG stop _audioPlayer.state=${_audioPlayer.state}");
-    if (_audioPlayer.state == PlayerState.playing) {
-      await _audioPlayer.stop();
+    if (_audioPlayer == null) return;
+    Log.d("$TAG stop _audioPlayer.state=${_audioPlayer!.state}");
+    try {
+      if (_audioPlayer!.state == PlayerState.playing) {
+        await _audioPlayer!.stop();
+      }
+    } catch (e) {
+      Log.d("$TAG stop error: $e");
     }
   }
  
   // pause
   Future<void> pause() async {
-    Log.d("$TAG pause _audioPlayer.state=${_audioPlayer.state}");
-    if (_audioPlayer.state == PlayerState.playing) {
-      await _audioPlayer.pause();
+    if (_audioPlayer == null) return;
+    Log.d("$TAG pause _audioPlayer.state=${_audioPlayer!.state}");
+    try {
+      if (_audioPlayer!.state == PlayerState.playing) {
+        await _audioPlayer!.pause();
+      }
+    } catch (e) {
+      Log.d("$TAG pause error: $e");
     }
   }
  
   // resume
   Future<void> resume() async {
-    Log.d("$TAG resume _audioPlayer.state=${_audioPlayer.state}");
-    if (_audioPlayer.state == PlayerState.paused) {
-      await _audioPlayer.resume();
+    if (_audioPlayer == null) return;
+    Log.d("$TAG resume _audioPlayer.state=${_audioPlayer!.state}");
+    try {
+      if (_audioPlayer!.state == PlayerState.paused) {
+        await _audioPlayer!.resume();
+      }
+    } catch (e) {
+      Log.d("$TAG resume error: $e");
     }
   }
  
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) async {
-    Log.d("$TAG didChangeAppLifecycleState appState=$state _wasPlaying=$_wasPlaying _audioPlayer.state=${_audioPlayer.state}");
+    if (_audioPlayer == null) return;
+    Log.d("$TAG didChangeAppLifecycleState appState=$state _wasPlaying=$_wasPlaying _audioPlayer.state=${_audioPlayer!.state}");
     if (state == AppLifecycleState.paused) {
-      if (_audioPlayer.state == PlayerState.playing) {
+      if (_audioPlayer!.state == PlayerState.playing) {
         _wasPlaying = true;
         await pause();
       };
@@ -118,12 +142,15 @@ class AudioPlayerUtil extends WidgetsBindingObserver {
   }
  
   bool isPlaying() {
-    return _audioPlayer.state == PlayerState.playing;
+    return _audioPlayer?.state == PlayerState.playing;
   }
  
   void dispose() {
-    Log.d("$TAG dispose _audioPlayer.state=${_audioPlayer.state}");
-    _audioPlayer.dispose();
+    if (_audioPlayer != null) {
+      Log.d("$TAG dispose _audioPlayer.state=${_audioPlayer!.state}");
+      _audioPlayer!.dispose();
+      _audioPlayer = null;
+    }
     WidgetsBinding.instance.removeObserver(this);
   }
 }