diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index dc5317f..54f18fa 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 6842331..bb112aa 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bf756f8..c32bcd5 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index f33a201..863f4ef 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 7905fc2..8931590 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/check_icon.png b/making_school_asignment_app/assets/images/2.0x/check_icon.png new file mode 100644 index 0000000..f5f18fa Binary files /dev/null and b/making_school_asignment_app/assets/images/2.0x/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/ic_home_normal.png b/making_school_asignment_app/assets/images/2.0x/ic_home_normal.png index 64354dc..931df28 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/ic_home_normal.png and b/making_school_asignment_app/assets/images/2.0x/ic_home_normal.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/ic_home_press.png b/making_school_asignment_app/assets/images/2.0x/ic_home_press.png index 4d1cefb..f691873 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/ic_home_press.png and b/making_school_asignment_app/assets/images/2.0x/ic_home_press.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/ic_mine_normal.png b/making_school_asignment_app/assets/images/2.0x/ic_mine_normal.png index 719e115..dc9e6b1 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/ic_mine_normal.png and b/making_school_asignment_app/assets/images/2.0x/ic_mine_normal.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/ic_mine_press.png b/making_school_asignment_app/assets/images/2.0x/ic_mine_press.png index 5ada58e..be507b1 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/ic_mine_press.png and b/making_school_asignment_app/assets/images/2.0x/ic_mine_press.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/ic_work_normal.png b/making_school_asignment_app/assets/images/2.0x/ic_work_normal.png index cd54b72..723a897 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/ic_work_normal.png and b/making_school_asignment_app/assets/images/2.0x/ic_work_normal.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/ic_work_press.png b/making_school_asignment_app/assets/images/2.0x/ic_work_press.png index 23d22f2..c40d284 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/ic_work_press.png and b/making_school_asignment_app/assets/images/2.0x/ic_work_press.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/job_data_right_icon.png b/making_school_asignment_app/assets/images/2.0x/job_data_right_icon.png new file mode 100644 index 0000000..a05c6c5 Binary files /dev/null and b/making_school_asignment_app/assets/images/2.0x/job_data_right_icon.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/job_report_class_icon.png b/making_school_asignment_app/assets/images/2.0x/job_report_class_icon.png new file mode 100644 index 0000000..3d103d8 Binary files /dev/null and b/making_school_asignment_app/assets/images/2.0x/job_report_class_icon.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/login_bg.png b/making_school_asignment_app/assets/images/2.0x/login_bg.png new file mode 100644 index 0000000..1c57e19 Binary files /dev/null and b/making_school_asignment_app/assets/images/2.0x/login_bg.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/login_logo.png b/making_school_asignment_app/assets/images/2.0x/login_logo.png new file mode 100644 index 0000000..e6dc95e Binary files /dev/null and b/making_school_asignment_app/assets/images/2.0x/login_logo.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/personal_bgi.png b/making_school_asignment_app/assets/images/2.0x/personal_bgi.png index f633bd6..efe65ec 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/personal_bgi.png and b/making_school_asignment_app/assets/images/2.0x/personal_bgi.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/check_icon.png b/making_school_asignment_app/assets/images/3.0x/check_icon.png new file mode 100644 index 0000000..f5f18fa Binary files /dev/null and b/making_school_asignment_app/assets/images/3.0x/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/ic_home_normal.png b/making_school_asignment_app/assets/images/3.0x/ic_home_normal.png index 44b7e1c..931df28 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/ic_home_normal.png and b/making_school_asignment_app/assets/images/3.0x/ic_home_normal.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/ic_home_press.png b/making_school_asignment_app/assets/images/3.0x/ic_home_press.png index 19ab970..f691873 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/ic_home_press.png and b/making_school_asignment_app/assets/images/3.0x/ic_home_press.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/ic_mine_normal.png b/making_school_asignment_app/assets/images/3.0x/ic_mine_normal.png index e410817..dc9e6b1 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/ic_mine_normal.png and b/making_school_asignment_app/assets/images/3.0x/ic_mine_normal.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/ic_mine_press.png b/making_school_asignment_app/assets/images/3.0x/ic_mine_press.png index 512e001..be507b1 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/ic_mine_press.png and b/making_school_asignment_app/assets/images/3.0x/ic_mine_press.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/ic_work_normal.png b/making_school_asignment_app/assets/images/3.0x/ic_work_normal.png index deb6e0d..723a897 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/ic_work_normal.png and b/making_school_asignment_app/assets/images/3.0x/ic_work_normal.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/ic_work_press.png b/making_school_asignment_app/assets/images/3.0x/ic_work_press.png index ca13777..c40d284 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/ic_work_press.png and b/making_school_asignment_app/assets/images/3.0x/ic_work_press.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/job_data_right_icon.png b/making_school_asignment_app/assets/images/3.0x/job_data_right_icon.png new file mode 100644 index 0000000..a05c6c5 Binary files /dev/null and b/making_school_asignment_app/assets/images/3.0x/job_data_right_icon.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/job_report_class_icon.png b/making_school_asignment_app/assets/images/3.0x/job_report_class_icon.png new file mode 100644 index 0000000..3d103d8 Binary files /dev/null and b/making_school_asignment_app/assets/images/3.0x/job_report_class_icon.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/login_bg.png b/making_school_asignment_app/assets/images/3.0x/login_bg.png new file mode 100644 index 0000000..1c57e19 Binary files /dev/null and b/making_school_asignment_app/assets/images/3.0x/login_bg.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/login_logo.png b/making_school_asignment_app/assets/images/3.0x/login_logo.png new file mode 100644 index 0000000..e6dc95e Binary files /dev/null and b/making_school_asignment_app/assets/images/3.0x/login_logo.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/personal_bgi.png b/making_school_asignment_app/assets/images/3.0x/personal_bgi.png index 83e7ee9..b899eea 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/personal_bgi.png and b/making_school_asignment_app/assets/images/3.0x/personal_bgi.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/check_icon.png b/making_school_asignment_app/assets/images/4.0x/check_icon.png new file mode 100644 index 0000000..f5f18fa Binary files /dev/null and b/making_school_asignment_app/assets/images/4.0x/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/ic_home_normal.png b/making_school_asignment_app/assets/images/4.0x/ic_home_normal.png index d12ff70..931df28 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/ic_home_normal.png and b/making_school_asignment_app/assets/images/4.0x/ic_home_normal.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/ic_home_press.png b/making_school_asignment_app/assets/images/4.0x/ic_home_press.png index fd6267a..f691873 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/ic_home_press.png and b/making_school_asignment_app/assets/images/4.0x/ic_home_press.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/ic_mine_normal.png b/making_school_asignment_app/assets/images/4.0x/ic_mine_normal.png index eeed1a9..dc9e6b1 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/ic_mine_normal.png and b/making_school_asignment_app/assets/images/4.0x/ic_mine_normal.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/ic_mine_press.png b/making_school_asignment_app/assets/images/4.0x/ic_mine_press.png index b994e8e..be507b1 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/ic_mine_press.png and b/making_school_asignment_app/assets/images/4.0x/ic_mine_press.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/ic_work_normal.png b/making_school_asignment_app/assets/images/4.0x/ic_work_normal.png index 29bd81d..723a897 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/ic_work_normal.png and b/making_school_asignment_app/assets/images/4.0x/ic_work_normal.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/ic_work_press.png b/making_school_asignment_app/assets/images/4.0x/ic_work_press.png index 431435f..c40d284 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/ic_work_press.png and b/making_school_asignment_app/assets/images/4.0x/ic_work_press.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/job_data_right_icon.png b/making_school_asignment_app/assets/images/4.0x/job_data_right_icon.png new file mode 100644 index 0000000..a05c6c5 Binary files /dev/null and b/making_school_asignment_app/assets/images/4.0x/job_data_right_icon.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/job_report_class_icon.png b/making_school_asignment_app/assets/images/4.0x/job_report_class_icon.png new file mode 100644 index 0000000..3d103d8 Binary files /dev/null and b/making_school_asignment_app/assets/images/4.0x/job_report_class_icon.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/login_bg.png b/making_school_asignment_app/assets/images/4.0x/login_bg.png new file mode 100644 index 0000000..1c57e19 Binary files /dev/null and b/making_school_asignment_app/assets/images/4.0x/login_bg.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/login_logo.png b/making_school_asignment_app/assets/images/4.0x/login_logo.png new file mode 100644 index 0000000..e6dc95e Binary files /dev/null and b/making_school_asignment_app/assets/images/4.0x/login_logo.png differ diff --git a/making_school_asignment_app/assets/images/4.0x/personal_bgi.png b/making_school_asignment_app/assets/images/4.0x/personal_bgi.png index a15351f..e420979 100644 Binary files a/making_school_asignment_app/assets/images/4.0x/personal_bgi.png and b/making_school_asignment_app/assets/images/4.0x/personal_bgi.png differ diff --git a/making_school_asignment_app/assets/images/check_icon.png b/making_school_asignment_app/assets/images/check_icon.png index 6737f02..f5f18fa 100644 Binary files a/making_school_asignment_app/assets/images/check_icon.png and b/making_school_asignment_app/assets/images/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/ic_home_normal.png b/making_school_asignment_app/assets/images/ic_home_normal.png index 3b81a93..931df28 100644 Binary files a/making_school_asignment_app/assets/images/ic_home_normal.png and b/making_school_asignment_app/assets/images/ic_home_normal.png differ diff --git a/making_school_asignment_app/assets/images/ic_home_press.png b/making_school_asignment_app/assets/images/ic_home_press.png index b292be5..f691873 100644 Binary files a/making_school_asignment_app/assets/images/ic_home_press.png and b/making_school_asignment_app/assets/images/ic_home_press.png differ diff --git a/making_school_asignment_app/assets/images/ic_mine_normal.png b/making_school_asignment_app/assets/images/ic_mine_normal.png index 1e5dd34..dc9e6b1 100644 Binary files a/making_school_asignment_app/assets/images/ic_mine_normal.png and b/making_school_asignment_app/assets/images/ic_mine_normal.png differ diff --git a/making_school_asignment_app/assets/images/ic_mine_press.png b/making_school_asignment_app/assets/images/ic_mine_press.png index 03a2784..be507b1 100644 Binary files a/making_school_asignment_app/assets/images/ic_mine_press.png and b/making_school_asignment_app/assets/images/ic_mine_press.png differ diff --git a/making_school_asignment_app/assets/images/ic_work_normal.png b/making_school_asignment_app/assets/images/ic_work_normal.png index 565db6d..723a897 100644 Binary files a/making_school_asignment_app/assets/images/ic_work_normal.png and b/making_school_asignment_app/assets/images/ic_work_normal.png differ diff --git a/making_school_asignment_app/assets/images/ic_work_press.png b/making_school_asignment_app/assets/images/ic_work_press.png index f7d035c..c40d284 100644 Binary files a/making_school_asignment_app/assets/images/ic_work_press.png and b/making_school_asignment_app/assets/images/ic_work_press.png differ diff --git a/making_school_asignment_app/assets/images/job_data_right_icon.png b/making_school_asignment_app/assets/images/job_data_right_icon.png index 7c7edf4..a05c6c5 100644 Binary files a/making_school_asignment_app/assets/images/job_data_right_icon.png and b/making_school_asignment_app/assets/images/job_data_right_icon.png differ diff --git a/making_school_asignment_app/assets/images/job_report_class_icon.png b/making_school_asignment_app/assets/images/job_report_class_icon.png index 525b1d5..3d103d8 100644 Binary files a/making_school_asignment_app/assets/images/job_report_class_icon.png and b/making_school_asignment_app/assets/images/job_report_class_icon.png differ diff --git a/making_school_asignment_app/assets/images/login_bg.png b/making_school_asignment_app/assets/images/login_bg.png index b199639..1c57e19 100644 Binary files a/making_school_asignment_app/assets/images/login_bg.png and b/making_school_asignment_app/assets/images/login_bg.png differ diff --git a/making_school_asignment_app/assets/images/login_logo.png b/making_school_asignment_app/assets/images/login_logo.png index 1b083fe..e6dc95e 100644 Binary files a/making_school_asignment_app/assets/images/login_logo.png and b/making_school_asignment_app/assets/images/login_logo.png differ diff --git a/making_school_asignment_app/assets/images/personal_bgi.png b/making_school_asignment_app/assets/images/personal_bgi.png index a83ea12..efe65ec 100644 Binary files a/making_school_asignment_app/assets/images/personal_bgi.png and b/making_school_asignment_app/assets/images/personal_bgi.png differ diff --git a/making_school_asignment_app/lib/main.dart b/making_school_asignment_app/lib/main.dart index 84ce68a..414aa32 100644 --- a/making_school_asignment_app/lib/main.dart +++ b/making_school_asignment_app/lib/main.dart @@ -45,8 +45,8 @@ class MyApp extends StatelessWidget { debugShowCheckedModeBanner: false, theme: ThemeData( brightness: Brightness.light, - primarySwatch: createMaterialColor(const Color.fromRGBO(46, 91, 255, 1)), - primaryColor: const Color.fromRGBO(46, 91, 255, 1), + primarySwatch: createMaterialColor(const Color.fromRGBO(76, 199, 147, 1)), + primaryColor: const Color.fromRGBO(76, 199, 147, 1), // textTheme: Typography.englishLike2018.apply(fontSizeFactor: 1.sp,), primaryTextTheme: TextTheme( bodyLarge: TextStyle(fontSize: 14.sp, color: Colors.black87), @@ -54,7 +54,7 @@ class MyApp extends StatelessWidget { useMaterial3: false, colorScheme: const ColorScheme.light( // 修改亮色主题的主题颜色 - primary: Color.fromRGBO(46, 91, 255, 1), + primary: Color.fromRGBO(76, 199, 147, 1), )), enableLog: true, logWriterCallback: (text, {bool isError = false}) { diff --git a/making_school_asignment_app/lib/page/global_widget/bottom_navigation_bar.dart b/making_school_asignment_app/lib/page/global_widget/bottom_navigation_bar.dart index 4a5c1be..69da1e8 100644 --- a/making_school_asignment_app/lib/page/global_widget/bottom_navigation_bar.dart +++ b/making_school_asignment_app/lib/page/global_widget/bottom_navigation_bar.dart @@ -73,7 +73,7 @@ class MyBottomNavigationBar extends StatelessWidget { Text( e['title'] as String, style: TextStyle( - color: active == (e['id'] as int) ? const Color(0xFF6888FD) : const Color(0xFF767676), + color: active == (e['id'] as int) ? const Color(0xFFE8E8E8) : const Color(0xFF767676), fontSize: 11.sp, ), strutStyle: StrutStyle(fontSize: 16.sp), diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart index d4b6ad1..efab5f5 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart @@ -21,7 +21,7 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin { super.onInit(); state.preIndex = Get.arguments['tabIndex'] ?? 3; if(state.preIndex != 3){ - readOverController = Get.find(); + // readOverController = Get.find(); } refreshController = EasyRefreshController(); state.homeworkId.value = Get.arguments['id'] ?? ''; diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart index bfbfa01..458cdc0 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart @@ -124,9 +124,9 @@ class _AnnotateClassPageState extends State { Get.delete(); super.dispose(); if(state.preIndex != 3){ - logic.readOverController.state.tabIndex.value = state.preIndex; + // logic.readOverController.state.tabIndex.value = state.preIndex; }else{ - logic.homeController.getList(); + // logic.homeController.getList(); } } diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart index f0e199b..1b721a9 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart @@ -46,7 +46,7 @@ class _AnnotateItemState extends State { height: 27.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - color: const Color(0xFF6888FD), + color: const Color(0xFF4CC793), ), child: const Center( child: Text( @@ -104,7 +104,7 @@ class _AnnotateItemState extends State { const Spacer(), Text( '已交：${widget.item.commitStudentCount}', - style: TextStyle(fontSize: widget.font - 2.sp, color: const Color(0xFF6888FD)), + style: TextStyle(fontSize: widget.font - 2.sp, color: const Color(0xFF4CC793)), ), SizedBox( width: 20.r, @@ -230,21 +230,21 @@ class _AnnotateItemState extends State { ), ProgressBar( title: '客观题正确率：', - color: const Color(0xFFB8C7FF), + color: const Color(0xFF4CC793), percent: widget.item.kgtCorrectRate / 100, marginEdg: EdgeInsets.zero, padingEdg: EdgeInsets.only(top: 8.h, left: 14.r, right: 14.r), fontSize: widget.font - 2.sp), ProgressBar( title: '主观题正确率：', - color: const Color(0xFFB8C7FF), + color: const Color(0xFF4CC793), percent: widget.item.zgtCorrectRate / 100, padingEdg: EdgeInsets.symmetric(horizontal: 10.r), marginEdg: EdgeInsets.only(top: 8.h), fontSize: widget.font - 2.sp), ProgressBar( title: '总正确率：', - color: const Color(0xFFB8C7FF), + color: const Color(0xFF4CC793), percent: widget.item.correctRate / 100, padingEdg: EdgeInsets.symmetric(horizontal: 10.r), marginEdg: EdgeInsets.only(top: 8.h), diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart index 97a4f0d..2236cf4 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart @@ -43,7 +43,7 @@ class CompletedAnnotateItem extends StatelessWidget { decoration: BoxDecoration( border: Border(bottom: BorderSide(color: Color.fromRGBO(238, 238, 238, 1), width: 0.5.r)), ), - child: quickText(taskItem.className, color: Color.fromRGBO(104, 136, 253, 1), size: 12.sp), + child: quickText(taskItem.className, color: Color(0xFF4CC793), size: 12.sp), ), Column( mainAxisSize: MainAxisSize.min, diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart index 729ebb4..5370588 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart @@ -14,7 +14,7 @@ class ItemBtn extends StatelessWidget { child: ElevatedButton( style: ButtonStyle( overlayColor:WidgetStateProperty.all( - const Color(0xFF6888FD)), + const Color(0xFFE8E8E8)), backgroundColor: WidgetStateProperty.all( const Color(0xFFF4F4F4)), diff --git a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart index 28a581e..5675426 100644 --- a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart @@ -59,7 +59,7 @@ class _AnswerTrajectoryPageState extends State { tabAlignment: TabAlignment.start, indicator: const UnderlineTabIndicator( borderSide: BorderSide( - color: const Color.fromRGBO(104, 136, 253, 1), + color: const Color(0xFF4CC793), ), ), @@ -97,10 +97,10 @@ class _AnswerTrajectoryPageState extends State { TextStyle(fontSize: 14.sp, color: Color(0xFF666666)), labelStyle: TextStyle( fontSize: 14.sp, - color: Color(0xFF6888FD), + color: Color(0xFF4CC793), ), isScrollable: true, - labelColor: Color(0xFF6888FD), + labelColor: Color(0xFF4CC793), unselectedLabelColor: Color(0xFF666666), indicatorSize: TabBarIndicatorSize.label, labelPadding: const EdgeInsets.all(0), diff --git a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/widget/answer_trajectory_job.dart b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/widget/answer_trajectory_job.dart index 0512839..a8e2a4e 100644 --- a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/widget/answer_trajectory_job.dart +++ b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/widget/answer_trajectory_job.dart @@ -63,7 +63,7 @@ class AnswerTrajectoryJob extends StatelessWidget { padding: EdgeInsets.only(left: 2.w), decoration: BoxDecoration( color: - const Color.fromRGBO(104, 136, 253, 1), + const Color(0xFF4CC793), borderRadius: BorderRadius.only( topLeft: Radius.circular(14.r), topRight: Radius.circular(3.r), @@ -195,7 +195,7 @@ class AnswerTrajectoryJob extends StatelessWidget { padding: EdgeInsets.only(left: 2.w), decoration: BoxDecoration( color: - const Color.fromRGBO(104, 136, 253, 1), + const Color(0xFF4CC793), borderRadius: BorderRadius.only( topLeft: Radius.circular(14.r), topRight: Radius.circular(3.r), diff --git a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_view.dart b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_view.dart index 6b05ed5..72aa596 100644 --- a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_view.dart @@ -94,7 +94,7 @@ class _AnswerTrajectoryDetailPageState fontSize: 10.sp, color: state.currentClass.value .classId == item.classId - ? Color(0xFF6888FD) + ? Color(0xFF4CC793) : Color(0xFF686868)), ), ), @@ -159,7 +159,7 @@ class _AnswerTrajectoryDetailPageState item.studentName, style: TextStyle( fontSize: 12.sp, - color: Color(0xFF6888FD)), + color: Color(0xFF4CC793)), )), Container( @@ -208,7 +208,7 @@ class _AnswerTrajectoryDetailPageState item.studentName, style: TextStyle( fontSize: 12.sp, - color: Color(0xFF6888FD)), + color: Color(0xFF4CC793)), )), Container( height: 24.r, diff --git a/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart b/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart index 23b4bba..2f49a0c 100644 --- a/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart @@ -96,7 +96,7 @@ class _ClassStudentPageState extends State { item.name, style: TextStyle( fontSize: 12.sp, - color: const Color(0xFF6888FD)), + color: const Color(0xFF4CC793)), )), state.page == 'answerTrajectory' ? Container( @@ -121,7 +121,7 @@ class _ClassStudentPageState extends State { width: 70.r, decoration: BoxDecoration( color: - const Color(0xFF6888FD), + const Color(0xFF4CC793), borderRadius: BorderRadius.all( Radius.circular( @@ -272,7 +272,7 @@ class _ClassStudentPageState extends State { item.name, style: TextStyle( fontSize: 12.sp, - color: Color(0xFF6888FD)), + color: Color(0xFF4CC793)), )), state.page == 'answerTrajectory' ? Container( @@ -296,7 +296,7 @@ class _ClassStudentPageState extends State { height: 24.r, width: 82.r, decoration: BoxDecoration( - color: Color(0xFF6888FD), + color: Color(0xFF4CC793), borderRadius: BorderRadius.all( Radius.circular( diff --git a/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart b/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart index 05fd3b7..6550fdb 100644 --- a/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart @@ -58,7 +58,7 @@ class _FavStudentPageState extends State { height: 27.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - color: const Color(0xFF6888FD), + color: const Color(0xFF4CC793), ), child: const Center( child: Text( diff --git a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_view.dart b/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_view.dart index cadb486..edbca95 100644 --- a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_view.dart @@ -88,7 +88,7 @@ class _KnowledgePointsGraspPageState extends State { height: 30.r, decoration: BoxDecoration( borderRadius: BorderRadius.circular(4.r), - color: Color(0xFF6888FD), + color: Color(0xFF4CC793), ), child: Center( child: Text( @@ -200,19 +200,20 @@ class _KnowledgePointsGraspPageState extends State { height: 22.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - border: Border.all(width: 1.r, color: Color(0xFF6888FD)), + border: Border.all(width: 1.r, color: Color(0xFF4CC793)), ), child: Row( mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( '${item.count}次', - style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)), + style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)), ), Image.asset( - 'assets/images/right_icon_blue.png', - width: 8.r, - height: 8.r, + 'assets/images/job_data_right_icon.png', + width: 10.r, + height: 10.r, ), ], ), diff --git a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp_detail/knowledge_points_grasp_detail_view.dart b/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp_detail/knowledge_points_grasp_detail_view.dart index 15c891d..e15b169 100644 --- a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp_detail/knowledge_points_grasp_detail_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp_detail/knowledge_points_grasp_detail_view.dart @@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:making_school_asignment_app/common/config/request_config.dart'; import 'package:percent_indicator/percent_indicator.dart'; import 'package:making_school_asignment_app/common/job/knowledge_report_detail.dart'; import 'package:making_school_asignment_app/common/utils/toast_utils.dart'; @@ -38,7 +39,7 @@ class _KnowledgePointsGraspDetailPageState extends State { height: MediaQuery.of(context).size.height, decoration: const BoxDecoration( gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [ - Color(0xFF6889FD), + Color(0xFF4CC793), Color(0xFFF5F5F5), ], stops: [ 0.09, diff --git a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/kgt_zgt_table.dart b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/kgt_zgt_table.dart index fc8b2b1..76d560a 100644 --- a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/kgt_zgt_table.dart +++ b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/kgt_zgt_table.dart @@ -61,7 +61,7 @@ class _KgtZgtTableState extends State { ), Text( '${widget.kgtOkRate}%', - style: TextStyle(fontSize: 14.sp, color: Color(0xFF6888FD), fontWeight: FontWeight.w600), + style: TextStyle(fontSize: 14.sp, color: Color(0xFF4CC793), fontWeight: FontWeight.w600), ), ], ), @@ -106,7 +106,7 @@ class _KgtZgtTableState extends State { ), Text( '${widget.zgtOkRate}%', - style: TextStyle(fontSize: 14.sp, color: const Color(0xFF6888FD), fontWeight: FontWeight.w600), + style: TextStyle(fontSize: 14.sp, color: const Color(0xFF4CC793), fontWeight: FontWeight.w600), ), ], ), diff --git a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_student_data_table.dart b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_student_data_table.dart index 61d0f12..a0651ba 100644 --- a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_student_data_table.dart +++ b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_student_data_table.dart @@ -58,7 +58,7 @@ class _QuickStudentDataTableState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Text(item.studentName!, style: TextStyle(fontSize: 10.sp, color: const Color(0xFF6888FD), overflow: TextOverflow.ellipsis)), + Text(item.studentName!, style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793), overflow: TextOverflow.ellipsis)), SizedBox( width: 5.r, ), @@ -168,7 +168,7 @@ class _QuickStudentDataTableState extends State { DataCell(Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 5.r), - child: Text('${item.zgtUnrated}', style: TextStyle(fontSize: 10.sp, color: const Color(0xFF6888FD))), + child: Text('${item.zgtUnrated}', style: TextStyle(fontSize: 10.sp, color: const Color(0xFFE8E8E8))), ), )), ], diff --git a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/report_table.dart b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/report_table.dart index c51c92c..03ffed1 100644 --- a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/report_table.dart +++ b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/report_table.dart @@ -185,17 +185,17 @@ class _ReportTableState extends State { Text( widget.isZG == true ? '主观题' : '客观题', style: TextStyle( - fontSize: 14.sp, color: const Color(0xFF436CFF)), + fontSize: 14.sp, color: const Color(0xFF4CC793)), ), Text( '―', style: TextStyle( - fontSize: 14.sp, color: const Color(0xFF436CFF)), + fontSize: 14.sp, color: const Color(0xFF4CC793)), ), Text( '第$questionNo题', style: TextStyle( - fontSize: 14.sp, color: Color(0xFF436CFF)), + fontSize: 14.sp, color: Color(0xFF4CC793)), ), ], ), @@ -516,7 +516,7 @@ class _ReportTableState extends State { children: [ Text('${item.priorityInfo.length}人答错', style: TextStyle( - fontSize: 10.sp, color: const Color(0xFF6888FD))), + fontSize: 10.sp, color: const Color(0xFF4CC793))), Image.asset( 'assets/images/job_data_right_icon.png', width: 10.r, diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart index 64171b4..4160a73 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart @@ -95,7 +95,7 @@ class _ReadOverPageState extends State { ), labelStyle: TextStyle( fontSize: 14.sp, - color: const Color.fromRGBO(104, 136, 253, 1), + color: const Color(0xFF4CC793), ), // labelColor: const Color.fromRGBO(45, 56, 76, 1), indicator: const UnderlineTabIndicator( diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart index 8146a41..407a4c1 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart @@ -298,7 +298,7 @@ Widget $reviewedItem({ alignment: Alignment.center, padding: EdgeInsets.only(left: 2.w), decoration: BoxDecoration( - color: type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), + color: type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1), borderRadius: BorderRadius.only( topLeft: Radius.circular(14.r), topRight: Radius.circular(3.r), diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart index 6b3c42b..72d4af7 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart @@ -64,7 +64,7 @@ class _TaskListItemState extends State { alignment: Alignment.center, padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), decoration: BoxDecoration( - color: const Color.fromRGBO(104, 136, 253, 1), + color: const Color(0xFF4CC793), borderRadius: BorderRadius.only( topLeft: Radius.circular(14.r), topRight: Radius.circular(3.r), @@ -73,7 +73,7 @@ class _TaskListItemState extends State { ), ), margin: EdgeInsets.only(right: 4.w), - child: quickText('作业', color: Colors.white, size: 10.sp), + child: quickText( widget.jobTaskItem.assessType == 0?'作业':'考试', color: Colors.white, size: 10.sp), ), Expanded( child: quickText( @@ -199,7 +199,7 @@ class _TaskListItemState extends State { alignment: Alignment.center, padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), decoration: BoxDecoration( - color: widget.type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), + color: widget.type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1), borderRadius: BorderRadius.only( topLeft: Radius.circular(14.r), topRight: Radius.circular(3.r), @@ -208,7 +208,7 @@ class _TaskListItemState extends State { ), ), margin: EdgeInsets.only(top:3.h,right: 4.w), - child: quickText(widget.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp), + child: quickText(widget.jobTaskItem.assessType == 0?'作业':'考试', color: Colors.white, size: 10.sp), ), Expanded( child: quickText( diff --git a/making_school_asignment_app/lib/page/home_page/children/student_personal/student_personal_view.dart b/making_school_asignment_app/lib/page/home_page/children/student_personal/student_personal_view.dart index fb5229e..f6d9168 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_personal/student_personal_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/student_personal/student_personal_view.dart @@ -133,7 +133,7 @@ class _StudentPersonalPageState extends State { '${state.studentInfo.value.kgtCorrectRate}%', style: TextStyle( fontSize: 14.sp, - color: const Color(0xFF6888FD), + color: const Color(0xFF4CC793), fontWeight: FontWeight.w600), ); }), @@ -200,7 +200,7 @@ class _StudentPersonalPageState extends State { '${state.studentInfo.value.zgtCorrectRate}%', style: TextStyle( fontSize: 14.sp, - color: const Color(0xFF6888FD), + color: const Color(0xFF4CC793), fontWeight: FontWeight.w600), ); }), diff --git a/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_kg_table.dart b/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_kg_table.dart index e95ae4f..7c45671 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_kg_table.dart +++ b/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_kg_table.dart @@ -50,7 +50,7 @@ class _StudentKgTableState extends State { child: Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 5.r), - child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))), + child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))), ), ), ), diff --git a/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_zg_table.dart b/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_zg_table.dart index 3c34ab5..37da127 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_zg_table.dart +++ b/making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_zg_table.dart @@ -47,7 +47,7 @@ class _StudentZgTableState extends State { child: Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 5.r), - child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))), + child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))), ), ), )), diff --git a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_view.dart b/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_view.dart index 29e48a7..2d4d4bf 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_view.dart @@ -76,7 +76,7 @@ class _StudentWorkDetailPageState extends State { style: TextStyle( fontSize: 14.sp, color: state.isJob.value - ? Color(0xFF7491FD) + ? Color(0xFF4CC793) : Color(0xFF505E6E)), )); }), @@ -104,7 +104,7 @@ class _StudentWorkDetailPageState extends State { style: TextStyle( fontSize: 14.sp, color: !state.isJob.value - ? Color(0xFF7491FD) + ? Color(0xFF4CC793) : Color(0xFF505E6E)), ); })), @@ -128,24 +128,24 @@ class _StudentWorkDetailPageState extends State { '总览：', style: TextStyle( fontSize: 12.sp, - color: Color(0xFF7491FD), + color: Color(0xFF4CC793), fontWeight: FontWeight.w600), ), ProgressBar( title: '客观题正确率：', - color: Color(0xFFB8C7FF), + color: Color.fromRGBO(76, 199, 147, 0.36), percent: state.studentData.value.kgtCorrectRate / 100, padingEdg: EdgeInsets.zero, marginEdg: EdgeInsets.only(top: 8.h)), ProgressBar( title: '主观题正确率：', - color: Color(0xFFB8C7FF), + color: Color.fromRGBO(76, 199, 147, 0.36), percent: state.studentData.value.zgtCorrectRate / 100, padingEdg: EdgeInsets.zero, marginEdg: EdgeInsets.only(top: 8.h)), ProgressBar( title: '总正确率：', - color: Color(0xFFB8C7FF), + color: Color.fromRGBO(76, 199, 147, 0.36), percent: state.studentData.value.correctRate / 100, padingEdg: EdgeInsets.zero, marginEdg: EdgeInsets.only(top: 8.h)), diff --git a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/widget/personal_detail_topbar.dart b/making_school_asignment_app/lib/page/home_page/children/student_work_detail/widget/personal_detail_topbar.dart index 5f68403..59ae57f 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/widget/personal_detail_topbar.dart +++ b/making_school_asignment_app/lib/page/home_page/children/student_work_detail/widget/personal_detail_topbar.dart @@ -33,10 +33,10 @@ class _PersonalDetailTopBarState extends State { labelStyle: TextStyle( fontSize: 12.sp, fontWeight: FontWeight.bold, - color: const Color.fromRGBO(116, 145, 253, 1), + color: const Color(0xFF4CC793), ), isScrollable: true, - labelColor: const Color(0xFF7491FD), + labelColor: const Color(0xFF4CC793), unselectedLabelColor: const Color(0xFF505E6E), padding: EdgeInsets.symmetric(horizontal: 14.r), // indicatorSize: TabBarIndicatorSize.label, // 设置指示器高度和标签一样高 @@ -44,7 +44,7 @@ class _PersonalDetailTopBarState extends State { indicator: UnderlineTabIndicator( borderSide: BorderSide( width: 2.r, - color:const Color(0xFF7491FD) + color:const Color(0xFF4CC793) ), ), tabs: [ diff --git a/making_school_asignment_app/lib/page/home_page/home_view.dart b/making_school_asignment_app/lib/page/home_page/home_view.dart index bd2118d..a32557e 100644 --- a/making_school_asignment_app/lib/page/home_page/home_view.dart +++ b/making_school_asignment_app/lib/page/home_page/home_view.dart @@ -159,7 +159,7 @@ class _HomePageState extends State with AutomaticKeepAliveClientMixin alignment: Alignment.center, padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), decoration: BoxDecoration( - color: state.type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), + color: state.type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1), borderRadius: BorderRadius.only( topLeft: Radius.circular(14.r), topRight: Radius.circular(3.r), @@ -221,7 +221,7 @@ class _HomePageState extends State with AutomaticKeepAliveClientMixin lineHeight: 8.h, animationDuration: 2500, percent: item.annotateRate == null ? 0 : item.annotateRate! / 100, - progressColor: const Color(0xFF6888FD), + progressColor: const Color(0xFF4CC793), backgroundColor: const Color(0xFFE8E8E8), barRadius: Radius.circular(10.r), ), diff --git a/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart b/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart index 6832245..be329dc 100644 --- a/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart +++ b/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart @@ -45,7 +45,7 @@ class StudentGroupList extends StatelessWidget { padding: EdgeInsets.only(right: 8.r), child: Text( '${EnumUtils.formatGrade(item.grade)}${item.className}', - style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)), + style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)), ), ), const Spacer(), @@ -68,7 +68,7 @@ class StudentGroupList extends StatelessWidget { width: 55.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - color: const Color(0xFF6888FD), + color: const Color(0xFF4CC793), ), child: Center( child: Text( @@ -105,7 +105,7 @@ class StudentGroupList extends StatelessWidget { padding: EdgeInsets.only(right: 8.r), child: Text( '${EnumUtils.formatGrade(item.grade)}${item.className}', - style: TextStyle(fontSize: 14.sp, color: Color(0xFF6888FD)), + style: TextStyle(fontSize: 14.sp, color: Color(0xFF4CC793)), ), ), const Spacer(), @@ -128,7 +128,7 @@ class StudentGroupList extends StatelessWidget { width: 55.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - color: const Color(0xFF6888FD), + color: const Color(0xFF4CC793), ), child: Center( child: Text( diff --git a/making_school_asignment_app/lib/page/login_page/login_view.dart b/making_school_asignment_app/lib/page/login_page/login_view.dart index cf6c913..9109e46 100644 --- a/making_school_asignment_app/lib/page/login_page/login_view.dart +++ b/making_school_asignment_app/lib/page/login_page/login_view.dart @@ -83,7 +83,7 @@ class _LoginPageState extends State { padding: EdgeInsets.symmetric(horizontal: 20.r), decoration: BoxDecoration( color: Colors.transparent, - border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)), + border: Border.all(width: 1.w, color: const Color(0xFFFFFFFF)), borderRadius: BorderRadius.all(Radius.circular(17.w)), ), child: Center( @@ -132,7 +132,7 @@ class _LoginPageState extends State { padding: EdgeInsets.symmetric(horizontal: 20.r), decoration: BoxDecoration( color: Colors.transparent, - border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)), + border: Border.all(width: 1.w, color: const Color(0xFFFFFFFF)), borderRadius: BorderRadius.all(Radius.circular(17.w)), ), child: TextField( @@ -228,10 +228,10 @@ class _LoginPageState extends State { return Container( margin: EdgeInsets.symmetric(vertical: 10.h), decoration: BoxDecoration( - color: state.canLogin.value ? const Color.fromRGBO(107, 104, 252, 1) : const Color(0xFFdddddd), + color: state.canLogin.value ? const Color(0xFF4CC793) : const Color(0xFFdddddd), boxShadow: [ BoxShadow( - color: const Color.fromRGBO(46, 91, 255, 0.5), + color: const Color.fromRGBO(76, 199, 147, 0.5), offset: Offset(6.w, 10.h), //阴影y轴偏移量 blurRadius: 14, //阴影模糊程度 spreadRadius: 0.5, //阴影扩散程度 diff --git a/making_school_asignment_app/lib/page/work_page/work_view.dart b/making_school_asignment_app/lib/page/work_page/work_view.dart index 4d0b7b9..2c4a78a 100644 --- a/making_school_asignment_app/lib/page/work_page/work_view.dart +++ b/making_school_asignment_app/lib/page/work_page/work_view.dart @@ -79,7 +79,7 @@ class _WorkPageState extends State with AutomaticKeepAliveClientMixin ), labelStyle: TextStyle( fontSize: 14.sp, - color: const Color.fromRGBO(104, 136, 253, 1), + color: const Color(0xFF4CC793), ), // labelColor: const Color.fromRGBO(45, 56, 76, 1), indicator: const BoxDecoration(),