diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/making_school_asignment_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index 0bedcf2..00cabce 100644 --- a/making_school_asignment_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/making_school_asignment_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "LaunchImage.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "LaunchImage@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "LaunchImage@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/making_school_asignment_app/ios/Runner/Info.plist b/making_school_asignment_app/ios/Runner/Info.plist index fbad0cb..74381f6 100644 --- a/making_school_asignment_app/ios/Runner/Info.plist +++ b/making_school_asignment_app/ios/Runner/Info.plist @@ -1,49 +1,53 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Making School Asignment App - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - making_school_asignment_app - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Making School Asignment App + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + making_school_asignment_app + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + UIStatusBarHidden + + UIViewControllerBasedStatusBarAppearance + + diff --git a/making_school_asignment_app/lib/common/config/request_config.dart b/making_school_asignment_app/lib/common/config/request_config.dart index 32cc6e6..a101124 100644 --- a/making_school_asignment_app/lib/common/config/request_config.dart +++ b/making_school_asignment_app/lib/common/config/request_config.dart @@ -9,7 +9,9 @@ import 'package:making_school_asignment_app/common/job/common/base_page.dart'; class RequestConfig { - static const _devBaseUrl = "http://192.168.2.119:1091"; // 开发 + // static const _devBaseUrl = "http://192.168.2.119:1091"; // 开发 + static const _devBaseUrl = "https://dpc-teacher-api.23544.com"; // 开发 + // static const _proBaseUrl = "http://192.168.2.119:1091"; // 生产 static const _proBaseUrl = "https://dpc-teacher-api.23544.com"; // 生产 static const imgUrl = 'https://dpc-job-oss.23544.com/'; diff --git a/making_school_asignment_app/lib/common/job/homework_details.dart b/making_school_asignment_app/lib/common/job/homework_details.dart index 6e53448..d742283 100644 --- a/making_school_asignment_app/lib/common/job/homework_details.dart +++ b/making_school_asignment_app/lib/common/job/homework_details.dart @@ -37,7 +37,7 @@ class Questions extends Object { int templateId; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'questionType') int questionType; @@ -213,7 +213,7 @@ class Dtls extends Object { int? templateId; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'questionType') int questionType; diff --git a/making_school_asignment_app/lib/common/job/knowledge_report_detail.dart b/making_school_asignment_app/lib/common/job/knowledge_report_detail.dart index aa06f5c..d328df1 100644 --- a/making_school_asignment_app/lib/common/job/knowledge_report_detail.dart +++ b/making_school_asignment_app/lib/common/job/knowledge_report_detail.dart @@ -19,7 +19,7 @@ class KnowledgeReportDetail extends Object { int templateId; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'questionType') int questionType; diff --git a/making_school_asignment_app/lib/common/job/marking_models/original_manuscript_handwriting_params.dart b/making_school_asignment_app/lib/common/job/marking_models/original_manuscript_handwriting_params.dart index c1bbfb9..6dd4be2 100644 --- a/making_school_asignment_app/lib/common/job/marking_models/original_manuscript_handwriting_params.dart +++ b/making_school_asignment_app/lib/common/job/marking_models/original_manuscript_handwriting_params.dart @@ -16,7 +16,7 @@ class OriginalManuscriptHandwritingParams extends Object { int? templateId; @JsonKey(name: 'questionNo') - int? questionNo; + String? questionNo; @JsonKey(name: 'pageNum') int? pageNum; diff --git a/making_school_asignment_app/lib/common/job/student_history.dart b/making_school_asignment_app/lib/common/job/student_history.dart index d13941c..6285f69 100644 --- a/making_school_asignment_app/lib/common/job/student_history.dart +++ b/making_school_asignment_app/lib/common/job/student_history.dart @@ -105,7 +105,7 @@ class KgtList extends Object { String id; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'questionType') int questionType; @@ -135,7 +135,7 @@ class ZgtList extends Object { String id; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'questionType') int questionType; diff --git a/making_school_asignment_app/lib/common/job/student_personal_info.dart b/making_school_asignment_app/lib/common/job/student_personal_info.dart index 4009ff9..5a77607 100644 --- a/making_school_asignment_app/lib/common/job/student_personal_info.dart +++ b/making_school_asignment_app/lib/common/job/student_personal_info.dart @@ -43,7 +43,7 @@ class KgtList extends Object { int templateId; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'answer') String? answer; @@ -76,7 +76,7 @@ class ZgtList extends Object { int templateId; @JsonKey(name: 'questionNo') - int questionNo; + String questionNo; @JsonKey(name: 'answer') String? answer; diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/original_manuscript_handwriting/answer_handwriting_view.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/original_manuscript_handwriting/answer_handwriting_view.dart index d9e1a86..92b1ebe 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/original_manuscript_handwriting/answer_handwriting_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/original_manuscript_handwriting/answer_handwriting_view.dart @@ -29,7 +29,7 @@ class AnswerHandwriting extends Dialog { final int studentId; final int? templateId; final int? pageNum; - final int? questionNo; + final String? questionNo; final Function closeCall; AnswerHandwriting( {super.key, required this.homeworkId, required this.studentId, required this.closeCall, this.templateId, this.pageNum, this.questionNo}); @@ -68,7 +68,7 @@ Future showAnswerHandwriting( required int studentId, int? templateId, int? pageNum, - int? questionNo, + String? questionNo, }) async { backCall() { Navigator.of(context).pop(); @@ -118,7 +118,7 @@ class AnswerHandwritingMainBox extends HookWidget with EventBusMixin { final int? templateId; final int studentId; final int? pageNum; - final int? questionNo; + final String? questionNo; final Function closeCall; @override @@ -184,7 +184,7 @@ class UseMainBoxState with RequestToolMixin { final String homeworkId; final int studentId; final int? templateId; - int? questionNo; + String? questionNo; final ValueNotifier pageNum; final ValueNotifier pageCount; final ValueNotifier handwritingData; @@ -210,7 +210,7 @@ class UseMainBoxState with RequestToolMixin { }); // 工厂构造函数 - factory UseMainBoxState.use(String homeworkId, int studentId, [int? pageNum, int? questionNo, int? templateId]) { + factory UseMainBoxState.use(String homeworkId, int studentId, [int? pageNum, String? questionNo, int? templateId]) { return UseMainBoxState._( homeworkId: homeworkId, templateId: templateId, diff --git a/making_school_asignment_app/lib/page/home_page/children/job_report/widget/knowledge_point.dart b/making_school_asignment_app/lib/page/home_page/children/job_report/widget/knowledge_point.dart index 27cc43d..50aa0ca 100644 --- a/making_school_asignment_app/lib/page/home_page/children/job_report/widget/knowledge_point.dart +++ b/making_school_asignment_app/lib/page/home_page/children/job_report/widget/knowledge_point.dart @@ -263,11 +263,11 @@ class _KnowledgePointState extends State { int okCount = stu.queDtls!.where((w) => w.state == 3).length; int ttlCount = stu.queDtls!.length; stu.okRate = Utils.calcRate(okCount, ttlCount); - stu.queDtls!.sort((a, b) { + /*stu.queDtls!.sort((a, b) { int num1 = a.questionNo; int num2 = b.questionNo; return num1.compareTo(num2); - }); + });*/ } showPeopleListDialog( 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 03ffed1..df768bd 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 @@ -518,9 +518,9 @@ class _ReportTableState extends State { style: TextStyle( fontSize: 10.sp, color: const Color(0xFF4CC793))), Image.asset( - 'assets/images/job_data_right_icon.png', - width: 10.r, - height: 10.r, + 'assets/images/green_right_icon.png', + width: 12.r, + height: 12.r, ) ], ), 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 7c45671..bc2efa9 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 @@ -9,7 +9,7 @@ class StudentKgTable extends StatefulWidget { final List bodyList; final int? fixedRows; final int? fixedCols; - final Function(int, int)? questionNumCall; + final Function(String, int)? questionNumCall; const StudentKgTable({ Key? key, 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 37da127..ba519fa 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 @@ -11,7 +11,7 @@ class StudentZgTable extends StatefulWidget { final List bodyList; final int? fixedRows; final int? fixedCols; - final Function(int, int)? questionNumCall; + final Function(String, int)? questionNumCall; const StudentZgTable({ Key? key, diff --git a/making_school_asignment_app/web/index.html b/making_school_asignment_app/web/index.html index c684d25..09e6a6a 100644 --- a/making_school_asignment_app/web/index.html +++ b/making_school_asignment_app/web/index.html @@ -1,6 +1,4 @@ - - - + - + making_school_asignment_app + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + \ No newline at end of file