diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index f4223b1..5660f35 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -24,4 +24,22 @@
 -keep class com.tt.** { *; }
 -keep class com.xs.** { *; }
 -keep interface com.xs.** { *; }
--keep enum com.xs.** { *; }
\ No newline at end of file
+-keep enum com.xs.** { *; }
+
+# 友盟混淆
+-keep class com.umeng.** { *; }
+
+-keep class com.uc.** { *; }
+
+-keep class com.efs.** { *; }
+
+-keepclassmembers class *{
+     public<init>(org.json.JSONObject);
+}
+-keepclassmembers enum *{
+      public static **[] values();
+      public static ** valueOf(java.lang.String);
+}
+-keep public class com.kouyuxingqiu.wow_english.R$*{
+      public static final int *;
+}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 51368e1..bd431e7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
+                <!-- 友盟apm集成测试用 -->
+<!--                <data android:scheme="um.663b66b0b3362515012f4ea5" />-->
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt b/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
index 74ac2b8..e88da04 100644
--- a/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
@@ -12,6 +12,8 @@ import com.kouyuxingqiu.wow_english.methodChannels.GameMethodChannel
 import com.kouyuxingqiu.wow_english.methodChannels.SingSoungMethodChannel
 import com.umeng.commonsdk.UMConfigure
 import io.flutter.embedding.android.FlutterActivity
+import com.umeng.umcrash.UMCrash
+
 
 class MainActivity : FlutterActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -23,9 +25,7 @@ class MainActivity : FlutterActivity() {
             SingSoungMethodChannel(this, it)
             GameMethodChannel(this, it)
         }
-        //UM日志打印
-        UMConfigure.setLogEnabled(true)
-        UMConfigure.preInit(this, "663b66b0b3362515012f4ea5", "official")
+        initUmeng()
     }
 
     override fun onResume() {
@@ -56,4 +56,27 @@ class MainActivity : FlutterActivity() {
         // 打开沉浸式
         WindowCompat.setDecorFitsSystemWindows(window, false)*/
     }
+
+    /**
+     * 友盟初始化
+     */
+    private fun initUmeng() {
+        // 友盟集成测试阶段获取UMID
+//        android.util.Log.d("WQF UMConfigure", UMConfigure.getUMIDString(this))
+        // 在application.onCreate内配置各模块开关并预初始化SDK
+        // 重点关注：如果您还想采集Native 崩溃、ANR等日志可以参考下面设置
+        UMCrash.initConfig(Bundle().apply {
+            putBoolean(UMCrash.KEY_ENABLE_CRASH_JAVA, true)
+            putBoolean(UMCrash.KEY_ENABLE_CRASH_NATIVE, true)
+            putBoolean(UMCrash.KEY_ENABLE_ANR, true)
+            putBoolean(UMCrash.KEY_ENABLE_PA, false)
+            putBoolean(UMCrash.KEY_ENABLE_LAUNCH, false)
+            putBoolean(UMCrash.KEY_ENABLE_MEM, false)
+            putBoolean(UMCrash.KEY_ENABLE_H5PAGE, false)
+            putBoolean(UMCrash.KEY_ENABLE_POWER, false)
+        })
+        //UM日志打印
+        UMConfigure.setLogEnabled(false)
+        UMConfigure.preInit(this, "663b66b0b3362515012f4ea5", "official")
+    }
 }
diff --git a/assets/images/section_finish_again.png b/assets/images/section_finish_again.png
new file mode 100644
index 0000000..59753cb
--- /dev/null
+++ b/assets/images/section_finish_again.png
diff --git a/assets/images/section_finish_next.png b/assets/images/section_finish_next.png
new file mode 100644
index 0000000..6b5af89
--- /dev/null
+++ b/assets/images/section_finish_next.png
diff --git a/assets/images/section_finish_steve.png b/assets/images/section_finish_steve.png
new file mode 100644
index 0000000..e47384d
--- /dev/null
+++ b/assets/images/section_finish_steve.png
diff --git a/build.yaml b/build.yaml
new file mode 100644
index 0000000..a0bd16f
--- /dev/null
+++ b/build.yaml
@@ -0,0 +1,10 @@
+#targets:
+#  $default:
+#    builders:
+#      json_serializable:
+#        options:
+#          # 指定生成代码的配置
+#          # 是否要在生成的代码中包含 fromJson 和 toJson 方法的方法签名
+#          # 默认情况下，此值为false，设置为true可以生成方法签名，便于调试
+#          generate_to_json: true
+#          generate_from_json: true
diff --git a/lib/app/app.dart b/lib/app/app.dart
index 80b5808..3e2cbfe 100644
--- a/lib/app/app.dart
+++ b/lib/app/app.dart
@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:responsive_framework/responsive_framework.dart';
+import 'package:umeng_apm_sdk/umeng_apm_sdk.dart';
 import 'package:wow_english/common/blocs/cachebloc/cache_bloc.dart';
 import 'package:wow_english/common/widgets/hide_keyboard_widget.dart';
 import 'package:wow_english/pages/tab/blocs/tab_bloc.dart';
@@ -10,7 +11,9 @@ import 'package:wow_english/pages/user/bloc/user_bloc.dart';
 import 'package:wow_english/route/route.dart';
 
 class App extends StatelessWidget {
-  const App({super.key});
+  const App([this._navigatorObserver]);
+
+  final NavigatorObserver? _navigatorObserver;
 
   @override
   Widget build(BuildContext context) {
@@ -41,6 +44,11 @@ class App extends StatelessWidget {
               initialRoute: AppRouteName.splash,
               navigatorKey: AppRouter.navigatorKey,
               onGenerateRoute: AppRouter.generateRoute,
+              navigatorObservers: <NavigatorObserver>[
+                // 带入ApmNavigatorObserver实例用于路由监听
+                // 如果不带入SDK监听器将无法获知页面（PV）入栈退栈行为，错误率（Dart异常数/FlutterPV次数）将异常攀升。
+                _navigatorObserver ?? ApmNavigatorObserver.singleInstance
+              ],
             ),
           )),
     );
