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 db77bb4..f3d77a2 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 17987b7..a488ffe 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 09d4391..1f803d6 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 d5f1c8d..ceb8db7 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 4d6372e..a5bd17e 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/start_bg.png b/making_school_asignment_app/assets/images/start_bg.png new file mode 100644 index 0000000..da97443 Binary files /dev/null and b/making_school_asignment_app/assets/images/start_bg.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index dc9ada4..3caf642 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 7353c41..4bbd0e9 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452..b84624b 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d93..805e51b 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4cd7b00..25568e7 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe73094..b224fc0 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773c..672a316 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452..b84624b 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463..1c9240f 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec3034..778b30f 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec3034..778b30f 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea..78d31e4 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 84ac32a..abddf4c 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba..29dec03 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf1..8d9d05d 100644 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/making_school_asignment_app/lib/common/api/retrofit_client.dart b/making_school_asignment_app/lib/common/api/retrofit_client.dart index 3d7e1f9..8106375 100644 --- a/making_school_asignment_app/lib/common/api/retrofit_client.dart +++ b/making_school_asignment_app/lib/common/api/retrofit_client.dart @@ -122,6 +122,10 @@ abstract class RetrofitClient { @POST("/api/hms/Annotate/AllCorrect") Future getAllCorrect(@Field() String homeworkId, @Field() String classId); + // 结束提交 + @POST("/api/hms/Annotate/OverAnnotate") + Future overAnnotate(@Field() String homeworkId, @Field() String classId); + // 批阅提交 @POST("/api/hms/Annotate/AnnotateSubmit") Future reviewSubmission(@Body() ReviewSubmissionParams param); 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 a400ec6..d4b6ad1 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 @@ -4,6 +4,7 @@ import 'package:get/get.dart'; import 'package:making_school_asignment_app/common/job/annotated_class.dart'; import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart'; import 'package:making_school_asignment_app/common/utils/toast_utils.dart'; +import 'package:making_school_asignment_app/page/home_page/children/read_over/read_over_logic.dart'; import 'package:making_school_asignment_app/page/home_page/home_logic.dart'; import 'package:making_school_asignment_app/routes/app_pages.dart'; @@ -13,16 +14,22 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin { final AnnotateClassState state = AnnotateClassState(); late final EasyRefreshController refreshController; final HomeLogic homeController = Get.find(); + late ReadOverLogic readOverController ; @override void onInit() { super.onInit(); + state.preIndex = Get.arguments['tabIndex'] ?? 3; + if(state.preIndex != 3){ + readOverController = Get.find(); + } refreshController = EasyRefreshController(); state.homeworkId.value = Get.arguments['id'] ?? ''; state.name.value = Get.arguments['name'] ?? ''; state.grade = Get.arguments['grade']; state.subject = Get.arguments['subject']; state.completed.value = Get.arguments['completed'] ?? false; + EasyLoading.show(status: 'loading...'); getList(); } @@ -47,7 +54,7 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin { EasyLoading.dismiss(); } - + //一键批阅 void getAllCorrect(classId) async{ EasyLoading.show(status: 'loading...'); try { @@ -58,6 +65,17 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin { ToastUtils.showError('操作失败，请重试'); } } +//结束批阅 + void getOverAnnotate(classId) async{ + EasyLoading.show(status: 'loading...'); + try { + await getClient().overAnnotate(state.homeworkId.value,classId); + getList(); + } catch (e) { + EasyLoading.dismiss(); + ToastUtils.showError('操作失败，请重试'); + } + } void goQuickDataCheck(item) { Get.toNamed(Routes.quickDataCheckPage, @@ -73,5 +91,6 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin { void dispose() { super.dispose(); refreshController.dispose(); + } } diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_state.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_state.dart index 121d992..815d8ad 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_state.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_state.dart @@ -12,4 +12,5 @@ class AnnotateClassState { late RxBool completed = false.obs; late int grade; late int subject; + late int preIndex = 3; } 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 74ad7d1..3b01acf 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 @@ -35,7 +35,6 @@ class _AnnotateClassPageState extends State { leading: IconButton( icon: const Icon(Icons.arrow_back_ios, color: Colors.black), onPressed: () { - logic.homeController.getList(); Get.back(); }, ), @@ -120,5 +119,11 @@ class _AnnotateClassPageState extends State { void dispose() { Get.delete(); super.dispose(); + if(state.preIndex != 3){ + logic.readOverController.state.tabIndex.value = state.preIndex; + }else{ + 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 bdf9d30..f0e199b 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 @@ -23,7 +23,7 @@ class AnnotateItem extends StatefulWidget { } class _AnnotateItemState extends State { - Future confirmDialog() async { + Future confirmDialog(String text) async { return await showDialog( context: context, builder: (context) => AlertDialog( @@ -34,7 +34,7 @@ class _AnnotateItemState extends State { content: SizedBox( width: 200.r, child: Text( - '一键批阅后，默认学生答题结果全部正确， 是否进行此操作？', + text, style: TextStyle(fontSize: 14.sp, color: const Color(0xFF505E6E)), ), ), @@ -152,7 +152,7 @@ class _AnnotateItemState extends State { title: "一键批阅", font: widget.font - 2.sp, clickFunction: () async { - var confim = await confirmDialog(); + var confim = await confirmDialog('一键批阅后，默认学生答题结果全部正确， 是否进行此操作？'); if (confim) { widget.logic.getAllCorrect(widget.item.classId); } @@ -319,7 +319,12 @@ class _AnnotateItemState extends State { // Container(width: 1.w, height: 30.h, color: const Color.fromRGBO(221, 221, 221, 1)), Expanded( child: InkWell( - onTap: () {}, + onTap: () async{ + var confim = await confirmDialog('当前批阅任务未完成，请确认需要结束此任务？'); + if (confim) { + widget.logic.getOverAnnotate(widget.item.classId); + } + }, child: Container( alignment: Alignment.center, child: quickText('结束批阅', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font), 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 35d958e..0ee1941 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 @@ -65,69 +65,101 @@ class _ClassStudentPageState extends State { crossAxisSpacing: 10.r, childAspectRatio: 556 / 112, ), - children: List.generate(state.studentList.length, (index) { + children: + List.generate(state.studentList.length, (index) { StudentItem item = state.studentList[index]; return InkWell( onTap: () { // RouterManager.router.navigateTo(context, // '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); - Get.toNamed(Routes.studentWorkDetailPage, arguments: {'studentName': item.name, 'studentId': item.id}); + Get.toNamed(Routes.studentWorkDetailPage, + arguments: { + 'studentName': item.name, + 'studentId': item.id + }); }, child: Container( padding: EdgeInsets.symmetric(horizontal: 10.r), decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(10.r)), + borderRadius: + BorderRadius.all(Radius.circular(10.r)), color: Colors.white, ), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, children: [ Expanded( child: Text( item.name, - style: TextStyle(fontSize: 12.sp, color: const Color(0xFF6888FD)), + style: TextStyle( + fontSize: 12.sp, + color: const Color(0xFF6888FD)), )), state.page == 'answerTrajectory' ? Container( height: 20.r, width: 70.r, decoration: BoxDecoration( - border: Border.all(width: 1.r, color: const Color(0xFFFFA41E)), - borderRadius: BorderRadius.all(Radius.circular(20.r)), + border: Border.all( + width: 1.r, + color: const Color(0xFFFFA41E)), + borderRadius: BorderRadius.all( + Radius.circular(20.r)), ), child: Center( - child: Text('详情', style: TextStyle(fontSize: 10.r, color: Color(0xFFFFA41E))), + child: Text('详情', + style: TextStyle( + fontSize: 10.r, + color: Color(0xFFFFA41E))), )) : state.page == 'history' ? Container( height: 20.r, width: 70.r, decoration: BoxDecoration( - color: const Color(0xFF6888FD), borderRadius: BorderRadius.all(Radius.circular(20.r))), + color: + const Color(0xFF6888FD), + borderRadius: + BorderRadius.all( + Radius.circular( + 20.r))), child: Center( child: Text( '历史作业', - style: TextStyle(fontSize: 10.r, color: Colors.white), + style: TextStyle( + fontSize: 10.r, + color: Colors.white), )), ) : item.priorityAnnotate ? InkWell( onTap: () { - logic.setJobReadLevel(item.id, false); - EasyLoading.show(status: 'loading...'); + logic.setJobReadLevel( + item.id, false); + EasyLoading.show( + status: 'loading...'); }, child: Container( height: 20.r, width: 80.r, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(4.r)), - color: const Color(0xFFB7FFE0), + borderRadius: + BorderRadius.all( + Radius.circular( + 4.r)), + color: const Color( + 0xFFB7FFE0), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment + .start, children: [ Padding( - padding: EdgeInsets.only(left: 3.r), + padding: + EdgeInsets.only( + left: 3.r), child: Image.asset( 'assets/images/youx_icon_active.png', width: 14.r, @@ -135,10 +167,16 @@ class _ClassStudentPageState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 2.r, left: 4.r), + padding: + EdgeInsets.only( + top: 2.r, + left: 4.r), child: Text( '优先批阅', - style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793)), + style: TextStyle( + fontSize: 10.sp, + color: const Color( + 0xFF4CC793)), ), ), ], @@ -147,21 +185,31 @@ class _ClassStudentPageState extends State { ) : InkWell( onTap: () { - logic.setJobReadLevel(item.id, true); - EasyLoading.show(status: 'loading...'); + logic.setJobReadLevel( + item.id, true); + EasyLoading.show( + status: 'loading...'); }, child: Container( height: 20.r, width: 80.r, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(4.r)), - color: const Color(0xFFE1E1E1), + borderRadius: + BorderRadius.all( + Radius.circular( + 4.r)), + color: const Color( + 0xFFE1E1E1), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment + .start, children: [ Padding( - padding: EdgeInsets.only(left: 3.r), + padding: + EdgeInsets.only( + left: 3.r), child: Image.asset( 'assets/images/youx_icon_default.png', width: 14.r, @@ -169,10 +217,16 @@ class _ClassStudentPageState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 2.r, left: 4.r), + padding: + EdgeInsets.only( + top: 2.r, + left: 4.r), child: Text( '优先批阅', - style: TextStyle(fontSize: 10.sp, color: const Color(0xFF8A9691)), + style: TextStyle( + fontSize: 10.sp, + color: const Color( + 0xFF8A9691)), ), ), ], @@ -192,64 +246,94 @@ class _ClassStudentPageState extends State { onTap: () { // RouterManager.router.navigateTo(context, // '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); - Get.toNamed(Routes.studentWorkDetailPage, arguments: {'studentName': item.name, 'studentId': item.id}); + Get.toNamed(Routes.studentWorkDetailPage, + arguments: { + 'studentName': item.name, + 'studentId': item.id + }); }, child: Container( - padding: EdgeInsets.symmetric(vertical: 20.r, horizontal: 15.r), + padding: EdgeInsets.symmetric( + vertical: 20.r, horizontal: 15.r), margin: EdgeInsets.only(bottom: 15.r), decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(10.r)), + borderRadius: + BorderRadius.all(Radius.circular(10.r)), color: Colors.white, ), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, children: [ Expanded( child: Text( item.name, - style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD)), + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF6888FD)), )), state.page == 'answerTrajectory' ? Container( height: 24.r, width: 72.r, decoration: BoxDecoration( - border: Border.all(width: 1.r, color: Color(0xFFFFA41E)), - borderRadius: BorderRadius.all(Radius.circular(20.r)), + border: Border.all( + width: 1.r, + color: Color(0xFFFFA41E)), + borderRadius: BorderRadius.all( + Radius.circular(20.r)), ), child: Center( - child: Text('详情', style: TextStyle(fontSize: 10.r, color: Color(0xFFFFA41E))), + child: Text('详情', + style: TextStyle( + fontSize: 10.r, + color: Color(0xFFFFA41E))), )) : state.page == 'history' ? Container( height: 24.r, width: 82.r, - decoration: - BoxDecoration(color: Color(0xFF6888FD), borderRadius: BorderRadius.all(Radius.circular(20.r))), + decoration: BoxDecoration( + color: Color(0xFF6888FD), + borderRadius: + BorderRadius.all( + Radius.circular( + 20.r))), child: Center( child: Text( '历史作业', - style: TextStyle(fontSize: 10.r, color: Colors.white), + style: TextStyle( + fontSize: 10.r, + color: Colors.white), )), ) : item.priorityAnnotate ? InkWell( onTap: () { - logic.setJobReadLevel(item.id, false); - EasyLoading.show(status: 'loading...'); + logic.setJobReadLevel( + item.id, false); + EasyLoading.show( + status: 'loading...'); }, child: Container( height: 24.r, width: 82.r, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(4.r)), + borderRadius: + BorderRadius.all( + Radius.circular( + 4.r)), color: Color(0xFFB7FFE0), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment + .start, children: [ Padding( - padding: EdgeInsets.only(left: 3.r), + padding: + EdgeInsets.only( + left: 3.r), child: Image.asset( 'assets/images/youx_icon_active.png', width: 14.r, @@ -257,10 +341,16 @@ class _ClassStudentPageState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 5.r, left: 4.r), + padding: + EdgeInsets.only( + top: 5.r, + left: 4.r), child: Text( '优先批阅', - style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793)), + style: TextStyle( + fontSize: 10.sp, + color: const Color( + 0xFF4CC793)), ), ), ], @@ -269,21 +359,31 @@ class _ClassStudentPageState extends State { ) : InkWell( onTap: () { - logic.setJobReadLevel(item.id, true); - EasyLoading.show(status: 'loading...'); + logic.setJobReadLevel( + item.id, true); + EasyLoading.show( + status: 'loading...'); }, child: Container( height: 24.r, width: 82.r, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(4.r)), - color: const Color(0xFFE1E1E1), + borderRadius: + BorderRadius.all( + Radius.circular( + 4.r)), + color: const Color( + 0xFFE1E1E1), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment + .start, children: [ Padding( - padding: EdgeInsets.only(left: 3.r), + padding: + EdgeInsets.only( + left: 3.r), child: Image.asset( 'assets/images/youx_icon_default.png', width: 14.r, @@ -291,10 +391,16 @@ class _ClassStudentPageState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 5.r, left: 4.r), + padding: + EdgeInsets.only( + top: 5.r, + left: 4.r), child: Text( '优先批阅', - style: TextStyle(fontSize: 10.sp, color: const Color(0xFF8A9691)), + style: TextStyle( + fontSize: 10.sp, + color: const Color( + 0xFF8A9691)), ), ), ], 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 f884e95..4c1e3a0 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 @@ -103,7 +103,6 @@ class _FavStudentPageState extends State { leading: IconButton( icon: const Icon(Icons.arrow_back_ios), onPressed: () { - logic.controller.getList(); Get.back(); }), iconTheme: const IconThemeData(color: Colors.black), @@ -382,5 +381,6 @@ class _FavStudentPageState extends State { void dispose() { Get.delete(); super.dispose(); + logic.controller.getList(); } } \ No newline at end of file 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 9e41cc3..64171b4 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 @@ -62,7 +62,6 @@ class _ReadOverPageState extends State { flex: 1, child: InkWell( onTap: () { - logic.homeController.getList(); Get.back(); }, child: Container( @@ -209,5 +208,6 @@ class _ReadOverPageState extends State { void dispose() { Get.delete(); super.dispose(); + logic.homeController.getList(); } } 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 71a1f44..63a34a2 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 @@ -230,7 +230,7 @@ Widget $easyRefresh({ children: List.generate(data.length, (index) { Items item = data[index]; String subjectName = EnumUtils.formatSubject(item.subject); - return $reviewedItem(jobTaskItem: item, type: type, subjectName: subjectName, collectFun: collectFun); + return $reviewedItem(jobTaskItem: item, type: type, subjectName: subjectName, collectFun: collectFun,tabIndex:tab - 1); }), ) : ListView.builder( @@ -242,6 +242,7 @@ Widget $easyRefresh({ jobTaskItem: item, type: type, collectFun: collectFun, + tabIndex:tab - 1 ); }, itemCount: data.length, @@ -256,6 +257,7 @@ Widget $easyRefresh({ Widget $reviewedItem({ required Items jobTaskItem, required int type, + required int tabIndex, required String subjectName, required Future Function(Items item) collectFun, }) { @@ -264,7 +266,7 @@ Widget $reviewedItem({ return InkWell( onTap: () { Get.toNamed(Routes.annotateClassPage, - arguments: {'id': jobTaskItem.id, 'name': jobTaskItem.name, 'grade': jobTaskItem.grade,'subject':jobTaskItem.subject, 'completed': true}); + arguments: {'id': jobTaskItem.id, 'name': jobTaskItem.name, 'grade': jobTaskItem.grade,'subject':jobTaskItem.subject, 'completed': true,'tabIndex':tabIndex}); }, child: Container( padding: EdgeInsets.only(top: 10.h), 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 a7381c3..9113ef4 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 @@ -16,9 +16,10 @@ class TaskListItem extends StatefulWidget { final bool completed; final Items jobTaskItem; final int type; + final int tabIndex; final Function(Items item) collectFun; - const TaskListItem({Key? key, required this.completed, required this.jobTaskItem, required this.type, required this.collectFun}) : super(key: key); + const TaskListItem({Key? key, required this.completed, required this.jobTaskItem, required this.type, required this.collectFun,required this.tabIndex}) : super(key: key); @override State createState() => _TaskListItemState(); @@ -31,7 +32,7 @@ class _TaskListItemState extends State { ? InkWell( onTap: () { Get.toNamed(Routes.annotateClassPage, - arguments: {'id': widget.jobTaskItem.id, 'name': widget.jobTaskItem.name, 'grade': widget.jobTaskItem.grade,'subject': widget.jobTaskItem.subject, 'completed': true}); + arguments: {'id': widget.jobTaskItem.id, 'name': widget.jobTaskItem.name, 'grade': widget.jobTaskItem.grade,'subject': widget.jobTaskItem.subject, 'completed': true,'tabIndex':widget.tabIndex}); }, child: Container( width: double.infinity, @@ -157,7 +158,7 @@ class _TaskListItemState extends State { : InkWell( onTap: () { Get.toNamed(Routes.annotateClassPage, - arguments: {'id': widget.jobTaskItem.id, 'name': widget.jobTaskItem.name, 'grade': widget.jobTaskItem.grade,'subject':widget.jobTaskItem.subject,}); + arguments: {'id': widget.jobTaskItem.id, 'name': widget.jobTaskItem.name, 'grade': widget.jobTaskItem.grade,'subject':widget.jobTaskItem.subject,'tabIndex':widget.tabIndex}); }, child: Stack( alignment: const FractionalOffset(0.95, 0), diff --git a/making_school_asignment_app/lib/page/home_page/home_logic.dart b/making_school_asignment_app/lib/page/home_page/home_logic.dart index f89f1aa..a94c180 100644 --- a/making_school_asignment_app/lib/page/home_page/home_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/home_logic.dart @@ -26,7 +26,7 @@ class HomeLogic extends GetxController with RequestToolMixin, GetTickerProviderS void getList() async { params.pageNumber = state.pageNumber; WorkStudent data = await getClient().getUnAnnotateList(params); - state.totalCount = data.totalCount; + state.totalCount.value = data.totalCount; state.readOver.value = data.items.length; if(params.pageNumber == 1){ state.workList.value = data.items; diff --git a/making_school_asignment_app/lib/page/home_page/home_state.dart b/making_school_asignment_app/lib/page/home_page/home_state.dart index cd1a785..3e8b0c2 100644 --- a/making_school_asignment_app/lib/page/home_page/home_state.dart +++ b/making_school_asignment_app/lib/page/home_page/home_state.dart @@ -14,5 +14,5 @@ class HomeState { late int type = 1; late int pageSize = 10; late int pageNumber = 1; - late int totalCount = 1; + late RxInt totalCount = 1.obs; } 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 244d1d6..4731ede 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 @@ -58,7 +58,7 @@ class _HomePageState extends State return logic.getList(); }, onLoad: () async{ - if(state.workList.length EntranceModel(title: '知识点点掌握', image: 'assets/images/job_home_knowledge.png', navigationUrl: Routes.knowledgePointsGraspPage) - ], state.readOver.value); + ], state.totalCount.value); }), spaceWidth, $TermRow([ 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 6d23aa5..c48861b 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 @@ -114,8 +114,8 @@ class _LoginPageState extends State { border: InputBorder.none, prefixIcon: Image.asset( 'assets/images/login_account.png', - width: 20.r, - height: 20.r, + width: 10.r, + height: 10.r, ), /* suffixIcon: !state.hasNameVal ? null @@ -178,8 +178,8 @@ class _LoginPageState extends State { ),*/ prefixIcon: Image.asset( 'assets/images/login_pwd.png', - width: 20.r, - height: 20.r, + width: 10.r, + height: 10.r, ), hintStyle: TextStyle( fontSize: 14.sp, @@ -277,8 +277,8 @@ class _LoginPageState extends State { Row( children: [ Container( - width: 30.w, - padding: EdgeInsets.only(right: 10.w), + width: 20.w, + padding: EdgeInsets.only(right: 0.w), child: Obx(() { return Checkbox( activeColor: Theme.of(context).primaryColor, @@ -299,7 +299,7 @@ class _LoginPageState extends State { onTap: () { Get.toNamed(Routes.agreementPage, arguments: {"type": AGREEMENT_KEY.USER_AGREEMENT.name}); }, - child: quickText('请仔细阅读', size: 13.sp), + child: quickText('请仔细阅读', size: 11.sp), ), InkWell( onTap: () { @@ -307,7 +307,7 @@ class _LoginPageState extends State { }, child: Text( '《用户协议》', - style: TextStyle(fontSize: 14.r, color: Colors.deepOrangeAccent), + style: TextStyle(fontSize: 12.r, color: Colors.deepOrangeAccent), ), ), ], diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 82b6f9d..3caf642 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index 13b35eb..b479756 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 0a3f5fa..c20ff1f 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bdb5722..8585536 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index f083318..d4728f7 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index 326c0e7..d087982 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 2f1632c..8449ae1 100644 Binary files a/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/making_school_asignment_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/making_school_asignment_app/web/favicon.png b/making_school_asignment_app/web/favicon.png index 8aaa46a..c20ff1f 100644 Binary files a/making_school_asignment_app/web/favicon.png and b/making_school_asignment_app/web/favicon.png differ diff --git a/making_school_asignment_app/web/icons/Icon-192.png b/making_school_asignment_app/web/icons/Icon-192.png index b749bfe..a5bd17e 100644 Binary files a/making_school_asignment_app/web/icons/Icon-192.png and b/making_school_asignment_app/web/icons/Icon-192.png differ diff --git a/making_school_asignment_app/web/icons/Icon-512.png b/making_school_asignment_app/web/icons/Icon-512.png index 88cfd48..d087982 100644 Binary files a/making_school_asignment_app/web/icons/Icon-512.png and b/making_school_asignment_app/web/icons/Icon-512.png differ diff --git a/making_school_asignment_app/web/icons/Icon-maskable-192.png b/making_school_asignment_app/web/icons/Icon-maskable-192.png index eb9b4d7..a5bd17e 100644 Binary files a/making_school_asignment_app/web/icons/Icon-maskable-192.png and b/making_school_asignment_app/web/icons/Icon-maskable-192.png differ diff --git a/making_school_asignment_app/web/icons/Icon-maskable-512.png b/making_school_asignment_app/web/icons/Icon-maskable-512.png index d69c566..d087982 100644 Binary files a/making_school_asignment_app/web/icons/Icon-maskable-512.png and b/making_school_asignment_app/web/icons/Icon-maskable-512.png differ diff --git a/making_school_asignment_app/windows/runner/resources/app_icon.ico b/making_school_asignment_app/windows/runner/resources/app_icon.ico index c04e20c..aae6e4b 100644 Binary files a/making_school_asignment_app/windows/runner/resources/app_icon.ico and b/making_school_asignment_app/windows/runner/resources/app_icon.ico differ