From 4d8b0da4cba692c0d4f6b474ac1004d21b0433b5 Mon Sep 17 00:00:00 2001 From: wuqifeng <540416539@qq.com> Date: Thu, 25 Jul 2024 00:41:09 +0800 Subject: [PATCH] feat:绘本跟读底部ui优化 --- lib/pages/reading/bloc/reading_bloc.dart | 6 +++++- lib/pages/reading/reading_page.dart | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/pages/reading/bloc/reading_bloc.dart b/lib/pages/reading/bloc/reading_bloc.dart index fcbd9a3..b779531 100644 --- a/lib/pages/reading/bloc/reading_bloc.dart +++ b/lib/pages/reading/bloc/reading_bloc.dart @@ -19,7 +19,6 @@ import '../../../route/route.dart'; import '../../../utils/loading.dart'; import '../../../utils/log_util.dart'; -import '../../../common/permission/permissionRequestPage.dart'; part 'reading_event.dart'; part 'reading_state.dart'; @@ -299,6 +298,11 @@ class ReadingPageBloc return _entity?.readings?[_currentPage]; } + ///当前页绘本跟读内容 + String readingContent() { + return currentPageData()?.word?.trim() ?? ''; + } + void nextPage() { if (currentPage >= dataCount()) { sectionComplete(() { diff --git a/lib/pages/reading/reading_page.dart b/lib/pages/reading/reading_page.dart index cf13c4b..c4becba 100644 --- a/lib/pages/reading/reading_page.dart +++ b/lib/pages/reading/reading_page.dart @@ -13,6 +13,7 @@ import '../../models/course_process_entity.dart'; import '../../utils/log_util.dart'; import 'bloc/reading_bloc.dart'; +///绘本页 class ReadingPage extends StatelessWidget { const ReadingPage({super.key, this.courseLessonId}); @@ -151,8 +152,7 @@ class _ReadingPage extends StatelessWidget { Align( alignment: Alignment.bottomLeft, child: Container( - color: const Color(0x4DFFFFFF), - margin: EdgeInsets.symmetric(horizontal: 10.w), + color: const Color(0x80FFFFFF), child: Row( children: [ 5.horizontalSpace, @@ -177,7 +177,7 @@ class _ReadingPage extends StatelessWidget { ), Expanded( child: Text( - bloc.currentPageData()?.word?.trim() ?? '', + bloc.readingContent(), style: TextStyle( color: const Color(0xFF333333), fontSize: 21.sp), maxLines: 2, @@ -193,7 +193,7 @@ class _ReadingPage extends StatelessWidget { bloc.add(XSVoiceStopEvent()); } else { bloc.add(XSVoiceStartEvent( - bloc.currentPageData()?.word ?? '', + bloc.readingContent(), '0', UserUtil.getUser()?.id.toString())); } -- libgit2 0.22.2