Merge branch 'work-wqf-20240715'

吴启风
2 parents bdd7ee99 fc3c67bf
Showing 44 changed files with 538 additions and 220 deletions
.fvm/flutter_sdk
.fvm/fvm_config.json
.vscode/settings.json
assets/images/micro_phone.gif
assets/images/read_background.png
assets/images/reade_answer.gif
assets/images/shop_desc.png
assets/images/voice.png
assets/images/xe_shop.png
assets/sounds/class_time.mp3
assets/sounds/count_with_me_instrumental.mp3
assets/sounds/game_time.mp3
assets/sounds/in_my_tummy_instrumental.mp3
assets/sounds/music_time.mp3
assets/sounds/quiz_time.mp3
assets/sounds/reading_time.mp3
assets/sounds/touch_instrumental.mp3
assets/sounds/video_time.mp3
assets/sounds/welcome_to_wow.mp3
ios/Runner.xcodeproj/project.pbxproj
-/Users/stay/fvm/versions/3.19.2
 \ No newline at end of file
+/Users/biao/fvm/versions/3.19.2
 \ No newline at end of file
 {
-  "flutterSdkVersion": "3.19.2",
-  "flavors": {}
+  "flutterSdkVersion": "3.19.2"
 }
 \ No newline at end of file
+{
+  "dart.flutterSdkPath": ".fvm/versions/3.19.2"
+}
 \ No newline at end of file
@@ -2327,7 +2327,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = T8P9KW8GWH;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -2671,7 +2671,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = T8P9KW8GWH;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2876,7 +2876,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = T8P9KW8GWH;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -77,11 +77,11 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>需要访问相机完成拍照</string>
+	<string>需要访问相机,完成修改头像功能</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>需要获取录音完成后续功能</string>
+	<string>需要获取录音，完成上课功能</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>需要获取照片用来修改头像</string>
+	<string>需要获取照片，完成上传头像功能</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -2,16 +2,26 @@ import &#39;../request/basic_config.dart&#39;;
 class AppConsts {
   /// 隐私协议
-  static const String userPrivacyPolicyUrl = 'http://page.kouyuxingqiu.com/wowenglishuserregister.html';
+  static const String userPrivacyPolicyUrl =
+      'http://page.kouyuxingqiu.com/wowenglishuserregister.html';
   /// 儿童隐私协议
-  static const String childrenPrivacyPolicyUrl = 'http://page.kouyuxingqiu.com/wowenglishchildprotect.html';
+  static const String childrenPrivacyPolicyUrl =
+      'http://page.kouyuxingqiu.com/wowenglishchildprotect.html';
+
+  /// 小鵝通
+  static const String xiaoeShopUrl = 'https://appo61s7g678876.h5.xiaoeknow.com';
   /// 与第三方共享协议
-  static const String userTermSdkUrl = 'http://page.kouyuxingqiu.com/term_sdk.html';
+  static const String userTermSdkUrl =
+      'http://page.kouyuxingqiu.com/term_sdk.html';
   /// 先声SDK
-  static  String xsAppKey = 'a418';
-  static  String xsAppSecretKey = BasicConfig.isTestDev?'1a16f31f2611bf32fb7b3fc38f5b2c81':'c11163aa6c834a028da4a4b30955be99';
-  static  String xsAppService = BasicConfig.isTestDev?'ws://trial.cloud.ssapi.cn:8080':'"wss://api.cloud.ssapi.cn';
+  static String xsAppKey = 'a418';
+  static String xsAppSecretKey = BasicConfig.isTestDev
+      ? '1a16f31f2611bf32fb7b3fc38f5b2c81'
+      : 'c11163aa6c834a028da4a4b30955be99';
+  static String xsAppService = BasicConfig.isTestDev
+      ? 'ws://trial.cloud.ssapi.cn:8080'
+      : '"wss://api.cloud.ssapi.cn';
 }