diff --git a/lib/common/request/apis.dart b/lib/common/request/apis.dart
index 70e4f71..5682d84 100644
--- a/lib/common/request/apis.dart
+++ b/lib/common/request/apis.dart
@@ -89,9 +89,12 @@ class Apis {
   /// 进入课堂
   static const String enterClass = 'course/enter/class';
 
-  /// 退出课堂
+  /// 退出课堂（非完整、中断）
   static const String exitClass = 'course/exit/class';
 
+  /// 结束课堂（完整）
+  static const String endClass = 'course/end/class';
+
   /// 商品列表
   static const String productList = 'order/course/combo/list';
 
diff --git a/lib/common/request/basic_config.dart b/lib/common/request/basic_config.dart
index 26031a8..d507c86 100644
--- a/lib/common/request/basic_config.dart
+++ b/lib/common/request/basic_config.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 
 class BasicConfig {
    // static bool isTestDev = true;
@@ -7,7 +7,6 @@ class BasicConfig {
 
    // 暂时未启用
    static bool isEnvProd() {
-      bool kReleaseMode = const bool.fromEnvironment('dart.vm.product');
       if (kReleaseMode) {
          debugPrint("dart.vm.product-现在是release环境.");
       } else {
diff --git a/lib/common/request/dao/listen_dao.dart b/lib/common/request/dao/listen_dao.dart
index 318f1d5..6aeb4b4 100644
--- a/lib/common/request/dao/listen_dao.dart
+++ b/lib/common/request/dao/listen_dao.dart
@@ -4,6 +4,7 @@ import 'package:wow_english/models/follow_read_entity.dart';
 import 'package:wow_english/models/listen_entity.dart';
 
 import '../../../models/read_content_entity.dart';
+import '../../../utils/date_util.dart';
 
 class ListenDao {
   /// 磨耳朵
@@ -14,37 +15,66 @@ class ListenDao {
 
   ///视频跟读
   static Future<List<FollowReadEntity?>?> followRead() async {
-    var data = await requestClient.get<List<FollowReadEntity?>>(Apis.followRead);
+    var data =
+        await requestClient.get<List<FollowReadEntity?>>(Apis.followRead);
     return data;
   }
 
   ///课程内容
   static Future<CourseProcessEntity?> process(courseLessonId) async {
-    var data = await requestClient.get<CourseProcessEntity>(Apis.process,queryParameters: {'courseLessonId':courseLessonId});
+    var data = await requestClient.get<CourseProcessEntity>(Apis.process,
+        queryParameters: {'courseLessonId': courseLessonId});
     return data;
   }
 
   ///获取视频跟读内容
-  static Future<List<ReadContentEntity?>?> readContent(videoFollowReadId) async {
-    var data = await requestClient.get<List<ReadContentEntity?>>(Apis.readContent,queryParameters: {'videoFollowReadId':videoFollowReadId});
+  static Future<List<ReadContentEntity?>?> readContent(
+      videoFollowReadId) async {
+    var data = await requestClient.get<List<ReadContentEntity?>>(
+        Apis.readContent,
+        queryParameters: {'videoFollowReadId': videoFollowReadId});
     return data;
   }
 
   ///视频跟读提交结果
-  static Future followResult(frequency,videoFollowReadId) async {
-    var data = await requestClient.post(Apis.followResult,data: {'frequency':frequency,'videoFollowReadContentId':videoFollowReadId});
+  static Future followResult(frequency, videoFollowReadId) async {
+    var data = await requestClient.post(Apis.followResult, data: {
+      'frequency': frequency,
+      'videoFollowReadContentId': videoFollowReadId
+    });
     return data;
   }
 
   ///进入课堂
   static Future enterClass(courseLessonId) async {
-    var data = await requestClient.post(Apis.enterClass,data: {'courseLessonId':courseLessonId});
+    var data = await requestClient
+        .post(Apis.enterClass, data: {'courseLessonId': courseLessonId});
     return data;
   }
 
   ///退出课堂
-  static Future exitClass(courseLessonId,currentStep,currentTime) async {
-    var data = await requestClient.post(Apis.exitClass,data: {'courseLessonId':courseLessonId,'currentStep':currentStep,'currentTime':currentTime});
+  static Future exitClass(courseLessonId,
+      {int? currentStep, int? currentTime}) async {
+    var data = await requestClient.post(Apis.exitClass, data: {
+      'courseLessonId': courseLessonId,
+
+      ///如果currentStep不为空，才传currentStep参数
+      if (currentStep != null) 'currentStep': currentStep,
+
+      ///如果currentTime不为空，才传currentTime参数
+      if (currentTime != null) 'currentTime': currentTime
+    });
+    return data;
+  }
+
+  ///完成课堂
+  static Future endClass(courseLessonId,
+      {int? currentStep, int? currentTime}) async {
+    var data = await requestClient.post(Apis.endClass, data: {
+      'courseLessonId': courseLessonId,
+      if (currentStep != null) 'currentStep': currentStep,
+      if (currentTime != null) 'currentTime': currentTime
+    });
     return data;
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
index e67d6a1..50590fc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,16 +1,88 @@
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:umeng_apm_sdk/umeng_apm_sdk.dart';
 import 'package:wow_english/app/app.dart';
 
+// void main() {
+//   ///设置设备默认方向
+//   WidgetsFlutterBinding.ensureInitialized();
+//   if (Platform.isAndroid) {
+//     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( //设置状态栏透明
+//       statusBarColor: Colors.transparent,
+//     ));
+//   }
+//   runApp(const App());
+// }
+
 void main() {
   ///设置设备默认方向
-  WidgetsFlutterBinding.ensureInitialized();
   if (Platform.isAndroid) {
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( //设置状态栏透明
       statusBarColor: Colors.transparent,
     ));
   }
-  runApp(const App());
+
+  final UmengApmSdk umengApmSdk = UmengApmSdk(
+    name: "",
+    bver: "",
+
+    // 是否开启SDK运行时日志输出
+    enableLog: !kReleaseMode,
+
+    // 您使用的flutter版本，默认为空，为方便定位访问，建议配置
+    flutterVersion: '3.13.2',
+
+    // 您使用的flutter引擎版本
+    engineVersion: 'ff5b5b5fa6',
+
+    // 开启监测页面帧率（默认关闭) 版本 v2.1.3 可支持
+    enableTrackingPageFps: !kReleaseMode,
+
+    // 开启监测页面性能（默认关闭）版本 v2.1.3 可支持
+    enableTrackingPagePerf: !kReleaseMode,
+
+    // 带入继承ApmWidgetsFlutterBinding的覆写和初始化方法, 可用于自定义监听应用生命周期
+    // 确保去掉原有的WidgetsFlutterBinding.ensureInitialized() ，以免出现重复初始化绑定的异常造成无法正常初始化，SDK内部已通过initFlutterBinding入参带入继承的WidgetsFlutterBinding实现初始化操作
+    initFlutterBinding: MyApmWidgetsFlutterBinding.ensureInitialized,
+
+    // 抛出异常事件
+    onError: (exception, stack) {
+      debugPrint(exception.toString());
+    },
+
+  );
+  umengApmSdk.init(appRunner: (observer) async {
+    // 确保去掉原有的WidgetsFlutterBinding.ensureInitialized() ，以免出现重复初始化绑定的异常造成无法正常初始化，SDK内部已通过initFlutterBinding入参带入继承的WidgetsFlutterBinding实现初始化操作
+    // 依赖ensureInitialized()初始化的代码可在此调用
+    // 需要异步获取设置应用名称和版本号可在此回调中操作
+    // SDK实例化的设置可先将name和bver 为 "",然后通过以下方式进行设置
+    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    String packageName = packageInfo.packageName;
+    String buildNumber = packageInfo.buildNumber;
+    String version = packageInfo.version;
+    umengApmSdk.name = packageName;
+    umengApmSdk.bver = '$version+$buildNumber';
+
+    return App(observer);
+  });
+}
+
+
+//ApmWidgetsFlutterBinding的覆写和初始化方法
+class MyApmWidgetsFlutterBinding extends ApmWidgetsFlutterBinding {
+  @override
+  void handleAppLifecycleStateChanged(AppLifecycleState state) {
+    // 添加自己的实现逻辑
+    debugPrint('AppLifecycleState changed to $state');
+    super.handleAppLifecycleStateChanged(state);
+  }
+
+  static WidgetsBinding? ensureInitialized() {
+    MyApmWidgetsFlutterBinding();
+    return WidgetsBinding.instance;
+  }
 }
diff --git a/lib/pages/practice/bloc/topic_picture_bloc.dart b/lib/pages/practice/bloc/topic_picture_bloc.dart
index 59d46d5..d84f1ce 100644
--- a/lib/pages/practice/bloc/topic_picture_bloc.dart
+++ b/lib/pages/practice/bloc/topic_picture_bloc.dart
@@ -9,10 +9,14 @@ 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';
+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 'package:wow_english/utils/loading.dart';
 import 'package:wow_english/utils/toast_util.dart';
 
 import '../../../common/permission/permissionRequestPage.dart';
+import '../../../route/route.dart';
 
 part 'topic_picture_event.dart';
 part 'topic_picture_state.dart';
@@ -28,7 +32,7 @@ enum VoicePlayState {
   stop
 }
 
-class TopicPictureBloc extends Bloc<TopicPictureEvent, TopicPictureState> {
+class TopicPictureBloc extends BaseSectionBloc<TopicPictureEvent, TopicPictureState> {
 
   final PageController pageController;
 
@@ -94,11 +98,15 @@ class TopicPictureBloc extends Bloc<TopicPictureEvent, TopicPictureState> {
               _forbiddenWhenCorrect = false;
               debugPrint('播放完成后解除禁止');
               if (event == PlayerState.completed) {
-                // 答对后且播放完自动翻页
-                pageController.nextPage(
-                  duration: const Duration(milliseconds: 500),
-                  curve: Curves.ease,
-                );
+                if (isLastPage()) {
+                  showStepPage();
+                } else {
+                  // 答对后且播放完自动翻页
+                  pageController.nextPage(
+                    duration: const Duration(milliseconds: 500),
+                    curve: Curves.ease,
+                  );
+                }
               }
             }
           }
@@ -263,6 +271,9 @@ class TopicPictureBloc extends Bloc<TopicPictureEvent, TopicPictureState> {
     showToast('测评成功,分数是$overall',duration: const Duration(seconds: 5));
     _isVoicing = false;
     emitter(XSVoiceTestState());
+    if (isLastPage()) {
+      showStepPage();
+    }
   }
 
   // 暂时没用上
@@ -288,6 +299,7 @@ class TopicPictureBloc extends Bloc<TopicPictureEvent, TopicPictureState> {
     }
   }
 
+  ///播放选择结果音效
   void _playResultSound(bool isCorrect) async {
     // await audioPlayer.stop();
     if (audioPlayer.state == PlayerState.playing && _isResultSoundPlaying == false) {
@@ -302,4 +314,26 @@ class TopicPictureBloc extends Bloc<TopicPictureEvent, TopicPictureState> {
       await audioPlayer.play(AssetSource('incorrect_voice'.assetMp3));
     }
   }
+
+  ///是否是最后一页
+  bool isLastPage() {
+    return currentPage == _entity?.topics?.length;
+  }
+
+  ///展示过渡页
+  void showStepPage() {
+    ///如果最后一页是语音问答题，评测完后自动翻页
+    sectionComplete(() {
+      popPage(
+          data:{
+            'currentStep':currentPage,
+            'courseLessonId':courseLessonId,
+            'isCompleted': true,
+            'nextSection': true
+          });
+    }, againSectionTap: () {
+      debugPrint("WQF 重做");
+      pageController.jumpToPage(0);
+    });
+  }
 }
diff --git a/lib/pages/practice/bloc/topic_picture_event.dart b/lib/pages/practice/bloc/topic_picture_event.dart
index 965fed5..4914c1b 100644
--- a/lib/pages/practice/bloc/topic_picture_event.dart
+++ b/lib/pages/practice/bloc/topic_picture_event.dart
@@ -1,7 +1,7 @@
 part of 'topic_picture_bloc.dart';
 
 @immutable
-abstract class TopicPictureEvent {}
+abstract class TopicPictureEvent extends BaseSectionEvent {}
 
 class InitBlocEvent extends TopicPictureEvent {}
 
diff --git a/lib/pages/practice/bloc/topic_picture_state.dart b/lib/pages/practice/bloc/topic_picture_state.dart
index 96d7381..d1d9b5d 100644
--- a/lib/pages/practice/bloc/topic_picture_state.dart
+++ b/lib/pages/practice/bloc/topic_picture_state.dart
@@ -1,7 +1,7 @@
 part of 'topic_picture_bloc.dart';
 
 @immutable
-abstract class TopicPictureState {}
+abstract class TopicPictureState extends BaseSectionState {}
 
 class TopicPictureInitial extends TopicPictureState {}
 
diff --git a/lib/pages/practice/topic_picture_page.dart b/lib/pages/practice/topic_picture_page.dart
index 2c0dc48..87ba70d 100644
--- a/lib/pages/practice/topic_picture_page.dart
+++ b/lib/pages/practice/topic_picture_page.dart
@@ -6,6 +6,7 @@ import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/widgets/ow_image_widget.dart';
 import 'package:wow_english/models/course_process_entity.dart';
+import 'package:wow_english/pages/practice/topic_type.dart';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/utils/toast_util.dart';
 
@@ -70,8 +71,9 @@ class _TopicPicturePage extends StatelessWidget {
                     onTap: () {
                       popPage(
                           data:{
-                            'currentStep':bloc.currentPage.toString(),
-                            'courseLessonId':bloc.courseLessonId
+                            'currentStep':bloc.currentPage,
+                            'courseLessonId':bloc.courseLessonId,
+                            'isCompleted': bloc.isLastPage(),
                           });
                       // Navigator.pop(context);
                       },
@@ -86,13 +88,13 @@ class _TopicPicturePage extends StatelessWidget {
                         },
                         itemBuilder: (BuildContext context,int index){
                           CourseProcessTopics? topics = bloc.entity?.topics![index];
-                          if (topics?.type == 1) {//听音选图
+                          if (topics?.type == TopicType.audioImageSelect.value) {//听音选图
                             return _pageViewVoicePictureItemWidget(topics);
-                          } else if (topics?.type == 2) {//听音选字
+                          } else if (topics?.type == TopicType.audioCharSelect.value) {//听音选字
                             return _pageViewVoiceWordItemWidget(topics);
-                          } else if (topics?.type == 3) {//看题选字
+                          } else if (topics?.type == TopicType.questionCharSelect.value) {//看题选字
                             return _pageViewWordItemWidget(topics);
-                          } else if (topics?.type == 4) {//看题选图
+                          } else if (topics?.type == TopicType.questionImageSelect.value) {//看题选图
                             return _pageViewItemWidget(topics);
                           } else {//语音问答
                             return _voiceAnswerItem(topics);
diff --git a/lib/pages/practice/topic_type.dart b/lib/pages/practice/topic_type.dart
new file mode 100644
index 0000000..91ac9ac
--- /dev/null
+++ b/lib/pages/practice/topic_type.dart
@@ -0,0 +1,36 @@
+///练习（题型）类型
+enum TopicType {
+  ///听音选图
+  audioImageSelect,
+
+  ///听音选字
+  audioCharSelect,
+
+  ///看题选字
+  questionCharSelect,
+
+  ///看题选图
+  questionImageSelect,
+
+  ///语音问答
+  voiceQuestion
+}
+
+extension TopicTypeExtension on TopicType {
+  int get value {
+    switch (this) {
+      case TopicType.audioImageSelect:
+        return 1;
+      case TopicType.audioCharSelect:
+        return 2;
+      case TopicType.questionCharSelect:
+        return 3;
+      case TopicType.questionImageSelect:
+        return 4;
+      case TopicType.voiceQuestion:
+        return 5;
+      default:
+        throw ArgumentError('Unknown topic type');
+    }
+  }
+}
diff --git a/lib/pages/reading/bloc/reading_bloc.dart b/lib/pages/reading/bloc/reading_bloc.dart
index 6dc05d8..3012b82 100644
--- a/lib/pages/reading/bloc/reading_bloc.dart
+++ b/lib/pages/reading/bloc/reading_bloc.dart
@@ -6,11 +6,15 @@ 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/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<ReadingPageEvent, ReadingPageState> {
   }
 
   ///播放原音音频
-  Future<void> _playOriginalAudioInner(String? audioUrl) async {
+  void _playOriginalAudioInner(String? audioUrl) async {
     if (_isRecordAudioPlaying) {
       _isRecordAudioPlaying = false;
     }
@@ -219,7 +224,7 @@ class ReadingPageBloc extends Bloc<ReadingPageEvent, ReadingPageState> {
         "_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<ReadingPageEvent, ReadingPageState> {
   }
 
   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<ReadingPageEvent, ReadingPageState> {
 
   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<ReadingPageEvent, ReadingPageState> {
     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<ReadingPageEvent, ReadingPageState> {
       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<ReadingPageEvent, ReadingPageState> {
     _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;
+    });
+  }
+}
diff --git a/lib/pages/reading/bloc/reading_event.dart b/lib/pages/reading/bloc/reading_event.dart
index ccebd9a..9d4ae4d 100644
--- a/lib/pages/reading/bloc/reading_event.dart
+++ b/lib/pages/reading/bloc/reading_event.dart
@@ -1,7 +1,7 @@
 part of 'reading_bloc.dart';
 
 @immutable
-abstract class ReadingPageEvent {}
+abstract class ReadingPageEvent extends BaseSectionEvent {}
 
 ///页面初始化
 class InitBlocEvent extends ReadingPageEvent {}
diff --git a/lib/pages/reading/bloc/reading_state.dart b/lib/pages/reading/bloc/reading_state.dart
index dee9c28..d71ef2a 100644
--- a/lib/pages/reading/bloc/reading_state.dart
+++ b/lib/pages/reading/bloc/reading_state.dart
@@ -1,7 +1,7 @@
 part of 'reading_bloc.dart';
 
 @immutable
-abstract class ReadingPageState {}
+abstract class ReadingPageState extends BaseSectionState {}
 
 class ReadingPageInitial extends ReadingPageState {}
 
diff --git a/lib/pages/reading/reading_page.dart b/lib/pages/reading/reading_page.dart
index fcd0b55..5947b0d 100644
--- a/lib/pages/reading/reading_page.dart
+++ b/lib/pages/reading/reading_page.dart
@@ -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(),
                                 }
                             );
                           },
diff --git a/lib/pages/repeataftercontent/widgets/repeat_video_widget.dart b/lib/pages/repeataftercontent/widgets/repeat_video_widget.dart
index 9011c4b..3b9c9fa 100644
--- a/lib/pages/repeataftercontent/widgets/repeat_video_widget.dart
+++ b/lib/pages/repeataftercontent/widgets/repeat_video_widget.dart
@@ -140,13 +140,14 @@ class _RepeatVideoWidgetState extends State<RepeatVideoWidget> {
           :
       Container(
         color: Colors.white,
-        child: Text(
-          '视频加载中....',
-          style: TextStyle(
-              fontSize: 20.sp,
-              color: Colors.black
-          ),
-        ),
+        child: const CircularProgressIndicator(),
+        // Text(
+        //   '视频加载中....',
+        //   style: TextStyle(
+        //       fontSize: 20.sp,
+        //       color: Colors.black
+        //   ),
+        // ),
       ),
     );
   }
diff --git a/lib/pages/section/bloc/section_bloc.dart b/lib/pages/section/bloc/section_bloc.dart
index ef3b3f0..8f5c8e1 100644
--- a/lib/pages/section/bloc/section_bloc.dart
+++ b/lib/pages/section/bloc/section_bloc.dart
@@ -10,39 +10,55 @@ import 'package:wow_english/utils/toast_util.dart';
 
 import '../../../models/course_section_entity.dart';
 import '../../../models/course_unit_entity.dart';
+import '../../../utils/list_ext.dart';
 
 part 'section_event.dart';
 part 'section_state.dart';
 
 class SectionBloc extends Bloc<SectionEvent, SectionState> {
 
-  CourseUnitEntity _courseUnitEntity;
+  PageController _pageController;
 
-  CourseUnitEntity get courseUnitEntity => _courseUnitEntity;
+  PageController get pageController => _pageController;
 
-  CourseUnitDetail _courseUnitDetail;
+  ///当前页索引
+  int _currentPage = 0;
 
-  CourseUnitDetail get courseUnitDetail => _courseUnitDetail;
+  int get currentPage => _currentPage;
 
-  List<CourseSectionEntity>? _courseSectionDatas;
+  ScrollController _listController;
 
-  List<CourseSectionEntity>? get courseSectionDatas => _courseSectionDatas;
+  ScrollController get listController => _listController;
+
+  CourseUnitEntity _courseUnitEntity;
+
+  CourseUnitEntity get courseUnitEntity => _courseUnitEntity;
+
+  ///courseUnitId与课程环节列表的映射
+  final Map<int, List<CourseSectionEntity>?> _courseSectionDatasMap = {};
+
+  Map<int, List<CourseSectionEntity>?> get courseSectionDatasMap => _courseSectionDatasMap;
 
   CourseProcessEntity? _processEntity;
 
   CourseProcessEntity? get processEntity => _processEntity;
 
-  SectionBloc(this._courseUnitEntity, this._courseUnitDetail) : super(LessonInitial()) {
-    on<RequestDataEvent>(_requestData);
-    on<RequestExitClassEvent>(_requestExitClass);
+  SectionBloc(this._courseUnitEntity, this._currentPage,
+      this._pageController, this._listController)
+      : super(LessonInitial()) {
+    on<RequestDataEvent>(_requestSectionsData);
+    on<RequestEndClassEvent>(_requestEndClass);
     on<RequestEnterClassEvent>(_requestEnterClass);
     on<RequestVideoLessonEvent>(_requestVideoLesson);
+    on<CurrentUnitIndexChangeEvent>(_pageControllerChange);
   }
 
-  void _requestData(RequestDataEvent event, Emitter<SectionState> emitter) async {
+  void _requestSectionsData(
+      RequestDataEvent event, Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
-        _courseSectionDatas = await LessonDao.courseSection(courseUnitId: _courseUnitDetail.id!);
+        _courseSectionDatasMap[event.courseUnitId] =
+            await LessonDao.courseSection(courseUnitId: event.courseUnitId);
         emitter(LessonDataLoadState());
       });
     } catch (e) {
@@ -52,34 +68,156 @@ class SectionBloc extends Bloc<SectionEvent, SectionState> {
     }
   }
 
-  void _requestVideoLesson(RequestVideoLessonEvent event, Emitter<SectionState> emitter) async {
+  void _requestVideoLesson(
+      RequestVideoLessonEvent event, Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
         _processEntity = await ListenDao.process(event.courseLessonId);
-        emitter(RequestVideoLessonState(event.courseLessonId,event.courseType));
+        emitter(
+            RequestVideoLessonState(event.courseLessonId, event.courseType));
       });
     } catch (e) {
       if (e is ApiException) {
-        showToast(e.message??'请求失败,请检查网络连接');
+        showToast(e.message ?? '请求失败,请检查网络连接');
       }
     }
   }
 
-
-  void _requestEnterClass(RequestEnterClassEvent event,Emitter<SectionState> emitter) async {
+  void _requestEnterClass(
+      RequestEnterClassEvent event, Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
-         await ListenDao.enterClass(event.courseLessonId);
-         emitter(RequestEnterClassState(event.courseLessonId,event.courseType));
+        await ListenDao.enterClass(event.courseLessonId);
+        emitter(RequestEnterClassState(event.courseLessonId, event.courseType));
       });
     } catch (e) {
       if (e is ApiException) {
-        showToast(e.message??'请求失败,请检查网络连接');
+        showToast(e.message ?? '请求失败,请检查网络连接');
       }
     }
   }
 
-  void _requestExitClass(RequestExitClassEvent event,Emitter<SectionState> emitter) async {
-    await ListenDao.exitClass(event.courseLessonId,event.currentStep,event.currentTime);
+  void _requestEndClass(
+      RequestEndClassEvent event, Emitter<SectionState> emitter) async {
+    if (event.isCompleted) {
+      await await ListenDao.endClass(event.courseLessonId,
+          currentStep: event.currentStep,
+          currentTime: event.currentTime);
+    } else {
+      await await ListenDao.exitClass(event.courseLessonId,
+          currentStep: event.currentStep,
+          currentTime: event.currentTime);
+    }
+    if (event.autoNextSection) {
+      final nextCourseSection =
+          await getNextCourseSection(int.parse(event.courseLessonId));
+      if (nextCourseSection != null) {
+        ///进入课堂
+        add(RequestEnterClassEvent(nextCourseSection.id.toString(),
+            nextCourseSection.courseType));
+      }
+    }
+  }
+
+  void _pageControllerChange(
+      CurrentUnitIndexChangeEvent event, Emitter<SectionState> emitter) async {
+    _currentPage = event.unitIndex;
+    emitter(CurrentPageIndexState());
+  }
+
+  ///未锁定的页（单元）数
+  int unlockPageCount() {
+    return _courseUnitEntity.courseUnitVOList
+            ?.indexWhereOrNull((element) => element.lock == true) ??
+        1;
+  }
+
+  ///当前页的课程详情
+  CourseUnitDetail getCourseUnitDetail({int? pageIndex}) {
+    return _courseUnitEntity.courseUnitVOList![pageIndex ?? _currentPage];
+  }
+
+  ///根据courseLessonId查找对应的courseSection
+  CourseSectionEntity? findCourseSectionById(int courseLessonId) {
+    for (var entry in courseSectionDatasMap.entries) {
+      var sectionList = entry.value;
+      if (sectionList != null) {
+        for (var section in sectionList) {
+          if (section.id == courseLessonId) {
+            return section;
+          }
+        }
+      }
+    }
+    return null;
+  }
+
+  ///根据sortOrder查找对应的courseSection
+  CourseSectionEntity? findCourseSectionBySort(int sortOrder) {
+    for (var entry in courseSectionDatasMap.entries) {
+      var sectionList = entry.value;
+      if (sectionList != null) {
+        for (var section in sectionList) {
+          if (section.sortOrder == sortOrder) {
+            return section;
+          }
+        }
+      }
+    }
+    return null;
+  }
+
+  ///根据courseLessonId查找对应的CourseUnitDetail
+  CourseUnitDetail? findCourseUnitDetailById(int courseLessonId) {
+    final curCourseSectionEntity = findCourseSectionById(courseLessonId);
+    if (curCourseSectionEntity != null) {
+      final curCourseUnitDetail = _courseUnitEntity.courseUnitVOList?.firstWhere((element) =>
+        element.id == curCourseSectionEntity.courseUnitId);
+      return curCourseUnitDetail;
+    }
+    return null;
+  }
+
+  ///根据courseLessonId查找下一个courseSection
+  Future<CourseSectionEntity?> getNextCourseSection(int courseLessonId) async {
+    final curCourseSectionEntity = findCourseSectionById(courseLessonId);
+    final curSectionSort = curCourseSectionEntity?.sortOrder ?? 0;
+    final nextCourseSectionEntity = findCourseSectionBySort(curSectionSort + 1);
+    if (nextCourseSectionEntity != null) {
+      return nextCourseSectionEntity;
+    } else {
+      ///跨unit选lesson
+      final curCourseUnitDetail = findCourseUnitDetailById(courseLessonId);
+      if (curCourseUnitDetail != null) {
+        final nextCourseUnitDetail = _courseUnitEntity.courseUnitVOList
+            ?.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());
+            });
+            _pageController.nextPage(
+              duration: const Duration(milliseconds: 500),
+              curve: Curves.ease,
+            );
+            return _courseSectionDatasMap[courseUnitId]!.first;
+          } catch (e) {
+            if (e is ApiException) {
+              showToast(e.message.toString());
+            }
+            return null;
+          }
+        } else {
+          ///最后一个unit了
+          return null;
+        }
+      } else {
+        ///找不到对应的unitDetail，理论上不可能
+        return null;
+      }
+    }
   }
 }
diff --git a/lib/pages/section/bloc/section_event.dart b/lib/pages/section/bloc/section_event.dart
index cff955d..e9fa3ad 100644
--- a/lib/pages/section/bloc/section_event.dart
+++ b/lib/pages/section/bloc/section_event.dart
@@ -3,12 +3,17 @@ part of 'section_bloc.dart';
 @immutable
 abstract class SectionEvent {}
 
-class RequestDataEvent extends SectionEvent {}
+class RequestDataEvent extends SectionEvent {
+  final int courseUnitId;
+
+  RequestDataEvent(this.courseUnitId);
+}
 
 ///获取视频课程内容
 class RequestVideoLessonEvent extends SectionEvent {
   final String courseLessonId;
   final int courseType;
+
   RequestVideoLessonEvent(this.courseLessonId, this.courseType);
 }
 
@@ -16,13 +21,35 @@ class RequestVideoLessonEvent extends SectionEvent {
 class RequestEnterClassEvent extends SectionEvent {
   final String courseLessonId;
   final int courseType;
-  RequestEnterClassEvent(this.courseLessonId,this.courseType);
+
+  RequestEnterClassEvent(this.courseLessonId, this.courseType);
 }
 
-///退出课堂
-class RequestExitClassEvent extends SectionEvent {
+///结束课堂
+class RequestEndClassEvent extends SectionEvent {
   final String courseLessonId;
-  final String currentStep;
-  final String currentTime;
-  RequestExitClassEvent(this.courseLessonId,this.currentStep,this.currentTime);
+
+  ///当前进展（进度类，比如练习、绘本）
+  final int? currentStep;
+
+  ///当前时间（进度类，比如音视频）
+  final int? currentTime;
+
+  ///课程环节是否完成（决定调结束接口还是退出接口）
+  final bool isCompleted;
+
+  ///自动进入下一环节
+  final bool autoNextSection;
+
+  RequestEndClassEvent(this.courseLessonId, isCompleted,
+      {this.currentStep, this.currentTime, autoNextSection})
+      : isCompleted = isCompleted ?? false,
+        autoNextSection = autoNextSection ?? false;
+}
+
+///页面切换
+class CurrentUnitIndexChangeEvent extends SectionEvent {
+  final int unitIndex;
+
+  CurrentUnitIndexChangeEvent(this.unitIndex);
 }
diff --git a/lib/pages/section/bloc/section_state.dart b/lib/pages/section/bloc/section_state.dart
index 9c50452..47aec56 100644
--- a/lib/pages/section/bloc/section_state.dart
+++ b/lib/pages/section/bloc/section_state.dart
@@ -10,11 +10,15 @@ class LessonDataLoadState extends SectionState {}
 class RequestVideoLessonState extends SectionState {
   final String courseLessonId;
   final int type;
-  RequestVideoLessonState(this.courseLessonId,this.type);
+
+  RequestVideoLessonState(this.courseLessonId, this.type);
 }
 
-class RequestEnterClassState extends SectionState{
+class RequestEnterClassState extends SectionState {
   final String courseLessonId;
   final int courseType;
-  RequestEnterClassState(this.courseLessonId,this.courseType);
+
+  RequestEnterClassState(this.courseLessonId, this.courseType);
 }
+
+class CurrentPageIndexState extends SectionState {}
diff --git a/lib/pages/section/section_page.dart b/lib/pages/section/section_page.dart
index 3bb055c..78fc39f 100644
--- a/lib/pages/section/section_page.dart
+++ b/lib/pages/section/section_page.dart
@@ -1,9 +1,12 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:nested_scroll_views/material.dart';
 import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/models/course_unit_entity.dart';
+import 'package:wow_english/pages/section/section_type.dart';
 import 'package:wow_english/pages/section/widgets/home_video_item.dart';
 import 'package:wow_english/pages/section/widgets/section_bouns_item.dart';
 import 'package:wow_english/pages/section/widgets/section_header_widget.dart';
@@ -16,17 +19,22 @@ import 'courese_module_model.dart';
 
 /// 环节列表页
 class SectionPage extends StatelessWidget {
-  const SectionPage({super.key, required this.courseUnitEntity, required this.courseUnitDetail});
+  const SectionPage(
+      {super.key, required this.courseUnitEntity, required this.courseUnitId});
 
   final CourseUnitEntity courseUnitEntity;
 
   /// unitId
-  final CourseUnitDetail courseUnitDetail;
+  final int courseUnitId;
 
   @override
   Widget build(BuildContext context) {
+    int initialPage = courseUnitEntity.courseUnitVOList
+            ?.indexWhere((element) => element.id == courseUnitId) ??
+        0;
     return BlocProvider(
-      create: (context) => SectionBloc(courseUnitEntity, courseUnitDetail)..add(RequestDataEvent()),
+      create: (context) => SectionBloc(courseUnitEntity, initialPage,
+          PageController(initialPage: initialPage), ScrollController()),
       child: _SectionPageView(context),
     );
   }
@@ -45,15 +53,15 @@ class _SectionPageView extends StatelessWidget {
         if (state is RequestVideoLessonState) {
           final videoUrl = bloc.processEntity?.videos?.videoUrl ?? '';
           var title = '';
-          if (state.type == 1) {
+          if (state.type == SectionType.song.value) {
             title = 'song';
           }
 
-          if (state.type == 2) {
+          if (state.type == SectionType.video.value) {
             title = 'video';
           }
 
-          if (state.type == 5) {
+          if (state.type == SectionType.bouns.value) {
             title = 'bonus';
           }
 
@@ -63,22 +71,23 @@ class _SectionPageView extends StatelessWidget {
           pushNamed(AppRouteName.lookVideo, arguments: {
             'videoUrl': videoUrl,
             'title': title,
-            'courseLessonId': state.courseLessonId
+            'courseLessonId': state.courseLessonId,
+            'isTopic': true
           }).then((value) {
             if (value != null) {
-              Map<String, String> dataMap = value as Map<String, String>;
-              bloc.add(RequestExitClassEvent(
-                dataMap['courseLessonId']!,
-                '0',
-                dataMap['currentTime']!,
-              ));
+              Map<String, dynamic> dataMap = value as Map<String, dynamic>;
+              bloc.add(RequestEndClassEvent(
+                  dataMap['courseLessonId']!, dataMap['isCompleted'],
+                  currentTime: dataMap['currentTime'],
+                  autoNextSection: dataMap['nextSection']));
             }
           });
           return;
         }
 
         if (state is RequestEnterClassState) {
-          if (state.courseType != 3 && state.courseType != 4) {
+          if (state.courseType != SectionType.practice.value &&
+              state.courseType != SectionType.pictureBook.value) {
             ///视频类型
             ///获取视频课程内容
             bloc.add(RequestVideoLessonEvent(
@@ -86,40 +95,46 @@ class _SectionPageView extends StatelessWidget {
             return;
           }
 
-          if (state.courseType == 4) {
+          if (state.courseType == SectionType.pictureBook.value) {
             //绘本
             pushNamed(AppRouteName.reading,
                     arguments: {'courseLessonId': state.courseLessonId})
                 .then((value) {
               if (value != null) {
-                Map<String, String> dataMap = value as Map<String, String>;
-                bloc.add(RequestExitClassEvent(
-                    dataMap['courseLessonId']!, dataMap['currentStep']!, '0'));
+                Map<String, dynamic> dataMap = value as Map<String, dynamic>;
+                bloc.add(RequestEndClassEvent(
+                  dataMap['courseLessonId']!,
+                  dataMap['isCompleted'],
+                  currentStep: dataMap['currentStep'],
+                  autoNextSection: dataMap['nextSection'],
+                ));
               }
             });
             return;
           }
 
-          if (state.courseType == 3) {
+          if (state.courseType == SectionType.practice.value) {
             //练习
             pushNamed(AppRouteName.topicPic,
                     arguments: {'courseLessonId': state.courseLessonId})
                 .then((value) {
               if (value != null) {
-                Map<String, String> dataMap = value as Map<String, String>;
-                bloc.add(RequestExitClassEvent(
-                    dataMap['courseLessonId']!, dataMap['currentStep']!, '0'));
+                Map<String, dynamic> dataMap = value as Map<String, dynamic>;
+                bloc.add(RequestEndClassEvent(
+                    dataMap['courseLessonId']!, dataMap['isCompleted'],
+                    currentStep: dataMap['currentStep'],
+                    autoNextSection: dataMap['nextSection']));
               }
             });
             return;
           }
         }
       },
-      child: _homeView(),
+      child: _sectionView(),
     );
   }
 
-  Widget _homeView() =>
+  Widget _sectionView() =>
       BlocBuilder<SectionBloc, SectionState>(builder: (context, state) {
         final bloc = BlocProvider.of<SectionBloc>(context);
         return Scaffold(
@@ -130,99 +145,71 @@ class _SectionPageView extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   SectionHeaderWidget(
-                      title: bloc.courseUnitDetail.name,
+                      title: bloc.getCourseUnitDetail().name,
                       courseModuleCode: bloc.courseUnitEntity.courseModuleCode),
                   Expanded(
-                      child: ListView.builder(
-                          itemCount: bloc.courseSectionDatas?.length ?? 0,
-                          scrollDirection: Axis.horizontal,
-                          itemBuilder: (BuildContext context, int index) {
-                            CourseSectionEntity sectionData =
-                                bloc.courseSectionDatas![index];
-                            if (sectionData.courseType == 5) {
-                              //彩蛋
-                              return GestureDetector(
-                                onTap: () {
-                                  if (!UserUtil.isLogined()) {
-                                    pushNamed(AppRouteName.login);
-                                    return;
-                                  }
-                                  if (sectionData.lock == true) {
-                                    showToast('当前课程暂未解锁');
-                                    return;
-                                  }
-
-                                  ///进入课堂
-                                  bloc.add(RequestEnterClassEvent(
-                                      sectionData.id.toString(), sectionData.courseType));
-                                },
-                                child: SectionBoundsItem(
-                                  imageUrl: sectionData.coverUrl,
-                                ),
-                              );
-                            } else {
-                              return GestureDetector(
-                                onTap: () {
-                                  if (!UserUtil.isLogined()) {
-                                    pushNamed(AppRouteName.login);
-                                    return;
-                                  }
-                                  if (sectionData.lock == true) {
-                                    showToast('当前课程暂未解锁');
-                                    return;
-                                  }
-
-                                  ///进入课堂
-                                  bloc.add(RequestEnterClassEvent(
-                                      sectionData.id.toString(), sectionData.courseType));
-                                },
-                                child: SectionVideoItem(
-                                  unitEntity: bloc.courseUnitEntity,
-                                  lessons: sectionData,
-                                ),
-                              );
-                            }
-                          })),
-                  // SafeArea(
-                  //   child: Padding(
-                  //     padding: EdgeInsets.symmetric(horizontal: 13.w),
-                  //     child: Row(
-                  //       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  //       children: [
-                  //         SizedBox(
-                  //           height: 47.h,
-                  //           width: 80.w,
-                  //         ),
-                  //         Container(
-                  //           decoration: BoxDecoration(
-                  //             color: CourseModuleModel(
-                  //                     bloc.courseUnitEntity.courseModuleCode ??
-                  //                         'Phase-1')
-                  //                 .color,
-                  //             borderRadius: BorderRadius.circular(14.5.r),
-                  //           ),
-                  //           padding: EdgeInsets.symmetric(
-                  //               vertical: 8.h, horizontal: 24.w),
-                  //           child: Text(
-                  //             '${(bloc.courseUnitEntity.nowStep ?? 0)}/${bloc.courseUnitEntity.total ?? 0}',
-                  //             style: TextStyle(
-                  //                 color: Colors.white, fontSize: 12.sp),
-                  //           ),
-                  //         ),
-                  //         Image.asset(
-                  //           CourseModuleModel(
-                  //                   bloc.courseUnitEntity.courseModuleCode ??
-                  //                       'Phase-1')
-                  //               .courseModuleLogo
-                  //               .assetPng,
-                  //           height: 47.h,
-                  //           width: 80.w,
-                  //           // color: Colors.red,
-                  //         ),
-                  //       ],
-                  //     ),
-                  //   ),
-                  // )
+                      child: Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 10.w),
+                    child: OverflowBox(
+                      child: NestedPageView.builder(
+                          itemCount: bloc.unlockPageCount(),
+                          controller: bloc.pageController,
+                          onPageChanged: (int index) {
+                            bloc.add(CurrentUnitIndexChangeEvent(index));
+                          },
+                          itemBuilder: (context, index) {
+                            return ScrollConfiguration(
+                              ///去掉 Android 上默认的边缘拖拽效果
+                              behavior: ScrollConfiguration.of(context)
+                                  .copyWith(overscroll: false),
+                              child: _itemTransCard(
+                                  bloc.getCourseUnitDetail(pageIndex: index),
+                                  index,
+                                  context),
+                            );
+                          }),
+                    ), // 设置外部padding,
+                  )),
+                  SafeArea(
+                    child: Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 13.w),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          SizedBox(
+                            height: 47.h,
+                            width: 80.w,
+                          ),
+                          Container(
+                            decoration: BoxDecoration(
+                              color: CourseModuleModel(
+                                      bloc.courseUnitEntity.courseModuleCode ??
+                                          'Phase-1')
+                                  .color,
+                              borderRadius: BorderRadius.circular(14.5.r),
+                            ),
+                            padding: EdgeInsets.symmetric(
+                                vertical: 8.h, horizontal: 24.w),
+                            child: Text(
+                              '${bloc.currentPage + 1}/${bloc.unlockPageCount()}',
+                              style: TextStyle(
+                                  color: Colors.white, fontSize: 12.sp),
+                            ),
+                          ),
+                          Image.asset(
+                            CourseModuleModel(
+                                    bloc.courseUnitEntity.courseModuleCode ??
+                                        'Phase-1')
+                                .courseModuleLogo
+                                .assetPng,
+                            height: 47.h,
+                            width: 80.w,
+                            // color: Colors.red,
+                          ),
+                        ],
+                      ),
+                    ),
+                  )
                 ],
               ),
             ),
@@ -230,3 +217,81 @@ class _SectionPageView extends StatelessWidget {
         );
       });
 }
+
+Widget _itemTransCard(
+    CourseUnitDetail courseUnitDetail, int pageIndex, BuildContext context) {
+  final bloc = BlocProvider.of<SectionBloc>(context);
+  List<CourseSectionEntity>? courseSectionEntities =
+      bloc.courseSectionDatasMap[courseUnitDetail.id];
+  if (courseSectionEntities == null) {
+    bloc.add(RequestDataEvent(courseUnitDetail.id!));
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          const Text(
+            '暂无数据',
+            style: TextStyle(fontSize: 24.0),
+          ),
+          const SizedBox(height: 16.0),
+          // 间距
+          CircularProgressIndicator(
+              color: CourseModuleModel(
+                      bloc.courseUnitEntity.courseModuleCode ?? 'Phase-1')
+                  .color),
+          // 加载动画
+        ],
+      ),
+    );
+  } else {
+    return NestedListView.builder(
+        itemCount: bloc.courseSectionDatasMap[courseUnitDetail.id]?.length ?? 0,
+        scrollDirection: Axis.horizontal,
+        itemBuilder: (BuildContext context, int index) {
+          CourseSectionEntity sectionData = courseSectionEntities[index];
+          if (sectionData.courseType == SectionType.bouns.value) {
+            //彩蛋
+            return GestureDetector(
+              onTap: () {
+                if (!UserUtil.isLogined()) {
+                  pushNamed(AppRouteName.login);
+                  return;
+                }
+                if (sectionData.lock == true) {
+                  showToast('当前课程暂未解锁');
+                  return;
+                }
+
+                ///进入课堂
+                bloc.add(RequestEnterClassEvent(
+                    sectionData.id.toString(), sectionData.courseType));
+              },
+              child: SectionBoundsItem(
+                imageUrl: sectionData.coverUrl,
+              ),
+            );
+          } else {
+            return GestureDetector(
+              onTap: () {
+                if (!UserUtil.isLogined()) {
+                  pushNamed(AppRouteName.login);
+                  return;
+                }
+                if (sectionData.lock == true) {
+                  showToast('当前课程暂未解锁');
+                  return;
+                }
+
+                ///进入课堂
+                bloc.add(RequestEnterClassEvent(
+                    sectionData.id.toString(), sectionData.courseType));
+              },
+              child: SectionVideoItem(
+                unitEntity: bloc.courseUnitEntity,
+                lessons: sectionData,
+              ),
+            );
+          }
+        });
+  }
+}
diff --git a/lib/pages/section/section_type.dart b/lib/pages/section/section_type.dart
new file mode 100644
index 0000000..48c375e
--- /dev/null
+++ b/lib/pages/section/section_type.dart
@@ -0,0 +1,36 @@
+///环节类型
+enum SectionType {
+  ///儿歌
+  song,
+
+  ///视频
+  video,
+
+  ///练习
+  practice,
+
+  ///绘本
+  pictureBook,
+
+  ///彩蛋
+  bouns
+}
+
+extension SectionTypeExtension on SectionType {
+  int get value {
+    switch (this) {
+      case SectionType.song:
+        return 1;
+      case SectionType.video:
+        return 2;
+      case SectionType.practice:
+        return 3;
+      case SectionType.pictureBook:
+        return 4;
+      case SectionType.bouns:
+        return 5;
+      default:
+        throw ArgumentError('Unknown section type');
+    }
+  }
+}
diff --git a/lib/pages/section/subsection/base_section/bloc.dart b/lib/pages/section/subsection/base_section/bloc.dart
new file mode 100644
index 0000000..99bbba5
--- /dev/null
+++ b/lib/pages/section/subsection/base_section/bloc.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+
+import '../../../../route/route.dart';
+import 'event.dart';
+import 'state.dart';
+
+abstract class BaseSectionBloc<E extends BaseSectionEvent,
+    S extends BaseSectionState> extends Bloc<E, S> {
+  BaseSectionBloc(super.initialState);
+
+  bool isCompleteDialogShow = false;
+
+  ///这里可以定义一些通用的逻辑
+  void sectionComplete(final VoidCallback? nextSectionTap,
+      {VoidCallback? againSectionTap, BuildContext? context}) {
+    // 逻辑来标记步骤为已完成
+    // 比如更新状态
+    if (isCompleteDialogShow) {
+      return;
+    }
+    isCompleteDialogShow = true;
+    showDialog(
+      context: context ?? AppRouter.context,
+      barrierDismissible: false,
+      barrierColor: Colors.black54,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          backgroundColor: Colors.transparent,
+          content: SizedBox(
+            width: double.infinity, // 宽度设置为无限，使其尽可能铺满屏幕
+            height: MediaQuery.of(context).size.height * 0.6, // 高度设置为屏幕高度的60%
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween, // 图片之间分配空间
+              children: <Widget>[
+                Expanded(
+                  flex: 1,
+                  child: GestureDetector(
+                    onTap: () {
+                      popPage();
+                      againSectionTap!();
+                    },
+                    child: Image.asset('section_finish_again'.assetPng),
+                  ),
+                ),
+                Expanded(
+                  flex: 2,
+                  child: Image.asset('section_finish_steve'.assetPng),
+                ),
+                Expanded(
+                  flex: 1,
+                  child: GestureDetector(
+                    onTap: () {
+                      popPage();
+                      nextSectionTap!();
+                    },
+                    child: Image.asset('section_finish_next'.assetPng),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    ).then((value) => isCompleteDialogShow = false);
+  }
+}
diff --git a/lib/pages/section/subsection/base_section/event.dart b/lib/pages/section/subsection/base_section/event.dart
new file mode 100644
index 0000000..d864bb2
--- /dev/null
+++ b/lib/pages/section/subsection/base_section/event.dart
@@ -0,0 +1,10 @@
+abstract class BaseSectionEvent {}
+
+///环节完成（结束）
+class SectionCompleted extends BaseSectionEvent {}
+
+///环节再来一次
+class SectionAgainEvent extends BaseSectionEvent {}
+
+///下一个环节
+class SectionNextEvent extends BaseSectionEvent {}
\ No newline at end of file
diff --git a/lib/pages/section/subsection/base_section/state.dart b/lib/pages/section/subsection/base_section/state.dart
new file mode 100644
index 0000000..4ef4a6e
--- /dev/null
+++ b/lib/pages/section/subsection/base_section/state.dart
@@ -0,0 +1,7 @@
+abstract class BaseSectionState {}
+
+///环节完成事件
+class SectionCompletedState extends BaseSectionState {}
+
+///环节再来一次事件
+class SectionAgainState extends BaseSectionState {}
diff --git a/lib/pages/unit/view.dart b/lib/pages/unit/view.dart
index f61d56b..fc6971c 100644
--- a/lib/pages/unit/view.dart
+++ b/lib/pages/unit/view.dart
@@ -64,7 +64,7 @@ class UnitPage extends StatelessWidget {
                                 pushNamed(AppRouteName.courseSection,
                                     arguments: {
                                       'courseUnitEntity': bloc.unitData,
-                                      'courseUnitDetail': data
+                                      'courseUnitId': data.id
                                     });
                               },
                               child: CourseUnitItem(
diff --git a/lib/pages/video/lookvideo/bloc/look_video_bloc.dart b/lib/pages/video/lookvideo/bloc/look_video_bloc.dart
index 9c10502..882c666 100644
--- a/lib/pages/video/lookvideo/bloc/look_video_bloc.dart
+++ b/lib/pages/video/lookvideo/bloc/look_video_bloc.dart
@@ -1,17 +1,32 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:video_player/video_player.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';
 
 part 'look_video_event.dart';
 part 'look_video_state.dart';
 
-class LookVideoBloc extends Bloc<LookVideoEvent, LookVideoState> {
+class LookVideoBloc extends BaseSectionBloc<BaseSectionEvent, BaseSectionState> {
 
   VideoPlayerController? _controller;
 
-  LookVideoBloc() : super(LookVideoInitial()) {
+  final String? _videoUrl;
+  String? get videoUrl => _videoUrl;
+  final String? _typeTitle;
+  String? get typeTitle => _typeTitle;
+  final String? _courseLessonId;
+  String? get courseLessonId => _courseLessonId;
+  final bool _isTopic;
+  bool get isTopic => _isTopic;
+
+  LookVideoBloc(this._videoUrl, this._typeTitle, this._courseLessonId, this._isTopic) : super(LookVideoInitial()) {
     on<LookVideoEvent>((event, emit) {
       // TODO: implement event handler
     });
+    on<SectionAgainEvent>((event, emit) {
+      emit(SectionAgainState());
+    });
   }
 }
diff --git a/lib/pages/video/lookvideo/bloc/look_video_event.dart b/lib/pages/video/lookvideo/bloc/look_video_event.dart
index 95bd813..d4759e2 100644
--- a/lib/pages/video/lookvideo/bloc/look_video_event.dart
+++ b/lib/pages/video/lookvideo/bloc/look_video_event.dart
@@ -1,4 +1,6 @@
 part of 'look_video_bloc.dart';
 
 @immutable
-abstract class LookVideoEvent {}
+abstract class LookVideoEvent extends BaseSectionEvent {}
+
+class RestartVideoEvent extends LookVideoEvent {}
diff --git a/lib/pages/video/lookvideo/bloc/look_video_state.dart b/lib/pages/video/lookvideo/bloc/look_video_state.dart
index 9d7102f..cf00985 100644
--- a/lib/pages/video/lookvideo/bloc/look_video_state.dart
+++ b/lib/pages/video/lookvideo/bloc/look_video_state.dart
@@ -1,7 +1,7 @@
 part of 'look_video_bloc.dart';
 
 @immutable
-abstract class LookVideoState {}
+abstract class LookVideoState extends BaseSectionState {}
 
 class LookVideoInitial extends LookVideoState {}
 
diff --git a/lib/pages/video/lookvideo/look_video_page.dart b/lib/pages/video/lookvideo/look_video_page.dart
index b535aa7..3575336 100644
--- a/lib/pages/video/lookvideo/look_video_page.dart
+++ b/lib/pages/video/lookvideo/look_video_page.dart
@@ -1,29 +1,39 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+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';
 
-class LookVideoPage extends StatefulWidget {
-  const LookVideoPage({super.key, this.videoUrl, this.typeTitle, this.courseLessonId});
+class LookVideoPage extends StatelessWidget {
+  const LookVideoPage(
+      {super.key, this.videoUrl, this.typeTitle, this.courseLessonId, this.isTopic = false});
 
   final String? videoUrl;
   final String? typeTitle;
   final String? courseLessonId;
+  final bool isTopic;
 
   @override
-  State<StatefulWidget> createState() {
-    return _LookVideoPageState();
-  }
-}
-
-class _LookVideoPageState extends State<LookVideoPage> {
-  @override
   Widget build(BuildContext context) {
-    return  Container(
-      color: Colors.white,
-      child: VideoWidget(
-        videoUrl: widget.videoUrl??'',
-        typeTitle: widget.typeTitle,
-        courseLessonId: widget.courseLessonId??'',
-      ),
+    return BlocProvider(
+      create: (BuildContext context) => LookVideoBloc(videoUrl, typeTitle, courseLessonId, isTopic),
+      child: Builder(builder: (context) => _buildPage(context)),
     );
   }
-}
\ No newline at end of file
+}
+
+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,
+          )
+      );
+    }
+  );
+}
diff --git a/lib/pages/video/lookvideo/widgets/video_widget.dart b/lib/pages/video/lookvideo/widgets/video_widget.dart
index 11d2cd3..2a88449 100644
--- a/lib/pages/video/lookvideo/widgets/video_widget.dart
+++ b/lib/pages/video/lookvideo/widgets/video_widget.dart
@@ -1,18 +1,27 @@
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:video_player/video_player.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/pages/video/lookvideo/bloc/look_video_bloc.dart';
 import 'package:wow_english/route/route.dart';
 
+import '../../../section/subsection/base_section/event.dart';
+import '../../../section/subsection/base_section/state.dart';
 import 'video_opera_widget.dart';
 
 class VideoWidget extends StatefulWidget {
-  const VideoWidget({super.key, this.videoUrl = '',this.typeTitle, this.courseLessonId = ''});
+  const VideoWidget({super.key,
+    this.videoUrl = '',
+    this.typeTitle,
+    this.courseLessonId = '',
+    this.isTopic = false});
 
   final String videoUrl;
   final String? typeTitle;
   final String courseLessonId;
+  final bool isTopic;
 
   @override
   State<StatefulWidget> createState() {
@@ -30,39 +39,62 @@ class _VideoWidgetState extends State<VideoWidget> {
 
   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";
   }
 
   void _addListener() {
     _controller!.addListener(() {
-      if(_controller!.value.isInitialized) {
+      if (_controller!.value.isInitialized) {
         if (_controller!.value.isPlaying) {
           setState(() {
-            double currentSecond = (_controller!.value.position.inMinutes.remainder(60)*60+_controller!.value.position.inSeconds.remainder(60)).toDouble();
-            int totalSecond = _controller!.value.duration.inMinutes.remainder(60)*60+_controller!.value.duration.inSeconds.remainder(60);
+            double currentSecond = getCurrentPositionSeconds().toDouble();
+            int totalSecond =
+                _controller!.value.duration.inMinutes.remainder(60) * 60 +
+                    _controller!.value.duration.inSeconds.remainder(60);
             _currentTime = formatDuration(_controller!.value.position);
-            _playDegree = currentSecond/totalSecond;
+            _playDegree = currentSecond / totalSecond;
             if (_playDegree > 1.0) {
               _playDegree = 1.0;
             }
-            if(_playDegree < 0) {
+            if (_playDegree < 0) {
               _playDegree = 0.0;
             }
           });
+        } else if (widget.isTopic &&
+            //受限于video_player库没有唯一的播放完成状态标识，发现isBuffering=false的时候暂时是安全唯一的
+            _controller?.value.isBuffering == false &&
+            _controller!.value.isCompleted &&
+            _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);
         }
       }
     });
   }
 
   //开始倒计时
-  void startTimer()  {
-    if(timerUtil == null) {
-      timerUtil =  TimerUtil(mInterval: 1000,mTotalTime: 1000*10);
+  void startTimer() {
+    if (timerUtil == null) {
+      timerUtil = TimerUtil(mInterval: 1000, mTotalTime: 1000 * 10);
       timerUtil!.setOnTimerTickCallback((int tick) {
         double currentTick = tick / 1000;
-        if (currentTick.toInt() == 0) {//倒计时结束
+        if (currentTick.toInt() == 0) {
+          //倒计时结束
           setState(() {
             _hiddenTipView = true;
           });
@@ -89,8 +121,10 @@ class _VideoWidgetState extends State<VideoWidget> {
           popPage();
           return;
         }
-        String currentTime = (_controller!.value.position.inMinutes.remainder(60)*60+_controller!.value.position.inSeconds.remainder(60)).toString();
-        popPage(data:{'courseLessonId':widget.courseLessonId,'currentTime':currentTime});
+        popPage(data: {
+          'courseLessonId': widget.courseLessonId,
+          'currentTime': getCurrentPositionSeconds(),
+        });
       }
     } else if (type == OperationType.playState) {
       if (_controller!.value.isPlaying) {
@@ -98,9 +132,7 @@ class _VideoWidgetState extends State<VideoWidget> {
       } else {
         _controller!.play();
       }
-      setState(() {
-
-      });
+      setState(() {});
     }
   }
 
@@ -109,12 +141,12 @@ class _VideoWidgetState extends State<VideoWidget> {
     super.initState();
     Uri uri = Uri.parse(widget.videoUrl);
     _controller = VideoPlayerController.networkUrl(uri)
-      ..initialize().then((_){
+      ..initialize().then((_) {
         startTimer();
         setState(() {
           _currentTime = formatDuration(_controller!.value.position);
           _totalTime = formatDuration(_controller!.value.duration);
-          _controller!.setLooping(true);
+          _controller!.setLooping(!widget.isTopic);
           _controller!.setVolume(100);
           _controller!.play();
         });
@@ -124,83 +156,95 @@ class _VideoWidgetState extends State<VideoWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        setState(() {
-          _hiddenTipView = !_hiddenTipView;
-          if(!_hiddenTipView) {
-            startTimer();
-          } else {
-            if (timerUtil!.isActive()) {
-              cancelTimer();
-            }
-          }
-        });
+    return BlocListener<LookVideoBloc, BaseSectionState>(
+      listener: (context, state) async {
+        if (state is SectionAgainState) {
+          await _controller?.seekTo(Duration.zero);
+          _controller?.play();
+        }
       },
-      onDoubleTap: () {
-        if(_controller!.value.isInitialized) {
-          if (_controller!.value.isPlaying) {
-            _controller!.pause();
-          } else {
-            _controller!.play();
-          }
+      child: GestureDetector(
+        onTap: () {
           setState(() {
-
+            _hiddenTipView = !_hiddenTipView;
+            if (!_hiddenTipView) {
+              startTimer();
+            } else {
+              if (timerUtil!.isActive()) {
+                cancelTimer();
+              }
+            }
           });
-        }
-      },
-      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));
-                },
+        },
+        onDoubleTap: () {
+          if (_controller!.value.isInitialized) {
+            if (_controller!.value.isPlaying) {
+              _controller!.pause();
+            } else {
+              _controller!.play();
+            }
+            setState(() {});
+          }
+        },
+        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: _controller!.value.isPlaying,
-              child: IconButton(
-                onPressed: () {
-                  _controller!.play();
-                },
-                icon: Image.asset(
-                  'video_stop'.assetPng,
-                  width: 70.w,
-                  height: 70.h,
+              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));
+                  },
                 ),
               ),
-            )
-          ],
-        ): Container(
-          color: Colors.white,
-          child: Text(
-            '视频加载中....',
-            style: TextStyle(
-              fontSize: 20.sp,
-              color: Colors.black
-            ),
+              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),
+            // ),
           ),
         ),
       ),
@@ -217,4 +261,10 @@ class _VideoWidgetState extends State<VideoWidget> {
     }
     super.dispose();
   }
+
+  ///获取当前进度秒数
+  int getCurrentPositionSeconds() {
+    return (_controller!.value.position.inMinutes.remainder(60) * 60 +
+        _controller!.value.position.inSeconds.remainder(60));
+  }
 }
diff --git a/lib/route/route.dart b/lib/route/route.dart
index 49020a9..eecdf7f 100644
--- a/lib/route/route.dart
+++ b/lib/route/route.dart
@@ -126,17 +126,17 @@ class AppRouter {
             builder: (_) => UnitPage(courseModuleEntity: courseModuleEntity));
       case AppRouteName.courseSection:
         CourseUnitEntity courseUnitEntity = CourseUnitEntity();
-        CourseUnitDetail courseUnitDetail = CourseUnitDetail();
+        int courseUnitDetail = 0;
         if (settings.arguments != null) {
           courseUnitEntity = (settings.arguments as Map)
               .getOrNull('courseUnitEntity') as CourseUnitEntity;
           courseUnitDetail = (settings.arguments as Map)
-              .getOrNull('courseUnitDetail') as CourseUnitDetail;
+              .getOrNull('courseUnitId');
         }
         return CupertinoPageRoute(
             builder: (_) => SectionPage(
                 courseUnitEntity: courseUnitEntity,
-                courseUnitDetail: courseUnitDetail));
+                courseUnitId: courseUnitDetail));
       case AppRouteName.listen:
         return CupertinoPageRoute(builder: (_) => const ListenPage());
       case AppRouteName.shop:
@@ -190,11 +190,14 @@ class AppRouter {
         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;
         return CupertinoPageRoute(
             builder: (_) => LookVideoPage(
                   videoUrl: videoUrl,
                   typeTitle: title,
                   courseLessonId: courseLessonId,
+                  isTopic: isTopic,
                 ));
       /*case AppRouteName.setPwd:
       case AppRouteName.setPwd:
diff --git a/lib/utils/date_util.dart b/lib/utils/date_util.dart
new file mode 100644
index 0000000..ec4a00d
--- /dev/null
+++ b/lib/utils/date_util.dart
@@ -0,0 +1,14 @@
+
+///获取当前时间（单位：秒）
+int getTimestampOfSecond() {
+  // 获取当前时间
+  DateTime now = DateTime.now();
+
+  // 获取自Unix纪元以来的毫秒数
+  int milliseconds = now.millisecondsSinceEpoch;
+
+  // 将毫秒数转换为秒
+  int seconds = milliseconds ~/ 1000;
+
+  return seconds;
+}
\ No newline at end of file
diff --git a/lib/utils/list_ext.dart b/lib/utils/list_ext.dart
new file mode 100644
index 0000000..c7ac32a
--- /dev/null
+++ b/lib/utils/list_ext.dart
@@ -0,0 +1,11 @@
+
+
+extension ListExtension<E> on List<E> {
+  /// 获取数组中第一个匹配元素的index，没有就返回null
+  int? indexWhereOrNull(bool Function(E element) test) {
+    for (int i = 0; i < length; i++) {
+      if (test(this[i])) return i;
+    }
+    return null;
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index bff08ce..feead5e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,10 +16,11 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.3+3
+version: 1.0.4+4
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.2.0 <4.0.0'
+  flutter: '>=3.16.0'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -90,7 +91,7 @@ dependencies:
   # 富文本插件 https://pub.dev/packages/extended_text
   extended_text: ^11.0.1
   # 视频播放 https://pub.dev/packages/video_player
-  video_player: ^2.7.0
+  video_player: ^2.8.6
   # UI适配 https://pub.dev/packages/responsive_framework
   responsive_framework: ^1.0.0
   # 音频播放 https://pub.dev/packages/audioplayers
@@ -111,6 +112,8 @@ dependencies:
   umeng_common_sdk: ^1.2.7
   # 友盟APM https://pub-web.flutter-io.cn/packages/umeng_apm_sdk
   umeng_apm_sdk: ^2.2.1
+  # 嵌套滚动 https://pub.dev/packages/nested_scroll_views
+  nested_scroll_views: ^0.0.10
 
 dev_dependencies:
   build_runner: ^2.4.4