批阅按钮位置修改

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

@@ -1,4 +1,5 @@
 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';
@@ -24,101 +25,111 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
   @override
   Widget build(BuildContext context) {
     String homeworkId = state.homeworkId.value;
-    return OrientationBuilder(
+    return AnnotatedRegion(
-        builder: (BuildContext context, Orientation orientation) {
+      value: const SystemUiOverlayStyle(
-      return Scaffold(
+        systemNavigationBarColor:Colors.transparent,
-        backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
+        systemNavigationBarDividerColor: null,
-        appBar: AppBar(
+        statusBarColor: Colors.transparent,
-          backgroundColor: Colors.white,
+        systemNavigationBarIconBrightness: Brightness.light,
-          title: Obx(() {
+        statusBarIconBrightness: Brightness.light,
-            return Text(state.name.value,
+        statusBarBrightness: Brightness.light,
-                style:
+      ),
-                    TextStyle(fontSize: 14.sp, color: const Color(0xFF333333)));
+      child: OrientationBuilder(
-          }),
+          builder: (BuildContext context, Orientation orientation) {
-          centerTitle: true,
+        return Scaffold(
-          leading: IconButton(
+          backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
-            icon: const Icon(Icons.arrow_back_ios, color: Colors.black),
+          appBar: AppBar(
-            onPressed: () {
+            backgroundColor: Colors.white,
-              Get.back();
+            title: Obx(() {
-            },
+              return Text(state.name.value,
+                  style:
+                      TextStyle(fontSize: 14.sp, color: const Color(0xFF333333)));
+            }),
+            centerTitle: true,
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back_ios, color: Colors.black),
+              onPressed: () {
+                Get.back();
+              },
+            ),
+            actions: const [
+              ReturnToHomepage(),
+            ],
           ),
-          actions: const [
+          body: Padding(
-            ReturnToHomepage(),
+            padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 14.r),
-          ],
+            child: Obx(() {
-        ),
+              return EasyRefresh(
-        body: Padding(
+                  firstRefresh: false,
-          padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 14.r),
+                  taskIndependence: true,
-          child: Obx(() {
+                  controller: logic.refreshController,
-            return EasyRefresh(
+                  header: MaterialHeader(),
-                firstRefresh: false,
+                  footer: TaurusFooter(),
-                taskIndependence: true,
+                  onRefresh: () async {
-                controller: logic.refreshController,
+                    return logic.getList();
-                header: MaterialHeader(),
+                  },
-                footer: TaurusFooter(),
+                  child: state.completed.value
-                onRefresh: () async {
+                      ? Utils.isPad()
-                  return logic.getList();
+                          ? GridView(
-                },
+                              gridDelegate:
-                child: state.completed.value
+                                  SliverGridDelegateWithFixedCrossAxisCount(
-                    ? Utils.isPad()
+                                      crossAxisCount: 2, //横轴三个子widget
-                        ? GridView(
+                                      mainAxisSpacing: 10.h,
-                            gridDelegate:
+                                      crossAxisSpacing: 6.w,
-                                SliverGridDelegateWithFixedCrossAxisCount(
+                                      childAspectRatio: 1.48 //宽高比为1时，子widget
-                                    crossAxisCount: 2, //横轴三个子widget
+                                      ),
-                                    mainAxisSpacing: 10.h,
+                              children: state.classList.map((taskItem) {
-                                    crossAxisSpacing: 6.w,
+                                return CompletedAnnotateItem(
-                                    childAspectRatio: 1.48 //宽高比为1时，子widget
+                                  taskItem: taskItem,
-                                    ),
+                                  logic: logic,
-                            children: state.classList.map((taskItem) {
+                                  name: state.name.value,
-                              return CompletedAnnotateItem(
+                                );
-                                taskItem: taskItem,
+                              }).toList(),
-                                logic: logic,
+                            )
-                                name: state.name.value,
+                          : ListView.builder(
-                              );
+                              itemCount: state.classList.length,
-                            }).toList(),
+                              itemBuilder: (context, index) {
-                          )
+                                AnnotatedClass taskItem = state.classList[index];
-                        : ListView.builder(
+                                return CompletedAnnotateItem(
-                            itemCount: state.classList.length,
+                                  taskItem: taskItem,
-                            itemBuilder: (context, index) {
+                                  logic: logic,
-                              AnnotatedClass taskItem = state.classList[index];
+                                  name: state.name.value,
-                              return CompletedAnnotateItem(
+                                );
-                                taskItem: taskItem,
+                              })
-                                logic: logic,
+                      : Utils.isPad()
-                                name: state.name.value,
+                          ? MasonryGridView.count(
-                              );
+                              crossAxisCount: 2, //几列
-                            })
+                              mainAxisSpacing: 4.w, // 间距
-                    : Utils.isPad()
+                              crossAxisSpacing: 4.h, // 纵向间距？
-                        ? MasonryGridView.count(
+                              itemCount: state.classList.length,
-                            crossAxisCount: 2, //几列
+                              itemBuilder: (context, index) {
-                            mainAxisSpacing: 4.w, // 间距
+                                AnnotatedClass item = state.classList[index];
-                            crossAxisSpacing: 4.h, // 纵向间距？
+                                return AnnotateItem(
-                            itemCount: state.classList.length,
+                                  homeworkId: homeworkId,
-                            itemBuilder: (context, index) {
+                                  item: item,
-                              AnnotatedClass item = state.classList[index];
+                                  font: 11.sp,
-                              return AnnotateItem(
+                                  name: state.name.value,
-                                homeworkId: homeworkId,
+                                  logic: logic,
-                                item: item,
+                                );
-                                font: 11.sp,
+                              },
-                                name: state.name.value,
+                            )
-                                logic: logic,
+                          : ListView.builder(
-                              );
+                              itemCount: state.classList.length,
-                            },
+                              itemBuilder: (context, index) {
-                          )
+                                AnnotatedClass item = state.classList[index];
-                        : ListView.builder(
+                                return AnnotateItem(
-                            itemCount: state.classList.length,
+                                  homeworkId: homeworkId,
-                            itemBuilder: (context, index) {
+                                  item: item,
-                              AnnotatedClass item = state.classList[index];
+                                  font: 12.sp,
-                              return AnnotateItem(
+                                  name: state.name.value,
-                                homeworkId: homeworkId,
+                                  logic: logic,
-                                item: item,
+                                );
-                                font: 12.sp,
+                              }));
-                                name: state.name.value,
+            }),
-                                logic: logic,
+          ),
-                              );
+        );
-                            }));
+      }),
-          }),
+    );
-        ),
-      );
-    });
   }
 
   @override

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

