From 951eb853271dcf1ccf7aab05a9f790956246c46a Mon Sep 17 00:00:00 2001 From: wuqifeng <540416539@qq.com> Date: Sun, 4 Aug 2024 00:05:38 +0800 Subject: [PATCH] feat:代码优化-星星等动效对话框不受返回关闭，能保证稳定关闭 --- lib/common/utils/show_star_reward_dialog.dart | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ lib/common/widgets/cheer_reward_widget.dart | 10 +++++----- lib/common/widgets/star_reward_widget.dart | 3 ++- lib/pages/practice/bloc/topic_picture_bloc.dart | 60 +++++++++++++++++++++++++++++++----------------------------- lib/pages/reading/bloc/reading_bloc.dart | 45 +++++++++++++++++++++++++++------------------ 5 files changed, 115 insertions(+), 83 deletions(-) diff --git a/lib/common/utils/show_star_reward_dialog.dart b/lib/common/utils/show_star_reward_dialog.dart index cfd7abd..fd9ae5b 100644 --- a/lib/common/utils/show_star_reward_dialog.dart +++ b/lib/common/utils/show_star_reward_dialog.dart @@ -1,56 +1,76 @@ import 'package:flutter/material.dart'; +import '../../utils/log_util.dart'; import '../widgets/cheer_reward_widget.dart'; import '../widgets/star_reward_widget.dart'; -void showStarRewardDialog(BuildContext context, { +Future showStarRewardDialog( + BuildContext context, { double width = 357.5, double height = 165, int starCount = 3, -}) { - showDialog( + VoidCallback? onDismiss, +}) async { + ///showDialog 方法的返回值将是 Navigator.of(context).pop 传递给对话框的参数 + await showDialog( context: context, - barrierDismissible: false, // 点击对话框外部不关闭对话框 + barrierDismissible: false, builder: (BuildContext context) { - return Dialog( - backgroundColor: Colors.transparent, // 设置对话框背景为透明 - insetPadding: const EdgeInsets.all(0), // 去除对话框的内边距 - child: StarRewardWidget( - width: width, - height: height, - isPlaying: true, - starCount: starCount, - onAnimationEnd: () { - Navigator.of(context).pop(); // 关闭对话框 - }, + return PopScope( + canPop: false, + onPopInvoked: (didPop) { + Log.d('WQF showStarRewardDialog onPopInvoked didPop=$didPop'); + }, + child: Dialog( + backgroundColor: Colors.transparent, // 设置对话框背景为透明 + insetPadding: const EdgeInsets.all(0), // 去除对话框的内边距 + child: StarRewardWidget( + width: width, + height: height, + isPlaying: true, + starCount: starCount, + onAnimationEnd: () { + Navigator.of(context).pop(); // 关闭对话框 + }, + ), ), ); }, ); + onDismiss?.call(); } -void showCheerRewardDialog(BuildContext context, { +Future showCheerRewardDialog( + BuildContext context, { required String lottieFile, double width = 357.5, double height = 165, -}) { - showDialog( + VoidCallback? onDismiss, +}) async { + await showDialog( context: context, barrierDismissible: false, // 点击对话框外部不关闭对话框 builder: (BuildContext context) { - return Dialog( - backgroundColor: Colors.transparent, // 设置对话框背景为透明 - insetPadding: const EdgeInsets.all(0), // 去除对话框的内边距 - child: CheerRewardWidget( - lottieFile: lottieFile, - width: width, - height: height, - isPlaying: true, - onAnimationEnd: () { - Navigator.of(context).pop(); // 关闭对话框 - }, + return PopScope( + canPop: false, + onPopInvoked: (didPop) { + Log.d('WQF showCheerRewardDialog onPopInvoked didPop=$didPop'); + }, + child: Dialog( + backgroundColor: Colors.transparent, // 设置对话框背景为透明 + insetPadding: const EdgeInsets.all(0), // 去除对话框的内边距 + child: CheerRewardWidget( + lottieFile: lottieFile, + width: width, + height: height, + isPlaying: true, + onAnimationEnd: () { + Navigator.of(context).pop(); // 关闭对话框 + }, + ), ), ); }, ); -} \ No newline at end of file + onDismiss?.call(); +} diff --git a/lib/common/widgets/cheer_reward_widget.dart b/lib/common/widgets/cheer_reward_widget.dart index 22af249..d4d7f32 100644 --- a/lib/common/widgets/cheer_reward_widget.dart +++ b/lib/common/widgets/cheer_reward_widget.dart @@ -53,6 +53,10 @@ class _CheerRewardWidgetState extends State } } + Future _loadLottieComposition() async { + return AssetLottie(widget.lottieFile).load(); + } + void _startAnimation() { Log.d("$TAG ${identityHashCode(this)} _startAnimation"); setState(() { @@ -67,16 +71,12 @@ class _CheerRewardWidgetState extends State setState(() { _isVisible = false; }); - widget.onAnimationEnd(); // 调用外部回调函数 } + widget.onAnimationEnd(); // 调用外部回调函数 }); }); } - Future _loadLottieComposition() async { - return AssetLottie(widget.lottieFile).load(); - } - @override void dispose() { _controller.dispose(); diff --git a/lib/common/widgets/star_reward_widget.dart b/lib/common/widgets/star_reward_widget.dart index 5081476..c2d0176 100644 --- a/lib/common/widgets/star_reward_widget.dart +++ b/lib/common/widgets/star_reward_widget.dart @@ -73,8 +73,9 @@ class _StarRewardWidgetState extends State setState(() { _isVisible = false; }); - widget.onAnimationEnd(); // 调用外部回调函数 } + Log.d('$StarRewardWidget whenCompleteOrCancel'); + widget.onAnimationEnd(); // 调用外部回调函数 }); }); } diff --git a/lib/pages/practice/bloc/topic_picture_bloc.dart b/lib/pages/practice/bloc/topic_picture_bloc.dart index 4f0742a..ee88c2a 100644 --- a/lib/pages/practice/bloc/topic_picture_bloc.dart +++ b/lib/pages/practice/bloc/topic_picture_bloc.dart @@ -7,7 +7,6 @@ import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/common/request/dao/listen_dao.dart'; import 'package:wow_english/common/request/exception.dart'; import 'package:wow_english/models/course_process_entity.dart'; @@ -207,10 +206,14 @@ class TopicPictureBloc if (checkAnswerRight(_optionSelectItem) == true) { /// 如果选择题答（选）对后题目没播完，则暂停播放题目。答错的话继续播放体验也不错 await closePlayerResource(); - showStarRewardDialog(context); - await _playResultSound(true); + + /// right音频长度比动效短，所以等动效完了再翻页 + AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.right); + await showStarRewardDialog(context, onDismiss: () { + autoFlipPage(); + }); } else { - await _playResultSound(false); + await AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.wrong); } } @@ -276,14 +279,18 @@ class TopicPictureBloc int score = int.parse(overall); final voiceResult = VoiceResultType.fromScore(score); if (voiceResult.lottieFilePath != null) { - showCheerRewardDialog(context, lottieFile: voiceResult.lottieFilePath!); + AudioPlayerUtil.getInstance().playAudio(voiceResult.audioType); + await showCheerRewardDialog(context, lottieFile: voiceResult.lottieFilePath!, onDismiss: () { + if (isLastPage()) { + showStepPage(); + } + }); + } else { + await AudioPlayerUtil.getInstance().playAudio(voiceResult.audioType); + if (isLastPage()) { + showStepPage(); + } } - await ClickWithMusicController.instance.playMusicAndPerformAction( - context, - voiceResult.audioType, - () { - if (isLastPage()) {showStepPage();}; - }); } // 暂时没用上 @@ -319,29 +326,24 @@ class TopicPictureBloc await ClickWithMusicController.instance.reset(); } - ///播放选择结果音效 - Future _playResultSound(bool isCorrect) async { - await ClickWithMusicController.instance.playMusicAndPerformAction(context, - isCorrect ? AudioPlayerUtilType.right : AudioPlayerUtilType.wrong, () { - if (isCorrect) { - if (isLastPage()) { - showStepPage(); - } else { - // 答对后且播放完自动翻页 - pageController.nextPage( - duration: const Duration(milliseconds: 250), - curve: Curves.ease, - ); - } - } - }); - } - ///是否是最后一页 bool isLastPage() { return currentPage == _entity?.topics?.length; } + ///自动翻页 + void autoFlipPage() { + if (isLastPage()) { + showStepPage(); + } else { + // 答对后且播放完自动翻页 + pageController.nextPage( + duration: const Duration(milliseconds: 250), + curve: Curves.ease, + ); + } + } + ///展示过渡页 void showStepPage() { ///如果最后一页是语音问答题，评测完后自动翻页 diff --git a/lib/pages/reading/bloc/reading_bloc.dart b/lib/pages/reading/bloc/reading_bloc.dart index 82011df..1671d8f 100644 --- a/lib/pages/reading/bloc/reading_bloc.dart +++ b/lib/pages/reading/bloc/reading_bloc.dart @@ -22,6 +22,7 @@ import '../../../models/course_process_entity.dart'; import '../../../models/singsound_result_detail_entity.dart'; import '../../../models/voice_result_type.dart'; import '../../../route/route.dart'; +import '../../../utils/audio_player_util.dart'; import '../../../utils/loading.dart'; import '../../../utils/log_util.dart'; @@ -418,27 +419,35 @@ class ReadingPageBloc add(OnXSVoiceStateChangeEvent()); final voiceResult = VoiceResultType.fromScore(score); + if (voiceResult.lottieFilePath != null) { - showCheerRewardDialog(context, lottieFile: voiceResult.lottieFilePath!); + AudioPlayerUtil.getInstance().playAudio(voiceResult.audioType); + await showCheerRewardDialog(context, lottieFile: voiceResult.lottieFilePath!, onDismiss: () async { + await actionAfterRecord(); + }); + } else { + await AudioPlayerUtil.getInstance().playAudio(voiceResult.audioType); + await actionAfterRecord(); } - await ClickWithMusicController.instance - .playMusicAndPerformAction(context, voiceResult.audioType, () async { - ///完成录音后紧接着播放录音 - await _playRecordAudioInner(); - if (isLastPage()) { - sectionComplete(() { - popPage(data: { - 'currentStep': currentPage, - 'courseLessonId': courseLessonId, - 'isCompleted': true, - 'nextSection': true - }); - }, againSectionTap: () { - _resetLocalResult(); - pageController.jumpToPage(0); + } + + /// 作答音效&动效播放结束后 + Future actionAfterRecord() async { + ///完成录音后紧接着播放录音 + await _playRecordAudioInner(); + if (isLastPage()) { + sectionComplete(() { + popPage(data: { + 'currentStep': currentPage, + 'courseLessonId': courseLessonId, + 'isCompleted': true, + 'nextSection': true }); - } - }); + }, againSectionTap: () { + _resetLocalResult(); + pageController.jumpToPage(0); + }); + } } ///终止评测 -- libgit2 0.22.2