making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
@@ -25,16 +24,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
   @override
   Widget build(BuildContext context) {
     String homeworkId = state.homeworkId.value;
-    return AnnotatedRegion(
+    return OrientationBuilder(
-      value: const SystemUiOverlayStyle(
-        systemNavigationBarColor:Colors.transparent,
-        systemNavigationBarDividerColor: null,
-        statusBarColor: Colors.transparent,
-        systemNavigationBarIconBrightness: Brightness.light,
-        statusBarIconBrightness: Brightness.light,
-        statusBarBrightness: Brightness.light,
-      ),
-      child: OrientationBuilder(
         builder: (BuildContext context, Orientation orientation) {
       return Scaffold(
         backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
@@ -128,8 +118,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
           }),
         ),
       );
-      }),
+    });
-    );
   }
 
   @override

making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart

@@ -71,6 +71,35 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
       // padding: EdgeInsets.symmetric(vertical: 1.h),
       child: Row(
         children: [
+          Expanded(
+            flex: 3,
+            child: Row(
+              children: [
+                Expanded(
+                  child: SizedBox(
+                    width: double.infinity,
+                    height: double.infinity,
+                    child: TextButton(
+                      onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.submit(context)),
+                      child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor),
+                    ),
+                  ),
+                ),
+                Container(width: 0.3.w, height: double.infinity, color: Colors.white),
+                Expanded(
+                  child: SizedBox(
+                    width: double.infinity,
+                    height: double.infinity,
+                    child: TextButton(
+                      onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.cancelAllRatings()),
+                      child: quickText('取 消', size: 14.sp, color: Colors.white),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          Container(width: 0.3.w, height: double.infinity, color: Colors.white),
           Expanded(
             flex: 7,
             child: Column(
@@ -79,18 +108,6 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
                 Expanded(
                   child: Row(
                     children: [
-                      // 全对按钮
-                      Expanded(
-                        child: SizedBox(
-                          width: double.infinity,
-                          height: double.infinity,
-                          child: TextButton(
-                            child: quickText('全 对', color: Colors.white, size: 12.sp),
-                            onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allPairs(context)),
-                          ),
-                        ),
-                      ),
-                      Container(width: 0.3.w, height: double.infinity, color: Colors.white),
                       // 注解笔
                       Expanded(
                         child: SizedBox(
@@ -134,6 +151,18 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
                           ),
                         ),
                       ),
+                      Container(width: 0.3.w, height: double.infinity, color: Colors.white),
+                      // 全对按钮
+                      Expanded(
+                        child: SizedBox(
+                          width: double.infinity,
+                          height: double.infinity,
+                          child: TextButton(
+                            child: quickText('全 对', color: Colors.white, size: 12.sp),
+                            onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allPairs(context)),
+                          ),
+                        ),
+                      ),
                     ],
                   ),
                 ),
@@ -141,19 +170,6 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
                 Expanded(
                   child: Row(
                     children: [
-                      // 全错按钮
-                      Expanded(
-                        child: SizedBox(
-                          width: double.infinity,
-                          height: double.infinity,
-                          child: TextButton(
-                            onPressed: () =>
-                                easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allWrongRating(context)),
-                            child: quickText('全 错', color: Colors.white, size: 12.sp),
-                          ),
-                        ),
-                      ),
-                      Container(width: 0.3.w, height: double.infinity, color: Colors.white),
                       // 撤销上一步
                       Expanded(
                         child: SizedBox(
@@ -183,43 +199,25 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
                           ),
                         ),
                       ),
-
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
                       Container(width: 0.3.w, height: double.infinity, color: Colors.white),
-          Expanded(
+                      // 全错按钮
-            flex: 3,
-            child: Row(
-              children: [
                       Expanded(
                         child: SizedBox(
                           width: double.infinity,
                           height: double.infinity,
                           child: TextButton(
-                      onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.cancelAllRatings()),
+                            onPressed: () =>
-                      child: quickText('取 消', size: 14.sp, color: Colors.white),
+                                easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allWrongRating(context)),
-                    ),
+                            child: quickText('全 错', color: Colors.white, size: 12.sp),
-                  ),
-                ),
-                Container(width: 0.3.w, height: double.infinity, color: Colors.white),
-                Expanded(
-                  child: SizedBox(
-                    width: double.infinity,
-                    height: double.infinity,
-                    child: TextButton(
-                      onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.submit(context)),
-                      child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor),
                           ),
                         ),
                       ),
                     ],
                   ),
                 ),
-
+              ],
+            ),
+          ),
         ],
       ),
     );

making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:making_school_asignment_app/page/global_widget/ReturnToHomepage.dart';
@@ -48,15 +47,6 @@ class _HomeworkReviewState extends State<HomeworkReview> {
           _homeLogicController.getList();
         }
       },
-      child: AnnotatedRegion(
-        value: const SystemUiOverlayStyle(
-             systemNavigationBarColor: Color(0xFF000000),
-        systemNavigationBarDividerColor: null,
-          statusBarColor: Colors.transparent,
-          systemNavigationBarIconBrightness: Brightness.light,
-          statusBarIconBrightness: Brightness.light,
-          statusBarBrightness: Brightness.light,
-        ),
       child: SafeArea(
         child: Scaffold(
           appBar: AppBar(
@@ -83,7 +73,6 @@ class _HomeworkReviewState extends State<HomeworkReview> {
           // floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
         ),
       ),
-      ),
     );
   }
 }

making_school_asignment_app/lib/page/home_page/children/my_info.dart

@@ -24,7 +24,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
       statusBarIconBrightness: Brightness.light,
       statusBarColor: Colors.transparent, //状态栏背景颜色
-      // systemStatusBarContrastEnforced: false,
+      systemStatusBarContrastEnforced: false,
     ));
     super.initState();
   }

making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart

@@ -21,6 +21,11 @@ class _ReadOverPageState extends State<ReadOverPage> {
 
   @override
   void initState() {
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent, //状态栏背景颜色
+      statusBarIconBrightness: Brightness.light,
+      systemStatusBarContrastEnforced: false,
+    ));
     super.initState();
   }
 
@@ -28,9 +33,9 @@ class _ReadOverPageState extends State<ReadOverPage> {
   Widget build(BuildContext context) {
     return AnnotatedRegion(
       value: const SystemUiOverlayStyle(
-     /*   systemNavigationBarColor: Color(0xFF000000),
+        systemNavigationBarColor: Color(0xFF000000),
-        systemNavigationBarDividerColor: null,*/
+        systemNavigationBarDividerColor: null,
-        statusBarColor: Colors.transparent,
+        statusBarColor: Colors.white,
         systemNavigationBarIconBrightness: Brightness.light,
         statusBarIconBrightness: Brightness.light,
         statusBarBrightness: Brightness.light,