feat:修复所有unit解锁态下page页数

吴启风
1 parent ae77d87f
Showing 2 changed files with 28 additions and 19 deletions
lib/pages/reading/reading_page.dart
lib/pages/section/bloc/section_bloc.dart
@@ -8,6 +8,7 @@ import &#39;package:wow_english/route/route.dart&#39;;
 import '../../common/core/app_consts.dart';
 import '../../common/core/user_util.dart';
+import '../../common/widgets/throttledGesture_gesture_detector.dart';
 import '../../models/course_process_entity.dart';
 import '../../utils/log_util.dart';
 import 'bloc/reading_bloc.dart';
@@ -187,7 +188,8 @@ class _ReadingPage extends StatelessWidget {
                       SizedBox(
                         width: 10.w,
                       ),
-                      GestureDetector(
+                      ThrottledGestureDetector(
+                          throttleTime: 1000,
                           onTap: () {
                             if (bloc.isRecording) {
                               bloc.add(XSVoiceStopEvent());
@@ -37,14 +37,15 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
   ///courseUnitId与课程环节列表的映射
   final Map<int, List<CourseSectionEntity>?> _courseSectionDatasMap = {};
-  Map<int, List<CourseSectionEntity>?> get courseSectionDatasMap => _courseSectionDatasMap;
+  Map<int, List<CourseSectionEntity>?> get courseSectionDatasMap =>
+      _courseSectionDatasMap;
   CourseProcessEntity? _processEntity;
   CourseProcessEntity? get processEntity => _processEntity;
-  SectionBloc(this._courseUnitEntity, this._currentPage,
-      this._pageController, this._listController)
+  SectionBloc(this._courseUnitEntity, this._currentPage, this._pageController,
+      this._listController)
       : super(LessonInitial()) {
     on<RequestDataEvent>(_requestSectionsData);
     on<RequestEndClassEvent>(_requestEndClass);
@@ -101,20 +102,18 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
       RequestEndClassEvent event, Emitter<SectionState> emitter) async {
     if (event.isCompleted) {
       await await ListenDao.endClass(event.courseLessonId,
-          currentStep: event.currentStep,
-          currentTime: event.currentTime);
+          currentStep: event.currentStep, currentTime: event.currentTime);
     } else {
       await await ListenDao.exitClass(event.courseLessonId,
-          currentStep: event.currentStep,
-          currentTime: event.currentTime);
+          currentStep: event.currentStep, currentTime: event.currentTime);
     }
     if (event.autoNextSection) {
       final nextCourseSection =
-          await getNextCourseSection(int.parse(event.courseLessonId));
+          await getNextCourseSection(int.parse(event.courseLessonId), emitter);
       if (nextCourseSection != null) {
         ///进入课堂
-        add(RequestEnterClassEvent(nextCourseSection.id.toString(),
-            nextCourseSection.courseType));
+        add(RequestEnterClassEvent(
+            nextCourseSection.id.toString(), nextCourseSection.courseType));
       }
     }
   }
@@ -129,7 +128,8 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
   int unlockPageCount() {
     return _courseUnitEntity.courseUnitVOList
             ?.indexWhereOrNull((element) => element.lock == true) ??
-        1;
+        _courseUnitEntity.courseUnitVOList?.length ??
+        0;
   }
   ///当前页的课程详情
@@ -171,33 +171,40 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
   CourseUnitDetail? findCourseUnitDetailById(int courseLessonId) {
     final curCourseSectionEntity = findCourseSectionById(courseLessonId);
     if (curCourseSectionEntity != null) {
-      final curCourseUnitDetail = _courseUnitEntity.courseUnitVOList?.firstWhere((element) =>
-        element.id == curCourseSectionEntity.courseUnitId);
+      final curCourseUnitDetail = _courseUnitEntity.courseUnitVOList
+          ?.firstWhere(
+              (element) => element.id == curCourseSectionEntity.courseUnitId);
       return curCourseUnitDetail;
     }
     return null;
   }
   ///根据courseLessonId查找下一个courseSection
-  Future<CourseSectionEntity?> getNextCourseSection(int courseLessonId) async {
+  Future<CourseSectionEntity?> getNextCourseSection(
+      int courseLessonId, Emitter<SectionState> emitter) async {
     final curCourseSectionEntity = findCourseSectionById(courseLessonId);
     final curSectionSort = curCourseSectionEntity?.sortOrder ?? 0;
+
+    ///查找下一个section
     final nextCourseSectionEntity = findCourseSectionBySort(curSectionSort + 1);
     if (nextCourseSectionEntity != null) {
       return nextCourseSectionEntity;
     } else {
-      ///跨unit选lesson
+      ///section为空说明当前unit学完了，找下一个unit。（跨unit选lesson）
+      ///先根据courseLessonId找出当前的unit
       final curCourseUnitDetail = findCourseUnitDetailById(courseLessonId);
       if (curCourseUnitDetail != null) {
+        ///再根据当前unit找出下一个unit
         final nextCourseUnitDetail = _courseUnitEntity.courseUnitVOList
-            ?.firstWhere((element) => element.sortOrder == (curCourseUnitDetail.sortOrder! + 1));
+            ?.firstWhere((element) =>
+                element.sortOrder == (curCourseUnitDetail.sortOrder! + 1));
         if (nextCourseUnitDetail != null) {
           final courseUnitId = nextCourseUnitDetail.id!;
           try {
             await loading(() async {
               _courseSectionDatasMap[courseUnitId] =
-              await LessonDao.courseSection(courseUnitId: courseUnitId);
-              emit(LessonDataLoadState());
+                  await LessonDao.courseSection(courseUnitId: courseUnitId);
+              emitter(LessonDataLoadState());
             });
             _pageController.nextPage(
               duration: const Duration(milliseconds: 500),