feat:过渡页-绘本环节

吴启风
1 parent 66a7e3e7
Showing 5 changed files with 66 additions and 24 deletions
lib/pages/reading/bloc/reading_bloc.dart
lib/pages/reading/bloc/reading_event.dart
lib/pages/reading/bloc/reading_state.dart
lib/pages/reading/reading_page.dart
lib/pages/section/bloc/section_bloc.dart
@@ -6,11 +6,15 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:wow_english/pages/reading/widgets/ReadingModeType.dart';
+import 'package:wow_english/pages/section/subsection/base_section/bloc.dart';
+import 'package:wow_english/pages/section/subsection/base_section/event.dart';
+import 'package:wow_english/pages/section/subsection/base_section/state.dart';
  
 import '../../../common/core/user_util.dart';
 import '../../../common/request/dao/listen_dao.dart';
 import '../../../common/request/exception.dart';
 import '../../../models/course_process_entity.dart';
+import '../../../route/route.dart';
 import '../../../utils/loading.dart';
  
 import '../../../utils/log_util.dart';
@@ -33,7 +37,8 @@ enum VoicePlayState {
   stop
 }
  
-class ReadingPageBloc extends Bloc<ReadingPageEvent, ReadingPageState> {
+class ReadingPageBloc
+    extends BaseSectionBloc<ReadingPageEvent, ReadingPageState> {
   final PageController pageController;
  
   final String courseLessonId;
@@ -211,7 +216,7 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
   }
  
   ///播放原音音频
-  Future<void> _playOriginalAudioInner(String? audioUrl) async {
+  void _playOriginalAudioInner(String? audioUrl) async {
     if (_isRecordAudioPlaying) {
       _isRecordAudioPlaying = false;
     }
@@ -219,7 +224,7 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
         "_playOriginalAudio _isRecordAudioPlaying=$_isRecordAudioPlaying _isOriginAudioPlaying=$_isOriginAudioPlaying url=$audioUrl");
     if (_isOriginAudioPlaying) {
       _isOriginAudioPlaying = false;
-      await audioPlayer.stop();
+      audioPlayer.stop();
     } else {
       _isOriginAudioPlaying = true;
       audioUrl ??= currentPageData()?.audioUrl ?? '';
@@ -265,8 +270,17 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
   }
  
   void nextPage() {
-    if (_currentPage >= dataCount() - 1) {
-      ///todo 最后一页了
+    if (currentPage >= dataCount()) {
+      sectionComplete(() {
+        popPage(data: {
+          'currentStep': currentPage,
+          'courseLessonId': courseLessonId,
+          'isCompleted': true,
+          'nextSection': true
+        });
+      }, againSectionTap: () {
+        pageController.jumpToPage(0);
+      });
     } else {
       _currentPage += 1;
       pageController.nextPage(
@@ -291,14 +305,14 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
  
   void startRecord(String content) async {
     // 调用封装好的权限检查和请求方法
-    bool result = await permissionCheckAndRequest(
-        context,
-        Permission.microphone,
-        "录音"
-    );
+    bool result =
+        await permissionCheckAndRequest(context, Permission.microphone, "录音");
     if (result) {
-      methodChannel.invokeMethod(
-          'startVoice', {'word': content, 'type': '0', 'userId': UserUtil.getUser()?.id.toString()});
+      methodChannel.invokeMethod('startVoice', {
+        'word': content,
+        'type': '0',
+        'userId': UserUtil.getUser()?.id.toString()
+      });
     }
   }
  
@@ -313,7 +327,20 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
     currentPageData()?.recordScore = overall;
     currentPageData()?.recordUrl = args['audioUrl'] + '.mp3';
     ///完成录音后紧接着播放录音
-    _playRecordAudioInner();
+    await _playRecordAudioInner();
+    if (isLastPage()) {
+      sectionComplete(() {
+        popPage(data: {
+          'currentStep': currentPage,
+          'courseLessonId': courseLessonId,
+          'isCompleted': true,
+          'nextSection': true
+        });
+      }, againSectionTap: () {
+        _resetLocalResult();
+        pageController.jumpToPage(0);
+      });
+    }
     // emitter(FeedbackState());
   }
  
@@ -338,8 +365,11 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
       nextPage();
     }
  
-    Log.d("_onAudioPlayComplete _isOriginAudioPlaying=$_isOriginAudioPlaying _voicePlayState=$_voicePlayState recordUrl=${currentPageData()?.recordUrl?.isNotEmpty}");
-    if (_isOriginAudioPlaying && _voicePlayState == VoicePlayState.completed && currentPageData()?.recordUrl?.isNotEmpty != true) {
+    Log.d(
+        "_onAudioPlayComplete _isOriginAudioPlaying=$_isOriginAudioPlaying _voicePlayState=$_voicePlayState recordUrl=${currentPageData()?.recordUrl?.isNotEmpty}");
+    if (_isOriginAudioPlaying &&
+        _voicePlayState == VoicePlayState.completed &&
+        currentPageData()?.recordUrl?.isNotEmpty != true) {
       ///如果刚刚完成原音播放&&录音为空,则开始录音
       startRecord(currentPageData()?.word ?? '');
     }
@@ -354,11 +384,21 @@ class ReadingPageBloc extends Bloc&lt;ReadingPageEvent, ReadingPageState&gt; {
     _isRecordAudioPlaying = false;
   }
  
-  void _onVoiceXsStateChange(
-    OnXSVoiceStateChangeEvent event,
-      Emitter<ReadingPageState> emitter
-  ) async {
+  void _onVoiceXsStateChange(OnXSVoiceStateChangeEvent event,
+      Emitter<ReadingPageState> emitter) async {
     emitter(XSVoiceTestState());
   }
-}
  
+  ///是否是最后一页
+  bool isLastPage() {
+    return currentPage == dataCount();
+  }
+
+  ///重置数据
+  void _resetLocalResult() {
+    _entity?.readings?.forEach((element) {
+      element.recordScore = null;
+      element.recordUrl = null;
+    });
+  }
+}
 part of 'reading_bloc.dart';
  
 @immutable
-abstract class ReadingPageEvent {}
+abstract class ReadingPageEvent extends BaseSectionEvent {}
  
 ///页面初始化
 class InitBlocEvent extends ReadingPageEvent {}
 part of 'reading_bloc.dart';
  
 @immutable
-abstract class ReadingPageState {}
+abstract class ReadingPageState extends BaseSectionState {}
  
 class ReadingPageInitial extends ReadingPageState {}
  
@@ -88,8 +88,9 @@ class _ReadingPage extends StatelessWidget {
                           onPressed: () {
                             popPage(
                                 data:{
-                                  'currentStep':bloc.currentPage.toString(),
-                                  'courseLessonId':bloc.courseLessonId
+                                  'currentStep':bloc.currentPage,
+                                  'courseLessonId':bloc.courseLessonId,
+                                  'isCompleted':bloc.isLastPage(),
                                 }
                             );
                           },
@@ -111,6 +111,7 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
     if (event.autoNextSection) {
       final nextCourseSection =
           getNextCourseSection(int.parse(event.courseLessonId));
+      debugPrint("WQF nextCourseSection: $nextCourseSection");
       ///进入课堂
       add(RequestEnterClassEvent(nextCourseSection!.id.toString(),
           nextCourseSection.courseType));