@@ -2,17 +2,17 @@ import &#39;package:bloc/bloc.dart&#39;;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/utils/audio_player_util.dart';
 import 'event.dart';
 import 'game_entity.dart';
 import 'state.dart';
 class GamesBloc extends Bloc<GamesEvent, GamesState> {
-
   late MethodChannel _methodChannel;
   //手动初始化4个GameEntity对象
-   final List<GameEntity> _games = [
+  final List<GameEntity> _games = [
     GameEntity()
       ..id = 1
       ..imageName = 'game_food_1'.assetPng
@@ -31,7 +31,7 @@ class GamesBloc extends Bloc&lt;GamesEvent, GamesState&gt; {
       ..name = 'Animal'
   ];
-   List<GameEntity> get listData => _games;
+  List<GameEntity> get listData => _games;
   GamesBloc() : super(GamesState().init()) {
     on<InitEvent>(_init);
@@ -39,13 +39,16 @@ class GamesBloc extends Bloc&lt;GamesEvent, GamesState&gt; {
   }
   void _init(InitEvent event, Emitter<GamesState> emit) async {
+    AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.inMyTummy);
     emit(state.clone());
   }
   void _gotoGamePage(GotoGamePageEvent event, Emitter<GamesState> emit) async {
+    await AudioPlayerUtil.getInstance().pause();
     try {
       _methodChannel = const MethodChannel('wow_english/game_method_channel');
-      await _methodChannel.invokeMethod('openGamePage', { "gameId": event.gameId });
+      await _methodChannel
+          .invokeMethod('openGamePage', {"gameId": event.gameId});
     } on PlatformException catch (e) {
       debugPrint("Failed to go to native page: '${e.message}'.");
     }
+import 'package:audioplayers/audioplayers.dart';
 import 'package:bloc/bloc.dart';
+import 'package:wow_english/common/core/user_util.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/utils/audio_player_util.dart';
 import '../../common/core/app_config_helper.dart';
 import '../../common/request/dao/system_dao.dart';
@@ -16,6 +20,9 @@ class HomeBloc extends Bloc&lt;HomeEvent, HomeState&gt; {
   bool exchangeResult = false;
   void _init(InitEvent event, Emitter<HomeState> emit) async {
+    if (UserUtil.isLogined()) {
+      AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.welcomeToWow);
+    }
     await _checkUpdate(emit);
   }
@@ -37,7 +44,7 @@ class HomeBloc extends Bloc&lt;HomeEvent, HomeState&gt; {
       return;
     }
     Log.d(
-        "WQF _checkUpdate appVersionEntity: $appVersionEntity localVersion=$localVersion");
+        "HomeBloc _checkUpdate appVersionEntity: $appVersionEntity localVersion=$localVersion");
     if (localVersion < int.parse(appVersionEntity.version ?? '0')) {
       emit(UpdateDialogState(
           appVersionEntity.volType == UpdateStrategy.FORCE.name,
+import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app_update/azhon_app_update.dart';
 import 'package:flutter_app_update/update_model.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:url_launcher/url_launcher.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/extension/string_extension.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/shop/exchane/bloc/exchange_lesson_bloc.dart';
 import 'package:wow_english/pages/user/bloc/user_bloc.dart';
+import 'package:wow_english/utils/audio_player_util.dart';
 import '../../common/core/user_util.dart';
 import '../../common/dialogs/show_dialog.dart';
@@ -57,7 +60,9 @@ class _HomePageView extends StatelessWidget {
             child: Column(
               children: [
                 BaseHomeHeaderWidget(
-                    callBack: (value) => {
+                    callBack: (value) async => {
+                          await AudioPlayerUtil.getInstance()
+                              .playAudio(AudioPlayerUtilType.touch),
                           bloc.exchangeResult = value['exchange'],
                           bloc.add(ExchangeSuccessEvent())
                         }),
@@ -68,7 +73,9 @@ class _HomePageView extends StatelessWidget {
                         Expanded(
                           child: GestureDetector(
                             onTap: () {
-                              _checkPermission(() {
+                              _checkPermission(() async {
+                                await AudioPlayerUtil.getInstance()
+                                    .playAudio(AudioPlayerUtilType.classTime);
                                 pushNamed(AppRouteName.courseUnit)
                                     .then((value) => {
                                           if (value != null)
@@ -102,13 +109,45 @@ class _HomePageView extends StatelessWidget {
                             ),
                           ),
                         ),
+                        BlocBuilder<UserBloc, UserState>(
+                            builder: (context, userState) {
+                          return GestureDetector(
+                              onTap: () {
+                                _checkPermission(() async {
+                                  await AudioPlayerUtil.getInstance().pause();
+                                  Navigator.of(context).pushNamed(
+                                      AppRouteName.webView,
+                                      arguments: {
+                                        'urlStr': AppConsts.xiaoeShopUrl,
+                                        'webViewTitle': 'Wow精选'
+                                      }).then((value) async => {
+                                        await AudioPlayerUtil.getInstance().playAudio(
+                                            AudioPlayerUtilType.touch),
+                                      });
+                                }, bloc);
+                              },
+                              child: Offstage(
+                                offstage: AppConfigHelper.shouldHidePay() ||
+                                    !UserUtil.isLogined(),
+                                child: Image.asset('xe_shop'.assetPng,
+                                    width: 140.5.w, height: 172.h),
+                              ));
+                        }),
                         Expanded(
                           child: BlocBuilder<UserBloc, UserState>(
                               builder: (context, userState) {
                             return GestureDetector(
                                 onTap: () {
-                                  _checkPermission(() {
-                                    pushNamed(AppRouteName.games);
+                                  _checkPermission(() async {
+                                    await AudioPlayerUtil.getInstance()
+                                        .playAudio(
+                                            AudioPlayerUtilType.gameTime);
+                                    pushNamed(AppRouteName.games)
+                                        .then((value) => {
+                                              AudioPlayerUtil.getInstance()
+                                                  .playAudio(AudioPlayerUtilType
+                                                      .touch),
+                                            });
                                   }, bloc);
                                 },
                                 child: Column(
@@ -157,6 +196,8 @@ class _HomePageView extends StatelessWidget {
           }, rightTap: () {
             popPage();
             pushNamed(AppRouteName.shop).then((value) {
+              AudioPlayerUtil.getInstance()
+                  .playAudio(AudioPlayerUtilType.touch);
               if (value != null) {
                 bloc.exchangeResult = value['exchange'];
                 bloc.add(ExchangeSuccessEvent());
@@ -3,6 +3,7 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/core/app_config_helper.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/utils/audio_player_util.dart';
 import '../../../common/core/user_util.dart';
 import '../../../models/course_entity.dart';
@@ -83,7 +84,8 @@ class BaseHomeHeaderWidget extends StatelessWidget {
                     offstage: AppConfigHelper.shouldHidePay() ||
                         !UserUtil.isLogined(),
                     child: GestureDetector(
-                      onTap: () => {
+                      onTap: () async => {
+                        await AudioPlayerUtil.getInstance().pause(),
                         pushNamed(AppRouteName.shop).then((value) {
                           if (value != null) {
                             if (callBack == null) {
@@ -113,8 +115,9 @@ class BaseHomeHeaderWidget extends StatelessWidget {
     );
   }
-  void onUserClick() {
+  Future<void> onUserClick() async {
     if (UserUtil.isLogined()) {
+      await AudioPlayerUtil.getInstance().pause();
       pushNamed(AppRouteName.user).then((value) {
         if (value != null) {
           if (callBack == null) {
@@ -59,7 +59,12 @@ class _TopicPicturePage extends StatelessWidget {
           builder: (context, state) {
         final bloc = BlocProvider.of<TopicPictureBloc>(context);
         return Container(
-          color: Colors.white,
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: AssetImage('read_background'.assetPng), // 背景图片路径
+              fit: BoxFit.cover, // 适应图片的方式
+            ),
+          ),
           child: Stack(
             children: [
               Column(
@@ -75,6 +80,7 @@ class _TopicPicturePage extends StatelessWidget {
                       // Navigator.pop(context);
                     },
                   ),
+                  35.verticalSpace,
                   Expanded(
                     child: PageView.builder(
                         itemCount: bloc.entity?.topics?.length,
@@ -109,12 +115,7 @@ class _TopicPicturePage extends StatelessWidget {
                         }),
                   )
                 ],
-              ),
-              Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  child: Image.asset('bottom_grass'.assetPng))
+              )
             ],
           ),
         );
@@ -299,7 +300,7 @@ class _TopicPicturePage extends StatelessWidget {
               26.verticalSpace,
               SizedBox(
                 height: 143.h,
-                width: 163.w * (topics?.topicAnswerList?.length ?? 0),
+                width: 203.w * (topics?.topicAnswerList?.length ?? 0),
                 child: ListView.builder(
                     scrollDirection: Axis.horizontal,
                     physics: const NeverScrollableScrollPhysics(),
@@ -321,7 +322,7 @@ class _TopicPicturePage extends StatelessWidget {
           builder: (context, state) {
             final bloc = BlocProvider.of<TopicPictureBloc>(context);
             return Container(
-              padding: EdgeInsets.symmetric(horizontal: 10.w),
+              padding: EdgeInsets.symmetric(horizontal: 20.w),
               child: GestureDetector(
                 onTap: () => bloc.add(SelectItemEvent(index)),
                 child: Container(
@@ -333,15 +334,13 @@ class _TopicPicturePage extends StatelessWidget {
                     borderRadius: BorderRadius.circular(15),
                   ),
                   height: 143.h,
-                  width: 143.w,
+                  width: 163.w,
                   child: Container(
                     decoration: BoxDecoration(
                         color: Colors.white,
                         borderRadius: BorderRadius.circular(15),
-                        border: Border.all(
-                            width: 1.0, color: const Color(0xFF140C10)),
                         image: DecorationImage(
-                            fit: BoxFit.fitWidth,
+                            fit: BoxFit.fill,
                             image: NetworkImage(answerList?.picUrl ?? ''))),
                   ),
                 ),
@@ -449,12 +448,18 @@ class _TopicPicturePage extends StatelessWidget {
         return Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            OwImageWidget(
-              name: topics?.picUrl ?? '',
-              height: 186.h,
-              width: 186.w,
+            ClipRRect(
+              borderRadius: BorderRadius.circular(20),
+              child: Container(
+                color: Colors.white,
+                child: OwImageWidget(
+                  name: topics?.picUrl ?? '',
+                  height: 186.h,
+                  width: 186.w,
+                ),
+              ),
             ),
-            160.horizontalSpace,
+            120.horizontalSpace,
             Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -472,8 +477,8 @@ class _TopicPicturePage extends StatelessWidget {
                         bloc.voicePlayState == VoicePlayState.playing
                             ? 'reade_answer'.assetGif
                             : 'voice'.assetPng,
-                        height: 52.h,
-                        width: 46.w,
+                        height: 45.h,
+                        width: 45.w,
                       ),
                       10.horizontalSpace,
                       Text(topics?.word ?? '')
@@ -506,8 +511,8 @@ class _TopicPicturePage extends StatelessWidget {
                     bloc.isVoicing
                         ? 'micro_phone'.assetGif
                         : 'micro_phone'.assetPng,
-                    height: 75.w,
-                    width: 75.w,
+                    height: 46.h,
+                    width: 46.w,
                   ),
                 )
               ],
@@ -12,9 +12,10 @@ class PracticeHeaderWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-        color: Colors.white,
+        color: Colors.transparent,
         height: kToolbarHeight + 3.h,
         child: AppBar(
+          backgroundColor: Colors.transparent,
           leading: GestureDetector(
             child: Image.asset(
               'back_around'.assetPng,
@@ -25,7 +26,7 @@ class PracticeHeaderWidget extends StatelessWidget {
           ),
           centerTitle: true,
           title: Container(
-            height: 40.h,
+            height: 20.h,
             width: 100.w, // 容器宽度
             // padding: EdgeInsets.symmetric(horizontal: 27.w, vertical: 10.h),
             alignment: Alignment.center,
@@ -39,7 +39,7 @@ class XSVoiceStartEvent extends ReadingPageEvent {
   final String content;
   final String type;
   final String? userId;
-  XSVoiceStartEvent(this.content,this.type,this.userId);
+  XSVoiceStartEvent(this.content, this.type, this.userId);
 }
 ///先声评测停止
@@ -52,4 +52,7 @@ class OnXSVoiceStateChangeEvent extends ReadingPageEvent {}
 class VoicePlayStateChangeEvent extends ReadingPageEvent {}
 ///录音播放
-class PlayRecordAudioEvent extends ReadingPageEvent {}
 \ No newline at end of file
+class PlayRecordAudioEvent extends ReadingPageEvent {}
+
+///播放下一页
+class PlayNextPageEvent extends ReadingPageEvent {}
@@ -21,17 +21,16 @@ class ReadingPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (_) => ReadingPageBloc(context, PageController(), courseLessonId ?? '')
-        ..add(InitBlocEvent())
-        ..add(RequestDataEvent())
-        ..add(XSVoiceInitEvent(
-            {
-              'appKey':AppConsts.xsAppKey,
-              'service':AppConsts.xsAppService,
-              'secretKey':AppConsts.xsAppSecretKey,
-              'userId':UserUtil.getUser()!.id.toString(),
-            }
-        )),
+      create: (_) =>
+          ReadingPageBloc(context, PageController(), courseLessonId ?? '')
+            ..add(InitBlocEvent())
+            ..add(RequestDataEvent())
+            ..add(XSVoiceInitEvent({
+              'appKey': AppConsts.xsAppKey,
+              'service': AppConsts.xsAppService,
+              'secretKey': AppConsts.xsAppSecretKey,
+              'userId': UserUtil.getUser()!.id.toString(),
+            })),
       child: _ReadingPage(),
     );
   }
@@ -60,8 +59,8 @@ class _ReadingPage extends StatelessWidget {
     );
   }
-  Widget _readingPageView() => BlocBuilder<ReadingPageBloc, ReadingPageState>(
-      builder: (context, state) {
+  Widget _readingPageView() =>
+      BlocBuilder<ReadingPageBloc, ReadingPageState>(builder: (context, state) {
         final bloc = BlocProvider.of<ReadingPageBloc>(context);
         return Container(
           color: Colors.white,
@@ -84,16 +83,14 @@ class _ReadingPage extends StatelessWidget {
                   children: [
                     Padding(
                       padding:
-                      EdgeInsets.only(left: ScreenUtil().bottomBarHeight),
+                          EdgeInsets.only(left: ScreenUtil().bottomBarHeight),
                       child: IconButton(
                           onPressed: () {
-                            popPage(
-                                data:{
-                                  'currentStep':bloc.currentPage,
-                                  'courseLessonId':bloc.courseLessonId,
-                                  'isCompleted':bloc.isLastPage(),
-                                }
-                            );
+                            popPage(data: {
+                              'currentStep': bloc.currentPage,
+                              'courseLessonId': bloc.courseLessonId,
+                              'isCompleted': bloc.isLastPage(),
+                            });
                           },
                           icon: Image.asset(
                             'back_around'.assetPng,
@@ -158,6 +155,7 @@ class _ReadingPage extends StatelessWidget {
                   margin: EdgeInsets.symmetric(horizontal: 10.w),
                   child: Row(
                     children: [
+                      5.horizontalSpace,
                       GestureDetector(
                         onTap: () {
                           if (bloc.isRecording) {
@@ -167,7 +165,7 @@ class _ReadingPage extends StatelessWidget {
                         },
                         child: Image.asset(
                           bloc.voicePlayState == VoicePlayState.playing &&
-                              bloc.isOriginAudioPlaying
+                                  bloc.isOriginAudioPlaying
                               ? 'reade_answer'.assetGif
                               : 'voice'.assetPng,
                           height: 40.h,
@@ -179,12 +177,12 @@ class _ReadingPage extends StatelessWidget {
                       ),
                       Expanded(
                           child: Text(
-                            bloc.currentPageData()?.word?.trim() ?? '',
-                            style: TextStyle(
-                                color: const Color(0xFF333333), fontSize: 21.sp),
-                            maxLines: 2,
-                            overflow: TextOverflow.ellipsis,
-                          )),
+                        bloc.currentPageData()?.word?.trim() ?? '',
+                        style: TextStyle(
+                            color: const Color(0xFF333333), fontSize: 21.sp),
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      )),
                       SizedBox(
                         width: 10.w,
                       ),
@@ -241,8 +239,7 @@ class _ReadingPage extends StatelessWidget {
         return Stack(
           children: [
             Positioned.fill(
-              child:
-              Image.network(readings.picUrl ?? '', fit: BoxFit.cover),
+              child: Image.network(readings.picUrl ?? '', fit: BoxFit.cover),
             ),
           ],
         );
+import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 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/common/request/dao/lesson_dao.dart';
 import 'package:wow_english/common/request/exception.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/audio_player_util.dart';
 import 'package:wow_english/utils/loading.dart';
 import 'package:wow_english/utils/toast_util.dart';
@@ -61,16 +64,20 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
     on<RequestEnterClassEvent>(_requestEnterClass);
     on<RequestVideoLessonEvent>(_requestVideoLesson);
     on<CurrentUnitIndexChangeEvent>(_pageControllerChange);
+    on<InitEvent>((event, emit) async {
+      await AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.countWithMe);
+    });
   }
   void _requestSectionsData(
       RequestDataEvent event, Emitter<SectionState> emitter) async {
     try {
       await loading(() async {
-        List<CourseSectionEntity>? courseSectionEntities = await LessonDao.courseSection(courseUnitId: event.courseUnitId);
+        List<CourseSectionEntity>? courseSectionEntities =
+            await LessonDao.courseSection(courseUnitId: event.courseUnitId);
         if (courseSectionEntities != null) {
           _courseSectionDatasMap[event.courseUnitId] =
-          await LessonDao.courseSection(courseUnitId: event.courseUnitId);
+              await LessonDao.courseSection(courseUnitId: event.courseUnitId);
           emitter(LessonDataLoadState());
         }
       });
@@ -224,7 +231,8 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
       ///查找当前unit的下一个section
       CourseSectionEntity? nextCourseSectionEntity =
           findCourseSectionBySort(curSectionSort + 1);
-      return checkCourseSectionLocked(courseLessonId, nextCourseSectionEntity, emitter);
+      return checkCourseSectionLocked(
+          courseLessonId, nextCourseSectionEntity, emitter);
     } catch (e) {
       if (e is ApiException) {
         showToast(e.message.toString());
@@ -234,7 +242,9 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
   }
   ///检查section是否锁定
-  Future<CourseSectionEntity?> checkCourseSectionLocked(int courseLessonId, CourseSectionEntity? courseSectionEntity,
+  Future<CourseSectionEntity?> checkCourseSectionLocked(
+      int courseLessonId,
+      CourseSectionEntity? courseSectionEntity,
       Emitter<SectionState> emitter) async {
     if (courseSectionEntity != null) {
       if (courseSectionEntity.lock == false) {
@@ -243,15 +253,15 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
       } else {
         ///如果section锁了，请求当前unit下的section数据,查询解锁状态
         int courseUnitId = courseSectionEntity.courseUnitId;
-        CourseSectionEntity? result =  await loading(() async {
+        CourseSectionEntity? result = await loading(() async {
           List<CourseSectionEntity>? tempSectionEntities =
-          await LessonDao.courseSection(courseUnitId: courseUnitId);
+              await LessonDao.courseSection(courseUnitId: courseUnitId);
           if (tempSectionEntities != null) {
             _courseSectionDatasMap[courseUnitId] = tempSectionEntities;
             emitter(LessonDataLoadState());
           }
           courseSectionEntity = tempSectionEntities?.firstWhereOrNull(
-                  (element) => element.id == courseSectionEntity?.id);
+              (element) => element.id == courseSectionEntity?.id);
           if (courseSectionEntity?.lock == false) {
             ///刷新后的数据如果解锁了，直接返回
             return courseSectionEntity;
@@ -270,18 +280,20 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
       if (curCourseUnitDetail != null) {
         ///再根据当前unit的sortOrder找出下一个unit
         CourseUnitDetail? nextCourseUnitDetail =
-        _courseUnitEntity.courseUnitVOList?.firstWhereOrNull((element) =>
-          element.sortOrder == (curCourseUnitDetail.sortOrder! + 1));
+            _courseUnitEntity.courseUnitVOList?.firstWhereOrNull((element) =>
+                element.sortOrder == (curCourseUnitDetail.sortOrder! + 1));
         if (nextCourseUnitDetail != null) {
           if (nextCourseUnitDetail.lock == true) {
             ///如果下一个unit是锁定状态，请求数据刷新查询解锁状态
             CourseSectionEntity? result = await loading(() async {
-              CourseUnitEntity? newCourseUnitEntity = await LessonDao.courseUnit(
-                  _courseUnitEntity.nowCourseModuleId);
+              CourseUnitEntity? newCourseUnitEntity =
+                  await LessonDao.courseUnit(
+                      _courseUnitEntity.nowCourseModuleId);
               ///拿到重新获取到的unit后，再次判断是否解锁
-              nextCourseUnitDetail = newCourseUnitEntity?.courseUnitVOList?.firstWhereOrNull(
+              nextCourseUnitDetail = newCourseUnitEntity?.courseUnitVOList
+                  ?.firstWhereOrNull(
                       (element) => element.id == nextCourseUnitDetail?.id);
               if (nextCourseUnitDetail?.lock == false) {
                 ///解锁状态从锁定到解锁，覆盖原unit数据并刷新ui
@@ -289,7 +301,8 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
                 courseUnitEntityChanged = true;
                 emitter(LessonDataLoadState());
-                return checkCourseSectionLockedOfNextUnit(courseLessonId, nextCourseUnitDetail!.id!, emitter);
+                return checkCourseSectionLockedOfNextUnit(
+                    courseLessonId, nextCourseUnitDetail!.id!, emitter);
               } else {
                 showToast('下个单元课程还没解锁哦');
@@ -299,10 +312,12 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
             });
             return result;
           } else {
-            return checkCourseSectionLockedOfNextUnit(courseLessonId, nextCourseUnitDetail.id!, emitter);
+            return checkCourseSectionLockedOfNextUnit(
+                courseLessonId, nextCourseUnitDetail.id!, emitter);
           }
         } else {
           showToast("恭喜你，本阶段学到顶啦");
+
           ///最后一个unit了
           return null;
         }
@@ -314,13 +329,16 @@ class SectionBloc extends Bloc&lt;SectionEvent, SectionState&gt; {
   }
   ///检查下一个unit的（第一个）section
-  Future<CourseSectionEntity?> checkCourseSectionLockedOfNextUnit(int courseLessonId, int nextCourseUnitDetailId,
+  Future<CourseSectionEntity?> checkCourseSectionLockedOfNextUnit(
+      int courseLessonId,
+      int nextCourseUnitDetailId,
       Emitter<SectionState> emitter) async {
-    CourseSectionEntity? firstSectionNextUnit = await getFirstSectionByUnitId(
-        nextCourseUnitDetailId, emitter);
+    CourseSectionEntity? firstSectionNextUnit =
+        await getFirstSectionByUnitId(nextCourseUnitDetailId, emitter);
     if (firstSectionNextUnit != null) {
       ///下个unit的第一个section如果不为空，再次检查是否锁定
-      CourseSectionEntity? courseSectionEntity = await checkCourseSectionLocked(courseLessonId, firstSectionNextUnit, emitter);
+      CourseSectionEntity? courseSectionEntity = await checkCourseSectionLocked(
+          courseLessonId, firstSectionNextUnit, emitter);
       if (courseSectionEntity != null) {
         ///只有是下一unit的第一个section并且解锁了，才跳转
         _pageController.nextPage(
@@ -9,6 +9,8 @@ class RequestDataEvent extends SectionEvent {
   RequestDataEvent(this.courseUnitId);
 }
+class InitEvent extends SectionEvent {}
+
 ///获取视频课程内容
 class RequestVideoLessonEvent extends SectionEvent {
   final String courseLessonId;
+import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -11,6 +12,8 @@ import &#39;package:wow_english/pages/section/widgets/section_item.dart&#39;;
 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/audio_player_util.dart';
+import 'package:wow_english/utils/log_util.dart';
 import 'package:wow_english/utils/toast_util.dart';
 import '../../models/course_section_entity.dart';
@@ -38,7 +41,8 @@ class SectionPage extends StatelessWidget {
           initialPage,
           PageController(initialPage: initialPage),
           ScrollController(),
-          ScrollController()),
+          ScrollController())
+        ..add(InitEvent()),
       //为了触发指示器进入后计算位置
       //   ..add(CurrentUnitIndexChangeEvent(initialPage)),
       child: _SectionPageView(context),
@@ -55,7 +59,7 @@ class _SectionPageView extends StatelessWidget {
   Widget build(BuildContext context) {
     final bloc = BlocProvider.of<SectionBloc>(context);
     return BlocListener<SectionBloc, SectionState>(
-      listener: (context, state) {
+      listener: (context, state) async {
         if (state is RequestVideoLessonState) {
           final videoUrl = bloc.processEntity?.videos?.videoUrl ?? '';
           var title = '';
@@ -87,6 +91,8 @@ class _SectionPageView extends StatelessWidget {
                   currentTime: dataMap['currentTime'],
                   autoNextSection: dataMap['nextSection']));
             }
+            AudioPlayerUtil.getInstance()
+                .playAudio(AudioPlayerUtilType.countWithMe);
           });
           return;
         }
@@ -96,12 +102,22 @@ class _SectionPageView extends StatelessWidget {
               state.courseType != SectionType.pictureBook.value) {
             ///视频类型
             ///获取视频课程内容
+            if (state.courseType == 1) {
+              await AudioPlayerUtil.getInstance()
+                  .playAudio(AudioPlayerUtilType.musicTime);
+            } else {
+              await AudioPlayerUtil.getInstance()
+                  .playAudio(AudioPlayerUtilType.videoTime);
+            }
             bloc.add(RequestVideoLessonEvent(
                 state.courseLessonId, state.courseType));
+
             return;
           }
           if (state.courseType == SectionType.pictureBook.value) {
+            await AudioPlayerUtil.getInstance()
+                .playAudio(AudioPlayerUtilType.readingTime);
             //绘本
             pushNamed(AppRouteName.reading,
                     arguments: {'courseLessonId': state.courseLessonId})
@@ -114,13 +130,18 @@ class _SectionPageView extends StatelessWidget {
                   currentStep: dataMap['currentStep'],
                   autoNextSection: dataMap['nextSection'],
                 ));
+                AudioPlayerUtil.getInstance()
+                    .playAudio(AudioPlayerUtilType.countWithMe);
               }
             });
+
             return;
           }
           if (state.courseType == SectionType.practice.value) {
             //练习
+            await AudioPlayerUtil.getInstance()
+                .playAudio(AudioPlayerUtilType.quizTime);
             pushNamed(AppRouteName.topicPic,
                     arguments: {'courseLessonId': state.courseLessonId})
                 .then((value) {
@@ -131,6 +152,8 @@ class _SectionPageView extends StatelessWidget {
                     currentStep: dataMap['currentStep'],
                     autoNextSection: dataMap['nextSection']));
               }
+              AudioPlayerUtil.getInstance()
+                  .playAudio(AudioPlayerUtilType.countWithMe);
             });
             return;
           }
+import 'package:flutter/material.dart';
+
+import 'package:wow_english/common/extension/string_extension.dart';
+import 'package:wow_english/common/widgets/we_app_bar.dart';
+
+///购前须知页
+class ShopDescPage extends StatelessWidget {
+  const ShopDescPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return _ShopDescPageView();
+  }
+}
+
+class _ShopDescPageView extends StatelessWidget {
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: const WEAppBar(
+          titleText: '购前须知',
+          centerTitle: true,
+        ),
+        body: SingleChildScrollView(
+          child: Center(
+            child: Image.asset('shop_desc'.assetPng),
+          ),
+        ),
+    );
+  }
+}
@@ -58,7 +58,7 @@ class _ShopHomeView extends StatelessWidget {
                 ),
                 color: Colors.white,
                 onPressed: () {
-                  showToast('购前须知');
+                  pushNamed(AppRouteName.shopDesc);
                 },
               )
             ],
 import 'package:bloc/bloc.dart';
 import 'package:wow_english/pages/unit/widget/home_tab_header_widget.dart';
+import 'package:wow_english/utils/audio_player_util.dart';
 import '../../common/request/dao/lesson_dao.dart';
 import '../../common/request/exception.dart';
@@ -24,6 +25,9 @@ class UnitBloc extends Bloc&lt;UnitEvent, UnitState&gt; {
   UnitBloc(CourseModuleEntity? courseEntity) : super(UnitState().init()) {
     on<RequestUnitDataEvent>(_requestUnitDatas);
+    on<UnitInitEvent>((event, emit) {
+      AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.inMyTummy);
+    });
   }
   void _requestUnitDatas(
@@ -44,16 +48,28 @@ class UnitBloc extends Bloc&lt;UnitEvent, UnitState&gt; {
     return _moduleEntity?.code ?? _unitData?.courseModuleCode;
   }
-  void headerActionEvent(HeaderActionType type) {
+  Future<void> headerActionEvent(HeaderActionType type) async {
+    await AudioPlayerUtil.getInstance().pause();
     if (type == HeaderActionType.video) {
+      //视频跟读暂时隐藏了
       pushNamed(AppRouteName.reAfter);
     } else if (type == HeaderActionType.phase) {
-      pushNamed(AppRouteName.courseModule);
+      pushNamed(AppRouteName.courseModule).then((value) => {
+            AudioPlayerUtil.getInstance()
+                .playAudio(AudioPlayerUtilType.inMyTummy)
+          });
+      ;
     } else if (type == HeaderActionType.listen) {
-      pushNamed(AppRouteName.listen);
+      pushNamed(AppRouteName.listen).then((value) => {
+            AudioPlayerUtil.getInstance()
+                .playAudio(AudioPlayerUtilType.inMyTummy)
+          });
     } else if (type == HeaderActionType.shop) {
-      pushNamed(AppRouteName.shop)
-          .then((value) => {exchangeResult = value['exchange']});
+      pushNamed(AppRouteName.shop).then((value) => {
+            AudioPlayerUtil.getInstance()
+                .playAudio(AudioPlayerUtilType.inMyTummy),
+            exchangeResult = value['exchange']
+          });
     } else if (type == HeaderActionType.user) {
       pushNamed(AppRouteName.user);
     }
@@ -6,3 +6,5 @@ class RequestUnitDataEvent extends UnitEvent {
   RequestUnitDataEvent(this.moduleId);
 }
+
+class UnitInitEvent extends UnitEvent {}
@@ -5,6 +5,7 @@ import &#39;package:wow_english/pages/unit/state.dart&#39;;
 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 'package:wow_english/utils/audio_player_util.dart';
 import '../../models/course_module_entity.dart';
 import '../../models/course_unit_entity.dart';
@@ -23,6 +24,7 @@ class UnitPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (BuildContext context) => UnitBloc(courseModuleEntity)
+        ..add(UnitInitEvent())
         ..add(RequestUnitDataEvent(courseModuleEntity?.id)),
       child: Builder(builder: (context) => _buildPage(context)),
     );
@@ -41,6 +43,8 @@ class UnitPage extends StatelessWidget {
                 HomeTabHeaderWidget(
                   courseModuleCode: bloc.getCourseModuleCode(),
                   onBack: () {
+                    AudioPlayerUtil.getInstance()
+                        .playAudio(AudioPlayerUtilType.touch);
                     popPage(data: {'exchange': bloc.exchangeResult});
                   },
                   actionTap: (HeaderActionType type) {
@@ -58,17 +62,19 @@ class UnitPage extends StatelessWidget {
                             CourseUnitDetail? data =
                                 bloc.unitData?.courseUnitVOList?[index];
                             return GestureDetector(
-                              onTap: () {
+                              onTap: () async {
                                 if (data.lock == true) {
                                   showToast('当前单元课程暂未解锁');
                                   return;
                                 }
-
+                                // await AudioPlayerUtil.getInstance().pause();
                                 pushNamed(AppRouteName.courseSection,
                                     arguments: {
                                       'courseUnitEntity': bloc.unitData,
                                       'courseUnitId': data.id
                                     }).then((value) {
+                                  AudioPlayerUtil.getInstance()
+                                      .playAudio(AudioPlayerUtilType.inMyTummy);
                                   if (value != null) {
                                     Map<String, dynamic> dataMap =
                                         value as Map<String, dynamic>;
@@ -17,14 +17,13 @@ class CourseUnitItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 24.h),
-      child: Stack(
-        children: [
-          _normalItem(),
-          _lockWidget(),
-        ],
-      )
-    );
+        padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 24.h),
+        child: Stack(
+          children: [
+            _normalItem(),
+            _lockWidget(),
+          ],
+        ));
   }
   Widget _normalItem() {
@@ -40,17 +39,17 @@ class CourseUnitItem extends StatelessWidget {
         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,
+            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,
@@ -58,8 +57,7 @@ class CourseUnitItem extends StatelessWidget {
               unitLesson.name ?? '',
               maxLines: 2,
               overflow: TextOverflow.ellipsis,
-              style:
-              TextStyle(fontSize: 11.sp, color: const Color(0xFF140C10)),
+              style: TextStyle(fontSize: 11.sp, color: const Color(0xFF140C10)),
             ),
           )
         ],
@@ -75,12 +73,8 @@ class CourseUnitItem extends StatelessWidget {
         width: 165.w,
         decoration: BoxDecoration(
             image: DecorationImage(
-                image: AssetImage(
-                    'gendubeij_mengban'.assetPng
-                ),
-                fit: BoxFit.fill
-            )
-        ),
+                image: AssetImage('gendubeij_mengban'.assetPng),
+                fit: BoxFit.fill)),
         alignment: Alignment.center,
         child: Image.asset(
           'iv_lock'.assetPng,
@@ -26,73 +26,87 @@ class ReBackPageState extends State&lt;ReBackPage&gt; {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar:  const WEAppBar(
-        titleText: '我要反馈',
-      ),
-      body: Container(
-        color: Colors.white,
-        padding: EdgeInsets.symmetric(
-            horizontal: 24.w
+        appBar: const WEAppBar(
+          titleText: '我要反馈',
         ),
-        child: SafeArea(
-          child: Column(
-              children: [
-                20.verticalSpace,
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(
-                      '请输入您要反馈的问题和意见，10-500个字',
-                      textAlign: TextAlign.left,
-                      style: TextStyle(
-                          fontSize: 19.sp,
-                          color: HexColor('#333333')
-                      ),
-                    ),
-                    Text(
-                      '48/500',
-                      textAlign: TextAlign.right,
-                      style: TextStyle(
-                          fontSize: 19.sp,
-                          color: HexColor('#333333')
-                      ),)
-                  ],
-                ),
-                9.5.verticalSpace,
-                Expanded(
-                  child: Container(
-                    decoration: BoxDecoration(
-                        image: DecorationImage(
-                            fit: BoxFit.fill,
-                            image: AssetImage('bg_reback'.assetPng)
+        body: Container(
+          color: Colors.white,
+          padding: EdgeInsets.symmetric(horizontal: 10.w),
+          child: SafeArea(
+            child: LayoutBuilder(builder: (context, constraints) {
+              return SingleChildScrollView(
+                child: ConstrainedBox(
+                  constraints: BoxConstraints(
+                    minHeight: constraints.maxHeight,
+                  ),
+                  child: IntrinsicHeight(
+                    child: Column(
+                      children: [
+                        20.verticalSpace,
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Text(
+                              '请输入您要反馈的问题和意见，10-500个字',
+                              textAlign: TextAlign.left,
+                              style: TextStyle(
+                                  fontSize: 19.sp, color: HexColor('#333333')),
+                            ),
+                            Text(
+                              '48/500',
+                              textAlign: TextAlign.right,
+                              style: TextStyle(
+                                  fontSize: 19.sp, color: HexColor('#333333')),
+                            )
+                          ],
+                        ),
+                        9.5.verticalSpace,
+                        Expanded(
+                          child: Container(
+                            decoration: BoxDecoration(
+                                image: DecorationImage(
+                                    image: AssetImage('bg_reback'.assetPng),
+                                    fit: BoxFit.fill)),
+                            child: Padding(
+                              padding: const EdgeInsets.symmetric(
+                                  vertical: 10, horizontal: 16),
+                              // 设置对称内边距
+                              child: TextField(
+                                textInputAction: TextInputAction.done,
+                                decoration: InputDecoration(
+                                    border: InputBorder.none,
+                                    hintStyle: TextStyle(
+                                        fontSize: 16.sp,
+                                        color: const Color(0xFF999999))),
+                              ),
+                            ),
+                          ),
+                        ),
+                        4.5.verticalSpace,
+                        Container(
+                          decoration: BoxDecoration(
+                              image: DecorationImage(
+                                  fit: BoxFit.fill,
+                                  image: AssetImage(_canEnsure
+                                      ? 're_button'.assetPng
+                                      : 're_button_dis'.assetPng))),
+                          alignment: Alignment.center,
+                          width: 91.w,
+                          height: 45.h,
+                          child: Text(
+                            '提交',
+                            textAlign: TextAlign.center,
+                            style:
+                                TextStyle(color: Colors.white, fontSize: 17.sp),
+                          ),
                         )
+                      ],
                     ),
                   ),
                 ),
-                4.5.verticalSpace,
-                Container(
-                  decoration: BoxDecoration(
-                      image: DecorationImage(
-                          fit: BoxFit.fill,
-                          image: AssetImage(_canEnsure?'re_button'.assetPng:'re_button_dis'.assetPng)
-                      )
-                  ),
-                  alignment: Alignment.center,
-                  width: 91.w,
-                  height: 45.h,
-                  child: Text(
-                    '提交',
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                        color: Colors.white,
-                        fontSize: 17.sp
-                    ),
-                  ),
-                )
-              ],
-            ),
+              );
+            }),
           ),
-      )
-    );
+        ));
   }
-}
 \ No newline at end of file
+}
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
 import '../../../route/route.dart';
@@ -9,14 +10,30 @@ class SettingPage extends StatefulWidget {
   @override
   State<StatefulWidget> createState() {
-   return SettingPageState();
+    return SettingPageState();
   }
 }
 class SettingPageState extends State<SettingPage> {
+  String? _version;
+  String? _buildNum;
+  @override
+  void initState() {
+    super.initState();
+    _retrieveVersionInfo();
+  }
+
+  Future<void> _retrieveVersionInfo() async {
+    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    setState(() {
+      _version = packageInfo.version;
+      _buildNum = packageInfo.buildNumber;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
-    return  Scaffold(
+    return Scaffold(
       appBar: const WEAppBar(
         titleText: '设置',
       ),
@@ -28,17 +45,18 @@ class SettingPageState extends State&lt;SettingPage&gt; {
             child: ListView(
               children: [
                 34.verticalSpace,
-                _buildItemWidget('注销账号', onPress: (){
+                _buildItemWidget('注销账号', onPress: () {
                   pushNamed(AppRouteName.deleteAccount);
                 }),
                 12.verticalSpace,
-                _buildItemWidget('清除缓存', onPress: (){
-
-                }),
+                _buildItemWidget('清除缓存', onPress: () {}),
                 12.verticalSpace,
-                _buildItemWidget('帮助与反馈', onPress: (){
+                _buildItemWidget('帮助与反馈', onPress: () {
                   pushNamed(AppRouteName.reBack);
                 }),
+                12.verticalSpace,
+                _buildItemWidget('Version: $_version Build:$_buildNum',
+                    onPress: () {}),
               ],
             ),
           ),
@@ -46,13 +64,15 @@ class SettingPageState extends State&lt;SettingPage&gt; {
       ),
     );
   }
-  
-  Widget _buildItemWidget(String text,{VoidCallback? onPress}) {
+
+  Widget _buildItemWidget(String text, {VoidCallback? onPress}) {
     return OutlinedButton(
       onPressed: () => onPress?.call(),
       style: ButtonStyle(
-        side: MaterialStateProperty.all(BorderSide(color: const Color(0xFF140C10), width: 1.5.w)),
-        shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.r))),
+        side: MaterialStateProperty.all(
+            BorderSide(color: const Color(0xFF140C10), width: 1.5.w)),
+        shape: MaterialStateProperty.all(
+            RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.r))),
         minimumSize: MaterialStateProperty.all(Size(double.infinity, 58.h)),
         backgroundColor: MaterialStateProperty.all(Colors.white),
       ),
@@ -66,4 +86,4 @@ class SettingPageState extends State&lt;SettingPage&gt; {
       ),
     );
   }
-}
 \ No newline at end of file
+}
@@ -173,15 +173,7 @@ class _UserView extends StatelessWidget {
                             UserUtil.getUser()?.phoneNum == '17718485544')
                         ? 12.verticalSpace
                         : 1.verticalSpace),
-                    OutlinedButton(
-                      onPressed: () => pushNamed(AppRouteName.fogPwd),
-                      style: normalButtonStyle,
-                      child: Text(
-                        "修改密码",
-                        style: textStyle21sp,
-                      ),
-                    ),
-                    12.verticalSpace,
+
                     Offstage(
                       offstage: AppConfigHelper.shouldHidePay(),
                       child: OutlinedButton(
@@ -199,6 +191,15 @@ class _UserView extends StatelessWidget {
                             style: textStyle21sp,
                           )),
                     ),
+                    12.verticalSpace,
+                    OutlinedButton(
+                      onPressed: () => pushNamed(AppRouteName.fogPwd),
+                      style: normalButtonStyle,
+                      child: Text(
+                        "修改密码",
+                        style: textStyle21sp,
+                      ),
+                    ),
                     Offstage(
                       offstage: AppConfigHelper.shouldHidePay(),
                       child: 12.verticalSpace,
@@ -17,6 +17,7 @@ import &#39;package:wow_english/pages/repeatafter/repeat_after_page.dart&#39;;
 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_desc_page.dart';
 import 'package:wow_english/pages/shop/home/shop_home_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';
@@ -49,6 +50,7 @@ class AppRouteName {
   static const String courseSection = 'courseSections';
   static const String listen = 'listen';
   static const String shop = 'shop';
+  static const String shopDesc = 'shopDesc';
   static const String exLesson = 'exLesson';
   static const String exList = 'exList';
   static const String reAfter = 'reAfter';
@@ -141,6 +143,8 @@ class AppRouter {
         return CupertinoPageRoute(builder: (_) => const ListenPage());
       case AppRouteName.shop:
         return CupertinoPageRoute(builder: (_) => const ShopHomePage());
+      case AppRouteName.shopDesc:
+        return CupertinoPageRoute(builder: (_) => const ShopDescPage());
       case AppRouteName.pay:
         var productEntity = ProductEntity();
         if (settings.arguments != null && settings.arguments is ProductEntity) {
+import 'package:audioplayers/audioplayers.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:wow_english/common/extension/string_extension.dart';
+
+import 'log_util.dart';
+
+enum AudioPlayerUtilType {
+  welcomeToWow('welcome_to_wow'),
+  classTime('class_time'),
+  gameTime('game_time'),
+  musicTime('music_time'),
+  readingTime('reading_time'),
+  videoTime('video_time'),
+  quizTime('quiz_time'),
+  countWithMe('count_with_me_instrumental'),
+  inMyTummy('in_my_tummy_instrumental'),
+  touch('touch_instrumental');
+
+  const AudioPlayerUtilType(this.path);
+
+  final String path;
+}
+
+class AudioPlayerUtil extends WidgetsBindingObserver {
+  static AudioPlayerUtil? _instance;
+  late AudioPlayer _audioPlayer;
+  late AudioPlayerUtilType currentType;
+  bool _wasPlaying = false;
+  static const TAG = "AudioPlayerUtil";
+
+  // 私有构造函数
+  AudioPlayerUtil._internal() {
+    // 监听应用生命周期
+    WidgetsBinding.instance.addObserver(this);
+    _audioPlayer = AudioPlayer();
+    _audioPlayer.onPlayerStateChanged.listen((event) async {
+      if (event == PlayerState.completed) {
+        // 播放结束再次播放
+        if (currentType == AudioPlayerUtilType.inMyTummy) {
+          AudioPlayerUtil.getInstance()
+              .playAudio(AudioPlayerUtilType.inMyTummy);
+        }
+        if (currentType == AudioPlayerUtilType.countWithMe) {
+          AudioPlayerUtil.getInstance()
+              .playAudio(AudioPlayerUtilType.countWithMe);
+        }
+        if (currentType == AudioPlayerUtilType.welcomeToWow) {
+          AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.touch);
+        }
+        if (currentType == AudioPlayerUtilType.touch) {
+          AudioPlayerUtil.getInstance().playAudio(AudioPlayerUtilType.touch);
+        }
+      }
+    });
+  }
+
+  static AudioPlayerUtil getInstance() {
+    _instance ??= AudioPlayerUtil._internal();
+    return _instance!;
+  }
+
+// 播放音频
+  Future<void> playAudio(AudioPlayerUtilType type) async {
+    Log.d("$TAG playAudio $type");
+    currentType = type;
+    String path = type.path;
+    await _audioPlayer.play(AssetSource(path.assetMp3), volume: 0.5);
+    await _audioPlayer.onPlayerComplete.first;
+  }
+
+  // stop
+  Future<void> stop() async {
+    Log.d("$TAG stop _audioPlayer.state=${_audioPlayer.state}");
+    await _audioPlayer.stop();
+  }
+
+  // pause
+  Future<void> pause() async {
+    Log.d("$TAG pause _audioPlayer.state=${_audioPlayer.state}");
+    if (_audioPlayer.state == PlayerState.playing) {
+      await _audioPlayer.pause();
+    }
+  }
+
+  // resume
+  Future<void> resume() async {
+    Log.d("$TAG resume _audioPlayer.state=${_audioPlayer.state}");
+    if (_audioPlayer.state == PlayerState.paused) {
+      await _audioPlayer.resume();
+    }
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) async {
+    Log.d("$TAG didChangeAppLifecycleState appState=$state _wasPlaying=$_wasPlaying _audioPlayer.state=${_audioPlayer.state}");
+    if (state == AppLifecycleState.paused) {
+      if (_audioPlayer.state == PlayerState.playing) {
+        _wasPlaying = true;
+        await pause();
+      };
+    } else if (state == AppLifecycleState.resumed) {
+      if (_wasPlaying == true) {
+        _wasPlaying = false;
+        await resume();
+      }
+    }
+  }
+
+  void dispose() {
+    Log.d("$TAG dispose _audioPlayer.state=${_audioPlayer.state}");
+    _audioPlayer.dispose();
+    WidgetsBinding.instance.removeObserver(this);
+  }
+}