@@ -71,35 +71,6 @@ 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(
@@ -108,6 +79,18 @@ 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(
@@ -151,18 +134,6 @@ 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)),
-                          ),
-                        ),
-                      ),
                     ],
                   ),
                 ),
@@ -170,6 +141,19 @@ 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(
@@ -199,25 +183,43 @@ 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(
-                            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(
+            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()),
+                      child: quickText('取 消', size: 14.sp, color: Colors.white),
+                    ),
+                  ),
+                ),
+                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,4 +1,5 @@
 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';
@@ -47,30 +48,40 @@ class _HomeworkReviewState extends State<HomeworkReview> {
           _homeLogicController.getList();
         }
       },
-      child: SafeArea(
+      child: AnnotatedRegion(
-        child: Scaffold(
+        value: const SystemUiOverlayStyle(
-          appBar: AppBar(
+             systemNavigationBarColor: Color(0xFF000000),
-            // titleSpacing: 0,
+        systemNavigationBarDividerColor: null,
-            leading: IconButton(icon: const Icon(Icons.arrow_back_ios), onPressed: () => Get.back()),
+          statusBarColor: Colors.transparent,
-            iconTheme: const IconThemeData(color: Colors.black),
+          systemNavigationBarIconBrightness: Brightness.light,
-            title: quickText(sateData.param.value.homeworkName),
+          statusBarIconBrightness: Brightness.light,
-            backgroundColor: Colors.white,
+          statusBarBrightness: Brightness.light,
-            elevation: 0,
+        ),
-            actions: [const FavoriteWidget(), SizedBox(width: 5.w), const ReturnToHomepage()],
+        child: SafeArea(
-          ),
+          child: Scaffold(
-          body: SafeArea(
+            appBar: AppBar(
-            child: Column(
+              // titleSpacing: 0,
-              children: [
+              leading: IconButton(icon: const Icon(Icons.arrow_back_ios), onPressed: () => Get.back()),
-                // 下拉切换
+              iconTheme: const IconThemeData(color: Colors.black),
-                const DropdownSwitchStudentsType(),
+              title: quickText(sateData.param.value.homeworkName),
-                SizedBox(height: 1.h),
+              backgroundColor: Colors.white,
-                const Expanded(child: QuestionPaperView()),
+              elevation: 0,
-                const BottomAnnotationSwitch()
+              actions: [const FavoriteWidget(), SizedBox(width: 5.w), const ReturnToHomepage()],
-              ],
             ),
+            body: SafeArea(
+              child: Column(
+                children: [
+                  // 下拉切换
+                  const DropdownSwitchStudentsType(),
+                  SizedBox(height: 1.h),
+                  const Expanded(child: QuestionPaperView()),
+                  const BottomAnnotationSwitch()
+                ],
+              ),
+            ),
+            // floatingActionButton: const ButtonFloatingAction(),
+            // floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
           ),
-          // floatingActionButton: const ButtonFloatingAction(),
-          // 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,11 +21,6 @@ class _ReadOverPageState extends State<ReadOverPage> {
 
   @override
   void initState() {
-    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-      statusBarColor: Colors.transparent, //状态栏背景颜色
-      statusBarIconBrightness: Brightness.light,
-      systemStatusBarContrastEnforced: false,
-    ));
     super.initState();
   }
 
@@ -33,9 +28,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.white,
+        statusBarColor: Colors.transparent,
         systemNavigationBarIconBrightness: Brightness.light,
         statusBarIconBrightness: Brightness.light,
         statusBarBrightness: Brightness.light,