Merge remote-tracking branch 'origin/feat-wqf-payment' into xiaoyu_cocossteve

# Conflicts: # pubspec.yaml

Merge remote-tracking branch 'origin/feat-wqf-payment' into xiaoyu_cocossteve
# Conflicts: # pubspec.yaml
xiaoyu
2 parents 22495953 911794fd
Showing 53 changed files with 1270 additions and 469 deletions
lib/app/splash_page.dart
lib/common/core/app_config_helper.dart
lib/common/core/user_util.dart
lib/common/permission/permissionRequestPage.dart
lib/common/request/apis.dart
lib/common/request/dao/home_dao.dart → lib/common/request/dao/lesson_dao.dart
lib/common/request/dao/system_dao.dart
lib/common/request/token_interceptor.dart
lib/common/widgets/webview_dialog.dart
lib/generated/json/app_config_entity.g.dart
lib/generated/json/app_version_entity.g.dart
lib/generated/json/base/json_convert_content.dart
lib/generated/json/course_module_entity.g.dart
lib/generated/json/course_section_entity.g.dart
lib/generated/json/course_unit_entity.g.dart
lib/models/app_config_entity.dart
lib/models/app_version_entity.dart
lib/models/course_module_entity.dart
lib/models/course_section_entity.dart
lib/models/course_unit_entity.dart
@@ -77,7 +77,7 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
       }*/
       bool isAggreementAccepted = AppConfigHelper.getAgreementAccepted();
       if (isAggreementAccepted) {
-        pushNamedAndRemoveUntil(AppRouteName.moduleSelect, (route) => false);
+        pushNamedAndRemoveUntil(AppRouteName.home, (route) => false);
       } else {
         showDialog(
           context: context,
@@ -91,11 +91,11 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
                 leftTap: () {
                   AppConfigHelper.saveAgreementAccepted(true);
                   pushNamedAndRemoveUntil(
-                      AppRouteName.moduleSelect, (route) => false);
+                      AppRouteName.home, (route) => false);
                 },
                 rightTap: () {
                   // 退出应用
-                  SystemNavigator.pop();
+                  AppConfigHelper.exitApp();
                 },
               ),
             );
@@ -2,6 +2,8 @@ import &#39;dart:ffi&#39;;
 import 'dart:io';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:wow_english/common/core/sp_const.dart';
 import 'package:wow_english/common/core/user_util.dart';
@@ -16,6 +18,9 @@ class AppConfigHelper {
   static String _versionCode = '';
+  // 是否检测过更新，因为路由混乱导致首页会多次启动，避免重复检测更新，先临时处理
+  static bool checkedUpdate = false;
+
   // 获取用户信息
   static Future<AppConfigEntity?> getAppConfig() async {
     if (configEntityEntity != null) {
@@ -25,9 +30,15 @@ class AppConfigHelper {
     return configEntityEntity;
   }
+  // 是否是iOS平台
+  static bool isIosPlatform() {
+    return defaultTargetPlatform == TargetPlatform.iOS;
+  }
+
   // 是否需要隐藏...
   static bool shouldHidePay() {
-    return configEntityEntity?.isAppReviewing() == true || UserUtil.getUser()?.phoneNum == "17730280759";
+    return isIosPlatform() &&
+        (configEntityEntity?.isAppReviewing() == true || UserUtil.getUser()?.phoneNum == "17730280759");
   }
   // 获取app版本号
@@ -55,4 +66,13 @@ class AppConfigHelper {
   static void _clearUserData() {
     SpUtil.getInstance().remove(SpConst.prefsKeyAgreementAccepted);
   }
+
+  static void exitApp() {
+    if (Platform.isIOS) {
+      exit(0);
+    } else {
+      //此种方式在IOS上不生效
+      SystemNavigator.pop();
+    }
+  }
 }
@@ -60,12 +60,11 @@ class UserUtil {
     if (currentPageName != AppRouteName.splash) {
       Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false);
     }*/
-    Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false, arguments: {'showPasswordPage': showPasswordLoginPage});
+    pushNamedAndRemoveUntil(AppRouteName.login, (route) => false, arguments: {'showPasswordPage': showPasswordLoginPage});
   }
   // 是否有游戏权限
   static bool hasGamePermission() {
-    debugPrint('hasGamePermission: ${_userEntity}');
     return _userEntity?.valid ?? false;
   }
 import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:wow_english/common/core/app_config_helper.dart';
 import '../../utils/log_util.dart';
@@ -167,7 +167,7 @@ class _PermissionRequestPageState extends State&lt;PermissionRequestPage&gt;
   /// 退出应用程序
   void _quitApp() {
-    SystemChannels.platform.invokeMethod("SystemNavigator.pop");
+    AppConfigHelper.exitApp();
   }
   /// 关闭整个权限申请页面
@@ -6,6 +6,9 @@ class Apis {
   ///   接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897678
   static const String appConfig = 'system/app/config';
+  /// app版本信息
+  static const String appVersion = 'system/app/version';
+
   /// 登录
   static const String login = 'login';
@@ -42,11 +45,17 @@ class Apis {
   //  接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897663
   static const String courseModule = 'home/courseModule';
+  /// 课程单元列表
+  static const String courseUnit = 'home/courseUnit';
+
   /// 课程列表
   //  GET /home/courseLesson
   //  接口地址：https://app.apifox.com/link/project/2684751/apis/api-89897662
   static const String courseLesson = 'home/courseLesson';
+  // 课程环节列表
+  static const String courseSection = 'course/courseLesson';
+
   /// 磨耳朵
   /// GET
   static const String ears = 'course/grinding/ears';
 import 'package:wow_english/common/request/request_client.dart';
 import 'package:wow_english/models/course_entity.dart';
+import 'package:wow_english/models/course_section_entity.dart';
 import '../../../models/course_module_entity.dart';
+import '../../../models/course_unit_entity.dart';
-class HomeDao {
-  ///获取课程模块信息
+class LessonDao {
+  ///获取课程模块（列表）信息
   static Future<List<CourseModuleEntity?>?> courseModule() async {
     var data = await requestClient.get<List<CourseModuleEntity>>(Apis.courseModule);
     return data;
   }
-  ///课程列表
-  static Future<CourseEntity?> courseLesson({String moduleId = ''}) async {
+  ///课程单元列表
+  static Future<CourseUnitEntity?> courseUnit(int? moduleId) async {
     Map<String, dynamic> mapData = {};
-    if (moduleId.isNotEmpty) {
+    if (moduleId != null) {
       mapData['moduleId'] = moduleId;
     }
+    var data = await requestClient.get<CourseUnitEntity>(Apis.courseUnit, queryParameters: mapData);
+    return data;
+  }
+
+  ///课程列表
+  static Future<CourseEntity?> courseLesson({int? courseUnitId}) async {
+    Map<String, dynamic> mapData = {};
+    if (courseUnitId != null) {
+      mapData['courseUnitId'] = courseUnitId;
+    }
     var data = await requestClient.get<CourseEntity>(Apis.courseLesson, queryParameters: mapData);
     return data;
   }
+
+  ///课程（单元）列表
+  static Future<List<CourseSectionEntity>?> courseSection({required int courseUnitId}) async {
+    Map<String, dynamic> mapData = {};
+    mapData['courseUnitId'] = courseUnitId;
+    var data = await requestClient.get<List<CourseSectionEntity>?>(Apis.courseSection, queryParameters: mapData);
+    return data;
+  }
 }
 import '../../../models/app_config_entity.dart';
+import '../../../models/app_version_entity.dart';
 import '../request_client.dart';
 class SystemDao {
@@ -7,4 +8,9 @@ class SystemDao {
   static Future<AppConfigEntity?> getAppConfig() async {
     return await requestClient.get(Apis.appConfig);
   }
+
+  // 获取app版本信息
+  static Future<AppVersionEntity?> getVersionInfo() async {
+    return await requestClient.get(Apis.appVersion);
+  }
 }
 import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
 import 'package:wow_english/common/core/user_util.dart';
 import '../core/app_config_helper.dart';
@@ -13,6 +14,7 @@ class TokenInterceptor extends Interceptor {
     // 在发送请求之前获取版本号
     String version = await AppConfigHelper.getAppVersion();
     options.headers["version"] = version;
+    options.headers["User-Agent"] = AppConfigHelper.isIosPlatform() ? "ios" : "android";
     super.onRequest(options, handler);
   }
 }
@@ -41,21 +41,26 @@ class WebviewDialog extends StatelessWidget {
                 }
               })),
       actions: <Widget>[
-        TextButton(
-          child:
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            TextButton(
+              child:
               const Text('同意并继续', style: TextStyle(color: Color(0xFFFBB621))),
-          onPressed: () {
-            // 处理接受按钮的点击事件
-            leftTap(); // 关闭对话框
-          },
-        ),
-        TextButton(
-          child: const Text('不同意，退出应用'),
-          onPressed: () {
-            // 处理拒绝按钮的点击事件
-            rightTap(); // 关闭对话框
-          },
-        ),
+              onPressed: () {
+                // 处理接受按钮的点击事件
+                leftTap(); // 关闭对话框
+              },
+            ),
+            TextButton(
+              child: const Text('不同意，退出应用'),
+              onPressed: () {
+                // 处理拒绝按钮的点击事件
+                rightTap(); // 关闭对话框
+              },
+            ),
+          ],
+        )
       ],
     );
   }
 import 'package:wow_english/generated/json/base/json_convert_content.dart';
 import 'package:wow_english/models/app_config_entity.dart';
