From 457ac44701cb2c7594eb2105f0e3c4895b87d5b2 Mon Sep 17 00:00:00 2001 From: wuqifeng <540416539@qq.com> Date: Sun, 4 Aug 2024 14:15:58 +0800 Subject: [PATCH] feat:代码优化-空条件调用 --- lib/common/utils/click_with_music_controller.dart | 2 +- lib/common/widgets/throttledGesture_gesture_detector.dart | 4 +--- lib/common/widgets/we_app_bar.dart | 2 +- lib/pages/reading/bloc/reading_bloc.dart | 4 +--- lib/pages/reading/reading_page.dart | 14 +++++++------- lib/pages/section/subsection/base_section/bloc.dart | 4 ++-- lib/pages/section/widgets/section_header_widget.dart | 2 +- lib/pages/unit/widget/home_tab_header_widget.dart | 2 +- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lib/common/utils/click_with_music_controller.dart b/lib/common/utils/click_with_music_controller.dart index f0f6d26..4ebb754 100644 --- a/lib/common/utils/click_with_music_controller.dart +++ b/lib/common/utils/click_with_music_controller.dart @@ -23,7 +23,7 @@ class ClickWithMusicController { ///@param action 可以是同步函数也可以是异步函数 Future playMusicAndPerformAction(BuildContext? context, AudioPlayerUtilType audioType, FutureOr Function() action) async { - Log.d("$TAG playMusicAndPerformAction _isPlaying=$_isPlaying"); + Log.d("$TAG playMusicAndPerformAction _isPlaying=$_isPlaying audioType=$audioType"); ///todo 是否需要考虑打断覆盖能力 if (_isPlaying) return; diff --git a/lib/common/widgets/throttledGesture_gesture_detector.dart b/lib/common/widgets/throttledGesture_gesture_detector.dart index 0eb4c17..b143303 100644 --- a/lib/common/widgets/throttledGesture_gesture_detector.dart +++ b/lib/common/widgets/throttledGesture_gesture_detector.dart @@ -24,9 +24,7 @@ class _ThrottledGestureDetectorState extends State { void _handleTap() { if (!_isThrottled) { - if (widget.onTap != null) { - widget.onTap!(); - } + widget.onTap?.call(); _isThrottled = true; Timer(Duration(milliseconds: widget.throttleTime), () { _isThrottled = false; diff --git a/lib/common/widgets/we_app_bar.dart b/lib/common/widgets/we_app_bar.dart index abfa9b2..3611262 100644 --- a/lib/common/widgets/we_app_bar.dart +++ b/lib/common/widgets/we_app_bar.dart @@ -41,7 +41,7 @@ class WEAppBar extends StatelessWidget implements PreferredSizeWidget { if (onBack == null) { Navigator.pop(context); } else { - onBack!(); + onBack?.call(); } }, child: Container( diff --git a/lib/pages/reading/bloc/reading_bloc.dart b/lib/pages/reading/bloc/reading_bloc.dart index 248c813..beeacc7 100644 --- a/lib/pages/reading/bloc/reading_bloc.dart +++ b/lib/pages/reading/bloc/reading_bloc.dart @@ -6,7 +6,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/pages/reading/widgets/ReadingModeType.dart'; import 'package:wow_english/pages/section/subsection/base_section/bloc.dart'; import 'package:wow_english/pages/section/subsection/base_section/event.dart'; @@ -16,7 +15,6 @@ import '../../../common/core/user_util.dart'; import '../../../common/permission/permissionRequester.dart'; import '../../../common/request/dao/listen_dao.dart'; import '../../../common/request/exception.dart'; -import '../../../common/utils/click_with_music_controller.dart'; import '../../../common/utils/show_star_reward_dialog.dart'; import '../../../models/course_process_entity.dart'; import '../../../models/singsound_result_detail_entity.dart'; @@ -339,7 +337,7 @@ class ReadingPageBloc color: detail.score > 80 ? const Color(0XFF35C137) : const Color(0xFF333333), - fontSize: 20.sp, + fontSize: 18.sp, ), ); }).toList(); diff --git a/lib/pages/reading/reading_page.dart b/lib/pages/reading/reading_page.dart index 81f197d..53c6d28 100644 --- a/lib/pages/reading/reading_page.dart +++ b/lib/pages/reading/reading_page.dart @@ -189,8 +189,8 @@ class _ReadingPage extends StatelessWidget { ), RecorderWidget( isPlaying: bloc.isRecording, - width: 60.w, - height: 60.w, + width: 54.w, + height: 54.w, onTap: () { if (bloc.isRecording) { bloc.add(XSVoiceStopEvent()); @@ -200,9 +200,6 @@ class _ReadingPage extends StatelessWidget { } }, ), - SizedBox( - width: 10.w, - ), GestureDetector( onTap: () { if (bloc.isRecording) { @@ -216,8 +213,8 @@ class _ReadingPage extends StatelessWidget { bloc.isRecordAudioPlaying ? 'record_pause'.assetWebp : 'record_play'.assetWebp, - height: 33.h, - width: 33.w, + height: 35.h, + width: 35.h, ), )), // RecorderPlaybackWidget( @@ -229,6 +226,9 @@ class _ReadingPage extends StatelessWidget { // bloc.add(PlayRecordAudioEvent()); // }, // ) + SizedBox( + width: 10.w, + ) ], ), ), diff --git a/lib/pages/section/subsection/base_section/bloc.dart b/lib/pages/section/subsection/base_section/bloc.dart index 99bbba5..8e5aee1 100644 --- a/lib/pages/section/subsection/base_section/bloc.dart +++ b/lib/pages/section/subsection/base_section/bloc.dart @@ -39,7 +39,7 @@ abstract class BaseSectionBloc