feat:儿歌/视频保留url传参，留作日后扩展

吴启风
1 parent 1e22b7d1
Showing 4 changed files with 10 additions and 7 deletions
lib/pages/section/section_page.dart
lib/pages/video/lookvideo/bloc/look_video_bloc.dart
lib/pages/video/lookvideo/look_video_page.dart
lib/route/route.dart
@@ -61,7 +61,7 @@ class _SectionPageView extends StatelessWidget {
     return BlocListener<SectionBloc, SectionState>(
       listener: (context, state) async {
         if (state is RequestEnterClassState) {
-          if (state.courseType == SectionType.song.value &&
+          if (state.courseType == SectionType.song.value ||
               state.courseType == SectionType.video.value) {
             var title =
                 state.courseType == SectionType.song.value ? 'song' : 'video';
@@ -75,7 +75,7 @@ class _SectionPageView extends StatelessWidget {
                   .playAudio(AudioPlayerUtilType.videoTime);
             }
             pushNamed(AppRouteName.lookVideo, arguments: {
-              'videoUrl': "",
+              'videoUrl': null,
               'title': title,
               'courseLessonId': state.courseLessonId,
               'isTopic': true
@@ -17,7 +17,7 @@ part &#39;look_video_state.dart&#39;;
 class LookVideoBloc extends BaseSectionBloc<BaseSectionEvent, BaseSectionState> {
  
   final String? _videoUrl;
-  String? get videoUrl => _videoUrl ?? _entity?.videos?.videoUrl ?? '';
+  String? get videoUrl => (_videoUrl?.isNotEmpty == true) ? _videoUrl : _entity?.videos?.videoUrl ?? '';
   final String? _typeTitle;
   String? get typeTitle => _typeTitle;
   final String? _courseLessonId;
@@ -13,6 +13,7 @@ class LookVideoPage extends StatelessWidget {
       this.courseLessonId,
       this.isTopic = false});
  
+  ///暂时不删，留着以后扩展。目前的逻辑是null，进入后请求课程数据
   final String? videoUrl;
   final String? typeTitle;
   final String? courseLessonId;
@@ -132,8 +132,8 @@ class AppRouter {
         if (settings.arguments != null) {
           courseUnitEntity = (settings.arguments as Map)
               .getOrNull('courseUnitEntity') as CourseUnitEntity;
-          courseUnitDetail = (settings.arguments as Map)
-              .getOrNull('courseUnitId');
+          courseUnitDetail =
+              (settings.arguments as Map).getOrNull('courseUnitId');
         }
         return CupertinoPageRoute(
             builder: (_) => SectionPage(
@@ -190,12 +190,14 @@ class AppRouter {
         return CupertinoPageRoute(
             builder: (_) => TopicPicturePage(courseLessonId: courseLessonId));
       case AppRouteName.lookVideo:
-        final videoUrl = (settings.arguments as Map)['videoUrl'] as String;
+        final videoUrl = (settings.arguments as Map)['videoUrl'] as String?;
         final title = (settings.arguments as Map)['title'] as String?;
         final courseLessonId =
             (settings.arguments as Map)['courseLessonId'] as String?;
+
         ///是否是课程内的视频环节，用于播放结束判断要不要再来一次以及下一环节用
-        final isTopic = (settings.arguments as Map)['isTopic'] as bool? ?? false;
+        final isTopic =
+            (settings.arguments as Map)['isTopic'] as bool? ?? false;
         return CupertinoPageRoute(
             builder: (_) => LookVideoPage(
                   videoUrl: videoUrl,