-AppConfigEntity $AppConfigEntityEntityFromJson(
-    Map<String, dynamic> json) {
-  final AppConfigEntity appConfigEntityEntity = AppConfigEntity();
-  final bool? androidForceUpdate = jsonConvert.convert<bool>(
-      json['androidForceUpdate']);
-  if (androidForceUpdate != null) {
-    appConfigEntityEntity.androidForceUpdate = androidForceUpdate;
-  }
-  final bool? androidRecommendUpdate = jsonConvert.convert<bool>(
-      json['androidRecommendUpdate']);
-  if (androidRecommendUpdate != null) {
-    appConfigEntityEntity.androidRecommendUpdate = androidRecommendUpdate;
-  }
-  final String? androidUpdatePackageUrl = jsonConvert.convert<String>(
-      json['androidUpdatePackageUrl']);
-  if (androidUpdatePackageUrl != null) {
-    appConfigEntityEntity.androidUpdatePackageUrl = androidUpdatePackageUrl;
-  }
-  final int? androidVersion = jsonConvert.convert<int>(json['androidVersion']);
-  if (androidVersion != null) {
-    appConfigEntityEntity.androidVersion = androidVersion;
-  }
-  final bool? iosForceUpdate = jsonConvert.convert<bool>(
-      json['iosForceUpdate']);
-  if (iosForceUpdate != null) {
-    appConfigEntityEntity.iosForceUpdate = iosForceUpdate;
-  }
-  final bool? iosRecommendUpdate = jsonConvert.convert<bool>(
-      json['iosRecommendUpdate']);
-  if (iosRecommendUpdate != null) {
-    appConfigEntityEntity.iosRecommendUpdate = iosRecommendUpdate;
-  }
-  final int? iosVersion = jsonConvert.convert<int>(json['iosVersion']);
-  if (iosVersion != null) {
-    appConfigEntityEntity.iosVersion = iosVersion;
-  }
-  final String? noticeBeforePurchaseUrl = jsonConvert.convert<String>(
-      json['noticeBeforePurchaseUrl']);
-  if (noticeBeforePurchaseUrl != null) {
-    appConfigEntityEntity.noticeBeforePurchaseUrl = noticeBeforePurchaseUrl;
-  }
+AppConfigEntity $AppConfigEntityFromJson(Map<String, dynamic> json) {
+  final AppConfigEntity appConfigEntity = AppConfigEntity();
   final String? safe = jsonConvert.convert<String>(json['safe']);
   if (safe != null) {
-    appConfigEntityEntity.safe = safe;
+    appConfigEntity.safe = safe;
   }
-  return appConfigEntityEntity;
+  return appConfigEntity;
 }
-Map<String, dynamic> $AppConfigEntityEntityToJson(
-    AppConfigEntity entity) {
+Map<String, dynamic> $AppConfigEntityToJson(AppConfigEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
-  data['androidForceUpdate'] = entity.androidForceUpdate;
-  data['androidRecommendUpdate'] = entity.androidRecommendUpdate;
-  data['androidUpdatePackageUrl'] = entity.androidUpdatePackageUrl;
-  data['androidVersion'] = entity.androidVersion;
-  data['iosForceUpdate'] = entity.iosForceUpdate;
-  data['iosRecommendUpdate'] = entity.iosRecommendUpdate;
-  data['iosVersion'] = entity.iosVersion;
-  data['noticeBeforePurchaseUrl'] = entity.noticeBeforePurchaseUrl;
   data['safe'] = entity.safe;
   return data;
 }
-extension AppConfigEntityEntityExtension on AppConfigEntity {
+extension AppConfigEntityExtension on AppConfigEntity {
   AppConfigEntity copyWith({
-    bool? androidForceUpdate,
-    bool? androidRecommendUpdate,
-    String? androidUpdatePackageUrl,
-    int? androidVersion,
-    bool? iosForceUpdate,
-    bool? iosRecommendUpdate,
-    int? iosVersion,
-    String? noticeBeforePurchaseUrl,
     String? safe,
   }) {
     return AppConfigEntity()
-      ..androidForceUpdate = androidForceUpdate ?? this.androidForceUpdate
-      ..androidRecommendUpdate = androidRecommendUpdate ??
-          this.androidRecommendUpdate
-      ..androidUpdatePackageUrl = androidUpdatePackageUrl ??
-          this.androidUpdatePackageUrl
-      ..androidVersion = androidVersion ?? this.androidVersion
-      ..iosForceUpdate = iosForceUpdate ?? this.iosForceUpdate
-      ..iosRecommendUpdate = iosRecommendUpdate ?? this.iosRecommendUpdate
-      ..iosVersion = iosVersion ?? this.iosVersion
-      ..noticeBeforePurchaseUrl = noticeBeforePurchaseUrl ??
-          this.noticeBeforePurchaseUrl
       ..safe = safe ?? this.safe;
   }
 }
 \ No newline at end of file
+import 'package:wow_english/generated/json/base/json_convert_content.dart';
+import 'package:wow_english/models/app_version_entity.dart';
+
+AppVersionEntity $AppVersionEntityFromJson(Map<String, dynamic> json) {
+  final AppVersionEntity appVersionEntity = AppVersionEntity();
+  final String? packageUrl = jsonConvert.convert<String>(json['packageUrl']);
+  if (packageUrl != null) {
+    appVersionEntity.packageUrl = packageUrl;
+  }
+  final String? packageName = jsonConvert.convert<String>(json['packageName']);
+  if (packageName != null) {
+    appVersionEntity.packageName = packageName;
+  }
+  final String? packageSize = jsonConvert.convert<String>(json['packageSize']);
+  if (packageSize != null) {
+    appVersionEntity.packageSize = packageSize;
+  }
+  final String? platformType = jsonConvert.convert<String>(
+      json['platformType']);
+  if (platformType != null) {
+    appVersionEntity.platformType = platformType;
+  }
+  final String? remark = jsonConvert.convert<String>(json['remark']);
+  if (remark != null) {
+    appVersionEntity.remark = remark;
+  }
+  final String? status = jsonConvert.convert<String>(json['status']);
+  if (status != null) {
+    appVersionEntity.status = status;
+  }
+  final String? version = jsonConvert.convert<String>(json['version']);
+  if (version != null) {
+    appVersionEntity.version = version;
+  }
+  final String? volType = jsonConvert.convert<String>(json['volType']);
+  if (volType != null) {
+    appVersionEntity.volType = volType;
+  }
+  return appVersionEntity;
+}
+
+Map<String, dynamic> $AppVersionEntityToJson(AppVersionEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['packageUrl'] = entity.packageUrl;
+  data['packageName'] = entity.packageName;
+  data['packageSize'] = entity.packageSize;
+  data['platformType'] = entity.platformType;
+  data['remark'] = entity.remark;
+  data['status'] = entity.status;
+  data['version'] = entity.version;
+  data['volType'] = entity.volType;
+  return data;
+}
+
+extension AppVersionEntityExtension on AppVersionEntity {
+  AppVersionEntity copyWith({
+    String? packageUrl,
+    String? packageName,
+    String? packageSize,
+    String? platformType,
+    String? remark,
+    String? status,
+    String? version,
+    String? volType,
+  }) {
+    return AppVersionEntity()
+      ..packageUrl = packageUrl ?? this.packageUrl
+      ..packageName = packageName ?? this.packageName
+      ..packageSize = packageSize ?? this.packageSize
+      ..platformType = platformType ?? this.platformType
+      ..remark = remark ?? this.remark
+      ..status = status ?? this.status
+      ..version = version ?? this.version
+      ..volType = volType ?? this.volType;
+  }
+}
 \ No newline at end of file
@@ -6,9 +6,12 @@
 import 'package:flutter/material.dart' show debugPrint;
 import 'package:wow_english/models/aliyun_oss_upload_sts_entity.dart';
 import 'package:wow_english/models/app_config_entity.dart';
+import 'package:wow_english/models/app_version_entity.dart';
 import 'package:wow_english/models/course_entity.dart';
 import 'package:wow_english/models/course_module_entity.dart';
 import 'package:wow_english/models/course_process_entity.dart';
+import 'package:wow_english/models/course_section_entity.dart';
+import 'package:wow_english/models/course_unit_entity.dart';
 import 'package:wow_english/models/follow_read_entity.dart';
 import 'package:wow_english/models/listen_entity.dart';
 import 'package:wow_english/models/product_entity.dart';
@@ -159,6 +162,10 @@ class JsonConvert {
       return data.map<AppConfigEntity>((Map<String, dynamic> e) =>
           AppConfigEntity.fromJson(e)).toList() as M;
     }
+    if (<AppVersionEntity>[] is M) {
+      return data.map<AppVersionEntity>((Map<String, dynamic> e) =>
+          AppVersionEntity.fromJson(e)).toList() as M;
+    }
     if (<CourseEntity>[] is M) {
       return data.map<CourseEntity>((Map<String, dynamic> e) =>
           CourseEntity.fromJson(e)).toList() as M;
@@ -192,6 +199,18 @@ class JsonConvert {
       return data.map<CourseProcessVideos>((Map<String, dynamic> e) =>
           CourseProcessVideos.fromJson(e)).toList() as M;
     }
+    if (<CourseSectionEntity>[] is M) {
+      return data.map<CourseSectionEntity>((Map<String, dynamic> e) =>
+          CourseSectionEntity.fromJson(e)).toList() as M;
+    }
+    if (<CourseUnitEntity>[] is M) {
+      return data.map<CourseUnitEntity>((Map<String, dynamic> e) =>
+          CourseUnitEntity.fromJson(e)).toList() as M;
+    }
+    if (<CourseUnitDetail>[] is M) {
+      return data.map<CourseUnitDetail>((Map<String, dynamic> e) =>
+          CourseUnitDetail.fromJson(e)).toList() as M;
+    }
     if (<FollowReadEntity>[] is M) {
       return data.map<FollowReadEntity>((Map<String, dynamic> e) =>
           FollowReadEntity.fromJson(e)).toList() as M;
@@ -237,6 +256,7 @@ class JsonConvertClassCollection {
     (AliyunOssUploadStsCallbackParam)
         .toString(): AliyunOssUploadStsCallbackParam.fromJson,
     (AppConfigEntity).toString(): AppConfigEntity.fromJson,
+    (AppVersionEntity).toString(): AppVersionEntity.fromJson,
     (CourseEntity).toString(): CourseEntity.fromJson,
     (CourseCourseLessons).toString(): CourseCourseLessons.fromJson,
     (CourseModuleEntity).toString(): CourseModuleEntity.fromJson,
@@ -246,6 +266,9 @@ class JsonConvertClassCollection {
     (CourseProcessTopicsTopicAnswerList)
         .toString(): CourseProcessTopicsTopicAnswerList.fromJson,
     (CourseProcessVideos).toString(): CourseProcessVideos.fromJson,
+    (CourseSectionEntity).toString(): CourseSectionEntity.fromJson,
+    (CourseUnitEntity).toString(): CourseUnitEntity.fromJson,
+    (CourseUnitDetail).toString(): CourseUnitDetail.fromJson,
     (FollowReadEntity).toString(): FollowReadEntity.fromJson,
     (ListenEntity).toString(): ListenEntity.fromJson,
     (ProductEntity).toString(): ProductEntity.fromJson,
@@ -3,7 +3,7 @@ import &#39;package:wow_english/models/course_module_entity.dart&#39;;
 CourseModuleEntity $CourseModuleEntityFromJson(Map<String, dynamic> json) {
   final CourseModuleEntity courseModuleEntity = CourseModuleEntity();
-  final String? id = jsonConvert.convert<String>(json['id']);
+  final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
     courseModuleEntity.id = id;
   }
@@ -90,7 +90,7 @@ Map&lt;String, dynamic&gt; $CourseModuleEntityToJson(CourseModuleEntity entity) {
 extension CourseModuleEntityExtension on CourseModuleEntity {
   CourseModuleEntity copyWith({
-    String? id,
+    int? id,
     String? code,
     int? courseModuleThemeId,
     int? courseTotal,
+import 'package:wow_english/generated/json/base/json_convert_content.dart';
+import 'package:wow_english/models/course_section_entity.dart';
+
+CourseSectionEntity $CourseSectionEntityFromJson(Map<String, dynamic> json) {
+  final CourseSectionEntity courseSectionEntity = CourseSectionEntity();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    courseSectionEntity.id = id;
+  }
+  final int? courseUnitId = jsonConvert.convert<int>(json['courseUnitId']);
+  if (courseUnitId != null) {
+    courseSectionEntity.courseUnitId = courseUnitId;
+  }
+  final int? courseModuleId = jsonConvert.convert<int>(json['courseModuleId']);
+  if (courseModuleId != null) {
+    courseSectionEntity.courseModuleId = courseModuleId;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    courseSectionEntity.name = name;
+  }
+  final dynamic des = json['des'];
+  if (des != null) {
+    courseSectionEntity.des = des;
+  }
+  final int? courseType = jsonConvert.convert<int>(json['courseType']);
+  if (courseType != null) {
+    courseSectionEntity.courseType = courseType;
+  }
+  final dynamic coverUrl = json['coverUrl'];
+  if (coverUrl != null) {
+    courseSectionEntity.coverUrl = coverUrl;
+  }
+  final int? sortOrder = jsonConvert.convert<int>(json['sortOrder']);
+  if (sortOrder != null) {
+    courseSectionEntity.sortOrder = sortOrder;
+  }
+  final int? status = jsonConvert.convert<int>(json['status']);
+  if (status != null) {
+    courseSectionEntity.status = status;
+  }
+  final bool? lock = jsonConvert.convert<bool>(json['lock']);
+  if (lock != null) {
+    courseSectionEntity.lock = lock;
+  }
+  return courseSectionEntity;
+}
+
+Map<String, dynamic> $CourseSectionEntityToJson(CourseSectionEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['courseUnitId'] = entity.courseUnitId;
+  data['courseModuleId'] = entity.courseModuleId;
+  data['name'] = entity.name;
+  data['des'] = entity.des;
+  data['courseType'] = entity.courseType;
+  data['coverUrl'] = entity.coverUrl;
+  data['sortOrder'] = entity.sortOrder;
+  data['status'] = entity.status;
+  data['lock'] = entity.lock;
+  return data;
+}
+
+extension CourseSectionEntityExtension on CourseSectionEntity {
+  CourseSectionEntity copyWith({
+    int? id,
+    int? courseUnitId,
+    int? courseModuleId,
+    String? name,
+    dynamic des,
+    int? courseType,
+    dynamic coverUrl,
+    int? sortOrder,
+    int? status,
+    bool? lock,
+  }) {
+    return CourseSectionEntity()
+      ..id = id ?? this.id
+      ..courseUnitId = courseUnitId ?? this.courseUnitId
+      ..courseModuleId = courseModuleId ?? this.courseModuleId
+      ..name = name ?? this.name
+      ..des = des ?? this.des
+      ..courseType = courseType ?? this.courseType
+      ..coverUrl = coverUrl ?? this.coverUrl
+      ..sortOrder = sortOrder ?? this.sortOrder
+      ..status = status ?? this.status
+      ..lock = lock ?? this.lock;
+  }
+}
 \ No newline at end of file
+import 'package:wow_english/generated/json/base/json_convert_content.dart';
+import 'package:wow_english/models/course_unit_entity.dart';
+
+CourseUnitEntity $CourseUnitEntityFromJson(Map<String, dynamic> json) {
+  final CourseUnitEntity courseUnitEntity = CourseUnitEntity();
+  final List<
+      CourseUnitDetail>? courseUnitVOList = (json['courseUnitVOList'] as List<
+      dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<CourseUnitDetail>(e) as CourseUnitDetail)
+      .toList();
+  if (courseUnitVOList != null) {
+    courseUnitEntity.courseUnitVOList = courseUnitVOList;
+  }
+  final int? nowStep = jsonConvert.convert<int>(json['nowStep']);
+  if (nowStep != null) {
+    courseUnitEntity.nowStep = nowStep;
+  }
+  final int? total = jsonConvert.convert<int>(json['total']);
+  if (total != null) {
+    courseUnitEntity.total = total;
+  }
+  final int? nowCourseModuleId = jsonConvert.convert<int>(
+      json['nowCourseModuleId']);
+  if (nowCourseModuleId != null) {
+    courseUnitEntity.nowCourseModuleId = nowCourseModuleId;
+  }
+  final String? nowCourseModuleName = jsonConvert.convert<String>(
+      json['nowCourseModuleName']);
+  if (nowCourseModuleName != null) {
+    courseUnitEntity.nowCourseModuleName = nowCourseModuleName;
+  }
+  final String? courseModuleThemeColor = jsonConvert.convert<String>(
+      json['courseModuleThemeColor']);
+  if (courseModuleThemeColor != null) {
+    courseUnitEntity.courseModuleThemeColor = courseModuleThemeColor;
+  }
+  final String? courseModuleCode = jsonConvert.convert<String>(
+      json['courseModuleCode']);
+  if (courseModuleCode != null) {
+    courseUnitEntity.courseModuleCode = courseModuleCode;
+  }
+  return courseUnitEntity;
+}
+
+Map<String, dynamic> $CourseUnitEntityToJson(CourseUnitEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['courseUnitVOList'] =
+      entity.courseUnitVOList?.map((v) => v.toJson()).toList();
+  data['nowStep'] = entity.nowStep;
+  data['total'] = entity.total;
+  data['nowCourseModuleId'] = entity.nowCourseModuleId;
+  data['nowCourseModuleName'] = entity.nowCourseModuleName;
+  data['courseModuleThemeColor'] = entity.courseModuleThemeColor;
+  data['courseModuleCode'] = entity.courseModuleCode;
+  return data;
+}
+
+extension CourseUnitEntityExtension on CourseUnitEntity {
+  CourseUnitEntity copyWith({
+    List<CourseUnitDetail>? courseUnitVOList,
+    int? nowStep,
+    int? total,
+    int? nowCourseModuleId,
+    String? nowCourseModuleName,
+    String? courseModuleThemeColor,
+    String? courseModuleCode,
+  }) {
+    return CourseUnitEntity()
+      ..courseUnitVOList = courseUnitVOList ?? this.courseUnitVOList
+      ..nowStep = nowStep ?? this.nowStep
+      ..total = total ?? this.total
+      ..nowCourseModuleId = nowCourseModuleId ?? this.nowCourseModuleId
+      ..nowCourseModuleName = nowCourseModuleName ?? this.nowCourseModuleName
+      ..courseModuleThemeColor = courseModuleThemeColor ??
+          this.courseModuleThemeColor
+      ..courseModuleCode = courseModuleCode ?? this.courseModuleCode;
+  }
+}
+
+CourseUnitDetail $CourseUnitDetailFromJson(Map<String, dynamic> json) {
+  final CourseUnitDetail courseUnitDetail = CourseUnitDetail();
+  final int? courseModuleId = jsonConvert.convert<int>(json['courseModuleId']);
+  if (courseModuleId != null) {
+    courseUnitDetail.courseModuleId = courseModuleId;
+  }
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    courseUnitDetail.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    courseUnitDetail.name = name;
+  }
+  final String? coverUrl = jsonConvert.convert<String>(json['coverUrl']);
+  if (coverUrl != null) {
+    courseUnitDetail.coverUrl = coverUrl;
+  }
+  final bool? lock = jsonConvert.convert<bool>(json['lock']);
+  if (lock != null) {
+    courseUnitDetail.lock = lock;
+  }
+  final int? sortOrder = jsonConvert.convert<int>(json['sortOrder']);
+  if (sortOrder != null) {
+    courseUnitDetail.sortOrder = sortOrder;
+  }
+  final int? status = jsonConvert.convert<int>(json['status']);
+  if (status != null) {
+    courseUnitDetail.status = status;
+  }
+  return courseUnitDetail;
+}
+
+Map<String, dynamic> $CourseUnitDetailToJson(CourseUnitDetail entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['courseModuleId'] = entity.courseModuleId;
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['coverUrl'] = entity.coverUrl;
+  data['lock'] = entity.lock;
+  data['sortOrder'] = entity.sortOrder;
+  data['status'] = entity.status;
+  return data;
+}
+
+extension CourseUnitDetailExtension on CourseUnitDetail {
+  CourseUnitDetail copyWith({
+    int? courseModuleId,
+    int? id,
+    String? name,
+    String? coverUrl,
+    bool? lock,
+    int? sortOrder,
+    int? status,
+  }) {
+    return CourseUnitDetail()
+      ..courseModuleId = courseModuleId ?? this.courseModuleId
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..coverUrl = coverUrl ?? this.coverUrl
+      ..lock = lock ?? this.lock
+      ..sortOrder = sortOrder ?? this.sortOrder
+      ..status = status ?? this.status;
+  }
+}
 \ No newline at end of file
@@ -7,40 +7,15 @@ import &#39;../generated/json/app_config_entity.g.dart&#39;;
 @JsonSerializable()
 class AppConfigEntity {
-	// 安卓是否强制更新
-	bool? androidForceUpdate;
-
-	// 安卓是否推荐更新
-	bool? androidRecommendUpdate;
-
-	// 安卓更新包地址
-	String? androidUpdatePackageUrl;
-
-	// 安卓当前版本号
-	late int androidVersion;
-
-	bool? iosForceUpdate;
-
-	bool? iosRecommendUpdate;
-
-	// ios版本
-	late int iosVersion;
-
-	// 更新说明
-	String? updatePackageDescription;
-
-	// 购前须知图片
-	String? noticeBeforePurchaseUrl;
-
 	// 当前是否安全，safe-安全 otherwise-隐藏pay
 	String? safe;
 	AppConfigEntity();
-	factory AppConfigEntity.fromJson(Map<String, dynamic> json) => $AppConfigEntityEntityFromJson(json);
+	factory AppConfigEntity.fromJson(Map<String, dynamic> json) => $AppConfigEntityFromJson(json);
-	Map<String, dynamic> toJson() => $AppConfigEntityEntityToJson(this);
+	Map<String, dynamic> toJson() => $AppConfigEntityToJson(this);
 	@override
 	String toString() {
+import 'package:wow_english/generated/json/base/json_field.dart';
+import 'package:wow_english/generated/json/app_version_entity.g.dart';
+import 'dart:convert';
+export 'package:wow_english/generated/json/app_version_entity.g.dart';
+
+@JsonSerializable()
+class AppVersionEntity {
+
+	// 更新包地址
+	String? packageUrl;
+
+	// 更新包名
+	String? packageName;
+
+	// 更新包大小
+	String? packageSize;
+
+	// 平台类型
+	String? platformType;
+
+	// 更新说明
+	String? remark;
+
+	// 状态
+	String? status;
+
+	// app版本号
+	String? version;
+
+	// 强更类型
+	String? volType;
+
+
+	AppVersionEntity();
+
+	factory AppVersionEntity.fromJson(Map<String, dynamic> json) => $AppVersionEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $AppVersionEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+enum UpdateStrategy {
+	SUGGEST("suggest", "建议更新"),
+	FORCE("force", "强制更新");
+
+	const UpdateStrategy(this.name, this.chineseName);
+
+	final String name;
+
+	final String chineseName;
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@ import &#39;package:wow_english/generated/json/course_module_entity.g.dart&#39;;
 @JsonSerializable()
 class CourseModuleEntity {
-  late String id;
+  int? id;
   String? code;
   int? courseModuleThemeId;
   int? courseTotal;
+import 'package:wow_english/generated/json/base/json_field.dart';
+import 'package:wow_english/generated/json/course_section_entity.g.dart';
+import 'dart:convert';
+export 'package:wow_english/generated/json/course_section_entity.g.dart';
+
+@JsonSerializable()
+class CourseSectionEntity {
+	late int id;
+	late int courseUnitId;
+	late int courseModuleId;
+	late String name;
+	dynamic des;
+	late int courseType;
+	dynamic coverUrl;
+	late int sortOrder;
+	late int status;
+	late bool lock;
+
+	CourseSectionEntity();
+
+	factory CourseSectionEntity.fromJson(Map<String, dynamic> json) => $CourseSectionEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $CourseSectionEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
 \ No newline at end of file
+import 'package:wow_english/generated/json/base/json_field.dart';
+import 'package:wow_english/generated/json/course_unit_entity.g.dart';
+import 'dart:convert';
+
+export 'package:wow_english/generated/json/course_unit_entity.g.dart';
+
+@JsonSerializable()
+class CourseUnitEntity {
+
+	// 课程详情列表
+	List<CourseUnitDetail>? courseUnitVOList;
+
+	// 当前进行了多少节课程
+	int? nowStep;
+
+	// 当前模块一共多少节课程
+	int? total;
+
+	// 当前模块id
+	int? nowCourseModuleId;
+
+	// 当前模块名
+	String? nowCourseModuleName;
+
+	// 主题颜色值
+	String? courseModuleThemeColor;
+
+	// 课程模块code
+	String? courseModuleCode;
+
+	CourseUnitEntity();
+
+	factory CourseUnitEntity.fromJson(Map<String, dynamic> json) => $CourseUnitEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $CourseUnitEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+
+@JsonSerializable()
+class CourseUnitDetail {
+
+	// 模块id
+	int? courseModuleId;
+
+	// 单元
+	int? id;
+
+	// 单元名称
+	String? name;
+
+	// 单元封面
+	String? coverUrl;
+
+	bool? lock;
+
+	int? sortOrder;
+
+	int? status;
+
+	CourseUnitDetail();
+
+	factory CourseUnitDetail.fromJson(Map<String, dynamic> json) => $CourseUnitDetailFromJson(json);
+
+	Map<String, dynamic> toJson() => $CourseUnitDetailToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
 \ No newline at end of file
 import 'package:bloc/bloc.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
-import 'package:wow_english/models/app_config_entity.dart';
 import '../../common/core/app_config_helper.dart';
+import '../../common/request/dao/system_dao.dart';
+import '../../models/app_version_entity.dart';
+import '../../utils/log_util.dart';
 import 'event.dart';
 import 'state.dart';
-class ModuleSelectBloc extends Bloc<ModuleSelectEvent, ModuleSelectState> {
-  ModuleSelectBloc() : super(ModuleSelectState().init()) {
+class ModuleSelectBloc extends Bloc<HomeEvent, HomeState> {
+  ModuleSelectBloc() : super(HomeState().init()) {
     on<InitEvent>(_init);
   }
-  void _init(InitEvent event, Emitter<ModuleSelectState> emit) async {
+  void _init(InitEvent event, Emitter<HomeState> emit) async {
     await _checkUpdate(emit);
     debugPrint('WQF ModuleSelectBloc _init');
   }
-  Future<void> _checkUpdate(Emitter<ModuleSelectState> emit) async {
+  Future<void> _checkUpdate(Emitter<HomeState> emit) async {
+    if (AppConfigHelper.checkedUpdate) {
+      return;
+    }
     int localVersion = int.parse(await AppConfigHelper.getAppVersion());
-    AppConfigEntity? appConfigEntity = await AppConfigHelper.getAppConfig();
-    if (appConfigEntity == null) {
+    AppVersionEntity? appVersionEntity = await SystemDao.getVersionInfo();
+    AppConfigHelper.checkedUpdate = true;
+    if (appVersionEntity == null) {
       return;
     }
-    debugPrint('WQF _checkUpdate');
-    if (defaultTargetPlatform == TargetPlatform.iOS) {
-      if (localVersion < appConfigEntity.iosVersion &&
-          appConfigEntity.iosRecommendUpdate == true) {
-        emit(UpdateDialogState(
-            appConfigEntity.iosForceUpdate ?? false, appConfigEntity));
-      }
-    } else {
-      if (localVersion < appConfigEntity.androidVersion &&
-          appConfigEntity.androidRecommendUpdate == true) {
-        emit(UpdateDialogState(
-          appConfigEntity.androidForceUpdate ?? false, appConfigEntity,
-        ));
-      }
+    Log.d("WQF _checkUpdate appVersionEntity: $appVersionEntity localVersion=$localVersion");
+    if (localVersion < int.parse(appVersionEntity.version ?? '0')) {
+      emit(UpdateDialogState(
+          appVersionEntity.volType == UpdateStrategy.FORCE.name, appVersionEntity));
     }
   }
 }
+abstract class HomeEvent {}
+
+class InitEvent extends HomeEvent {}
 \ No newline at end of file
+import 'package:wow_english/models/app_version_entity.dart';
+
+class HomeState {
+  HomeState init() {
+    return HomeState();
+  }
+
+  HomeState clone() {
+    return HomeState();
+  }
+}
+
+class UpdateDialogState extends HomeState {
+
+  final AppVersionEntity appVersionEntity;
+
+  final bool forceUpdate;
+
+  UpdateDialogState(this.forceUpdate, this.appVersionEntity);
+}
@@ -8,20 +8,21 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:url_launcher/url_launcher.dart';
 import 'package:wow_english/common/core/app_config_helper.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/pages/moduleSelect/state.dart';
-import 'package:wow_english/pages/moduleSelect/widgets/BaseHomeHeaderWidget.dart';
+import 'package:wow_english/models/app_version_entity.dart';
+import 'package:wow_english/pages/home/state.dart';
+import 'package:wow_english/pages/home/widgets/BaseHomeHeaderWidget.dart';
 import 'package:wow_english/pages/user/bloc/user_bloc.dart';
 import '../../common/core/user_util.dart';
 import '../../common/dialogs/show_dialog.dart';
-import '../../models/app_config_entity.dart';
+import '../../utils/log_util.dart';
 import 'bloc.dart';
 import 'event.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/route/route.dart';
-class ModuleSelectPage extends StatelessWidget {
-  const ModuleSelectPage({super.key});
+class HomePage extends StatelessWidget {
+  const HomePage({super.key});
   @override
   Widget build(BuildContext context) {
@@ -41,10 +42,11 @@ class _HomePageView extends StatelessWidget {
       BlocListener<UserBloc, UserState>(listener: (context, state) {
         debugPrint('WQF ModuleSelectPage BlocListener state: $state');
       }),
-      BlocListener<ModuleSelectBloc, ModuleSelectState>(
+      BlocListener<ModuleSelectBloc, HomeState>(
         listener: (context, state) {
+          Log.d("WQF HomePage listener state: $state");
           if (state is UpdateDialogState) {
-            _showUpdateDialog(context, state.forceUpdate, state.appConfigEntity);
+            _showUpdateDialog(context, state.forceUpdate, state.appVersionEntity);
           }
         },
       ),
@@ -52,7 +54,7 @@ class _HomePageView extends StatelessWidget {
   }
   Widget _homeView() =>
-      BlocBuilder<ModuleSelectBloc, ModuleSelectState>(
+      BlocBuilder<ModuleSelectBloc, HomeState>(
           builder: (context, state) {
             return Scaffold(
               body: Container(
@@ -68,7 +70,7 @@ class _HomePageView extends StatelessWidget {
                               child: GestureDetector(
                                 onTap: () {
                                   if (UserUtil.isLogined()) {
-                                    pushNamed(AppRouteName.home);
+                                    pushNamed(AppRouteName.courseUnit);
                                   } else {
                                     pushNamed(AppRouteName.login);
                                   }
@@ -169,7 +171,7 @@ class _HomePageView extends StatelessWidget {
   ///Flutter侧处理升级对话框
   ///[forcedUpgrade] 是否强制升级
   _showUpdateDialog(BuildContext context, bool forcedUpgrade,
-      AppConfigEntity appConfigEntity) {
+      AppVersionEntity appVersionEntity) {
     showDialog(
       context: context,
       // 当我们点击除开对话框内容以外的区域是否关闭对话需用用到barrierDismissible参数 . 这个参数默认值是true ,但不能为null .
@@ -180,7 +182,7 @@ class _HomePageView extends StatelessWidget {
           child: AlertDialog(
             title: const Text('发现新版本'),
             content: Text(
-                appConfigEntity.updatePackageDescription ??
+                appVersionEntity.remark ??
                     '修复了一些已知问题'),
             actions: <Widget>[
               TextButton(
@@ -188,7 +190,7 @@ class _HomePageView extends StatelessWidget {
                 onPressed: () =>
                 {
                   if (forcedUpgrade) {
-                    SystemNavigator.pop()
+                    AppConfigHelper.exitApp()
                   } else
                     {
                       Navigator.of(context).pop()
@@ -198,11 +200,11 @@ class _HomePageView extends StatelessWidget {
               TextButton(
                 child: const Text('升级'),
                 onPressed: () async {
-                  if (defaultTargetPlatform == TargetPlatform.iOS) {
+                  if (AppConfigHelper.isIosPlatform()) {
                     _launchAppStore("6450870731");
                     return;
                   }
-                  final String? apkUrl = appConfigEntity.androidUpdatePackageUrl;
+                  final String? apkUrl = appVersionEntity.packageUrl;
                   if (apkUrl == null || apkUrl.isEmpty) {
                     return;
                   }
@@ -78,8 +78,8 @@ class BaseHomeHeaderWidget extends StatelessWidget {
                   textAlign: TextAlign.left,
                   style: TextStyle(color: Colors.white, fontSize: 30.0),
                 )),
-                Visibility(
-                  visible: !AppConfigHelper.shouldHidePay(),
+                Offstage(
+                  offstage: AppConfigHelper.shouldHidePay(),
                   child: Row(children: <Widget>[
                     Image(
                         width: 20.0.w,
-part of 'lesson_bloc.dart';
-
-@immutable
-abstract class LessonState {}
-
-class LessonInitial extends LessonState {}
-
-class PageIndexChangeState extends LessonState {}
-
-class LessonDataLoadState extends LessonState {}
@@ -34,7 +34,7 @@ class _LoginPageView extends StatelessWidget {
         if (state is LoginResultChangeState) {
           // 调试用
           // Navigator.of(context).pushNamed(AppRouteName.home);
-          pushNamedAndRemoveUntil(AppRouteName.moduleSelect, (route) => false);
+          pushNamedAndRemoveUntil(AppRouteName.home, (route) => false);
         }
       },
       child: _buildLoginViewWidget(),
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wow_english/common/request/dao/home_dao.dart';
+import 'package:wow_english/common/request/dao/lesson_dao.dart';
 import 'package:wow_english/common/request/exception.dart';
 import 'package:wow_english/models/course_module_entity.dart';
 import 'package:wow_english/utils/loading.dart';
 import 'package:wow_english/utils/toast_util.dart';
-part 'lesson_event.dart';
-part 'lesson_state.dart';
+part 'module_event.dart';
+part 'module_state.dart';
-class LessonBloc extends Bloc<LessonEvent, LessonState> {
+class ModuleBloc extends Bloc<ModuleEvent, ModuleState> {
   final int pageIndex;
   final PageController pageController;
@@ -22,22 +22,22 @@ class LessonBloc extends Bloc&lt;LessonEvent, LessonState&gt; {
   List<CourseModuleEntity?> get listData => _listData;
-  LessonBloc(this.pageIndex, this.pageController) : super(LessonInitial()) {
+  ModuleBloc(this.pageIndex, this.pageController) : super(ModuleInitial()) {
     _currentPageIndex = pageIndex;
     on<PageViewChangeIndexEvent>(_pageIndexChange);
     on<RequestDataEvent>(_requestData);
   }
-  void _pageIndexChange(PageViewChangeIndexEvent event, Emitter<LessonState> emitter) async {
+  void _pageIndexChange(PageViewChangeIndexEvent event, Emitter<ModuleState> emitter) async {
     _currentPageIndex = event.index;
     emitter(PageIndexChangeState());
   }
-  void _requestData(RequestDataEvent event, Emitter<LessonState> emitter) async {
+  void _requestData(RequestDataEvent event, Emitter<ModuleState> emitter) async {
     try {
       await loading(() async {
-        _listData = await HomeDao.courseModule() ?? [];
-        emitter(LessonDataLoadState());
+        _listData = await LessonDao.courseModule() ?? [];
+        emitter(ModuleDataLoadState());
       });
     } catch (e) {
       if (e is ApiException) {
-part of 'lesson_bloc.dart';
+part of 'module_bloc.dart';
 @immutable
-abstract class LessonEvent {}
+abstract class ModuleEvent {}
-class PageViewChangeIndexEvent extends LessonEvent {
+class PageViewChangeIndexEvent extends ModuleEvent {
    final int index;
    PageViewChangeIndexEvent(this.index);
 }
-class RequestDataEvent extends LessonEvent {}
+class RequestDataEvent extends ModuleEvent {}
+part of 'module_bloc.dart';
+
+@immutable
+abstract class ModuleState {}
+
+class ModuleInitial extends ModuleState {}
+
+class PageIndexChangeState extends ModuleState {}
+
+class ModuleDataLoadState extends ModuleState {}
@@ -6,23 +6,21 @@ import &#39;package:wow_english/common/widgets/we_app_bar.dart&#39;;
 import 'package:wow_english/models/course_module_entity.dart';
 import 'package:wow_english/route/route.dart';
-import 'bloc/lesson_bloc.dart';
-import 'widgets/lesson_item_widget.dart';
+import 'bloc/module_bloc.dart';
+import 'widgets/module_item_widget.dart';
-class LessonPage extends StatelessWidget {
-  const LessonPage({super.key, this.starPageIndex});
+// 阶段（模块）列表页
+class ModulePage extends StatelessWidget {
+  const ModulePage({super.key, this.starPageIndex});
   final int? starPageIndex;
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => LessonBloc(
-          starPageIndex??0,
-          PageController(
-              initialPage: starPageIndex??0,
-              viewportFraction: 0.3
-          ),
+      create: (context) => ModuleBloc(
+        starPageIndex ?? 0,
+        PageController(initialPage: starPageIndex ?? 0, viewportFraction: 0.3),
       )..add(RequestDataEvent()),
       child: _LessonPageView(),
     );
@@ -30,27 +28,25 @@ class LessonPage extends StatelessWidget {
 }
 class _LessonPageView extends StatelessWidget {
-
   final double _cardHeight = 240.h;
   final double _scale = 0.8;
   @override
   Widget build(BuildContext context) {
-    return BlocListener<LessonBloc,LessonState>(
-      listener: (context, state){},
+    return BlocListener<ModuleBloc, ModuleState>(
+      listener: (context, state) {},
       child: Scaffold(
         appBar: WEAppBar(
           leading: IconButton(
-              onPressed: (){
-               popPage();
+              onPressed: () {
+                popPage();
               },
               icon: Image.asset(
                 'back'.assetPng,
                 height: 43,
                 width: 43,
-              )
-          ),
+              )),
           // actions: <Widget>[
           //   IconButton(
           //     icon: Image.asset('shop'.assetPng),
@@ -66,9 +62,9 @@ class _LessonPageView extends StatelessWidget {
     );
   }
-  Widget _lessViewWidget() => BlocBuilder<LessonBloc,LessonState>(
-      builder: (context, state){
-        final bloc = BlocProvider.of<LessonBloc>(context);
+  Widget _lessViewWidget() =>
+      BlocBuilder<ModuleBloc, ModuleState>(builder: (context, state) {
+        final bloc = BlocProvider.of<ModuleBloc>(context);
         return Center(
           child: SafeArea(
             child: Column(
@@ -81,8 +77,7 @@ class _LessonPageView extends StatelessWidget {
                       onPageChanged: (int index) {
                         bloc.add(PageViewChangeIndexEvent(index));
                       },
-                      itemBuilder: (context,index) => _itemTransCard(index)
-                  ),
+                      itemBuilder: (context, index) => _itemTransCard(index)),
                 ),
                 32.verticalSpace,
                 SizedBox(
@@ -91,7 +86,7 @@ class _LessonPageView extends StatelessWidget {
                   child: ListView.builder(
                       itemCount: bloc.listData.length,
                       scrollDirection: Axis.horizontal,
-                      itemBuilder: (BuildContext context,int index){
+                      itemBuilder: (BuildContext context, int index) {
                         return Container(
                           height: 32.h,
                           width: 66.w,
@@ -101,13 +96,19 @@ class _LessonPageView extends StatelessWidget {
                               if (index == bloc.currentPageIndex) {
                                 return;
                               }
-                              int mill = (index - bloc.currentPageIndex) > 0 ? 100 * (index - bloc.currentPageIndex):100 * (bloc.currentPageIndex-index);
-                              bloc.pageController.animateToPage(index, duration:  Duration(milliseconds: mill), curve: Curves.ease);
+                              int mill = (index - bloc.currentPageIndex) > 0
+                                  ? 100 * (index - bloc.currentPageIndex)
+                                  : 100 * (bloc.currentPageIndex - index);
+                              bloc.pageController.animateToPage(index,
+                                  duration: Duration(milliseconds: mill),
+                                  curve: Curves.ease);
                             },
                             child: Container(
-                              height: bloc.currentPageIndex == index ? 32:20,
+                              height: bloc.currentPageIndex == index ? 32 : 20,
                               decoration: BoxDecoration(
-                                color: bloc.currentPageIndex == index ? Colors.red:Colors.white,
+                                color: bloc.currentPageIndex == index
+                                    ? Colors.red
+                                    : Colors.white,
                                 borderRadius: BorderRadius.circular(5.r),
                                 border: Border.all(
                                   width: 0.5,
@@ -116,10 +117,11 @@ class _LessonPageView extends StatelessWidget {
                               ),
                               alignment: Alignment.center,
                               child: Text(
-                                (index+1).toString(),
+                                (index + 1).toString(),
                                 style: TextStyle(
-                                    color: bloc.currentPageIndex == index ? Colors.white:Colors.black
-                                ),
+                                    color: bloc.currentPageIndex == index
+                                        ? Colors.white
+                                        : Colors.black),
                               ),
                             ),
                           ),
@@ -132,49 +134,54 @@ class _LessonPageView extends StatelessWidget {
         );
       });
-  Widget _itemTransCard(int index) => BlocBuilder<LessonBloc,LessonState>(
-    builder: (context, state) {
-      final bloc = BlocProvider.of<LessonBloc>(context);
-      Matrix4 matrix4 = Matrix4.identity();
-      if (index == bloc.currentPageIndex.floor()) {
-        //当前的item
-        double currScale = (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble();
-        var currTrans = _cardHeight * (1 - currScale) / 2;
+  Widget _itemTransCard(int index) =>
+      BlocBuilder<ModuleBloc, ModuleState>(builder: (context, state) {
+        final bloc = BlocProvider.of<ModuleBloc>(context);
+        Matrix4 matrix4 = Matrix4.identity();
+        if (index == bloc.currentPageIndex.floor()) {
+          //当前的item
+          double currScale =
+              (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble();
+          var currTrans = _cardHeight * (1 - currScale) / 2;
-        matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0)
-          ..setTranslationRaw(0.0, currTrans, 0.0);
-      } else if (index == bloc.currentPageIndex.floor() + 1) {
-        //右边的item
-        var currScale = _scale + (bloc.currentPageIndex - index + 1) * (1 - _scale);
-        var currTrans = _cardHeight * (1 - currScale) / 2;
+          matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0)
+            ..setTranslationRaw(0.0, currTrans, 0.0);
+        } else if (index == bloc.currentPageIndex.floor() + 1) {
+          //右边的item
+          var currScale =
+              _scale + (bloc.currentPageIndex - index + 1) * (1 - _scale);
+          var currTrans = _cardHeight * (1 - currScale) / 2;
-        matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0)
-          ..setTranslationRaw(0.0, currTrans, 0.0);
-      } else if (index == bloc.currentPageIndex - 1) {
-        //左边
-        var currScale = (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble();
-        var currTrans = _cardHeight * (1 - currScale) / 2;
+          matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0)
+            ..setTranslationRaw(0.0, currTrans, 0.0);
+        } else if (index == bloc.currentPageIndex - 1) {
+          //左边
+          var currScale =
+              (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble();
+          var currTrans = _cardHeight * (1 - currScale) / 2;
-        matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0)
-          ..setTranslationRaw(0.0, currTrans, 0.0);
-      } else {
-        //其他，不在屏幕显示的item
-        matrix4 = Matrix4.diagonal3Values(1.0, _scale, 1.0)
-          ..setTranslationRaw(0.0, _cardHeight * (1 - _scale) / 2, 0.0);
-      }
-      CourseModuleEntity? model = bloc.listData[index];
-      return Transform(
-        transform: matrix4,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10),
-          child: LessonItemWidget(
-            model: model,
-            isSelected: bloc.currentPageIndex == index,
-            onClickEvent: () {
-              pushNamedAndRemoveUntil(AppRouteName.home, (route) => false,arguments: {'moduleId':model?.id});
-            },
+          matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0)
+            ..setTranslationRaw(0.0, currTrans, 0.0);
+        } else {
+          //其他，不在屏幕显示的item
+          matrix4 = Matrix4.diagonal3Values(1.0, _scale, 1.0)
+            ..setTranslationRaw(0.0, _cardHeight * (1 - _scale) / 2, 0.0);
+        }
+        CourseModuleEntity? model = bloc.listData[index];
+        return Transform(
+          transform: matrix4,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10),
+            child: ModuleItemWidget(
+              model: model,
+              isSelected: bloc.currentPageIndex == index,
+              onClickEvent: () {
+                pushNamedAndRemoveUntil(
+                    AppRouteName.courseUnit, (route) => route.isFirst,
+                    arguments: {'courseModuleEntity': model});
+              },
+            ),
           ),
-        ),
-      );
-    });
+        );
+      });
 }
@@ -4,10 +4,10 @@ import &#39;package:wow_english/common/extension/string_extension.dart&#39;;
 import 'package:wow_english/common/widgets/ow_image_widget.dart';
 import 'package:wow_english/models/course_module_entity.dart';
-import '../../home/courese_module_model.dart';
+import '../../section/courese_module_model.dart';
-class LessonItemWidget extends StatelessWidget {
-  const LessonItemWidget({super.key, required this.isSelected, this.model, this.onClickEvent});
+class ModuleItemWidget extends StatelessWidget {
+  const ModuleItemWidget({super.key, required this.isSelected, this.model, this.onClickEvent});
   ///是否被选中
   final bool isSelected;
   final CourseModuleEntity? model;
-abstract class ModuleSelectEvent {}
-
-class InitEvent extends ModuleSelectEvent {}
 \ No newline at end of file
-import '../../models/app_config_entity.dart';
-
-class ModuleSelectState {
-  ModuleSelectState init() {
-    return ModuleSelectState();
-  }
-
-  ModuleSelectState clone() {
-    return ModuleSelectState();
-  }
-}
-
-class UpdateDialogState extends ModuleSelectState {
-
-  final AppConfigEntity appConfigEntity;
-
-  final bool forceUpdate;
-
-  UpdateDialogState(this.forceUpdate, this.appConfigEntity);
-}
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wow_english/common/request/dao/home_dao.dart';
+import 'package:wow_english/common/request/dao/lesson_dao.dart';
 import 'package:wow_english/common/request/exception.dart';
-import 'package:wow_english/models/course_entity.dart';
 import 'package:wow_english/common/request/dao/listen_dao.dart';
 import 'package:wow_english/models/course_process_entity.dart';
 import 'package:wow_english/utils/loading.dart';
 import 'package:wow_english/utils/toast_util.dart';
-part 'home_event.dart';
-part 'home_state.dart';
+import '../../../models/course_section_entity.dart';
+import '../../../models/course_unit_entity.dart';
-class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  final String? moduleId;
+part 'section_event.dart';
+part 'section_state.dart';
-  CourseEntity? _modelData;
+class SectionBloc extends Bloc<SectionEvent, SectionState> {
-  CourseEntity? get modelData => _modelData;
+  CourseUnitEntity _courseUnitEntity;
+
+  CourseUnitEntity get courseUnitEntity => _courseUnitEntity;
+
+  CourseUnitDetail _courseUnitDetail;
+
+  CourseUnitDetail get courseUnitDetail => _courseUnitDetail;
+
+  List<CourseSectionEntity>? _courseSectionDatas;
+
+  List<CourseSectionEntity>? get courseSectionDatas => _courseSectionDatas;
   CourseProcessEntity? _processEntity;
   CourseProcessEntity? get processEntity => _processEntity;
-  HomeBloc(this.moduleId) : super(HomeInitial()) {
+  SectionBloc(this._courseUnitEntity, this._courseUnitDetail) : super(LessonInitial()) {
     on<RequestDataEvent>(_requestData);
     on<RequestExitClassEvent>(_requestExitClass);
     on<RequestEnterClassEvent>(_requestEnterClass);
     on<RequestVideoLessonEvent>(_requestVideoLesson);
   }
-  void _requestData(RequestDataEvent event, Emitter<HomeState> emitter) async {
+  void _requestData(RequestDataEvent event, Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
-        _modelData = await HomeDao.courseLesson(moduleId: moduleId ?? '');
-        emitter(HomeDataLoadState());
+        _courseSectionDatas = await LessonDao.courseSection(courseUnitId: _courseUnitDetail.id!);
+        emitter(LessonDataLoadState());
       });
     } catch (e) {
       if (e is ApiException) {
@@ -43,7 +52,7 @@ class HomeBloc extends Bloc&lt;HomeEvent, HomeState&gt; {
     }
   }
-  void _requestVideoLesson(RequestVideoLessonEvent event, Emitter<HomeState> emitter) async {
+  void _requestVideoLesson(RequestVideoLessonEvent event, Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
         _processEntity = await ListenDao.process(event.courseLessonId);
@@ -57,7 +66,7 @@ class HomeBloc extends Bloc&lt;HomeEvent, HomeState&gt; {
   }
-  void _requestEnterClass(RequestEnterClassEvent event,Emitter<HomeState> emitter) async {
+  void _requestEnterClass(RequestEnterClassEvent event,Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
          await ListenDao.enterClass(event.courseLessonId);
@@ -70,7 +79,7 @@ class HomeBloc extends Bloc&lt;HomeEvent, HomeState&gt; {
     }
   }
-  void _requestExitClass(RequestExitClassEvent event,Emitter<HomeState> emitter) async {
+  void _requestExitClass(RequestExitClassEvent event,Emitter<SectionState> emitter) async {
     await ListenDao.exitClass(event.courseLessonId,event.currentStep,event.currentTime);
   }
 }
-part of 'home_bloc.dart';
+part of 'section_bloc.dart';
 @immutable
-abstract class HomeEvent {}
+abstract class SectionEvent {}
-class RequestDataEvent extends HomeEvent {}
+class RequestDataEvent extends SectionEvent {}
 ///获取视频课程内容
-class RequestVideoLessonEvent extends HomeEvent {
+class RequestVideoLessonEvent extends SectionEvent {
   final String courseLessonId;
   final int courseType;
   RequestVideoLessonEvent(this.courseLessonId, this.courseType);
 }
 ///进入课堂
-class RequestEnterClassEvent extends HomeEvent {
+class RequestEnterClassEvent extends SectionEvent {
   final String courseLessonId;
   final int courseType;
   RequestEnterClassEvent(this.courseLessonId,this.courseType);
 }
 ///退出课堂
-class RequestExitClassEvent extends HomeEvent {
+class RequestExitClassEvent extends SectionEvent {
   final String courseLessonId;
   final String currentStep;
   final String currentTime;
-part of 'home_bloc.dart';
+part of 'section_bloc.dart';
 @immutable
-abstract class HomeState {}
+abstract class SectionState {}
-class HomeInitial extends HomeState {}
+class LessonInitial extends SectionState {}
-class HomeDataLoadState extends HomeState {}
+class LessonDataLoadState extends SectionState {}
-class RequestVideoLessonState extends HomeState {
+class RequestVideoLessonState extends SectionState {
   final String courseLessonId;
   final int type;
   RequestVideoLessonState(this.courseLessonId,this.type);
 }
-class RequestEnterClassState extends HomeState{
+class RequestEnterClassState extends SectionState{
   final String courseLessonId;
   final int courseType;
   RequestEnterClassState(this.courseLessonId,this.courseType);
@@ -2,9 +2,10 @@ import &#39;package:flutter/material.dart&#39;;
 class CourseModuleModel {
   Color get color => getCourseColor();
-  String get courseModuleTitle =>  getCourseModuleTitle();
-  String get courseModuleLogo => getCoureseImageName();
+  String get courseModuleTitle => getCourseModuleTitle();
+
+  String get courseModuleLogo => getCoureseImageName();
   String course;
@@ -84,4 +85,4 @@ class CourseModuleModel {
     }
     return 'red_positive';
   }
-}
 \ No newline at end of file
+}
@@ -3,60 +3,47 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.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_entity.dart';
-import 'package:wow_english/pages/home/widgets/home_bouns_item.dart';
-import 'package:wow_english/pages/home/widgets/home_tab_header_widget.dart';
-import 'package:wow_english/pages/home/widgets/home_vidoe_item.dart';
+import 'package:wow_english/models/course_unit_entity.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';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/utils/toast_util.dart';
-import 'bloc/home_bloc.dart';
+import '../../models/course_section_entity.dart';
+import 'bloc/section_bloc.dart';
 import 'courese_module_model.dart';
-class HomePage extends StatelessWidget {
-  const HomePage({super.key, this.moduleId});
+/// 环节列表页
+class SectionPage extends StatelessWidget {
+  const SectionPage({super.key, required this.courseUnitEntity, required this.courseUnitDetail});
-  /// 模块id
-  final String? moduleId;
+  final CourseUnitEntity courseUnitEntity;
+
+  /// unitId
+  final CourseUnitDetail courseUnitDetail;
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => HomeBloc(moduleId)..add(RequestDataEvent()),
-      child: _HomePageView(context),
+      create: (context) => SectionBloc(courseUnitEntity, courseUnitDetail)..add(RequestDataEvent()),
+      child: _SectionPageView(context),
     );
   }
 }
-class _HomePageView extends StatelessWidget {
-
-  const _HomePageView(this.context);
+class _SectionPageView extends StatelessWidget {
+  const _SectionPageView(this.context);
   final BuildContext context;
-  void _headerActionEvent(HeaderActionType type) {
-    if (type == HeaderActionType.video) {
-      pushNamed(AppRouteName.reAfter);
-    } else if (type == HeaderActionType.phase) {
-      pushNamed(AppRouteName.lesson);
-    } else if (type == HeaderActionType.listen) {
-      pushNamed(AppRouteName.listen);
-    } else if (type == HeaderActionType.shop) {
-      pushNamed(AppRouteName.shop);
-    } else if (type == HeaderActionType.user) {
-      pushNamed(AppRouteName.user);
-    } else if (type == HeaderActionType.home) {
-      Navigator.pop(context);
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    final bloc = BlocProvider.of<HomeBloc>(context);
-    return BlocListener<HomeBloc, HomeState>(
+    final bloc = BlocProvider.of<SectionBloc>(context);
+    return BlocListener<SectionBloc, SectionState>(
       listener: (context, state) {
         if (state is RequestVideoLessonState) {
-          final videoUrl = bloc.processEntity?.videos?.videoUrl??'';
+          final videoUrl = bloc.processEntity?.videos?.videoUrl ?? '';
           var title = '';
           if (state.type == 1) {
             title = 'song';
@@ -73,9 +60,13 @@ class _HomePageView extends StatelessWidget {
           if (videoUrl.isEmpty || !videoUrl.contains('http')) {
             return;
           }
-          pushNamed(AppRouteName.lookVideo,arguments: {'videoUrl':videoUrl,'title':title,'courseLessonId':state.courseLessonId}).then((value) {
+          pushNamed(AppRouteName.lookVideo, arguments: {
+            'videoUrl': videoUrl,
+            'title': title,
+            'courseLessonId': state.courseLessonId
+          }).then((value) {
             if (value != null) {
-              Map<String,String> dataMap = value as Map<String,String>;
+              Map<String, String> dataMap = value as Map<String, String>;
               bloc.add(RequestExitClassEvent(
                 dataMap['courseLessonId']!,
                 '0',
@@ -87,35 +78,37 @@ class _HomePageView extends StatelessWidget {
         }
         if (state is RequestEnterClassState) {
-          if (state.courseType != 3 && state.courseType != 4) {///视频类型
+          if (state.courseType != 3 && state.courseType != 4) {
+            ///视频类型
             ///获取视频课程内容
-            bloc.add(RequestVideoLessonEvent(state.courseLessonId,state.courseType));
+            bloc.add(RequestVideoLessonEvent(
+                state.courseLessonId, state.courseType));
             return;
           }
-          if (state.courseType == 4) {//绘本
-            pushNamed(AppRouteName.reading, arguments: {'courseLessonId':state.courseLessonId}).then((value) {
+          if (state.courseType == 4) {
+            //绘本
+            pushNamed(AppRouteName.reading,
+                    arguments: {'courseLessonId': state.courseLessonId})
+                .then((value) {
               if (value != null) {
-                Map<String,String> dataMap = value as Map<String,String>;
+                Map<String, String> dataMap = value as Map<String, String>;
                 bloc.add(RequestExitClassEvent(
-                    dataMap['courseLessonId']!,
-                    dataMap['currentStep']!,
-                    '0'
-                ));
+                    dataMap['courseLessonId']!, dataMap['currentStep']!, '0'));
               }
             });
             return;
           }
-          if (state.courseType == 3) {//练习
-            pushNamed(AppRouteName.topicPic,arguments: {'courseLessonId':state.courseLessonId}).then((value) {
+          if (state.courseType == 3) {
+            //练习
+            pushNamed(AppRouteName.topicPic,
+                    arguments: {'courseLessonId': state.courseLessonId})
+                .then((value) {
               if (value != null) {
-                Map<String,String> dataMap = value as Map<String,String>;
+                Map<String, String> dataMap = value as Map<String, String>;
                 bloc.add(RequestExitClassEvent(
-                    dataMap['courseLessonId']!,
-                    dataMap['currentStep']!,
-                    '0'
-                ));
+                    dataMap['courseLessonId']!, dataMap['currentStep']!, '0'));
               }
             });
             return;
@@ -126,9 +119,9 @@ class _HomePageView extends StatelessWidget {
     );
   }
-  Widget _homeView() => BlocBuilder<HomeBloc, HomeState>(
-      builder: (context, state) {
-        final bloc = BlocProvider.of<HomeBloc>(context);
+  Widget _homeView() =>
+      BlocBuilder<SectionBloc, SectionState>(builder: (context, state) {
+        final bloc = BlocProvider.of<SectionBloc>(context);
         return Scaffold(
           body: Container(
             color: Colors.white,
@@ -136,19 +129,17 @@ class _HomePageView extends StatelessWidget {
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  HomeTabHeaderWidget(
-                    entity: bloc.modelData,
-                    actionTap: (HeaderActionType type) {
-                      _headerActionEvent(type);
-                    },
-                  ),
+                  SectionHeaderWidget(
+                      title: bloc.courseUnitDetail.name,
+                      courseModuleCode: bloc.courseUnitEntity.courseModuleCode),
                   Expanded(
                       child: ListView.builder(
-                          itemCount: bloc.modelData?.totalCourseLesson??0,
+                          itemCount: bloc.courseSectionDatas?.length ?? 0,
                           scrollDirection: Axis.horizontal,
                           itemBuilder: (BuildContext context, int index) {
-                            CourseCourseLessons? data = bloc.modelData?.courseLessons?[index];
-                            if (data?.courseType == 5) {
+                            CourseSectionEntity sectionData =
+                                bloc.courseSectionDatas![index];
+                            if (sectionData.courseType == 5) {
                               //彩蛋
                               return GestureDetector(
                                 onTap: () {
@@ -156,15 +147,17 @@ class _HomePageView extends StatelessWidget {
                                     pushNamed(AppRouteName.login);
                                     return;
                                   }
-                                  if (data!.lock!) {
+                                  if (sectionData.lock == true) {
                                     showToast('当前课程暂未解锁');
                                     return;
                                   }
+
                                   ///进入课堂
-                                  bloc.add(RequestEnterClassEvent(data.id!,data.courseType!));
+                                  bloc.add(RequestEnterClassEvent(
+                                      sectionData.id.toString(), sectionData.courseType));
                                 },
-                                child: HomeBoundsItem(
-                                  imageUrl: data?.coverUrl,
+                                child: SectionBoundsItem(
+                                  imageUrl: sectionData.coverUrl,
                                 ),
                               );
                             } else {
@@ -174,16 +167,18 @@ class _HomePageView extends StatelessWidget {
                                     pushNamed(AppRouteName.login);
                                     return;
                                   }
-                                  if (data!.lock!) {
+                                  if (sectionData.lock == true) {
                                     showToast('当前课程暂未解锁');
                                     return;
                                   }
+
                                   ///进入课堂
-                                  bloc.add(RequestEnterClassEvent(data.id!,data.courseType!));
+                                  bloc.add(RequestEnterClassEvent(
+                                      sectionData.id.toString(), sectionData.courseType));
                                 },
-                                child: HomeVideoItem(
-                                  entity: bloc.modelData,
-                                  lessons: data,
+                                child: SectionVideoItem(
+                                  unitEntity: bloc.courseUnitEntity,
+                                  lessons: sectionData,
                                 ),
                               );
                             }
@@ -200,17 +195,26 @@ class _HomePageView extends StatelessWidget {
                           ),
                           Container(
                             decoration: BoxDecoration(
-                              color: CourseModuleModel(bloc.modelData?.courseModuleCode??'Phase-1').color,
+                              color: CourseModuleModel(
+                                      bloc.courseUnitEntity.courseModuleCode ??
+                                          'Phase-1')
+                                  .color,
                               borderRadius: BorderRadius.circular(14.5.r),
                             ),
-                            padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 24.w),
+                            padding: EdgeInsets.symmetric(
+                                vertical: 8.h, horizontal: 24.w),
                             child: Text(
-                              '${(bloc.modelData?.nowCourseLesson??0)}/${bloc.modelData?.totalCourseLesson??0}',
-                              style: TextStyle(color: Colors.white, fontSize: 12.sp),
+                              '${(bloc.courseUnitEntity.nowStep ?? 0)}/${bloc.courseUnitEntity.total ?? 0}',
+                              style: TextStyle(
+                                  color: Colors.white, fontSize: 12.sp),
                             ),
                           ),
                           Image.asset(
-                            CourseModuleModel(bloc.modelData?.courseModuleCode??'Phase-1').courseModuleLogo.assetPng,
+                            CourseModuleModel(
+                                    bloc.courseUnitEntity.courseModuleCode ??
+                                        'Phase-1')
+                                .courseModuleLogo
+                                .assetPng,
                             height: 47.h,
                             width: 80.w,
                             // color: Colors.red,
@@ -2,15 +2,16 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.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_entity.dart';
+import '../../../models/course_section_entity.dart';
+import '../../../models/course_unit_entity.dart';
 import '../courese_module_model.dart';
-class HomeVideoItem extends StatelessWidget {
-  const HomeVideoItem({super.key, this.lessons, this.entity});
+class SectionVideoItem extends StatelessWidget {
+  const SectionVideoItem({super.key, this.lessons, this.unitEntity});
-  final CourseEntity? entity;
-  final CourseCourseLessons? lessons;
+  final CourseUnitEntity? unitEntity;
+  final CourseSectionEntity? lessons;
   @override
   Widget build(BuildContext context) {
@@ -50,7 +51,7 @@ class HomeVideoItem extends StatelessWidget {
                     width: 2,
                     color: const Color(0xFF140C10),
                   ),
-                  color: CourseModuleModel(entity?.courseModuleCode??'Phase-1').color,
+                  color: CourseModuleModel(unitEntity?.courseModuleCode??'Phase-1').color,
                   borderRadius: BorderRadius.circular(6)
               ),
               padding: EdgeInsets.symmetric(horizontal: 10.w),
@@ -2,8 +2,8 @@ import &#39;package:flutter/cupertino.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/widgets/ow_image_widget.dart';
-class HomeBoundsItem extends StatelessWidget {
-  const HomeBoundsItem({super.key, this.imageUrl});
+class SectionBoundsItem extends StatelessWidget {
+  const SectionBoundsItem({super.key, this.imageUrl});
   final String? imageUrl;
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/pages/user/bloc/user_bloc.dart';
+
+import '../courese_module_model.dart';
+
+class SectionHeaderWidget extends StatelessWidget {
+  const SectionHeaderWidget({super.key, this.title, this.courseModuleCode});
+
+  final String? title;
+
+  final String? courseModuleCode;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<UserBloc, UserState>(
+      builder: (context, state) {
+        return Container(
+            height: 45,
+            width: double.infinity,
+            color: CourseModuleModel(courseModuleCode ?? 'Phase-1').color,
+            padding: EdgeInsets.symmetric(horizontal: 9.5.w),
+            child: Row(
+              children: [
+                ScreenUtil().bottomBarHeight.horizontalSpace,
+                GestureDetector(
+                  onTap: () {
+                    Navigator.pop(context);
+                  },
+                  child: Container(
+                    alignment: Alignment.center,
+                    child: Image.asset(
+                      'back_around'.assetPng,
+                      height: 40.h,
+                      width: 40.w,
+                    ),
+                  ),
+                ),
+                20.horizontalSpace,
+                Expanded(
+                    child: Text(
+                  title ??
+                      CourseModuleModel(courseModuleCode ?? 'Phase-1')
+                          .courseModuleTitle,
+                  textAlign: TextAlign.left,
+                  style: const TextStyle(color: Colors.white, fontSize: 30.0),
+                )),
+                ScreenUtil().bottomBarHeight.horizontalSpace,
+              ],
+            ));
+      },
+    );
+  }
+}
@@ -80,10 +80,9 @@ class ShoppingBloc extends Bloc&lt;ShoppingEvent, ShoppingState&gt; {
             await fluwx?.registerApi(appId: "wx365e5a79956a450a",
                 universalLink: "https://app-api.wowenglish.com.cn/app/");
             wxPayResponseListener = (WeChatResponse response) {
-              debugPrint("WqfPay wxPayResponseListener $response");
+              debugPrint("wxPayResponseListener $response");
               if (response is WeChatPaymentResponse) {
                 if (response.errCode == 0) {
-                  debugPrint("WqfPay wxPayResponseListener response=${response.errCode}");
                   showToast("支付成功");
                   // Log.d("emitter isDone=${emitter.isDone}");
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wow_english/pages/home/home_page.dart';
-import 'package:wow_english/pages/lessons/lesson_page.dart';
+import 'package:wow_english/pages/module/module_page.dart';
+import '../unit/view.dart';
 import 'blocs/tab_bloc.dart';
 class TabPage extends StatelessWidget {
   const TabPage({super.key});
   final _pages =const <Widget>[
-    HomePage(),
-    LessonPage()
+    UnitPage(),
+    ModulePage()
   ];
   final _tabIcons = const <Icon>[
+import 'package:bloc/bloc.dart';
+import 'package:wow_english/pages/unit/widget/home_tab_header_widget.dart';
+
+import '../../common/request/dao/lesson_dao.dart';
+import '../../common/request/exception.dart';
+import '../../models/course_module_entity.dart';
+import '../../models/course_unit_entity.dart';
+import '../../route/route.dart';
+import '../../utils/loading.dart';
+import '../../utils/toast_util.dart';
+import 'event.dart';
+import 'state.dart';
+
+class UnitBloc extends Bloc<UnitEvent, UnitState> {
+
+  CourseModuleEntity? _moduleEntity;
+
+  CourseModuleEntity? get moduleEntity => _moduleEntity;
+
+  CourseUnitEntity? _unitData;
+
+  CourseUnitEntity? get unitData => _unitData;
+
+
+  UnitBloc(CourseModuleEntity? courseEntity) : super(UnitState().init()) {
+    on<RequestUnitDataEvent>(_requestData);
+  }
+
+  void _requestData(RequestUnitDataEvent event, Emitter<UnitState> emitter) async {
+    try {
+      await loading(() async {
+        _unitData = await LessonDao.courseUnit(event.moduleId);
+        emitter(UnitDataLoadState());
+      });
+    } catch (e) {
+      if (e is ApiException) {
+        showToast(e.message ?? '请求失败,请检查网络连接');
+      }
+    }
+  }
+
+  String? getCourseModuleCode() {
+    return _moduleEntity?.code ?? _unitData?.courseModuleCode;
+  }
+
+  void headerActionEvent(HeaderActionType type) {
+    if (type == HeaderActionType.video) {
+      pushNamed(AppRouteName.reAfter);
+    } else if (type == HeaderActionType.phase) {
+      pushNamed(AppRouteName.courseModule);
+    } else if (type == HeaderActionType.listen) {
+      pushNamed(AppRouteName.listen);
+    } else if (type == HeaderActionType.shop) {
+      pushNamed(AppRouteName.shop);
+    } else if (type == HeaderActionType.user) {
+      pushNamed(AppRouteName.user);
+    }
+  }
+}
+abstract class UnitEvent {}
+
+// 获取课程单元数据
+class RequestUnitDataEvent extends UnitEvent {
+  final int? moduleId;
+
+  RequestUnitDataEvent(this.moduleId);
+}
+class UnitState {
+  UnitState init() {
+    return UnitState();
+  }
+
+  UnitState clone() {
+    return UnitState();
+  }
+}
+
+class UnitDataLoadState extends UnitState {}
 \ No newline at end of file
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/pages/unit/state.dart';
+import 'package:wow_english/pages/unit/widget/course_unit_item.dart';
+import 'package:wow_english/pages/unit/widget/home_tab_header_widget.dart';
+import 'package:wow_english/route/route.dart';
+
+import '../../models/course_module_entity.dart';
+import '../../models/course_unit_entity.dart';
+import '../../utils/toast_util.dart';
+import 'bloc.dart';
+import 'event.dart';
+
+// 课程列表页（多unit，参考口语星球的框或分割标志）
+class UnitPage extends StatelessWidget {
+  const UnitPage({super.key, this.courseModuleEntity});
+
+  /// 模块
+  final CourseModuleEntity? courseModuleEntity;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (BuildContext context) => UnitBloc(courseModuleEntity)
+        ..add(RequestUnitDataEvent(courseModuleEntity?.id)),
+      child: Builder(builder: (context) => _buildPage(context)),
+    );
+  }
+
+  Widget _buildPage(BuildContext context) {
+    return BlocBuilder<UnitBloc, UnitState>(builder: (context, state) {
+      final bloc = BlocProvider.of<UnitBloc>(context);
+      return Scaffold(
+        body: Container(
+          color: Colors.white,
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                HomeTabHeaderWidget(
+                  courseModuleCode: bloc.getCourseModuleCode(),
+                  actionTap: (HeaderActionType type) {
+                    bloc.headerActionEvent(type);
+                  },
+                ),
+                Expanded(
+                  child: Container(
+                      margin: EdgeInsets.symmetric(horizontal: 12.w),
+                      child: ListView.builder(
+                          itemCount:
+                              bloc.unitData?.courseUnitVOList?.length ?? 0,
+                          scrollDirection: Axis.horizontal,
+                          itemBuilder: (BuildContext context, int index) {
+                            CourseUnitDetail? data =
+                                bloc.unitData?.courseUnitVOList?[index];
+                            return GestureDetector(
+                              onTap: () {
+                                if (data.lock == true) {
+                                  showToast('当前unit暂未解锁');
+                                  return;
+                                }
+
+                                pushNamed(AppRouteName.courseSection,
+                                    arguments: {
+                                      'courseUnitEntity': bloc.unitData,
+                                      'courseUnitDetail': data
+                                    });
+                              },
+                              child: CourseUnitItem(
+                                unitEntity: bloc.unitData!,
+                                unitLesson: data!,
+                              ),
+                            );
+                          })),
+                ),
+                SafeArea(
+                  child: Column(
+                    children: [
+                      6.verticalSpace,
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      );
+    });
+  }
+}
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/common/widgets/ow_image_widget.dart';
+
+import '../../../models/course_unit_entity.dart';
+
+class CourseUnitItem extends StatelessWidget {
+  const CourseUnitItem(
+      {super.key, required this.unitEntity, required this.unitLesson});
+
+  final CourseUnitEntity unitEntity;
+  final CourseUnitDetail unitLesson;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 24.h),
+      child: Container(
+        width: 165.w,
+        padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 24.h),
+        decoration: BoxDecoration(
+          image: DecorationImage(
+              image: AssetImage('gendubeij'.assetPng), fit: BoxFit.fill),
+        ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Expanded(
+                child: Container(
+              decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 2,
+                    color: const Color(0xFF140C10),
+                  ),
+                  borderRadius: BorderRadius.circular(6)),
+              child: OwImageWidget(
+                name: unitLesson.coverUrl ?? '',
+                fit: BoxFit.fitHeight,
+              ),
+            )),
+            20.verticalSpace,
+            SizedBox(
+              height: 40.h,
+              child: Text(
+                unitLesson.name ?? '',
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style:
+                    TextStyle(fontSize: 11.sp, color: const Color(0xFF140C10)),
+              ),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
@@ -5,8 +5,7 @@ import &#39;package:wow_english/common/extension/string_extension.dart&#39;;
 import 'package:wow_english/pages/user/bloc/user_bloc.dart';
 import '../../../common/core/app_config_helper.dart';
-import '../../../models/course_entity.dart';
-import '../courese_module_model.dart';
+import '../../section/courese_module_model.dart';
 enum HeaderActionType {
   //视频跟读
@@ -19,14 +18,13 @@ enum HeaderActionType {
   shop,
   //个人信息
   user,
-  //返回到（模块选择）首页
-  home,
 }
 class HomeTabHeaderWidget extends StatelessWidget {
-  const HomeTabHeaderWidget({super.key, this.entity, this.actionTap});
+  const HomeTabHeaderWidget({super.key, this.courseModuleCode, this.actionTap});
+
+  final String? courseModuleCode;
-  final CourseEntity? entity;
   final Function(HeaderActionType type)? actionTap;
   @override
@@ -37,16 +35,14 @@ class HomeTabHeaderWidget extends StatelessWidget {
             height: 45,
             width: double.infinity,
             color:
-                CourseModuleModel(entity?.courseModuleCode ?? 'Phase-1').color,
+                CourseModuleModel(courseModuleCode ?? 'Phase-1').color,
             padding: EdgeInsets.symmetric(horizontal: 9.5.w),
             child: Row(
               children: [
                 ScreenUtil().bottomBarHeight.horizontalSpace,
                 GestureDetector(
                   onTap: () {
-                    if (actionTap != null) {
-                      actionTap!(HeaderActionType.home);
-                    }
+                    Navigator.pop(context);
                   },
                   child: Container(
                     alignment: Alignment.center,
@@ -96,7 +92,7 @@ class HomeTabHeaderWidget extends StatelessWidget {
                 20.horizontalSpace,
                 Expanded(
                     child: Text(
-                  CourseModuleModel(entity?.courseModuleCode ?? 'Phase-1')
+                  CourseModuleModel(courseModuleCode ?? 'Phase-1')
                       .courseModuleTitle,
                   textAlign: TextAlign.left,
                   style: const TextStyle(color: Colors.white, fontSize: 30.0),
@@ -122,8 +118,8 @@ class HomeTabHeaderWidget extends StatelessWidget {
                       }
                     },
                     icon: Image.asset('listen'.assetPng)),
-                Visibility(
-                  visible: !AppConfigHelper.shouldHidePay(),
+                Offstage(
+                  offstage: AppConfigHelper.shouldHidePay(),
                   child: IconButton(
                       onPressed: () {
                         if (actionTap != null) {
@@ -4,6 +4,7 @@ import &#39;package:flutter/services.dart&#39;;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/common/core/app_config_helper.dart';
 import 'package:wow_english/common/core/app_consts.dart';
 import 'package:wow_english/common/core/assets_const.dart';
 import 'package:wow_english/common/core/user_util.dart';
@@ -163,9 +164,8 @@ class _UserView extends StatelessWidget {
                   ),
                 ),
                 12.verticalSpace,
-                // todo 为了过审，把测试账号兑换功能下掉
                 Offstage(
-                  offstage: UserUtil.getUser()?.phoneNum == '17730280759',
+                  offstage: AppConfigHelper.shouldHidePay(),
                   child: OutlinedButton(
                       onPressed: () => pushNamed(AppRouteName.exLesson),
                       style: normalButtonStyle,
@@ -175,7 +175,7 @@ class _UserView extends StatelessWidget {
                       )),
                 ),
                 Offstage(
-                  offstage: UserUtil.getUser()?.phoneNum == '17730280759',
+                  offstage: AppConfigHelper.shouldHidePay(),
                   child: 12.verticalSpace,
                 ),
                 OutlinedButton(
@@ -3,22 +3,21 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:wow_english/app/splash_page.dart';
 import 'package:wow_english/common/pages/wow_web_page.dart';
 import 'package:wow_english/generated/json/base/json_convert_content.dart';
+import 'package:wow_english/models/course_unit_entity.dart';
 import 'package:wow_english/models/product_entity.dart';
 import 'package:wow_english/pages/games/view.dart';
-import 'package:wow_english/pages/home/home_page.dart';
-import 'package:wow_english/pages/lessons/lesson_page.dart';
+import 'package:wow_english/pages/home/view.dart';
 import 'package:wow_english/pages/listen/listen_page.dart';
 import 'package:wow_english/pages/login/forgetpwd/forget_password_home_page.dart';
 import 'package:wow_english/pages/login/loginpage/login_page.dart';
 import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart';
-import 'package:wow_english/pages/moduleSelect/view.dart';
+import 'package:wow_english/pages/module/module_page.dart';
 import 'package:wow_english/pages/practice/topic_picture_page.dart';
 import 'package:wow_english/pages/repeatafter/repeat_after_page.dart';
 import 'package:wow_english/pages/repeataftercontent/repeat_after_content_page.dart';
 import 'package:wow_english/pages/shop/exchane/exchange_lesson_page.dart';
 import 'package:wow_english/pages/shop/exchangelist/exchange_lesson_list_page.dart';
 import 'package:wow_english/pages/shop/home/shop_home_page.dart';
-import 'package:wow_english/pages/tab/tab_page.dart';
 import 'package:wow_english/pages/user/information/user_information_page.dart';
 import 'package:wow_english/pages/user/modify/modify_user_avatar_page.dart';
 import 'package:wow_english/pages/user/modify/modify_user_information_page.dart';
@@ -26,24 +25,28 @@ import &#39;package:wow_english/pages/user/setting/setting_page.dart&#39;;
 import 'package:wow_english/pages/user/user_page.dart';
 import 'package:wow_english/pages/video/lookvideo/look_video_page.dart';
+import '../models/course_module_entity.dart';
 import '../pages/reading/reading_page.dart';
+import '../pages/section/section_page.dart';
 import '../pages/shopping/view.dart';
+import '../pages/tab/tab_page.dart';
+import '../pages/unit/view.dart';
 import '../pages/user/setting/delete_account_page.dart';
 import '../pages/user/setting/reback_page.dart';
-import '../utils/log_util.dart';
 class AppRouteName {
   static const String splash = 'splash';
   static const String login = 'login';
-  static const String moduleSelect = 'moduleSelect';
-  static const String games = 'games';
   static const String home = 'home';
+  static const String games = 'games';
   static const String fogPwd = 'fogPwd';
   /// 设置密码，修改密码；不要自己调用，使用[SetPassWordPage.push]方法，隐藏这种实现
   //static const String setPwd = 'setPwd';
   static const String webView = 'webView';
-  static const String lesson = 'lesson';
+  static const String courseModule = 'courseModules';
+  static const String courseUnit = 'courseUnits';
+  static const String courseSection = 'courseSections';
   static const String listen = 'listen';
   static const String shop = 'shop';
   static const String exLesson = 'exLesson';
@@ -55,6 +58,7 @@ class AppRouteName {
   /// 用户详细信息页
   static const String userInformation = 'userInformation';
+
   /// 修改用户头像
   static const String userAvatar = 'userAvatar';
@@ -62,15 +66,19 @@ class AppRouteName {
   //static const String userModifyInformation = 'userModifyInformation';
   ///看视频
   static const String lookVideo = 'lookVideo';
+
   ///绘本
   static const String reading = 'reading';
+
   ///视频跟读详情
   static const String readAfterContent = 'readAfterContent';
   ///设置
   static const String setting = 'setting';
+
   ///注销账号
   static const String deleteAccount = 'deleteAccount';
+
   ///帮助与反馈
   static const String reBack = 'reBack';
@@ -93,25 +101,42 @@ class AppRouter {
             transitionsBuilder: (_, __, ___, child) => child);
       case AppRouteName.login:
         // 是否默认密码登录，修改密码后跳登录页，优先密码登录体验好点
-        final bool showPasswordPage = (settings.arguments as Map?)?.getOrNull('showPasswordPage') as bool? ?? false;
-        return CupertinoPageRoute(builder: (_) => LoginPage(preferencesPasswordLogin: showPasswordPage));
-      case AppRouteName.moduleSelect:
-        return CupertinoPageRoute(builder: (_) => const ModuleSelectPage());
+        final bool showPasswordPage = (settings.arguments as Map?)
+                ?.getOrNull('showPasswordPage') as bool? ??
+            false;
+        return CupertinoPageRoute(
+            builder: (_) =>
+                LoginPage(preferencesPasswordLogin: showPasswordPage));
+      case AppRouteName.home:
+        return CupertinoPageRoute(builder: (_) => const HomePage());
       case AppRouteName.games:
         return CupertinoPageRoute(builder: (_) => const GamesPage());
-      case AppRouteName.home:
-        var moduleId = '';
+      case AppRouteName.fogPwd:
+        return CupertinoPageRoute(
+            builder: (_) => const ForgetPasswordHomePage());
+      case AppRouteName.courseModule:
+        return CupertinoPageRoute(builder: (_) => const ModulePage());
+      case AppRouteName.courseUnit:
+        CourseModuleEntity courseModuleEntity = CourseModuleEntity();
         if (settings.arguments != null) {
-          moduleId = (settings.arguments as Map)['moduleId'] as String;
+          courseModuleEntity = (settings.arguments as Map)
+              .getOrNull('courseModuleEntity') as CourseModuleEntity;
         }
         return CupertinoPageRoute(
-            builder: (_) => HomePage(
-                  moduleId: moduleId,
-                ));
-      case AppRouteName.fogPwd:
-        return CupertinoPageRoute(builder: (_) => const ForgetPasswordHomePage());
-      case AppRouteName.lesson:
-        return CupertinoPageRoute(builder: (_) => const LessonPage());
+            builder: (_) => UnitPage(courseModuleEntity: courseModuleEntity));
+      case AppRouteName.courseSection:
+        CourseUnitEntity courseUnitEntity = CourseUnitEntity();
+        CourseUnitDetail courseUnitDetail = CourseUnitDetail();
+        if (settings.arguments != null) {
+          courseUnitEntity = (settings.arguments as Map)
+              .getOrNull('courseUnitEntity') as CourseUnitEntity;
+          courseUnitDetail = (settings.arguments as Map)
+              .getOrNull('courseUnitDetail') as CourseUnitDetail;
+        }
+        return CupertinoPageRoute(
+            builder: (_) => SectionPage(
+                courseUnitEntity: courseUnitEntity,
+                courseUnitDetail: courseUnitDetail));
       case AppRouteName.listen:
         return CupertinoPageRoute(builder: (_) => const ListenPage());
       case AppRouteName.shop:
@@ -121,11 +146,13 @@ class AppRouter {
         if (settings.arguments != null && settings.arguments is ProductEntity) {
           productEntity = settings.arguments as ProductEntity;
         }
-        return CupertinoPageRoute(builder: (_) => ShoppingPage(productEntity: productEntity));
+        return CupertinoPageRoute(
+            builder: (_) => ShoppingPage(productEntity: productEntity));
       case AppRouteName.exLesson:
         return CupertinoPageRoute(builder: (_) => const ExchangeLessonPage());
       case AppRouteName.exList:
-        return CupertinoPageRoute(builder: (_) => const ExchangeLessonListPage());
+        return CupertinoPageRoute(
+            builder: (_) => const ExchangeLessonListPage());
       case AppRouteName.reAfter:
         return CupertinoPageRoute(builder: (_) => const RepeatAfterPage());
       case AppRouteName.user:
@@ -153,19 +180,22 @@ class AppRouter {
       case AppRouteName.topicPic:
         var courseLessonId = '';
         if (settings.arguments != null) {
-          courseLessonId = (settings.arguments as Map)['courseLessonId'] as String;
+          courseLessonId =
+              (settings.arguments as Map)['courseLessonId'] as String;
         }
-        return CupertinoPageRoute(builder: (_) => TopicPicturePage(courseLessonId: courseLessonId));
+        return CupertinoPageRoute(
+            builder: (_) => TopicPicturePage(courseLessonId: courseLessonId));
       case AppRouteName.lookVideo:
         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 courseLessonId =
+            (settings.arguments as Map)['courseLessonId'] as String?;
         return CupertinoPageRoute(
             builder: (_) => LookVideoPage(
-              videoUrl: videoUrl,
-              typeTitle: title,
-              courseLessonId: courseLessonId,
-            ));
+                  videoUrl: videoUrl,
+                  typeTitle: title,
+                  courseLessonId: courseLessonId,
+                ));
       /*case AppRouteName.setPwd:
       case AppRouteName.setPwd:
                   phoneNum: phoneNum,
@@ -174,7 +204,8 @@ class AppRouter {
                 ));*/
       case AppRouteName.webView:
         final urlStr = (settings.arguments as Map)['urlStr'] as String;
-        final webViewTitle = (settings.arguments as Map)['webViewTitle'] as String;
+        final webViewTitle =
+            (settings.arguments as Map)['webViewTitle'] as String;
         return CupertinoPageRoute(
             builder: (_) => WowWebViewPage(
                   urlStr: urlStr,
@@ -183,13 +214,16 @@ class AppRouter {
       case AppRouteName.readAfterContent:
         var videoFollowReadId = '';
         if (settings.arguments != null) {
-          videoFollowReadId = (settings.arguments as Map)['videoFollowReadId'] as String;
+          videoFollowReadId =
+              (settings.arguments as Map)['videoFollowReadId'] as String;
         }
-        return CupertinoPageRoute(builder: (_) => RepeatAfterContentPage(videoFollowReadId: videoFollowReadId));
+        return CupertinoPageRoute(
+            builder: (_) =>
+                RepeatAfterContentPage(videoFollowReadId: videoFollowReadId));
       case AppRouteName.setting:
-        return  CupertinoPageRoute(builder: (_) => const SettingPage());
+        return CupertinoPageRoute(builder: (_) => const SettingPage());
       case AppRouteName.deleteAccount:
-        return  CupertinoPageRoute(builder: (_) => const DeleteAccountPage());
+        return CupertinoPageRoute(builder: (_) => const DeleteAccountPage());
       case AppRouteName.reBack:
         return CupertinoPageRoute(builder: (_) => const ReBackPage());
       case AppRouteName.tab:
@@ -202,26 +236,34 @@ class AppRouter {
       case AppRouteName.reading:
         var courseLessonId = '';
         if (settings.arguments != null) {
-          courseLessonId = (settings.arguments as Map)['courseLessonId'] as String;
+          courseLessonId =
+              (settings.arguments as Map)['courseLessonId'] as String;
         }
-        return CupertinoPageRoute(builder: (_) => ReadingPage(courseLessonId: courseLessonId));
+        return CupertinoPageRoute(
+            builder: (_) => ReadingPage(courseLessonId: courseLessonId));
       default:
         return CupertinoPageRoute(
-            builder: (_) => Scaffold(body: Center(child: Text('No route defined for ${settings.name}'))));
+            builder: (_) => Scaffold(
+                body: Center(
+                    child: Text('No route defined for ${settings.name}'))));
     }
   }
 }
 Future pushNamed(String routeName, {Object? arguments}) {
-  return Navigator.of(AppRouter.context).pushNamed(routeName, arguments: arguments).then((value) {
+  return Navigator.of(AppRouter.context)
+      .pushNamed(routeName, arguments: arguments)
+      .then((value) {
     return value;
   });
 }
-Future pushNamedAndRemoveUntil(String routeName, RoutePredicate predicate, {Object? arguments}) {
-  return Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(routeName, predicate, arguments: arguments);
+Future pushNamedAndRemoveUntil(String routeName, RoutePredicate predicate,
+    {Object? arguments}) {
+  return Navigator.of(AppRouter.context)
+      .pushNamedAndRemoveUntil(routeName, predicate, arguments: arguments);
 }
 void popPage({dynamic data}) {
-   Navigator.of(AppRouter.context).pop(data);
+  Navigator.of(AppRouter.context).pop(data);
 }
@@ -16,7 +16,7 @@ publish_to: &#39;none&#39; # 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+2
+version: 1.0.3+3
 environment:
   sdk: '>=3.0.0 <4.0.0'