feat:课程层级调整（增加unit层）

吴启风
1 parent 258578de
Showing 19 changed files with 539 additions and 31 deletions
lib/common/request/apis.dart
lib/common/request/dao/home_dao.dart
lib/generated/json/app_config_entity.g.dart
lib/generated/json/base/json_convert_content.dart
lib/generated/json/course_module_entity.g.dart
lib/generated/json/course_unit_entity.g.dart
lib/models/course_module_entity.dart
lib/models/course_unit_entity.dart
lib/pages/home/bloc/home_bloc.dart
lib/pages/home/home_page.dart
lib/pages/home/widgets/home_vidoe_item.dart → lib/pages/home/widgets/home_video_item.dart
lib/pages/lessons/lesson_page.dart
lib/pages/unit/bloc.dart
lib/pages/unit/event.dart
lib/pages/unit/state.dart
lib/pages/unit/view.dart
lib/pages/unit/widget/course_unit_header_widget.dart
lib/pages/unit/widget/course_unit_item.dart
lib/route/route.dart
@@ -42,6 +42,9 @@ 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
@@ -2,18 +2,27 @@ import &#39;package:wow_english/common/request/request_client.dart&#39;;
 import 'package:wow_english/models/course_entity.dart';
 import '../../../models/course_module_entity.dart';
