feat:儿歌/视频环节接口请求时机优化

吴启风
1 parent 26982eea
Showing 11 changed files with 172 additions and 187 deletions
lib/common/request/dao/lesson_dao.dart
lib/pages/practice/bloc/topic_picture_bloc.dart
lib/pages/section/bloc/section_bloc.dart
lib/pages/section/bloc/section_event.dart
lib/pages/section/bloc/section_state.dart
lib/pages/section/section_page.dart
lib/pages/video/lookvideo/bloc/look_video_bloc.dart
lib/pages/video/lookvideo/bloc/look_video_event.dart
lib/pages/video/lookvideo/bloc/look_video_state.dart
lib/pages/video/lookvideo/look_video_page.dart
lib/pages/video/lookvideo/widgets/video_widget.dart
@@ -13,6 +13,7 @@ class LessonDao {
   }
   ///课程单元列表
+  ///@param moduleId 模块id
   static Future<CourseUnitEntity?> courseUnit(int? moduleId) async {
     Map<String, dynamic> mapData = {};
     if (moduleId != null) {
@@ -32,7 +33,7 @@ class LessonDao {
     return data;
   }
-  ///课程（单元）列表
+  ///课程（环节）列表
   static Future<List<CourseSectionEntity>?> courseSection({required int courseUnitId}) async {
     Map<String, dynamic> mapData = {};
     mapData['courseUnitId'] = courseUnitId;
@@ -19,6 +19,7 @@ import &#39;../../../common/permission/permissionRequester.dart&#39;;
 import '../../../route/route.dart';
 part 'topic_picture_event.dart';
+
 part 'topic_picture_state.dart';
 enum VoicePlayState {
@@ -47,6 +48,8 @@ class TopicPictureBloc
   CourseProcessEntity? _entity;
+  CourseProcessEntity? get entity => _entity;
+
   ///正在评测
   bool _isVoicing = false;
@@ -63,8 +66,6 @@ class TopicPictureBloc
   bool get forbiddenWhenCorrect => _forbiddenWhenCorrect;
-  CourseProcessEntity? get entity => _entity;
-
   int get currentPage => _currentPage + 1;
   int get selectItem => _selectItem;
@@ -257,8 +258,8 @@ class TopicPictureBloc
       XSVoiceStartEvent event, Emitter<TopicPictureState> emitter) async {
     await audioPlayer.stop();
     // 调用封装好的权限检查和请求方法
-    bool result =
-        await requestPermission(context, Permission.microphone, "录音", "用于开启录音，识别您的开口作答并给出反馈");
+    bool result = await requestPermission(
+        context, Permission.microphone, "录音", "用于开启录音，识别您的开口作答并给出反馈");
     if (result) {
       methodChannel.invokeMethod('startVoice', {
         'word': event.testWord,
-import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/request/dao/lesson_dao.dart';
 import 'package:wow_english/common/request/exception.dart';
 import 'package:wow_english/common/request/dao/listen_dao.dart';
-import 'package:wow_english/models/course_process_entity.dart';
 import 'package:wow_english/utils/audio_player_util.dart';
 import 'package:wow_english/utils/loading.dart';
 import 'package:wow_english/utils/toast_util.dart';
@@ -53,10 +50,6 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
   Map<int, List<CourseSectionEntity>?> get courseSectionDatasMap =>
       _courseSectionDatasMap;
-  CourseProcessEntity? _processEntity;
-
-  CourseProcessEntity? get processEntity => _processEntity;
-
   ///点击环节后先请求数据再进入，标志位避免频繁点击多次请求（以及多次进入）
   bool _isRequesting = false;
@@ -66,7 +59,6 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
     on<RequestDataEvent>(_requestSectionsData);
     on<RequestEndClassEvent>(_requestEndClass);
     on<RequestEnterClassEvent>(_requestEnterClass);
-    on<RequestVideoLessonEvent>(_requestVideoLesson);
     on<CurrentUnitIndexChangeEvent>(_pageControllerChange);
     on<InitEvent>((event, emit) async {
       await AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.countWithMe);
@@ -92,23 +84,6 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
     }
   }
-  void _requestVideoLesson(
-      RequestVideoLessonEvent event, Emitter<SectionState> emitter) async {
-    try {
-      await loading(() async {
-        _processEntity = await ListenDao.process(event.courseLessonId);
-        emitter(
-            RequestVideoLessonState(event.courseLessonId, event.courseType));
-      });
-    } catch (e) {
-      if (e is ApiException) {
-        showToast(e.message ?? '请求失败,请检查网络连接');
-      }
-    } finally {
-      _isRequesting = false;
-    }
-  }
-
   void _requestEnterClass(
       RequestEnterClassEvent event, Emitter<SectionState> emitter) async {
     try {
@@ -124,8 +99,9 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
     } catch (e) {
       if (e is ApiException) {
         showToast(e.message ?? '请求失败,请检查网络连接');
-        _isRequesting = false;
       }
+    } finally {
+      _isRequesting = false;
     }
   }
@@ -11,14 +11,6 @@ class RequestDataEvent extends SectionEvent {
 class InitEvent extends SectionEvent {}
-///获取视频课程内容
-class RequestVideoLessonEvent extends SectionEvent {
-  final String courseLessonId;
-  final int courseType;
-
-  RequestVideoLessonEvent(this.courseLessonId, this.courseType);
-}
-
 ///进入课堂
 class RequestEnterClassEvent extends SectionEvent {
   final String courseLessonId;
@@ -7,13 +7,6 @@ class LessonInitial extends SectionState {}
 class LessonDataLoadState extends SectionState {}
-class RequestVideoLessonState extends SectionState {
-  final String courseLessonId;
-  final int type;
-
-  RequestVideoLessonState(this.courseLessonId, this.type);
-}
-
 class RequestEnterClassState extends SectionState {
   final String courseLessonId;
   final int courseType;
@@ -60,58 +60,36 @@ class _SectionPageView extends StatelessWidget {
     final bloc = BlocProvider.of<SectionBloc>(context);
     return BlocListener<SectionBloc, SectionState>(
       listener: (context, state) async {
-        if (state is RequestVideoLessonState) {
-          final videoUrl = bloc.processEntity?.videos?.videoUrl ?? '';
-          var title = '';
-          if (state.type == SectionType.song.value) {
-            title = 'song';
-          }
-
-          if (state.type == SectionType.video.value) {
-            title = 'video';
-          }
-
-          if (state.type == SectionType.bouns.value) {
-            title = 'bonus';
-          }
-
-          if (videoUrl.isEmpty || !videoUrl.contains('http')) {
-            return;
-          }
-          pushNamed(AppRouteName.lookVideo, arguments: {
-            'videoUrl': videoUrl,
-            'title': title,
-            'courseLessonId': state.courseLessonId,
-            'isTopic': true
-          }).then((value) {
-            if (value != null) {
-              Map<String, dynamic> dataMap = value as Map<String, dynamic>;
-              bloc.add(RequestEndClassEvent(
-                  dataMap['courseLessonId']!, dataMap['isCompleted'],
-                  currentTime: dataMap['currentTime'],
-                  autoNextSection: dataMap['nextSection']));
-            }
-            AudioPlayerUtil.getInstance()
-                .playAudio(AudioPlayerUtilType.countWithMe);
-          });
-          return;
-        }
-
         if (state is RequestEnterClassState) {
-          if (state.courseType != SectionType.practice.value &&
-              state.courseType != SectionType.pictureBook.value) {
-            ///视频类型
-            ///获取视频课程内容
-            if (state.courseType == 1) {
-              AudioPlayerUtil.getInstance()
+          if (state.courseType == SectionType.song.value &&
+              state.courseType == SectionType.video.value) {
+            var title =
+                state.courseType == SectionType.song.value ? 'song' : 'video';
+
+            ///儿歌/视频类型
+            if (state.courseType == SectionType.song.value) {
+              await AudioPlayerUtil.getInstance()
                   .playAudio(AudioPlayerUtilType.musicTime);
             } else {
-              AudioPlayerUtil.getInstance()
+              await AudioPlayerUtil.getInstance()
                   .playAudio(AudioPlayerUtilType.videoTime);
             }
-            bloc.add(RequestVideoLessonEvent(
-                state.courseLessonId, state.courseType));
-
+            pushNamed(AppRouteName.lookVideo, arguments: {
+              'videoUrl': "",
+              'title': title,
+              'courseLessonId': state.courseLessonId,
+              'isTopic': true
+            }).then((value) {
+              if (value != null) {
+                Map<String, dynamic> dataMap = value as Map<String, dynamic>;
+                bloc.add(RequestEndClassEvent(
+                    dataMap['courseLessonId']!, dataMap['isCompleted'],
+                    currentTime: dataMap['currentTime'],
+                    autoNextSection: dataMap['nextSection']));
+              }
+              AudioPlayerUtil.getInstance()
+                  .playAudio(AudioPlayerUtilType.countWithMe);
+            });
             return;
           }
@@ -5,15 +5,19 @@ import &#39;package:wow_english/pages/section/subsection/base_section/bloc.dart&#39;;
 import 'package:wow_english/pages/section/subsection/base_section/event.dart';
 import 'package:wow_english/pages/section/subsection/base_section/state.dart';
+import '../../../../common/request/dao/listen_dao.dart';
+import '../../../../common/request/exception.dart';
+import '../../../../models/course_process_entity.dart';
+import '../../../../utils/loading.dart';
+import '../../../../utils/toast_util.dart';
+
 part 'look_video_event.dart';
 part 'look_video_state.dart';
 class LookVideoBloc extends BaseSectionBloc<BaseSectionEvent, BaseSectionState> {
-  VideoPlayerController? _controller;
-
   final String? _videoUrl;
-  String? get videoUrl => _videoUrl;
+  String? get videoUrl => _videoUrl ?? _entity?.videos?.videoUrl ?? '';
   final String? _typeTitle;
   String? get typeTitle => _typeTitle;
   final String? _courseLessonId;
@@ -21,12 +25,32 @@ class LookVideoBloc extends BaseSectionBloc&lt;BaseSectionEvent, BaseSectionState&gt; 
   final bool _isTopic;
   bool get isTopic => _isTopic;
+  CourseProcessEntity? _entity;
+
+  CourseProcessEntity? get entity => _entity;
+
   LookVideoBloc(this._videoUrl, this._typeTitle, this._courseLessonId, this._isTopic) : super(LookVideoInitial()) {
     on<LookVideoEvent>((event, emit) {
       // TODO: implement event handler
     });
+    on<RequestDataEvent>(_requestData);
     on<SectionAgainEvent>((event, emit) {
       emit(SectionAgainState());
     });
   }
+
+  ///请求数据
+  void _requestData(
+      RequestDataEvent event, Emitter<BaseSectionState> emitter) async {
+    try {
+      await loading(() async {
+        _entity = await ListenDao.process(courseLessonId);
+        emitter(RequestDataState());
+      });
+    } catch (e) {
+      if (e is ApiException) {
+        showToast(e.message ?? '请求失败,请检查网络连接');
+      }
+    }
+  }
 }
@@ -4,3 +4,5 @@ part of &#39;look_video_bloc.dart&#39;;
 abstract class LookVideoEvent extends BaseSectionEvent {}
 class RestartVideoEvent extends LookVideoEvent {}
+
+class RequestDataEvent extends LookVideoEvent {}
@@ -6,3 +6,5 @@ abstract class LookVideoState extends BaseSectionState {}
 class LookVideoInitial extends LookVideoState {}
 class VideoStarState extends LookVideoState {}
+
+class RequestDataState extends LookVideoState {}
@@ -3,10 +3,15 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:wow_english/pages/section/subsection/base_section/state.dart';
 import 'package:wow_english/pages/video/lookvideo/bloc/look_video_bloc.dart';
 import 'package:wow_english/pages/video/lookvideo/widgets/video_widget.dart';
+import 'package:wow_english/utils/log_util.dart';
 class LookVideoPage extends StatelessWidget {
   const LookVideoPage(
-      {super.key, this.videoUrl, this.typeTitle, this.courseLessonId, this.isTopic = false});
+      {super.key,
+      this.videoUrl,
+      this.typeTitle,
+      this.courseLessonId,
+      this.isTopic = false});
   final String? videoUrl;
   final String? typeTitle;
@@ -16,24 +21,34 @@ class LookVideoPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (BuildContext context) => LookVideoBloc(videoUrl, typeTitle, courseLessonId, isTopic),
+      create: (BuildContext context) =>
+          LookVideoBloc(videoUrl, typeTitle, courseLessonId, isTopic)
+            ..add(RequestDataEvent()),
       child: Builder(builder: (context) => _buildPage(context)),
     );
   }
 }
 Widget _buildPage(BuildContext context) {
-  return BlocBuilder<LookVideoBloc, BaseSectionState>(builder: (context, state) {
-      final bloc = BlocProvider.of<LookVideoBloc>(context);
-      return Container(
-          color: Colors.white,
-          child: VideoWidget(
-            videoUrl: bloc.videoUrl ?? '',
-            typeTitle: bloc.typeTitle ?? '',
-            courseLessonId: bloc.courseLessonId ?? '',
-            isTopic: bloc.isTopic,
-          )
-      );
-    }
-  );
+  return BlocBuilder<LookVideoBloc, BaseSectionState>(
+      builder: (context, state) {
+    final bloc = BlocProvider.of<LookVideoBloc>(context);
+    Log.d("WQF lookvideo BlocBuilder bloc.videoUr=${bloc.videoUrl}");
+    return Center(
+      child: bloc.videoUrl?.isNotEmpty == true
+          ? Container(
+              color: Colors.white,
+              child: VideoWidget(
+                videoUrl: bloc.videoUrl ?? '',
+                typeTitle: bloc.typeTitle ?? '',
+                courseLessonId: bloc.courseLessonId ?? '',
+                isTopic: bloc.isTopic,
+              ))
+          //todo 空了需要抽一个通用的loading组件
+          : Container(
+              color: Colors.white,
+              child: const CircularProgressIndicator(),
+            ),
+    );
+  });
 }
@@ -12,11 +12,12 @@ import &#39;../../../section/subsection/base_section/state.dart&#39;;
 import 'video_opera_widget.dart';
 class VideoWidget extends StatefulWidget {
-  const VideoWidget({super.key,
-    this.videoUrl = '',
-    this.typeTitle,
-    this.courseLessonId = '',
-    this.isTopic = false});
+  const VideoWidget(
+      {super.key,
+      this.videoUrl = '',
+      this.typeTitle,
+      this.courseLessonId = '',
+      this.isTopic = false});
   final String videoUrl;
   final String? typeTitle;
@@ -39,10 +40,10 @@ class _VideoWidgetState extends State&lt;VideoWidget&gt; {
   String formatDuration(Duration duration) {
     String hours = duration.inHours.toString().padLeft(2, '0');
-    String minutes = duration.inMinutes.remainder(60).toString().padLeft(
-        2, '0');
-    String seconds = duration.inSeconds.remainder(60).toString().padLeft(
-        2, '0');
+    String minutes =
+        duration.inMinutes.remainder(60).toString().padLeft(2, '0');
+    String seconds =
+        duration.inSeconds.remainder(60).toString().padLeft(2, '0');
     return "$hours:$minutes:$seconds";
   }
@@ -71,17 +72,17 @@ class _VideoWidgetState extends State&lt;VideoWidget&gt; {
             _controller!.value.position.inSeconds ==
                 _controller!.value.duration.inSeconds) {
           final lookVideoBloc = context.read<LookVideoBloc>();
-          lookVideoBloc.sectionComplete(() {
-            popPage(data: {
-              'courseLessonId': widget.courseLessonId,
-              'currentTime': getCurrentPositionSeconds(),
-              'isCompleted': true,
-              'nextSection': widget.isTopic
-            });
-          } as VoidCallback,
-              againSectionTap: (() {
-                lookVideoBloc.add(SectionAgainEvent());
-              }), context: context);
+          lookVideoBloc.sectionComplete(
+              () {
+                popPage(data: {
+                  'courseLessonId': widget.courseLessonId,
+                  'currentTime': getCurrentPositionSeconds(),
+                  'isCompleted': true,
+                  'nextSection': widget.isTopic
+                });
+              } as VoidCallback, againSectionTap: (() {
+            lookVideoBloc.add(SectionAgainEvent());
+          }), context: context);
         }
       }
     });
@@ -189,63 +190,63 @@ class _VideoWidgetState extends State&lt;VideoWidget&gt; {
         child: Center(
           child: _controller!.value.isInitialized
               ? Stack(
-            alignment: Alignment.center,
-            children: [
-              SizedBox(
-                height: double.infinity,
-                width: double.infinity,
-                child: AspectRatio(
-                  aspectRatio: _controller!.value.aspectRatio,
-                  child: VideoPlayer(_controller!),
-                ),
-              ),
-              Offstage(
-                offstage: _hiddenTipView,
-                child: VideoOperaWidget(
-                  title: widget.typeTitle ?? 'song',
-                  degree: _playDegree,
-                  totalTime: _totalTime,
-                  currentTime: _currentTime,
-                  isPlay: _controller!.value.isPlaying,
-                  actionEvent: (OperationType type) {
-                    actionType(type);
-                  },
-                  sliderChangeEvent: (double degree) {
-                    int totalSecond = _controller!
-                        .value.duration.inMinutes
-                        .remainder(60) *
-                        60 +
-                        _controller!.value.duration.inSeconds
-                            .remainder(60);
-                    int positionSecond = (totalSecond * degree).toInt();
-                    _controller!
-                        .seekTo(Duration(seconds: positionSecond));
-                  },
-                ),
-              ),
-              Offstage(
-                offstage: _controller!.value.isPlaying,
-                child: IconButton(
-                  onPressed: () {
-                    _controller!.play();
-                  },
-                  icon: Image.asset(
-                    'video_stop'.assetPng,
-                    width: 70.w,
-                    height: 70.h,
-                  ),
-                ),
-              )
-            ],
-          )
+                  alignment: Alignment.center,
+                  children: [
+                    SizedBox(
+                      height: double.infinity,
+                      width: double.infinity,
+                      child: AspectRatio(
+                        aspectRatio: _controller!.value.aspectRatio,
+                        child: VideoPlayer(_controller!),
+                      ),
+                    ),
+                    Offstage(
+                      offstage: _hiddenTipView,
+                      child: VideoOperaWidget(
+                        title: widget.typeTitle ?? 'song',
+                        degree: _playDegree,
+                        totalTime: _totalTime,
+                        currentTime: _currentTime,
+                        isPlay: _controller!.value.isPlaying,
+                        actionEvent: (OperationType type) {
+                          actionType(type);
+                        },
+                        sliderChangeEvent: (double degree) {
+                          int totalSecond = _controller!
+                                      .value.duration.inMinutes
+                                      .remainder(60) *
+                                  60 +
+                              _controller!.value.duration.inSeconds
+                                  .remainder(60);
+                          int positionSecond = (totalSecond * degree).toInt();
+                          _controller!
+                              .seekTo(Duration(seconds: positionSecond));
+                        },
+                      ),
+                    ),
+                    Offstage(
+                      offstage: _controller!.value.isPlaying,
+                      child: IconButton(
+                        onPressed: () {
+                          _controller!.play();
+                        },
+                        icon: Image.asset(
+                          'video_stop'.assetPng,
+                          width: 70.w,
+                          height: 70.h,
+                        ),
+                      ),
+                    )
+                  ],
+                )
               : Container(
-            color: Colors.white,
-            child: const CircularProgressIndicator(),
-            // Text(
-            //   '视频加载中....',
-            //   style: TextStyle(fontSize: 20.sp, color: Colors.black),
-            // ),
-          ),
+                  color: Colors.white,
+                  child: const CircularProgressIndicator(),
+                  // Text(
+                  //   '视频加载中....',
+                  //   style: TextStyle(fontSize: 20.sp, color: Colors.black),
+                  // ),
+                ),
         ),
       ),
     );