diff --git a/lib/common/request/token_interceptor.dart b/lib/common/request/token_interceptor.dart index 6099274..95f24fa 100644 --- a/lib/common/request/token_interceptor.dart +++ b/lib/common/request/token_interceptor.dart @@ -1,7 +1,5 @@ import 'package:dio/dio.dart'; -import 'package:package_info_plus/package_info_plus.dart'; import 'package:wow_english/common/core/user_util.dart'; -import 'package:wow_english/common/request/basic_config.dart'; class TokenInterceptor extends Interceptor { @override diff --git a/lib/pages/practice/topic_picture_page.dart b/lib/pages/practice/topic_picture_page.dart index 08a96a8..3e41235 100644 --- a/lib/pages/practice/topic_picture_page.dart +++ b/lib/pages/practice/topic_picture_page.dart @@ -70,7 +70,7 @@ class _TopicPicturePage extends StatelessWidget { popPage( data:{ 'currentStep':bloc.currentPage.toString(), - 'courseLessonId':(int.parse(bloc.courseLessonId)+1).toString() + 'courseLessonId':bloc.courseLessonId }); // Navigator.pop(context); }, diff --git a/lib/pages/reading/reading_page.dart b/lib/pages/reading/reading_page.dart index 67ab5b8..fcd0b55 100644 --- a/lib/pages/reading/reading_page.dart +++ b/lib/pages/reading/reading_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/pages/reading/widgets/ReadingModeType.dart'; import 'package:wow_english/pages/reading/widgets/reading_dialog_widget.dart'; +import 'package:wow_english/route/route.dart'; import '../../common/core/app_consts.dart'; import '../../common/core/user_util.dart'; @@ -23,12 +24,12 @@ class ReadingPage extends StatelessWidget { ..add(InitBlocEvent()) ..add(RequestDataEvent()) ..add(XSVoiceInitEvent( - { - 'appKey':AppConsts.xsAppKey, - 'service':AppConsts.xsAppService, - 'secretKey':AppConsts.xsAppSecretKey, - 'userId':UserUtil.getUser()!.id.toString(), - } + { + 'appKey':AppConsts.xsAppKey, + 'service':AppConsts.xsAppService, + 'secretKey':AppConsts.xsAppSecretKey, + 'userId':UserUtil.getUser()!.id.toString(), + } )), child: _ReadingPage(), ); @@ -59,7 +60,7 @@ class _ReadingPage extends StatelessWidget { } Widget _readingPageView() => BlocBuilder( - builder: (context, state) { + builder: (context, state) { final bloc = BlocProvider.of(context); return Container( color: Colors.white, @@ -82,10 +83,15 @@ class _ReadingPage extends StatelessWidget { children: [ Padding( padding: - EdgeInsets.only(left: ScreenUtil().bottomBarHeight), + EdgeInsets.only(left: ScreenUtil().bottomBarHeight), child: IconButton( onPressed: () { - Navigator.pop(context); + popPage( + data:{ + 'currentStep':bloc.currentPage.toString(), + 'courseLessonId':bloc.courseLessonId + } + ); }, icon: Image.asset( 'back_around'.assetPng, @@ -159,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, @@ -171,12 +177,12 @@ class _ReadingPage extends StatelessWidget { ), Expanded( child: Text( - bloc.currentPageData()?.word ?? '', - style: TextStyle( - color: const Color(0xFF333333), fontSize: 21.sp), - maxLines: 2, - overflow: TextOverflow.ellipsis, - )), + bloc.currentPageData()?.word ?? '', + style: TextStyle( + color: const Color(0xFF333333), fontSize: 21.sp), + maxLines: 2, + overflow: TextOverflow.ellipsis, + )), SizedBox( width: 10.w, ), @@ -233,7 +239,7 @@ class _ReadingPage extends StatelessWidget { children: [ Positioned.fill( child: - Image.network(readings.picUrl ?? '', fit: BoxFit.cover), + Image.network(readings.picUrl ?? '', fit: BoxFit.cover), ), ], );