feat:代码优化-空条件调用

吴启风
1 parent 5647d1be
Showing 8 changed files with 15 additions and 19 deletions
lib/common/utils/click_with_music_controller.dart
lib/common/widgets/throttledGesture_gesture_detector.dart
lib/common/widgets/we_app_bar.dart
lib/pages/reading/bloc/reading_bloc.dart
lib/pages/reading/reading_page.dart
lib/pages/section/subsection/base_section/bloc.dart
lib/pages/section/widgets/section_header_widget.dart
lib/pages/unit/widget/home_tab_header_widget.dart
@@ -23,7 +23,7 @@ class ClickWithMusicController {
   ///@param action 可以是同步函数也可以是异步函数
   Future<void> playMusicAndPerformAction(BuildContext? context,
       AudioPlayerUtilType audioType, FutureOr<void> Function() action) async {
-    Log.d("$TAG playMusicAndPerformAction _isPlaying=$_isPlaying");
+    Log.d("$TAG playMusicAndPerformAction _isPlaying=$_isPlaying audioType=$audioType");
     ///todo 是否需要考虑打断覆盖能力
     if (_isPlaying) return;
@@ -24,9 +24,7 @@ class _ThrottledGestureDetectorState extends State&lt;ThrottledGestureDetector&gt; {
   void _handleTap() {
     if (!_isThrottled) {
-      if (widget.onTap != null) {
-        widget.onTap!();
-      }
+      widget.onTap?.call();
       _isThrottled = true;
       Timer(Duration(milliseconds: widget.throttleTime), () {
         _isThrottled = false;
@@ -41,7 +41,7 @@ class WEAppBar extends StatelessWidget implements PreferredSizeWidget {
               if (onBack == null) {
                 Navigator.pop(context);
               } else {
-                onBack!();
+                onBack?.call();
               }
             },
             child: Container(
@@ -6,7 +6,6 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 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 &#39;../../../common/core/user_util.dart&#39;;
 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();
@@ -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,
+                      )
                     ],
                   ),
                 ),
@@ -39,7 +39,7 @@ abstract class BaseSectionBloc&lt;E extends BaseSectionEvent,
                   child: GestureDetector(
                     onTap: () {
                       popPage();
-                      againSectionTap!();
+                      againSectionTap?.call();
                     },
                     child: Image.asset('section_finish_again'.assetPng),
                   ),
@@ -53,7 +53,7 @@ abstract class BaseSectionBloc&lt;E extends BaseSectionEvent,
                   child: GestureDetector(
                     onTap: () {
                       popPage();
-                      nextSectionTap!();
+                      nextSectionTap?.call();
                     },
                     child: Image.asset('section_finish_next'.assetPng),
                   ),
@@ -32,7 +32,7 @@ class SectionHeaderWidget extends StatelessWidget {
                     if (onBack == null) {
                       Navigator.pop(context);
                     } else {
-                      onBack!();
+                      onBack?.call();
                     }
                   },
                   child: Container(
@@ -45,7 +45,7 @@ class HomeTabHeaderWidget extends StatelessWidget {
                     if (onBack == null) {
                       Navigator.pop(context);
                     } else {
-                      onBack!();
+                      onBack?.call();
                     }
                   },
                   child: Container(