+import '../../../models/course_unit_entity.dart';
 class HomeDao {
-  ///获取课程模块信息
+  ///获取课程模块（列表）信息
   static Future<List<CourseModuleEntity?>?> courseModule() async {
     var data = await requestClient.get<List<CourseModuleEntity>>(Apis.courseModule);
     return data;
   }
+  ///课程单元列表
+  static Future<CourseUnitEntity?> courseUnit(int moduleId) async {
+    Map<String, dynamic> mapData = {};
+    mapData['moduleId'] = moduleId;
+    var data = await requestClient.get<CourseUnitEntity>(Apis.courseUnit, queryParameters: mapData);
+    return data;
+  }
+
   ///课程列表
-  static Future<CourseEntity?> courseLesson({String moduleId = ''}) async {
+  static Future<CourseEntity?> courseLesson({int? moduleId}) async {
     Map<String, dynamic> mapData = {};
-    if (moduleId.isNotEmpty) {
+    if (moduleId != null) {
       mapData['moduleId'] = moduleId;
     }
     var data = await requestClient.get<CourseEntity>(Apis.courseLesson, queryParameters: mapData);
 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();
+AppConfigEntity $AppConfigEntityFromJson(Map<String, dynamic> json) {
+  final AppConfigEntity appConfigEntity = AppConfigEntity();
   final bool? androidForceUpdate = jsonConvert.convert<bool>(
       json['androidForceUpdate']);
   if (androidForceUpdate != null) {
-    appConfigEntityEntity.androidForceUpdate = androidForceUpdate;
+    appConfigEntity.androidForceUpdate = androidForceUpdate;
   }
   final bool? androidRecommendUpdate = jsonConvert.convert<bool>(
       json['androidRecommendUpdate']);
   if (androidRecommendUpdate != null) {
-    appConfigEntityEntity.androidRecommendUpdate = androidRecommendUpdate;
+    appConfigEntity.androidRecommendUpdate = androidRecommendUpdate;
   }
   final String? androidUpdatePackageUrl = jsonConvert.convert<String>(
       json['androidUpdatePackageUrl']);
   if (androidUpdatePackageUrl != null) {
-    appConfigEntityEntity.androidUpdatePackageUrl = androidUpdatePackageUrl;
+    appConfigEntity.androidUpdatePackageUrl = androidUpdatePackageUrl;
   }
   final int? androidVersion = jsonConvert.convert<int>(json['androidVersion']);
   if (androidVersion != null) {
-    appConfigEntityEntity.androidVersion = androidVersion;
+    appConfigEntity.androidVersion = androidVersion;
   }
   final bool? iosForceUpdate = jsonConvert.convert<bool>(
       json['iosForceUpdate']);
   if (iosForceUpdate != null) {
-    appConfigEntityEntity.iosForceUpdate = iosForceUpdate;
+    appConfigEntity.iosForceUpdate = iosForceUpdate;
   }
   final bool? iosRecommendUpdate = jsonConvert.convert<bool>(
       json['iosRecommendUpdate']);
   if (iosRecommendUpdate != null) {
-    appConfigEntityEntity.iosRecommendUpdate = iosRecommendUpdate;
+    appConfigEntity.iosRecommendUpdate = iosRecommendUpdate;
   }
   final int? iosVersion = jsonConvert.convert<int>(json['iosVersion']);
   if (iosVersion != null) {
-    appConfigEntityEntity.iosVersion = iosVersion;
+    appConfigEntity.iosVersion = iosVersion;
+  }
+  final String? updatePackageDescription = jsonConvert.convert<String>(
+      json['updatePackageDescription']);
+  if (updatePackageDescription != null) {
+    appConfigEntity.updatePackageDescription = updatePackageDescription;
   }
   final String? noticeBeforePurchaseUrl = jsonConvert.convert<String>(
       json['noticeBeforePurchaseUrl']);
   if (noticeBeforePurchaseUrl != null) {
-    appConfigEntityEntity.noticeBeforePurchaseUrl = noticeBeforePurchaseUrl;
+    appConfigEntity.noticeBeforePurchaseUrl = noticeBeforePurchaseUrl;
   }
   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;
@@ -59,12 +62,13 @@ Map&lt;String, dynamic&gt; $AppConfigEntityEntityToJson(
   data['iosForceUpdate'] = entity.iosForceUpdate;
   data['iosRecommendUpdate'] = entity.iosRecommendUpdate;
   data['iosVersion'] = entity.iosVersion;
+  data['updatePackageDescription'] = entity.updatePackageDescription;
   data['noticeBeforePurchaseUrl'] = entity.noticeBeforePurchaseUrl;
   data['safe'] = entity.safe;
   return data;
 }
-extension AppConfigEntityEntityExtension on AppConfigEntity {
+extension AppConfigEntityExtension on AppConfigEntity {
   AppConfigEntity copyWith({
     bool? androidForceUpdate,
     bool? androidRecommendUpdate,
@@ -73,6 +77,7 @@ extension AppConfigEntityEntityExtension on AppConfigEntity {
     bool? iosForceUpdate,
     bool? iosRecommendUpdate,
     int? iosVersion,
+    String? updatePackageDescription,
     String? noticeBeforePurchaseUrl,
     String? safe,
   }) {
@@ -86,6 +91,8 @@ extension AppConfigEntityEntityExtension on AppConfigEntity {
       ..iosForceUpdate = iosForceUpdate ?? this.iosForceUpdate
       ..iosRecommendUpdate = iosRecommendUpdate ?? this.iosRecommendUpdate
       ..iosVersion = iosVersion ?? this.iosVersion
+      ..updatePackageDescription = updatePackageDescription ??
+          this.updatePackageDescription
       ..noticeBeforePurchaseUrl = noticeBeforePurchaseUrl ??
           this.noticeBeforePurchaseUrl
       ..safe = safe ?? this.safe;
@@ -9,6 +9,7 @@ import &#39;package:wow_english/models/app_config_entity.dart&#39;;
 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_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';
@@ -192,6 +193,14 @@ class JsonConvert {
       return data.map<CourseProcessVideos>((Map<String, dynamic> e) =>
           CourseProcessVideos.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;
@@ -246,6 +255,8 @@ class JsonConvertClassCollection {
     (CourseProcessTopicsTopicAnswerList)
         .toString(): CourseProcessTopicsTopicAnswerList.fromJson,
     (CourseProcessVideos).toString(): CourseProcessVideos.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_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
@@ -5,7 +5,7 @@ import &#39;package:wow_english/generated/json/course_module_entity.g.dart&#39;;
 @JsonSerializable()
 class CourseModuleEntity {
-  late String id;
+  late 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_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
@@ -13,7 +13,7 @@ part &#39;home_event.dart&#39;;
 part 'home_state.dart';
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  final String? moduleId;
+  final int? moduleId;
   CourseEntity? _modelData;
@@ -33,7 +33,7 @@ class HomeBloc extends Bloc&lt;HomeEvent, HomeState&gt; {
   void _requestData(RequestDataEvent event, Emitter<HomeState> emitter) async {
     try {
       await loading(() async {
-        _modelData = await HomeDao.courseLesson(moduleId: moduleId ?? '');
+        _modelData = await HomeDao.courseLesson(moduleId: moduleId);
         emitter(HomeDataLoadState());
       });
     } catch (e) {
@@ -6,7 +6,7 @@ import &#39;package:wow_english/common/extension/string_extension.dart&#39;;
 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/pages/home/widgets/home_video_item.dart';
 import 'package:wow_english/route/route.dart';
 import 'package:wow_english/utils/toast_util.dart';
@@ -17,7 +17,7 @@ class HomePage extends StatelessWidget {
   const HomePage({super.key, this.moduleId});
   /// 模块id
-  final String? moduleId;
+  final int? moduleId;
   @override
   Widget build(BuildContext context) {
@@ -171,7 +171,7 @@ class _LessonPageView extends StatelessWidget {
             model: model,
             isSelected: bloc.currentPageIndex == index,
             onClickEvent: () {
-              pushNamedAndRemoveUntil(AppRouteName.home, (route) => false,arguments: {'moduleId':model?.id});
+              pushNamed(AppRouteName.unit, arguments: {'courseModuleEntity':model});
             },
           ),
         ),
+import 'package:bloc/bloc.dart';
+
+import '../../common/request/dao/home_dao.dart';
+import '../../common/request/exception.dart';
+import '../../models/course_unit_entity.dart';
+import '../../utils/loading.dart';
+import '../../utils/toast_util.dart';
+import 'event.dart';
+import 'state.dart';
+
+class UnitBloc extends Bloc<UnitEvent, UnitState> {
+
+  CourseUnitEntity? _modelData;
+
+  CourseUnitEntity? get modelData => _modelData;
+
+
+  UnitBloc() : super(UnitState().init()) {
+    on<RequestUnitDataEvent>(_requestData);
+  }
+
+  void _requestData(RequestUnitDataEvent event, Emitter<UnitState> emitter) async {
+    try {
+      await loading(() async {
+        _modelData = await HomeDao.courseUnit(event.moduleId);
+        emitter(UnitDataLoadState());
+      });
+    } catch (e) {
+      if (e is ApiException) {
+        showToast(e.message ?? '请求失败,请检查网络连接');
+      }
+    }
+  }
+}
+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_header_widget.dart';
+import 'package:wow_english/pages/unit/widget/course_unit_item.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';
+
+class UnitPage extends StatelessWidget {
+  const UnitPage({super.key, required this.courseEntity});
+
+  /// 模块
+  final CourseModuleEntity courseEntity;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (BuildContext context) =>
+          UnitBloc()..add(RequestUnitDataEvent(courseEntity.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: [
+                CourseUnitHeaderWidget(entity: courseEntity),
+                Expanded(
+                    child: ListView.builder(
+                        itemCount:
+                            bloc.modelData?.courseUnitVOList?.length ?? 0,
+                        scrollDirection: Axis.horizontal,
+                        itemBuilder: (BuildContext context, int index) {
+                          CourseUnitDetail? data =
+                              bloc.modelData?.courseUnitVOList?[index];
+                          return GestureDetector(
+                            onTap: () {
+                              if (data.lock == true) {
+                                showToast('当前unit暂未解锁');
+                                return;
+                              }
+
+                              ///进入课堂
+                              pushNamedAndRemoveUntil(
+                                  AppRouteName.home, (route) => route.isFirst,
+                                  arguments: {
+                                    'moduleId': data.courseModuleId,
+                                    'unitId': data.id
+                                  });
+                            },
+                            child: CourseUnitItem(
+                              unitEntity: bloc.modelData!,
+                              unitLesson: data!,
+                            ),
+                          );
+                        })),
+                SafeArea(
+                  child: Column(
+                    children: [
+                      6.verticalSpace,
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      );
+    });
+  }
+}
+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 '../../../models/course_module_entity.dart';
+import '../../home/courese_module_model.dart';
+
+class CourseUnitHeaderWidget extends StatelessWidget {
+  const CourseUnitHeaderWidget({super.key, this.entity});
+
+  final CourseModuleEntity? entity;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<UserBloc, UserState>(
+      builder: (context, state) {
+        return Container(
+            height: 45,
+            width: double.infinity,
+            color:
+                CourseModuleModel(entity?.code ?? '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(entity?.name ??
+                  CourseModuleModel(entity?.code ?? 'Phase-1')
+                      .courseModuleTitle,
+                  textAlign: TextAlign.left,
+                  style: const TextStyle(color: Colors.white, fontSize: 30.0),
+                )),
+                ScreenUtil().bottomBarHeight.horizontalSpace,
+              ],
+            ));
+      },
+    );
+  }
+}
+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)),
+              ),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
@@ -26,11 +26,12 @@ 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/shopping/view.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';
@@ -43,7 +44,8 @@ class AppRouteName {
   /// 设置密码，修改密码；不要自己调用，使用[SetPassWordPage.push]方法，隐藏这种实现
   //static const String setPwd = 'setPwd';
   static const String webView = 'webView';
-  static const String lesson = 'lesson';
+  static const String unit = 'courseUnits';
+  static const String lesson = 'courseModules';
   static const String listen = 'listen';
   static const String shop = 'shop';
   static const String exLesson = 'exLesson';
@@ -100,9 +102,9 @@ class AppRouter {
       case AppRouteName.games:
         return CupertinoPageRoute(builder: (_) => const GamesPage());
       case AppRouteName.home:
-        var moduleId = '';
+        int? moduleId;
         if (settings.arguments != null) {
-          moduleId = (settings.arguments as Map)['moduleId'] as String;
+          moduleId = (settings.arguments as Map).getOrNull('moduleId') as int?;
         }
         return CupertinoPageRoute(
             builder: (_) => HomePage(
@@ -112,6 +114,12 @@ class AppRouter {
         return CupertinoPageRoute(builder: (_) => const ForgetPasswordHomePage());
       case AppRouteName.lesson:
         return CupertinoPageRoute(builder: (_) => const LessonPage());
+      case AppRouteName.unit:
+        CourseModuleEntity courseEntity = CourseModuleEntity();
+        if (settings.arguments != null) {
+          courseEntity = (settings.arguments as Map).getOrNull('courseModuleEntity') as CourseModuleEntity;
+        }
+        return CupertinoPageRoute(builder: (_) => UnitPage(courseEntity: courseEntity));
       case AppRouteName.listen:
         return CupertinoPageRoute(builder: (_) => const ListenPage());
       case AppRouteName.shop: