+ -
+
+
Frame-1
+ #icon-Frame-114
+
+
+ -
+
+
Frame-2
+ #icon-Frame-25
+
+
+ -
+
+
Frame
+ #icon-Frame15
+
+
+ -
+
+
Frame 2223726
+ #icon-a-Frame2223726
+
+
+ -
+
+
Frame 2223727
+ #icon-a-Frame2223727
+
+
+ -
+
+
Frame 2223723
+ #icon-a-Frame2223723
+
+
+ -
+
+
Frame 2223725
+ #icon-a-Frame2223725
+
+
+ -
+
+
Frame 2223728
+ #icon-a-Frame2223728
+
+
+ -
+
+
Frame 2223724
+ #icon-a-Frame2223724
+
+
-
+
+
2. 信息的存储
+
2.1 信息存储的方式和期限
+
+ - 我们会通过安全的方式存储您的信息，包括本地存储（例如利用APP进行数据缓存）、数据库和服务器日志。
+ - 一般情况下，我们只会在为实现服务目的所必需的时间内或法律法规规定的条件下存储您的个人信息。
+
+
+
2.2 信息存储的地域
+
+ - 我们会按照法律法规规定，将境内收集的用户个人信息存储于中国境内。
+ - 目前我们不会跨境传输或存储您的个人信息。将来如需跨境传输或存储的，我们会向您告知信息出境的目的、接收方、安全保证措施和安全风险，并征得您的同意。
+
+
+
2.3 产品或服务停止运营时的通知
+
+ - 当我们的产品或服务发生停止运营的情况时，我们将以推送通知、公告等形式通知您，并在合理期限内删除您的个人信息或进行匿名化处理，法律法规另有规定的除外。
+
+
+
3. 信息安全
+
+我们使用各种安全技术和程序，以防信息的丢失、不当使用、未经授权阅览或披露。例如，在某些服务中，我们将利用加密技术（例如SSL）来保护您提供的个人信息。但请您理解，由于技术的限制以及可能存在的各种恶意手段，在互联网行业，即便竭尽所能加强安全措施，也不可能始终保证信息百分之百的安全。您需要了解，您接入我们的服务所用的系统和通讯网络，有可能因我们可控范围外的因素而出现问题。
+
+
+
4. 我们如何使用信息
+
我们可能将在向您提供服务的过程之中所收集的信息用作下列用途：
+
+ - 向您提供服务；
+ - 在我们提供服务时，用于身份验证、客户服务、安全防范、诈骗监测、存档和备份用途，确保我们向您提供的产品和服务的安全性；
+ - 帮助我们设计新服务，改善我们现有服务；
+ - 向您提供与您更加相关的广告以替代普遍投放的广告；
+ - 评估我们服务中的广告和其他促销及推广活动的效果，并加以改善；
+ - 软件认证或管理软件升级；
+ - 让您参与有关我们产品和服务的调查。
+
+
+
5. 信息共享
+
+目前，我们不会主动共享或转让您的个人信息至第三方，如存在其他共享或转让您的个人信息或您需要我们将您的个人信息共享或转让至第三方情形时，我们会直接或确认第三方征得您对上述行为的明示同意。
+
+
+为了投放广告，评估、优化广告投放效果等目的，我们需要向广告主及其代理商等第三方合作伙伴共享您的部分数据，要求其严格遵守我们关于数据隐私保护的措施与要求，包括但不限于根据数据保护协议、承诺书及相关数据处理政策进行处理，避免识别出个人身份，保障隐私安全。
+
+
+我们不会向合作伙伴分享可用于识别您个人身份的信息（例如您的姓名或电子邮件地址），除非您明确授权。
+
+
+我们不会对外公开披露所收集的个人信息，如必须公开披露时，我们会向您告知此次公开披露的目的、披露信息的类型及可能涉及的敏感信息，并征得您的明示同意。
+
+
+随着我们业务的持续发展，我们有可能进行合并、收购、资产转让等交易，我们将告知您相关情形，按照法律法规及不低于本《隐私政策》所要求的标准继续保护或要求新的控制者继续保护您的个人信息。
+
+
+
6. 注销权
+
+另外，根据相关法律法规及国家标准，以下情形中，我们可能会共享、转让、公开披露个人信息无需事先征得您的授权同意：
+
+
+ - 与国家安全、国防安全直接相关的；
+ - 与公共安全、公共卫生、重大公共利益直接相关的；
+ - 犯罪侦查、起诉、审判和判决执行等直接相关的；
+ - 出于维护个人信息主体或其他个人的生命、财产等重大合法权益但又很难得到本人同意的；
+ - 个人信息主体自行向社会公众公开个人信息的；
+ - 从合法公开披露的信息中收集个人信息的，如合法的新闻报道、政府信息公开等渠道。
+
+
+
6. 您的权利
+
+
+
+
+
+
（一）访问权
+
+
原则上您可以通过如下方式访问您的个人信息：
+
+
1、账号信息：您可以随时登录您的账号，访问或编辑您账号中的资料信息、更改您的密码、添加安全信息、进行账号关联或身份认证等。
+
+
2、使用信息：您可以在我们的网站、客户端等服务中查阅订单信息等，您也可通过本隐私政策文末提供的方式联系我们删除这些信息，我们将在核实您的身份后提供，但法律法规另有约定的除外。
+
+
3、其他信息：如您在此访问过程中遇到操作问题的或如需获取其他前述无法获知的信息内容，您可通过本隐私政策文末提供的方式联系我们，我们将在核实您的身份后提供，但法律法规另有约定的除外。
+
+
（二）删除权
+
+
您可以通过本隐私政策文末提供的联系方式向我们提出删除您信息的请求，例如您不再需要我们继续为您提供服务，但已做数据匿名化处理或法律法规另有规定的除外。
+
+
（三）索取权
+
+
如您需要您数据的副本，您可以通过本隐私政策文末提供的方式联系我们，在核实您的身份后，我们将向您提供您在我们的服务中的信息副本（例如基本资料、身份信息），但法律法规另有规定的除外。
+
+
（四）撤回同意权
+
+
如您想更改相关功能的授权范围，您可以在我们的产品或服务中的相关功能设置界面进行操作处理。如您在此过程中遇到操作问题的，可以通过本隐私政策文末提供的方式联系我们。
+
+
当您取消相关信息收集的授权后，我们将不再收集该信息，也无法再为您提供上述与之对应的服务；但您知悉并同意，除非您行使前述“删除权”，否则您的该行为不会影响我们基于您之前的授权进行的信息的处理、存储。
+
+
（五）注销权
+
+
您可以通过联系我们的客服或通过其他我们公示的方式注销您的账号（但法律法规另有规定的除外），一旦您注销账号，将无法使用我们提供的全线用户产品的服务，因此请您谨慎操作。我们为了保护您或他人的合法权益会结合您对我们提供的各产品或服务的使用情况判断是否支持您的注销请求。除法律法规另有规定外，注销账号之后，您该账户内的所有信息将被清空，并根据您的要求删除您的信息。您通过第三方账号（如微信等）授权登录我们的服务时，需要向第三方申请注销账号。
+
+
（六）例外情形
+
+
在以下情形中，按照法律法规要求，我们将无法响应您的请求：
+
+
（1）与个人信息控制者履行法律法规规定的义务相关的；
+
+
（2）与国家安全、国防安全有关的；
+
+
（3）与公共安全、公共卫生、重大公共利益有关的；
+
+
（4）与刑事侦查、起诉、审判和执行判决等有关的；
+
+
（5）有充分证据表明您存在主观恶意或滥用权利的；
+
+
（6）出于维护个人信息主体或其他个人的生命、财产等重大合法权益但又很难得到本人同意的；
+
+
（7）响应您的请求将导致您或其他个人、组织的合法权益受到严重损害的；
+
+
（8）涉及商业秘密的。
+
+
7. 变更
+
+我们可能适时修订本《隐私政策》的条款。当变更发生时，我们会在版本更新时向您提示新的《隐私政策》，并向您说明生效日期。请您仔细阅读变更后的《隐私政策》内容，若您继续使用我们的服务，即表示您同意我们按照更新后的《隐私政策》处理您的个人信息。
+
+
+
8. 未成年人保护
+
+我们鼓励父母或监护人指导未满十八岁的未成年人使用我们的服务。我们建议未成年人鼓励他们的父母或监护人阅读本《隐私政策》，并建议未成年人在提交的个人信息之前寻求父母或监护人的同意和指导。
+
+
+
用户协议
+
重庆智学力人工智能科技有限公司（以下简称“我们”）依据本协议为用户（以下简称“你”）提供点智学服务。本协议对你和我们均具有法律约束力。
+
一、本服务的功能
+
你可以使用本服务网络阅卷。
+
二、责任范围及限制
+
你使用本服务得到的结果仅供参考，实际情况以官方为准。
+
三、隐私保护
+
我们重视对你隐私的保护，你的个人隐私信息将根据《隐私政策》受到保护与规范，详情请参阅《隐私政策》。
+
四、其他条款
+
4.1 本协议所有条款的标题仅为阅读方便，本身并无实际涵义，不能作为本协议涵义解释的依据。
+
4.2 本协议条款无论因何种原因部分无效或不可执行，其余条款仍有效，对双方具有约束力。
+
+
+
+''',
),
AGREEMENT_KEY.USER_AGREEMENT: AgreementClass(
title: '用户协议',
diff --git a/making_school_asignment_app/lib/common/job/annotate_list_to_refresh.dart b/making_school_asignment_app/lib/common/job/annotate_list_to_refresh.dart
new file mode 100644
index 0000000..73dfb10
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/annotate_list_to_refresh.dart
@@ -0,0 +1,17 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'annotate_list_to_refresh.g.dart';
+
+
+@JsonSerializable()
+ class AnnotateListToRefresh extends Object {
+
+ AnnotateListToRefresh();
+
+ factory AnnotateListToRefresh.fromJson(Map
srcJson) => _$AnnotateListToRefreshFromJson(srcJson);
+
+ Map toJson() => _$AnnotateListToRefreshToJson(this);
+
+}
+
+
diff --git a/lib/common/job/annotated_class.dart b/making_school_asignment_app/lib/common/job/annotated_class.dart
similarity index 91%
rename from lib/common/job/annotated_class.dart
rename to making_school_asignment_app/lib/common/job/annotated_class.dart
index 2483b53..528a8d0 100644
--- a/lib/common/job/annotated_class.dart
+++ b/making_school_asignment_app/lib/common/job/annotated_class.dart
@@ -114,42 +114,45 @@ class AnnotatedStudents extends Object {
class HomeworkFavs extends Object {
@JsonKey(name: 'id')
- String id;
+ String? id;
@JsonKey(name: 'homeworkId')
- String homeworkId;
+ String? homeworkId;
@JsonKey(name: 'homeworkName')
- String homeworkName;
+ String? homeworkName;
@JsonKey(name: 'grade')
- int grade;
+ int? grade;
@JsonKey(name: 'subject')
- int subject;
+ int? subject;
@JsonKey(name: 'classId')
- String classId;
+ String? classId;
@JsonKey(name: 'className')
- String className;
+ String? className;
@JsonKey(name: 'studentId')
- int studentId;
+ int? studentId;
@JsonKey(name: 'studentName')
- String studentName;
+ String? studentName;
@JsonKey(name: 'templateId')
- String templateId;
+ int templateId;
@JsonKey(name: 'questionNo')
- int questionNo;
+ String? questionNo;
@JsonKey(name: 'subjectiveAnswer')
- String subjectiveAnswer;
+ String? subjectiveAnswer;
- HomeworkFavs(this.id,this.homeworkId,this.homeworkName,this.grade,this.subject,this.classId,this.className,this.studentId,this.studentName,this.templateId,this.questionNo,this.subjectiveAnswer,);
+ @JsonKey(name: 'zgtAnswer')
+ String? zgtAnswer;
+
+ HomeworkFavs(this.id,this.homeworkId,this.homeworkName,this.grade,this.subject,this.classId,this.className,this.studentId,this.studentName,this.templateId,this.questionNo,this.subjectiveAnswer,this.zgtAnswer);
factory HomeworkFavs.fromJson(Map srcJson) => _$HomeworkFavsFromJson(srcJson);
diff --git a/making_school_asignment_app/lib/common/job/app_version.dart b/making_school_asignment_app/lib/common/job/app_version.dart
new file mode 100644
index 0000000..776fbb9
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/app_version.dart
@@ -0,0 +1,56 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../config/request_config.dart';
+
+part 'app_version.g.dart';
+
+@JsonSerializable()
+class AppVersion extends Object {
+ // @JsonKey(name: 'id')
+ // String id;
+
+ // @JsonKey(name: 'creatorId')
+ // int creatorId;
+
+ // @JsonKey(name: 'creatorName')
+ // String creatorName;
+
+ // @JsonKey(name: 'creationTime')
+ // String creationTime;
+
+ @JsonKey(name: 'appName')
+ String appName;
+
+ @JsonKey(name: 'version')
+ String version;
+
+ @JsonKey(name: 'ftuType')
+ int ftuType;
+
+ @JsonKey(name: 'appFileUrl')
+ String? appFileUrl;
+
+ @JsonKey(name: 'description')
+ String? description;
+
+ AppVersion(
+ // this.id,
+ // this.creatorId,
+ // this.creatorName,
+ // this.creationTime,
+ this.appName,
+ this.version,
+ this.ftuType,
+ this.appFileUrl,
+ this.description,
+ ) {
+ if (appFileUrl != null && ftuType != 2) {
+ appFileUrl = RequestConfig.imgUrl + appFileUrl!;
+ }
+ }
+
+ factory AppVersion.fromJson(Map srcJson) =>
+ _$AppVersionFromJson(srcJson);
+
+ Map toJson() => _$AppVersionToJson(this);
+}
diff --git a/lib/common/job/class_item.dart b/making_school_asignment_app/lib/common/job/class_item.dart
similarity index 100%
rename from lib/common/job/class_item.dart
rename to making_school_asignment_app/lib/common/job/class_item.dart
diff --git a/lib/common/job/common/app_version_model.dart b/making_school_asignment_app/lib/common/job/common/app_version_model.dart
similarity index 100%
rename from lib/common/job/common/app_version_model.dart
rename to making_school_asignment_app/lib/common/job/common/app_version_model.dart
diff --git a/lib/common/job/common/base_app_version.dart b/making_school_asignment_app/lib/common/job/common/base_app_version.dart
similarity index 86%
rename from lib/common/job/common/base_app_version.dart
rename to making_school_asignment_app/lib/common/job/common/base_app_version.dart
index a9283e2..008608a 100644
--- a/lib/common/job/common/base_app_version.dart
+++ b/making_school_asignment_app/lib/common/job/common/base_app_version.dart
@@ -1,5 +1,5 @@
import 'package:json_annotation/json_annotation.dart';
-import 'package:school_asignment_app/common/job/common/base_page.dart';
+import 'package:making_school_asignment_app/common/job/common/base_page.dart';
part 'base_app_version.g.dart';
diff --git a/lib/common/job/common/base_page.dart b/making_school_asignment_app/lib/common/job/common/base_page.dart
similarity index 100%
rename from lib/common/job/common/base_page.dart
rename to making_school_asignment_app/lib/common/job/common/base_page.dart
diff --git a/lib/common/job/common/base_page_data.dart b/making_school_asignment_app/lib/common/job/common/base_page_data.dart
similarity index 100%
rename from lib/common/job/common/base_page_data.dart
rename to making_school_asignment_app/lib/common/job/common/base_page_data.dart
diff --git a/lib/common/job/common/base_structure_result.dart b/making_school_asignment_app/lib/common/job/common/base_structure_result.dart
similarity index 93%
rename from lib/common/job/common/base_structure_result.dart
rename to making_school_asignment_app/lib/common/job/common/base_structure_result.dart
index a5bbd49..5cc8159 100644
--- a/lib/common/job/common/base_structure_result.dart
+++ b/making_school_asignment_app/lib/common/job/common/base_structure_result.dart
@@ -7,7 +7,7 @@
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import 'package:json_annotation/json_annotation.dart';
-import 'package:school_asignment_app/common/config/request_config.dart';
+import 'package:making_school_asignment_app/common/config/request_config.dart';
part 'base_structure_result.g.dart';
diff --git a/lib/common/job/common/upload_img_secret_key.dart b/making_school_asignment_app/lib/common/job/common/upload_img_secret_key.dart
similarity index 100%
rename from lib/common/job/common/upload_img_secret_key.dart
rename to making_school_asignment_app/lib/common/job/common/upload_img_secret_key.dart
diff --git a/lib/common/job/enum_subject.dart b/making_school_asignment_app/lib/common/job/enum_subject.dart
similarity index 100%
rename from lib/common/job/enum_subject.dart
rename to making_school_asignment_app/lib/common/job/enum_subject.dart
diff --git a/lib/common/job/homework_details.dart b/making_school_asignment_app/lib/common/job/homework_details.dart
similarity index 75%
rename from lib/common/job/homework_details.dart
rename to making_school_asignment_app/lib/common/job/homework_details.dart
index c7c1908..54f0fca 100644
--- a/lib/common/job/homework_details.dart
+++ b/making_school_asignment_app/lib/common/job/homework_details.dart
@@ -18,7 +18,10 @@ class HomeworkDetails extends Object {
@JsonKey(name: 'dtls')
List dtls;
- HomeworkDetails(this.questions,this.knows,this.students,this.dtls);
+ @JsonKey(name: 'subject')
+ int? subject;
+
+ HomeworkDetails(this.questions,this.knows,this.students,this.dtls,this.subject);
factory HomeworkDetails.fromJson(Map srcJson) => _$HomeworkDetailsFromJson(srcJson);
@@ -37,7 +40,7 @@ class Questions extends Object {
int templateId;
@JsonKey(name: 'questionNo')
- int questionNo;
+ String questionNo;
@JsonKey(name: 'questionType')
int questionType;
@@ -66,6 +69,9 @@ class Questions extends Object {
@JsonKey(name: 'okRate')
double? okRate;
+ @JsonKey(name: 'correctRate')
+ double? correctRate;
+
@JsonKey(name: 'priorityInfo')
List? priorityInfo;
@@ -78,8 +84,15 @@ class Questions extends Object {
@JsonKey(name: 'answerNgStudents')
List? answerNgStudents;
+ @JsonKey(name: 'overallTitles')
+ List? overallTitles;
+
+ @JsonKey(name: 'options')
+ List? options;
+
Questions(this.id,this.templateId,this.questionNo,this.questionType,this.answer,this.score,this.questionPicture,this.subjectivePicture,this.knows,this.answerCount,
- this.answerRate,this.okRate,this.priorityInfo,this.noAnswerStudents,this.answerOkStudents,this.answerNgStudents);
+ this.answerRate,this.okRate,this.priorityInfo,this.noAnswerStudents,this.answerOkStudents,this.answerNgStudents,this.correctRate,
+ this.overallTitles,this.options);
factory Questions.fromJson(Map srcJson) => _$QuestionsFromJson(srcJson);
@@ -117,7 +130,6 @@ class Knows extends Object {
}
-
@JsonSerializable()
class Students extends Object {
@@ -166,19 +178,31 @@ class Students extends Object {
@JsonKey(name: 'allNotDone')
bool? allNotDone;
+ @JsonKey(name: 'isAllCorrect')
+ bool? isAllCorrect;
+
@JsonKey(name: 'queDtls')
List? queDtls;
@JsonKey(name: 'okRate')
double? okRate;
+ @JsonKey(name: 'answerRate')
+ double? answerRate;
+
@JsonKey(name: 'noAnswerCount')
int? noAnswerCount;
@JsonKey(name: 'useTime')
int? useTime;
- Students(this.studentId,this.studentName,this.state,this.priorityAnnotate,this.kgtStu,this.kgtOkCount,this.kgtAnswerCount,this.zgtStu,this.zgtAnswerCount,this.zgtOkCount,this.allOk,this.kgtErrorCount,this.zgtErrorCount,this.zgtUnrated,this.allNotDone,this.queDtls,this.okRate,this.noAnswerCount,this.useTime);
+ @JsonKey(name: 'ttlSec')
+ String? ttlSec;
+
+ @JsonKey(name: 'allTime')
+ int? allTime;
+
+ Students(this.studentId,this.studentName,this.state,this.priorityAnnotate,this.kgtStu,this.kgtOkCount,this.kgtAnswerCount,this.zgtStu,this.zgtAnswerCount,this.zgtOkCount,this.allOk,this.kgtErrorCount,this.zgtErrorCount,this.zgtUnrated,this.allNotDone,this.queDtls,this.okRate,this.noAnswerCount,this.useTime,this.isAllCorrect,this.answerRate,this.allTime);
factory Students.fromJson(Map srcJson) => _$StudentsFromJson(srcJson);
@@ -206,7 +230,7 @@ class Dtls extends Object {
int? templateId;
@JsonKey(name: 'questionNo')
- int questionNo;
+ String questionNo;
@JsonKey(name: 'questionType')
int questionType;
@@ -220,6 +244,9 @@ class Dtls extends Object {
@JsonKey(name: 'useTime')
int useTime;
+ @JsonKey(name: 'lastAnswerTime')
+ String? lastAnswerTime;
+
@JsonKey(name: 'annotatePicture')
String? annotatePicture;
@@ -237,4 +264,42 @@ class Dtls extends Object {
}
+@JsonSerializable()
+class OverallTitles extends Object {
+ @JsonKey(name: 'title')
+ String title;
+
+ @JsonKey(name: 'count')
+ int count;
+
+ OverallTitles(this.title,this.count);
+
+ factory OverallTitles.fromJson(Map srcJson) => _$OverallTitlesFromJson(srcJson);
+
+ Map toJson() => _$OverallTitlesToJson(this);
+
+}
+
+@JsonSerializable()
+class SelectionRate extends Object {
+
+ @JsonKey(name: 'optionName')
+ String optionName;
+
+ @JsonKey(name: 'rate')
+ int rate;
+
+ @JsonKey(name: 'isCheck')
+ bool isCheck;
+
+ @JsonKey(name: 'currentOptionStudents')
+ List currentOptionStudents;
+
+ SelectionRate(this.optionName,this.rate,this.isCheck,this.currentOptionStudents,);
+
+ factory SelectionRate.fromJson(Map srcJson) => _$SelectionRateFromJson(srcJson);
+
+ Map toJson() => _$SelectionRateToJson(this);
+
+}
\ No newline at end of file
diff --git a/lib/common/job/knowledge_points_grasp.dart b/making_school_asignment_app/lib/common/job/knowledge_points_grasp.dart
similarity index 100%
rename from lib/common/job/knowledge_points_grasp.dart
rename to making_school_asignment_app/lib/common/job/knowledge_points_grasp.dart
diff --git a/lib/common/job/knowledge_report_detail.dart b/making_school_asignment_app/lib/common/job/knowledge_report_detail.dart
similarity index 97%
rename from lib/common/job/knowledge_report_detail.dart
rename to making_school_asignment_app/lib/common/job/knowledge_report_detail.dart
index aa06f5c..d328df1 100644
--- a/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/do_paper_bus.dart b/making_school_asignment_app/lib/common/job/marking_models/do_paper_bus.dart
new file mode 100644
index 0000000..4a1ec84
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/do_paper_bus.dart
@@ -0,0 +1,37 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'do_paper_bus.g.dart';
+
+// 批阅页面底部操作栏BUG
+@JsonSerializable()
+class BottomOperationBar extends Object {
+ @JsonKey(name: 'revoke_pre_step') // 撤销上一步
+ bool revokePreStep;
+
+ @JsonKey(name: 'revoke_all') // 撤销全部
+ bool revokeAll;
+
+ BottomOperationBar({
+ required this.revokePreStep,
+ required this.revokeAll,
+ });
+
+ factory BottomOperationBar.fromJson(Map srcJson) => _$BottomOperationBarFromJson(srcJson);
+
+ Map toJson() => _$BottomOperationBarToJson(this);
+}
+
+
+
+@JsonSerializable()
+ class ZoomKey extends Object {
+
+ ZoomKey();
+
+ factory ZoomKey.fromJson(Map srcJson) => _$ZoomKeyFromJson(srcJson);
+
+ Map toJson() => _$ZoomKeyToJson(this);
+
+}
+
+
diff --git a/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_param.dart b/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_param.dart
new file mode 100644
index 0000000..ad211c1
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_param.dart
@@ -0,0 +1,47 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'do_paper_details_param.g.dart';
+
+@JsonSerializable(includeIfNull: false)
+class DoPaperDetailsParam extends Object {
+ // 作业ID
+ @JsonKey(name: 'homeworkId')
+ String homeworkId;
+
+ @JsonKey(name: 'homeworkName')
+ String homeworkName;
+
+ // 班级ID
+ @JsonKey(name: 'classId')
+ String classId;
+
+ // 0 作业 1 考试
+ @JsonKey(name: 'assessType', defaultValue: 0)
+ int? assessType;
+
+ // 科目
+ @JsonKey(name: 'subject')
+ int subject;
+
+ // 题型ID
+ @JsonKey(name: 'templateId')
+ int? templateId;
+
+ // 学生ID
+ @JsonKey(name: 'studentId')
+ int? studentId;
+
+ DoPaperDetailsParam({
+ required this.homeworkId,
+ required this.homeworkName,
+ required this.classId,
+ required this.subject,
+ this.assessType,
+ this.templateId,
+ this.studentId,
+ });
+
+ factory DoPaperDetailsParam.fromJson(Map srcJson) => _$DoPaperDetailsParamFromJson(srcJson);
+
+ Map toJson() => _$DoPaperDetailsParamToJson(this);
+}
diff --git a/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart b/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart
new file mode 100644
index 0000000..3cb579e
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart
@@ -0,0 +1,281 @@
+import 'package:get/get.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'package:making_school_asignment_app/common/config/request_config.dart';
+
+part 'do_paper_details_result.g.dart';
+
+@JsonSerializable(checked: true, includeIfNull: false)
+class DoPaperDetailsResult extends Object {
+ @JsonKey(name: 'templateIds')
+ Map templateIds;
+
+ // 自定义字段
+ @JsonKey(name: 'templateIdKeys')
+ List? templateIdKeys;
+
+ // 自定义字段
+ @JsonKey(name: 'templateIdKeyMap')
+ Map? templateIdKeyMap;
+
+ @JsonKey(name: 'submitStudents', toJson: _paperStudentsToJson) // 当前页 总提交学生集合
+ List students;
+
+ @JsonKey(name: 'templateId')
+ int templateId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ // 自定义字段
+ @JsonKey(name: 'priority', defaultValue: false)
+ bool priority;
+
+ @JsonKey(name: 'annotatedCount') // 当前试题批阅数量
+ int annotatedCount;
+
+ @JsonKey(name: 'submitCount') // 当前试题提交数量
+ int submitCount;
+
+ @JsonKey(name: 'zgtAnswer') // 主观题作答图片
+ String zgtAnswer;
+
+ @JsonKey(name: 'showZgtAnnotate') // 主观题老师批注图片
+ String? showZgtAnnotate;
+
+ @JsonKey(name: 'zgtAnnotate') // 主观题老师批注图片
+ String? zgtAnnotate;
+
+ @JsonKey(name: 'lastAnswerTime') // 学生提交作答试题时间
+ String lastAnswerTime;
+
+ // 批注时间
+ @JsonKey(name: 'annotateTime')
+ String? annotateTime;
+
+ @JsonKey(name: 'isFav')
+ bool isFav;
+
+ @JsonKey(name: 'studentQuestions', toJson: _studentQuestionsToJson)
+ List studentQuestions;
+
+ // 当前页 未提交学生集合
+ @JsonKey(name: 'unSubmitStudents', toJson: _paperStudentsToJson)
+ List unSubmitStudents;
+
+ @JsonKey(name: 'lastPage', toJson: _lastPageToJson)
+ LastPage? lastPage;
+
+ @JsonKey(name: 'continuePage', toJson: _continuePageToJson)
+ ContinuePage? continuePage;
+
+
+ @JsonKey(name: 'nextPage', toJson: _nextPageToJson)
+ NextPage? nextPage;
+
+ // 所有页 总待提交数量
+ @JsonKey(name: 'totalUnAnnotateCount')
+ int totalUnAnnotateCount;
+
+ @JsonKey(name: 'needAnnotate') // 是否需要批阅
+ bool needAnnotate;
+
+ DoPaperDetailsResult(
+ this.totalUnAnnotateCount,
+ this.templateIds,
+ this.students,
+ this.templateId,
+ this.studentId,
+ this.annotatedCount,
+ this.submitCount,
+ this.zgtAnswer,
+ this.zgtAnnotate,
+ this.lastAnswerTime,
+ this.isFav,
+ this.studentQuestions,
+ this.unSubmitStudents,
+ this.lastPage,
+ this.nextPage,
+ this.continuePage,
+ this.templateIdKeys,
+ this.templateIdKeyMap,
+ this.priority,
+ this.annotateTime,
+ this.showZgtAnnotate,
+ {this.needAnnotate = false}) {
+ if (templateIds.keys.isNotEmpty) {
+ templateIdKeys = templateIds.keys.map((e) => int.parse(e)).toList();
+ templateIdKeyMap = {};
+ for (var i = 1; i <= templateIdKeys!.length; i++) {
+ var theVal = templateIdKeys![i - 1];
+ templateIdKeyMap![i] = theVal;
+ templateIdKeyMap![theVal] = i;
+ }
+ }
+
+ // 找到当前学生是否是优先批阅
+ if (students.isNotEmpty) {
+ var currentStudent = students.firstWhereOrNull((e) => e.id == studentId);
+ if (currentStudent != null) priority = currentStudent.isPriority;
+ }
+
+ if (!zgtAnswer.contains(RequestConfig.imgUrl)) {
+ zgtAnswer = '${RequestConfig.imgUrl}$zgtAnswer?$lastAnswerTime';
+ }
+
+ if (zgtAnnotate?.isNotEmpty ?? false) {
+ showZgtAnnotate = RequestConfig.imgUrl + zgtAnnotate!; // 批注图片地址赋值
+ if (annotateTime != null) showZgtAnnotate = '${showZgtAnnotate!}?$annotateTime';
+ }
+
+ // 判断当前试题是否需要批阅
+ if (annotateTime == null || studentQuestions.indexWhere((e) => e.studentScore == null) != -1) {
+ needAnnotate = true;
+ }
+ // print('学生作答图片：${annotatedCount}');
+ // print('老师批注图片提交数量：${submitCount}');
+ }
+
+ factory DoPaperDetailsResult.fromJson(Map srcJson) => _$DoPaperDetailsResultFromJson(srcJson);
+
+ Map toJson() => _$DoPaperDetailsResultToJson(this);
+
+ static List> _paperStudentsToJson(List examples) => examples.map((e) => e.toJson()).toList();
+
+ static List> _studentQuestionsToJson(List examples) => examples.map((e) => e.toJson()).toList();
+
+ static Map? _nextPageToJson(NextPage? example) => example?.toJson();
+ static Map? _lastPageToJson(LastPage? example) => example?.toJson();
+ static Map? _continuePageToJson(ContinuePage? example) => example?.toJson();
+
+}
+
+@JsonSerializable()
+class PaperStudents extends Object {
+ @JsonKey(name: 'id')
+ int id;
+
+ @JsonKey(name: 'name')
+ String name;
+
+ // 优先批阅
+ @JsonKey(name: 'isPriority')
+ bool isPriority;
+
+ PaperStudents(
+ this.id,
+ this.name,
+ this.isPriority,
+ );
+
+ factory PaperStudents.fromJson(Map srcJson) => _$PaperStudentsFromJson(srcJson);
+
+ Map toJson() => _$PaperStudentsToJson(this);
+}
+
+@JsonSerializable()
+class StudentQuestions extends Object {
+ @JsonKey(name: 'questionNo')
+ String questionNo;
+
+ // 总分
+ @JsonKey(name: 'score')
+ int? score;
+
+ // 分值步长
+ @JsonKey(name: 'scoreStep')
+ int? scoreStep;
+
+ // 是否已经批阅
+ @JsonKey(name: 'isNeedAnnotate')
+ bool isNeedAnnotate;
+
+ // 学生得分
+ @JsonKey(name: 'studentScore')
+ int? studentScore;
+
+ // 是否正确
+ @JsonKey(name: 'isCorrect')
+ bool? isCorrect;
+
+ // 正确率
+ @JsonKey(name: 'correctRate')
+ int correctRate;
+
+ @JsonKey(name: 'height')
+ double? height;
+
+ @JsonKey(name: 'useTime')
+ int? useTime;
+
+ StudentQuestions({
+ required this.height,
+ required this.questionNo,
+ required this.correctRate,
+ required this.isNeedAnnotate,
+ this.score,
+ this.scoreStep,
+ this.studentScore,
+ this.isCorrect,
+ this.useTime,
+ });
+
+ factory StudentQuestions.fromJson(Map srcJson) => _$StudentQuestionsFromJson(srcJson);
+
+ Map toJson() => _$StudentQuestionsToJson(this);
+}
+
+@JsonSerializable()
+class LastPage extends Object {
+ @JsonKey(name: 'templateId')
+ int templateId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ LastPage(
+ this.templateId,
+ this.studentId,
+ );
+
+ factory LastPage.fromJson(Map srcJson) => _$LastPageFromJson(srcJson);
+
+ Map toJson() => _$LastPageToJson(this);
+}
+
+@JsonSerializable()
+class NextPage extends Object {
+ @JsonKey(name: 'templateId')
+ int templateId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ NextPage(
+ this.templateId,
+ this.studentId,
+ );
+
+ factory NextPage.fromJson(Map srcJson) => _$NextPageFromJson(srcJson);
+
+ Map toJson() => _$NextPageToJson(this);
+}
+
+
+@JsonSerializable()
+ class ContinuePage extends Object {
+
+ @JsonKey(name: 'templateId')
+ int templateId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ ContinuePage(this.templateId,this.studentId,);
+
+ factory ContinuePage.fromJson(Map srcJson) => _$ContinuePageFromJson(srcJson);
+
+ Map toJson() => _$ContinuePageToJson(this);
+
+}
+
+
diff --git a/making_school_asignment_app/lib/common/job/marking_models/do_test_questions_image_info.dart b/making_school_asignment_app/lib/common/job/marking_models/do_test_questions_image_info.dart
new file mode 100644
index 0000000..d548e47
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/do_test_questions_image_info.dart
@@ -0,0 +1,75 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'do_test_questions_image_info.g.dart';
+
+@JsonSerializable()
+class TestQuestionsImageInfo extends Object {
+ @JsonKey(name: 'templateId')
+ int? templateId;
+
+ @JsonKey(name: 'boxHeight')
+ double boxHeight;
+
+ @JsonKey(name: 'boxWidth')
+ double boxWidth;
+
+ @JsonKey(name: 'imageWidth') // 图片原始宽
+ double imageWidth;
+
+ @JsonKey(name: 'imageHeight') // 图片原始高
+ double imageHeight;
+
+ @JsonKey(name: 'url')
+ String url;
+
+ @JsonKey(name: 'actualImgWidth') // 实际展示图片宽度
+ double actualImgWidth;
+
+ @JsonKey(name: 'actualImgHeight') // 实际展示图片高度
+ double actualImgHeight;
+
+ @JsonKey(name: 'remainingHeight') // 视图剩余高度 实际展示图片展示高度下 剩余高度.(若为负数就是超出视图的高度值)
+ double remainingHeight;
+
+ @JsonKey(name: 'imageHeightOffsetStart') // 顶部坐标Y
+ double imageHeightOffsetStart;
+
+ @JsonKey(name: 'imageHeightOffsetend') // 底部坐标Y
+ double imageHeightOffsetend;
+
+ // 基准
+ @JsonKey(name: 'scaleRatio')
+ double scaleRatio;
+
+ // 缩放比例
+ @JsonKey(name: 'zoom')
+ double zoom;
+
+ TestQuestionsImageInfo({
+ required this.url,
+ required this.boxWidth,
+ required this.boxHeight,
+ required this.imageWidth,
+ required this.imageHeight,
+ this.templateId,
+ this.scaleRatio = 1,
+ this.zoom = 1,
+ this.actualImgWidth = 0,
+ this.actualImgHeight = 0,
+ this.remainingHeight = 0,
+ this.imageHeightOffsetStart = 0,
+ this.imageHeightOffsetend = 0,
+ }) {
+ // 图片已视图宽为基准，高度自适应可滑动 图片的实际宽高都需要乘此基准值
+ scaleRatio = boxWidth / imageWidth;
+ actualImgWidth = imageWidth * scaleRatio * zoom;
+ actualImgHeight = imageHeight * scaleRatio * zoom;
+ remainingHeight = boxHeight - actualImgHeight;
+ imageHeightOffsetStart = remainingHeight / 2;
+ imageHeightOffsetend = imageHeightOffsetStart + actualImgHeight;
+ }
+
+ factory TestQuestionsImageInfo.fromJson(Map srcJson) => _$TestQuestionsImageInfoFromJson(srcJson);
+
+ Map toJson() => _$TestQuestionsImageInfoToJson(this);
+}
diff --git a/making_school_asignment_app/lib/common/job/marking_models/favor_param.dart b/making_school_asignment_app/lib/common/job/marking_models/favor_param.dart
new file mode 100644
index 0000000..d81a41b
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/favor_param.dart
@@ -0,0 +1,33 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'favor_param.g.dart';
+
+@JsonSerializable()
+class FavorParam extends Object {
+ @JsonKey(name: 'homeworkId')
+ String homeworkId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ @JsonKey(name: 'templateId')
+ int templateId;
+
+ @JsonKey(name: 'questionNo')
+ String questionNo;
+
+ @JsonKey(name: 'isFav')
+ bool isFav;
+
+ FavorParam({
+ required this.homeworkId,
+ required this.studentId,
+ required this.templateId,
+ required this.questionNo,
+ required this.isFav,
+ });
+
+ factory FavorParam.fromJson(Map srcJson) => _$FavorParamFromJson(srcJson);
+
+ Map toJson() => _$FavorParamToJson(this);
+}
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
new file mode 100644
index 0000000..6dd4be2
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/original_manuscript_handwriting_params.dart
@@ -0,0 +1,35 @@
+// 原稿笔迹参数
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'original_manuscript_handwriting_params.g.dart';
+
+@JsonSerializable(checked: true, includeIfNull: false)
+class OriginalManuscriptHandwritingParams extends Object {
+ @JsonKey(name: 'homeworkId')
+ String homeworkId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ @JsonKey(name: 'templateId')
+ int? templateId;
+
+ @JsonKey(name: 'questionNo')
+ String? questionNo;
+
+ @JsonKey(name: 'pageNum')
+ int? pageNum;
+
+ OriginalManuscriptHandwritingParams({
+ required this.homeworkId,
+ required this.studentId,
+ this.templateId,
+ this.pageNum,
+ this.questionNo,
+ });
+
+ factory OriginalManuscriptHandwritingParams.fromJson(Map srcJson) => _$OriginalManuscriptHandwritingParamsFromJson(srcJson);
+
+ Map toJson() => _$OriginalManuscriptHandwritingParamsToJson(this);
+}
diff --git a/making_school_asignment_app/lib/common/job/marking_models/review_submission_params.dart b/making_school_asignment_app/lib/common/job/marking_models/review_submission_params.dart
new file mode 100644
index 0000000..97dd4fc
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/marking_models/review_submission_params.dart
@@ -0,0 +1,55 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'review_submission_params.g.dart';
+
+@JsonSerializable(includeIfNull: false)
+class ReviewSubmissionParams extends Object {
+ @JsonKey(name: 'homeworkId')
+ String homeworkId;
+
+ @JsonKey(name: 'templateId')
+ int templateId;
+
+ @JsonKey(name: 'studentId')
+ int studentId;
+
+ @JsonKey(name: 'studentScores')
+ List studentScores;
+
+ @JsonKey(name: 'zgtAnnotate')
+ String? zgtAnnotate;
+
+ ReviewSubmissionParams({
+ required this.homeworkId,
+ required this.templateId,
+ required this.studentId,
+ required this.studentScores,
+ this.zgtAnnotate,
+ });
+
+ factory ReviewSubmissionParams.fromJson(Map srcJson) => _$ReviewSubmissionParamsFromJson(srcJson);
+
+ Map toJson() => _$ReviewSubmissionParamsToJson(this);
+}
+
+@JsonSerializable()
+class StudentScores extends Object {
+ @JsonKey(name: 'questionNo')
+ String questionNo;
+
+ @JsonKey(name: 'studentScore')
+ int studentScore;
+
+ @JsonKey(name: 'isCorrect')
+ bool isCorrect;
+
+ StudentScores({
+ required this.questionNo,
+ required this.studentScore,
+ required this.isCorrect,
+ });
+
+ factory StudentScores.fromJson(Map srcJson) => _$StudentScoresFromJson(srcJson);
+
+ Map toJson() => _$StudentScoresToJson(this);
+}
diff --git a/lib/common/job/student_history.dart b/making_school_asignment_app/lib/common/job/student_history.dart
similarity index 98%
rename from lib/common/job/student_history.dart
rename to making_school_asignment_app/lib/common/job/student_history.dart
index d13941c..6285f69 100644
--- a/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/lib/common/job/student_history_params.dart b/making_school_asignment_app/lib/common/job/student_history_params.dart
similarity index 100%
rename from lib/common/job/student_history_params.dart
rename to making_school_asignment_app/lib/common/job/student_history_params.dart
diff --git a/lib/common/job/student_item.dart b/making_school_asignment_app/lib/common/job/student_item.dart
similarity index 100%
rename from lib/common/job/student_item.dart
rename to making_school_asignment_app/lib/common/job/student_item.dart
diff --git a/lib/common/job/student_personal_info.dart b/making_school_asignment_app/lib/common/job/student_personal_info.dart
similarity index 98%
rename from lib/common/job/student_personal_info.dart
rename to making_school_asignment_app/lib/common/job/student_personal_info.dart
index 4009ff9..5a77607 100644
--- a/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/lib/common/job/user_info.dart b/making_school_asignment_app/lib/common/job/user_info.dart
similarity index 100%
rename from lib/common/job/user_info.dart
rename to making_school_asignment_app/lib/common/job/user_info.dart
diff --git a/lib/common/job/user_info_detail.dart b/making_school_asignment_app/lib/common/job/user_info_detail.dart
similarity index 100%
rename from lib/common/job/user_info_detail.dart
rename to making_school_asignment_app/lib/common/job/user_info_detail.dart
diff --git a/lib/common/job/user_login.dart b/making_school_asignment_app/lib/common/job/user_login.dart
similarity index 100%
rename from lib/common/job/user_login.dart
rename to making_school_asignment_app/lib/common/job/user_login.dart
diff --git a/making_school_asignment_app/lib/common/job/user_register_params.dart b/making_school_asignment_app/lib/common/job/user_register_params.dart
new file mode 100644
index 0000000..f3cc543
--- /dev/null
+++ b/making_school_asignment_app/lib/common/job/user_register_params.dart
@@ -0,0 +1,21 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'user_register_params.g.dart';
+
+@JsonSerializable()
+class UserRegisterParams extends Object {
+ @JsonKey(name: 'account')
+ String account;
+
+ @JsonKey(name: 'password')
+ String password;
+
+ UserRegisterParams({
+ required this.account,
+ required this.password,
+ });
+
+ factory UserRegisterParams.fromJson(Map srcJson) => _$UserRegisterParamsFromJson(srcJson);
+
+ Map toJson() => _$UserRegisterParamsToJson(this);
+}
diff --git a/lib/common/job/work_student.dart b/making_school_asignment_app/lib/common/job/work_student.dart
similarity index 100%
rename from lib/common/job/work_student.dart
rename to making_school_asignment_app/lib/common/job/work_student.dart
diff --git a/lib/common/job/work_student_params.dart b/making_school_asignment_app/lib/common/job/work_student_params.dart
similarity index 100%
rename from lib/common/job/work_student_params.dart
rename to making_school_asignment_app/lib/common/job/work_student_params.dart
diff --git a/making_school_asignment_app/lib/common/mixins/event_bus_mixin.dart b/making_school_asignment_app/lib/common/mixins/event_bus_mixin.dart
new file mode 100644
index 0000000..9aeb50e
--- /dev/null
+++ b/making_school_asignment_app/lib/common/mixins/event_bus_mixin.dart
@@ -0,0 +1,33 @@
+// event_bus 混入类
+import 'dart:async';
+
+import 'package:event_bus/event_bus.dart';
+import 'package:making_school_asignment_app/common/utils/event_bus_utils.dart';
+
+mixin EventBusMixin {
+ late final StreamSubscription? _subscription;
+ static final EventBusUtils _exampleUtil = EventBusUtils();
+ static final EventBus _eBus = _exampleUtil.getEventBus();
+
+ /*
+ * 发起事件总线监听
+ * @param {Function} callback 回调函数
+ */
+ /// 发起事件总线监听 @param {Function} callback 回调函数
+ StreamSubscription eventOn({required void Function(T) callback}) {
+ _subscription = _eBus.on().listen(callback);
+ return _subscription!;
+ }
+
+ // 触发事件总线
+ void eventFire({required T model}) {
+ _exampleUtil.toFire(model);
+ }
+
+ // 关闭监听总线事件
+ void eventCancel() {
+ try{
+ _subscription?.cancel();
+ }catch(_){}
+ }
+}
diff --git a/making_school_asignment_app/lib/common/mixins/request_tool_mixin.dart b/making_school_asignment_app/lib/common/mixins/request_tool_mixin.dart
new file mode 100644
index 0000000..b1a27a9
--- /dev/null
+++ b/making_school_asignment_app/lib/common/mixins/request_tool_mixin.dart
@@ -0,0 +1,10 @@
+import 'package:dio/dio.dart';
+import 'package:making_school_asignment_app/common/request/rest_dio.dart';
+import 'package:making_school_asignment_app/common/api/retrofit_client.dart';
+
+mixin RequestToolMixin {
+ // 获取DIO
+ Dio getClientDio() => RequestTool.instance.getDio();
+ // 获取Client
+ RetrofitClient getClient() => RequestTool.instance.getClient();
+}
diff --git a/lib/common/request/rest_dio.dart b/making_school_asignment_app/lib/common/request/rest_dio.dart
similarity index 69%
rename from lib/common/request/rest_dio.dart
rename to making_school_asignment_app/lib/common/request/rest_dio.dart
index 36fcb60..c057fd4 100644
--- a/lib/common/request/rest_dio.dart
+++ b/making_school_asignment_app/lib/common/request/rest_dio.dart
@@ -2,15 +2,20 @@ import 'dart:convert';
import 'dart:io';
import 'package:get/get.dart' as getx;
import 'package:dio/dio.dart';
-import 'package:package_info/package_info.dart';
-import 'package:school_asignment_app/common/api/retrofit_client.dart';
-import 'package:school_asignment_app/common/config/request_config.dart';
-import 'package:school_asignment_app/common/job/user_info.dart';
-import 'package:school_asignment_app/common/store/user_store.dart';
-import 'package:school_asignment_app/common/utils/toast_utils.dart';
-import 'package:school_asignment_app/routes/app_pages.dart';
+import 'package:making_school_asignment_app/common/utils/utils.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:making_school_asignment_app/common/api/retrofit_client.dart';
+import 'package:making_school_asignment_app/common/config/request_config.dart';
+import 'package:making_school_asignment_app/common/job/user_info.dart';
+import 'package:making_school_asignment_app/common/store/user_store.dart';
+import 'package:making_school_asignment_app/common/utils/toast_utils.dart';
+import 'package:making_school_asignment_app/routes/app_pages.dart';
+
+import '../job/user_info_detail.dart';
+import '../utils/storage.dart';
class RequestTool {
+ static late Dio _dio;
// 初始化请求配置
static _init() {
BaseOptions options = BaseOptions(
@@ -18,17 +23,18 @@ class RequestTool {
connectTimeout: const Duration(milliseconds: RequestConfig.connectTimeout),
receiveTimeout: const Duration(milliseconds: RequestConfig.receiveTimeout),
);
- Dio dio = Dio(options);
- dio.interceptors.add(AuthInterceptor()); // 添加 token
- dio.interceptors.add(ResponseHandle()); // 添加 数据返回拦截
- dio.interceptors.add(TheError()); // 添加 数据返回拦截
+ _dio = Dio(options);
+ _dio.interceptors.add(AuthInterceptor()); // 添加 token
+ _dio.interceptors.add(ResponseHandle()); // 添加 数据返回拦截
+ _dio.interceptors.add(TheError()); // 添加 数据返回拦截
const isProd = bool.fromEnvironment('dart.vm.product');
if (!isProd && RequestConfig.requestDataPrinting) {
- dio.interceptors.add(LogInterceptor(responseBody: true, requestBody: true)); //添加日志
+ _dio.interceptors.add(LogInterceptor(responseBody: true, requestBody: true)); //添加日志
}
- return RetrofitClient(dio, baseUrl: RequestConfig().baseUrl);
+ return RetrofitClient(_dio, baseUrl: RequestConfig().baseUrl);
}
+
final RetrofitClient _client;
static RequestTool? _instance;
@@ -42,6 +48,9 @@ class RequestTool {
return _instance!;
}
+ // DIO
+ Dio getDio() => _dio;
+
RetrofitClient getClient() => _client;
}
@@ -90,9 +99,9 @@ class AuthInterceptor extends Interceptor {
headers["x-Authorization"] = xToken!;
}
- if ((userInfo?.isExpired() ?? false) && userInfo?.termYear != '') {
+ /* if ((userInfo?.isExpired() ?? false) && userInfo?.termYear != '') {
headers["term-year"] = userInfo!.termYear;
- }
+ }*/
options.headers = headers;
return super.onRequest(options, handler);
@@ -106,6 +115,10 @@ class AuthInterceptor extends Interceptor {
class ResponseHandle extends Interceptor {
@override
void onResponse(Response response, ResponseInterceptorHandler handler) {
+ const isProd = bool.fromEnvironment('dart.vm.product');
+ if (!isProd && RequestConfig.requestDataPrinting) {
+ toPrint(val: response.data, toPrintJson: true);
+ }
if (RequestConfig.successCode.contains(response.statusCode)) {
//
String? token = response.headers.value('access-token');
@@ -125,11 +138,10 @@ class ResponseHandle extends Interceptor {
}
class TheError extends Interceptor {
+ late getx.Rx userInfo = UserStore.to.userDetailInfo;
+
@override
void onError(DioException error, ErrorInterceptorHandler handler) {
- print('----------------');
- print(error);
- print('*************');
var message = '请求错误，请重试';
switch (error.type) {
case DioExceptionType.connectionTimeout:
@@ -142,7 +154,7 @@ class TheError extends Interceptor {
message = '请求发送超时';
break;
case DioExceptionType.receiveTimeout:
- message = '接收超时时发生';
+ message = '接收超时';
break;
case DioExceptionType.badResponse:
if (error.response == null) {
@@ -153,6 +165,16 @@ class TheError extends Interceptor {
int? statusCode = response.statusCode;
var errorMap = response.data;
+
+ if (errorMap is String && errorMap.length > 0) {
+ try {
+ var errorModel = jsonDecode(errorMap);
+ var error = errorModel['error'];
+ if (error != null && error["message"] != null) {
+ message = error["message"];
+ }
+ } catch (e) {}
+ }
// var runtimeType = errorMap.runtimeType;
if (errorMap is Map && errorMap['error'] != null) {
message = errorMap['error']?['message'] ?? '请求错误，请重试';
@@ -161,7 +183,14 @@ class TheError extends Interceptor {
switch (statusCode) {
case 401:
message = '用户登录失效，请重新登录';
- Future.delayed(const Duration(seconds: 2), () => getx.Get.offAllNamed(Routes.login));
+
+ Future.delayed(const Duration(seconds: 2), () {
+ if (getx.Get.currentRoute != Routes.login) {
+ UserStore.to.erase();
+ StorageService.to.erase();
+ getx.Get.offAllNamed(Routes.login);
+ }
+ });
break;
case 404:
// message = '用户登录失效，请重新登录';
@@ -183,7 +212,10 @@ class TheError extends Interceptor {
default:
message = '请求错误';
}
- ToastUtils.showError(message);
+ if (message == '用户登录失效，请重新登录' && userInfo.value?.id == null) {
+ return handler.next(error);
+ }
+ Future.delayed(const Duration(milliseconds: 600), () => ToastUtils.showError(message));
return handler.next(error);
}
}
diff --git a/lib/common/store/app_storage_key.dart b/making_school_asignment_app/lib/common/store/app_storage_key.dart
similarity index 74%
rename from lib/common/store/app_storage_key.dart
rename to making_school_asignment_app/lib/common/store/app_storage_key.dart
index b9029b3..97347e9 100644
--- a/lib/common/store/app_storage_key.dart
+++ b/making_school_asignment_app/lib/common/store/app_storage_key.dart
@@ -5,7 +5,10 @@ enum AppStorageKey {
xToken(value: 'XTOKEN', label: "登录用户的Xtoken，刷新token信息"),
userMobile(value: 'USERMOBILE', label: "用户输入过的手机号码"),
userInfo(value: 'USERINFO', label: "登录用户的基本信息 及 token过期时间"),
- userDetailInfo(value: 'USERDETAILINFO', label: "用户的详细信息");
+ userDetailInfo(value: 'USERDETAILINFO', label: "用户的详细信息"),
+ account(value: 'ACCOUNT', label: "用户名"),
+ pwd(value: 'PWD', label: "密码"),
+ privacyAgreement(value: 'PRIVACYAGREEMENT', label: "用户同意隐私协议");
final String label;
final String value;
diff --git a/lib/common/store/user_store.dart b/making_school_asignment_app/lib/common/store/user_store.dart
similarity index 80%
rename from lib/common/store/user_store.dart
rename to making_school_asignment_app/lib/common/store/user_store.dart
index 451d009..b9cf327 100644
--- a/lib/common/store/user_store.dart
+++ b/making_school_asignment_app/lib/common/store/user_store.dart
@@ -1,13 +1,13 @@
import 'dart:convert';
import 'package:get/get.dart';
-import 'package:school_asignment_app/common/job/enum_subject.dart';
-import 'package:school_asignment_app/common/job/user_info.dart';
-import 'package:school_asignment_app/common/job/user_info_detail.dart';
-import 'package:school_asignment_app/common/mixins/request_tool_mixin.dart';
-import 'package:school_asignment_app/common/utils/storage.dart';
-import 'package:school_asignment_app/common/store/app_storage_key.dart';
-import 'package:school_asignment_app/routes/app_pages.dart';
+import 'package:making_school_asignment_app/common/job/enum_subject.dart';
+import 'package:making_school_asignment_app/common/job/user_info.dart';
+import 'package:making_school_asignment_app/common/job/user_info_detail.dart';
+import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart';
+import 'package:making_school_asignment_app/common/utils/storage.dart';
+import 'package:making_school_asignment_app/common/store/app_storage_key.dart';
+import 'package:making_school_asignment_app/routes/app_pages.dart';
class UserStore extends GetxController with RequestToolMixin {
static UserStore get to => Get.find();
@@ -28,8 +28,6 @@ class UserStore extends GetxController with RequestToolMixin {
//年级
RxList gradeList = RxList();
- RxInt readOver = 0.obs;
-
UserStore init() {
token = StorageService.to.read(AppStorageKey.token.value);
xToken = StorageService.to.read(AppStorageKey.xToken.value);
@@ -45,11 +43,11 @@ class UserStore extends GetxController with RequestToolMixin {
}
var _userDetail = StorageService.to.read(AppStorageKey.userDetailInfo.value);
if (_userDetail != null) {
- print(_userDetail);
+ // print(_userDetail);
userDetailInfo.value = UserInfoDetail.fromJson(_userDetail);
}
} catch (err) {
- print('LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL${err}');
+ // print('LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL${err}');
StorageService.to.remove(AppStorageKey.userInfo.value);
StorageService.to.remove(AppStorageKey.userDetailInfo.value);
}
@@ -61,8 +59,8 @@ class UserStore extends GetxController with RequestToolMixin {
return this;
}
- void getEnum() async{
- await getGradeList();
+ void getEnum() async {
+ await getGradeList();
}
/// 保存 token
@@ -99,18 +97,15 @@ class UserStore extends GetxController with RequestToolMixin {
//获取科目
getSubjectList() async {
// var res = await getClient().getEnumSubjectList();
-
}
//获取年级
getGradeList() async {
-
- var res = await getClient().getEnumSubjectList(['EnumGrade','EnumSubject']);
+ var res = await getClient().getEnumSubjectList(['EnumGrade', 'EnumSubject']);
gradeList.value = res['EnumGrade']!;
subjectList.value = res['EnumSubject']!;
}
-
// 用户信息更新
updateUserInfo() async {
UserInfo? userInfo = UserStore.to.userInfo.value;
diff --git a/lib/common/the_global.dart b/making_school_asignment_app/lib/common/the_global.dart
similarity index 100%
rename from lib/common/the_global.dart
rename to making_school_asignment_app/lib/common/the_global.dart
diff --git a/making_school_asignment_app/lib/common/utils/anti_shake_throttling.dart b/making_school_asignment_app/lib/common/utils/anti_shake_throttling.dart
new file mode 100644
index 0000000..142b4e9
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/anti_shake_throttling.dart
@@ -0,0 +1,52 @@
+// debounce.dart
+
+import 'dart:async';
+
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+
+/// 函数防抖
+///
+/// [func]: 要执行的方法
+/// [delay]: 要迟延的时长
+VoidCallback debounce(Function func, [Duration delay = const Duration(milliseconds: 2000)]) {
+ Timer? timer;
+ target() {
+ timer?.cancel();
+ timer = Timer(delay, () {
+ func.call();
+ });
+ }
+
+ return target;
+}
+
+/// 函数节流
+///
+/// [func]: 要执行的方法
+VoidCallback throttle(Future Function() func) {
+ bool enable = true;
+ target() {
+ if (enable == true) {
+ enable = false;
+ func().whenComplete(() {
+ enable = true;
+ });
+ }
+ }
+
+ return target;
+}
+
+/// 函数节流
+///
+/// [func]: 要执行的方法
+bool easyThrottle(String tagId, EasyThrottleCallback onExecute,
+ {Duration duration = const Duration(milliseconds: 300), EasyThrottleCallback? onAfter}) {
+ return EasyThrottle.throttle(
+ tagId, // <-- An ID for this particular throttler
+ duration, // <-- The throttle duration
+ onExecute, // <-- The target method
+ onAfter: onAfter // <-- Optional callback, called after the duration has passed
+ );
+}
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/DownloadApk.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/DownloadApk.dart
new file mode 100644
index 0000000..1b472af
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/DownloadApk.dart
@@ -0,0 +1,159 @@
+/*
+ * @Descripttion: 下载APK
+ * @version: DownloadApk
+ * @Author: wy
+ * @Date: 2020-07-30 15:54:40
+ * @LastEditors: wangyang 1147192855@qq.com
+ * @LastEditTime: 2022-08-02 15:12:21
+ */
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:making_school_asignment_app/common/utils/utils.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:app_installer/app_installer.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import 'UpgradePermission.dart';
+import 'model/UpdateAppEvent.dart';
+import 'upgradeLogic.dart';
+
+class DownloadApk {
+ /// 下载安卓更新包
+ static Future _downloadAndroid(
+ context, UpdateAppEvent event, UpgradeLogic logic) async {
+ /// 创建存储文件
+ Directory? storageDir = await getExternalStorageDirectory();
+ final storagePath = storageDir?.path ?? '/';
+ String version = event.version.replaceAll(".", "-");
+ File file = new File('$storagePath/${event.appName}v$version.apk');
+ if (await file.exists()) await file.delete();
+ if (!file.existsSync()) file.createSync();
+ try {
+ /// 发起下载请求
+ Response response = await Dio().get(
+ event.link,
+ onReceiveProgress: (num received, num total) {
+ showDownloadProgress(context, received, total, logic);
+ },
+ options: Options(
+ responseType: ResponseType.bytes,
+ followRedirects: false,
+ ),
+ );
+ file.writeAsBytesSync(response.data);
+ return file;
+ } catch (e) {
+ print(e);
+ // toPrint(val: e);
+ }
+ return null;
+ }
+
+ // 安装apk
+ static Future installApk(
+ context, UpdateAppEvent event, UpgradeLogic logic) async {
+ try {
+ logic.loadingApk.value = true;
+ File? _apkFile = await _downloadAndroid(context, event, logic);
+ if (_apkFile == null) return false;
+ String _apkFilePath = _apkFile.path;
+ if (_apkFilePath.isEmpty) {
+ debugPrint('make sure the apk file is set');
+ return false;
+ }
+
+ await showDialog(
+ context: context,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ title: const Text("未知应用安装权限提示",
+ style: TextStyle(
+ fontWeight: FontWeight.bold,
+ )),
+ content: const Text("请注意：更新时若出现需要同意“安装未知应用权限”，请同意！！！"),
+ actions: [
+ MaterialButton(
+ color: Theme.of(context).primaryColor,
+ child: const Text("我已知晓",
+ style: TextStyle(
+ color: Colors.white, fontWeight: FontWeight.bold)),
+ onPressed: () => Navigator.of(context).pop(),
+ ),
+ ],
+ );
+ },
+ );
+ await AppInstaller.installApk(_apkFilePath); // 安装APK
+ // 如果2秒还没有进入安装引导页面 一律视为更新失败，弹出其他方式更新
+ Utils.getInstance().setTimeOut(1, () async {
+ try {
+ // 其他方式下载
+ // await SystemNavigator.pop(); // 退出APP
+ var options = ['应用市场更新APP', '浏览器下载并安装APP'];
+ var uri =
+ Uri.parse('market://details?id=${event.packageName}'); // 应用市场URI
+ if (!await canLaunchUrl(uri))
+ options.removeAt(0); // 如果不能打开应用市场 就屏蔽掉 这个安装方式
+ String? option = await UpgradePermission.showCustomModalBottomSheet(
+ context, options);
+ if (option == '应用市场更新APP') await launchUrl(uri);
+ if (option == '浏览器下载并安装APP') await launchUrl(Uri.parse(event.link));
+ } catch (_) {}
+ });
+
+ print('安装执行完成了..............0.0');
+ } catch (e) {
+ print('安装进入报错....');
+ print(e);
+ } finally {
+ logic.loadingApk.value = false;
+ }
+
+ return false;
+ }
+
+ /// 展示下载进度
+ static void showDownloadProgress(
+ context, num received, num total, UpgradeLogic logic) {
+ if (total != -1) {
+ double progress = double.parse((received / total).toStringAsFixed(2));
+ // debugPrint('下载进度$progress');
+ logic.downloadRatio.value = progress;
+ }
+ }
+}
+
+class RestartWidget extends StatefulWidget {
+ final Widget child;
+
+ const RestartWidget({super.key, required this.child});
+
+ static restartApp(BuildContext context) {
+ final _RestartWidgetState? state =
+ context.findAncestorStateOfType<_RestartWidgetState>();
+ state?.restartApp();
+ }
+
+ @override
+ State createState() => _RestartWidgetState();
+}
+
+class _RestartWidgetState extends State {
+ Key key = UniqueKey();
+
+ void restartApp() {
+ setState(() {
+ key = UniqueKey();
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return KeyedSubtree(
+ key: key,
+ child: widget.child,
+ );
+ }
+}
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart
new file mode 100644
index 0000000..8b60c11
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart
@@ -0,0 +1,223 @@
+/*
+ * @Author: wangyang 1147192855@qq.com
+ * @Date:
+ * @LastEditors: wangyang 1147192855@qq.com
+ * @LastEditTime: 2022-09-29 10:11:54
+ * @FilePath: \marking_app\lib\utils\app_upgrade\UpdateDialog.dart
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+/*
+ * @Descripttion: 版本更新提示弹窗
+ * @version:
+ * @Author: wy
+ * @Date: 2020-07-30 14:03:28
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-01-12 15:08:43
+ */
+import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
+import 'package:get/get.dart';
+import 'package:making_school_asignment_app/common/utils/app_upgrade/DownloadApk.dart';
+import 'package:making_school_asignment_app/common/utils/app_upgrade/UpgradePermission.dart';
+import 'package:making_school_asignment_app/common/utils/app_upgrade/upgradeLogic.dart';
+import 'package:making_school_asignment_app/common/utils/utils.dart';
+import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
+import 'package:percent_indicator/linear_percent_indicator.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+import '../anti_shake_throttling.dart';
+import 'model/UpdateAppEvent.dart';
+
+class UpdateDialog extends Dialog {
+ final UpdateAppEvent updateAppEvent;
+ final String deviceInfo;
+
+ const UpdateDialog({super.key, required this.updateAppEvent, required this.deviceInfo});
+
+ @override
+ Widget build(BuildContext context) {
+ return Center(
+ child: Container(
+ width: isPad() ? ScreenUtil().screenWidth * 0.62 : 319.w,
+ height: 440.h,
+ padding: EdgeInsets.symmetric(vertical: 8.h),
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(18.sp),
+ image: const DecorationImage(
+ alignment: Alignment.topCenter,
+ image: AssetImage("assets/images/upgrade_dialog_bgc.png"),
+ fit: BoxFit.fitWidth,
+ ),
+ ),
+ child: Column(
+ children: [
+ Expanded(
+ child: ListView(
+ physics: const BouncingScrollPhysics(),
+ padding: EdgeInsets.fromLTRB(16.w, 0, 16.w, 0),
+ children: [
+ Container(
+ alignment: Alignment.center,
+ margin: EdgeInsets.only(top:isPad()? 136.h : 128.h, bottom: 10.h),
+ child: quickText(
+ updateAppEvent.title,
+ size: 18.sp,
+ fontWeight: FontWeight.w600,
+ color: const Color.fromRGBO(58, 90, 159, 1),
+ ),
+ ),
+ HtmlWidget(
+ updateAppEvent.description,
+ customStylesBuilder: (element) {
+ return {'color': '#666666', 'font-weight': 'normal', 'text-decoration': 'none'};
+ },
+ onLoadingBuilder: (context, element, loadingProgress) => const CircularProgressIndicator(),
+ renderMode: RenderMode.column,
+ textStyle: TextStyle(fontSize: 14.sp, color: Colors.black87),
+ )
+ ],
+ ),
+ ),
+ DownloadProgress(),
+ DownloadButton(updateAppEvent, deviceInfo: deviceInfo),
+ ],
+ ),
+ ),
+ );
+ }
+
+ // 调起
+ static showUpdateDialog(BuildContext context, UpdateAppEvent updateAppEvent) {
+ return showDialog(
+ barrierDismissible: false,
+ context: context,
+ builder: (BuildContext context) {
+ return WillPopScope(
+ onWillPop: () async => false,
+ child: UpdateDialog(updateAppEvent: updateAppEvent, deviceInfo: updateAppEvent.deviceInfo),
+ );
+ },
+ );
+ }
+}
+
+// 进度条
+class DownloadProgress extends StatelessWidget {
+ DownloadProgress({super.key});
+ final logic = Get.find();
+
+ @override
+ Widget build(BuildContext context) {
+ return Obx(() {
+ var str = (logic.downloadRatio.value * 100).toString().split('.')[0];
+ if (logic.downloadRatio.value <= 0) return Container();
+ return Column(
+ mainAxisSize: MainAxisSize.min,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ LinearPercentIndicator(
+ alignment: MainAxisAlignment.center,
+ width: isPad() ? ScreenUtil().screenWidth * 0.55 : 245.w,
+ animation: false,
+ lineHeight: 20.0.h,
+ percent: logic.downloadRatio.value,
+ center: quickText(
+ "$str%",
+ size: 14.sp,
+ align: TextAlign.center,
+ color: Colors.white,
+ ),
+ linearStrokeCap: LinearStrokeCap.roundAll,
+ progressColor: Theme.of(context).primaryColor,
+ ),
+ Container(
+ height: 6.h,
+ ),
+ quickText('更新中...', size: 12.sp, fontWeight: FontWeight.w500, color: const Color.fromRGBO(90, 90, 90, 1))
+ ],
+ );
+ });
+ }
+}
+
+// 点击下载按钮
+class DownloadButton extends StatelessWidget {
+ final UpdateAppEvent updateAppEvent;
+ final String deviceInfo;
+ DownloadButton(this.updateAppEvent, {required this.deviceInfo, super.key});
+ final logic = Get.find();
+
+ // 打开浏览器或者对应的对应市场进行下载
+ Future toLaunch(UpdateAppEvent data) async {
+ var uri = Uri.parse('market://details?id=${updateAppEvent.packageName}');
+ if (await canLaunchUrl(uri)) {
+ // 跳进对应的应用市场进行更新操作
+ return await launchUrl(uri);
+ }
+ // 无法进入应用市场就打开浏览器进行下载
+ uri = Uri.parse(data.link);
+ if (await canLaunchUrl(uri)) return await launchUrl(uri);
+ return false;
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Obx(() {
+ final count = logic.downloadRatio.value;
+ if (count > 0) return Container();
+ var primaryColor = Theme.of(context).primaryColor;
+
+ if (updateAppEvent.equipment == Equipment.windows) {
+ return SizedBox(
+ child: quickText('若没有弹出更新弹框，可关闭APP重新打开执行更新...', size: 16.sp),
+ );
+ }
+
+ return Container(
+ height: 38.h,
+ width: isPad() ? ScreenUtil().screenWidth * 0.45 : 245.w,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.all(Radius.circular(42.h)),
+ gradient: LinearGradient(colors: [primaryColor, primaryColor.withOpacity(0.7)]),
+ ),
+ child: MaterialButton(
+ onPressed: () => easyThrottle('DownloadButton_App_Upgrade', duration: const Duration(milliseconds: 1000), () async {
+ if (deviceInfo == "android" && updateAppEvent.equipment == Equipment.android) {
+ // 权限检查 判断是否有读写内存的权限
+ bool flag = await UpgradePermission(updateAppEvent.deviceInfo).checkPermission(context, updateAppEvent);
+ if (flag) {
+ flag = await DownloadApk.installApk(context, updateAppEvent, logic);
+ if (!flag) {
+ print('执行到了重置更新按钮的地方....');
+ logic.downloadRatio.value = 0.0; // 更新失败重置 更新按钮
+ } else {
+ print('更新成功重新打开APP..............');
+ RestartWidget.restartApp(context); // 安装成功 重启APP
+ }
+ return;
+ }
+ // await FlutterClipboard.copy(updateAppEvent.link);
+ // setTimeOut(1000, () => ToastUtils.showInfo('下载链接已经复制到设备，可前往浏览器下载安装'));
+ } else if (deviceInfo == "ios" && updateAppEvent.equipment == Equipment.ios) {
+ try {
+ print(updateAppEvent.link);
+ await launchUrlString(updateAppEvent.link);
+ } catch (e) {
+ print('进来更新报错$e');
+ }
+ }
+ // else if (deviceInfo == 'windows' && updateAppEvent.equipment == Equipment.windows) {
+ // await autoUpdater.setFeedURL(updateAppEvent.link);
+ // await autoUpdater.checkForUpdates();
+ // await autoUpdater.setScheduledCheckInterval(0);
+ // }
+ }),
+ child: quickText(!logic.loadingApk.value ? '立即体验' : '正在下载...', size: 16.sp, color: Colors.white, fontWeight: FontWeight.w500),
+ ),
+ );
+ });
+ }
+}
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/UpgradePermission.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/UpgradePermission.dart
new file mode 100644
index 0000000..eb95444
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/UpgradePermission.dart
@@ -0,0 +1,143 @@
+/*
+ * @Descripttion: 获取本地权限
+ * @version: UpgradePermission
+ * @Author: wy
+ * @Date: 2020-07-30 15:41:39
+ * @LastEditors: wangyang 1147192855@qq.com
+ * @LastEditTime: 2022-08-01 14:08:57
+ */
+import 'package:app_installer/app_installer.dart';
+import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import 'model/UpdateAppEvent.dart';
+
+class UpgradePermission {
+ final String _flatform;
+ const UpgradePermission(this._flatform);
+
+ /// 检查是否有权限，用于安卓
+ /// noExecutions 执行次数
+ Future checkPermission(BuildContext context, UpdateAppEvent updateAppEvent, [int? noExecutions]) async {
+ noExecutions ??= 1;
+ if (_flatform != 'android') return true; // 非安卓
+ var status = await Permission.storage.request();
+ if (status.isGranted) return true;
+
+ if (status.isDenied) {
+ // 普通拒绝 可以再进行提示
+
+ await showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ title: const Text("权限提示"),
+ content: const Text("无法获取存储权限，请同意获取设备存储权限"),
+ actions: [
+ MaterialButton(
+ color: Theme.of(context).primaryColor,
+ child: const Text("同意", style: TextStyle(color: Colors.white)),
+ onPressed: () => Navigator.of(context).pop(),
+ ),
+ ],
+ );
+ },
+ );
+
+ if (noExecutions < 2) return checkPermission(context, updateAppEvent, ++noExecutions);
+ // 执行次数大于2次，就不再询问直接打开设置权限页面（防止某些机型不会弹起权限询问交互弹框）
+ }
+
+ // 拒绝并不再提示
+ bool? res = await showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ title: const Text("权限提示"),
+ content: const Text("储存权限被永久拒绝，并且不再提示。请前往设置页面同意储存权限"),
+ actions: [
+ MaterialButton(
+ color: Colors.green.shade900,
+ child: const Text("其它方式更新", style: TextStyle(color: Colors.white)),
+ onPressed: () => Navigator.of(context).pop(false),
+ ),
+ MaterialButton(
+ color: Theme.of(context).primaryColor,
+ child: const Text("前往设置", style: TextStyle(color: Colors.white)),
+ onPressed: () => Navigator.of(context).pop(true),
+ ),
+ ],
+ );
+ },
+ );
+ if (res == null || !res) {
+ // 其他方式下载
+ // await SystemNavigator.pop(); // 退出APP
+ var options = ['应用市场更新APP', '浏览器下载并安装APP'];
+ var uri = Uri.parse('market://details?id=${updateAppEvent.packageName}'); // 应用市场URI
+ // if (!await canLaunchUrl(uri)) options.removeAt(0); // 如果不能打开应用市场 就屏蔽掉 这个安装方式
+ String? option = await showCustomModalBottomSheet(context, options);
+ if (option == '应用市场更新APP') {
+ if (await canLaunchUrl(uri)) {
+ await launchUrl(uri);
+ } else {
+ await AppInstaller.goStore(updateAppEvent.packageName, 'iOSAppId');
+ }
+ }
+ if (option == '浏览器下载并安装APP') await launchUrl(Uri.parse(updateAppEvent.link));
+ } else
+ await openAppSettings();
+ return false;
+ }
+
+ // 其他方式下载选择
+ static Future showCustomModalBottomSheet(context, List options) async {
+ return showModalBottomSheet(
+ backgroundColor: Colors.transparent,
+ isScrollControlled: true,
+ context: context,
+ builder: (BuildContext context) {
+ return Container(
+ clipBehavior: Clip.antiAlias,
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.only(
+ topLeft: const Radius.circular(20.0),
+ topRight: const Radius.circular(20.0),
+ ),
+ ),
+ height: MediaQuery.of(context).size.height / 4.0,
+ child: Column(children: [
+ SizedBox(
+ height: 50,
+ child: Stack(
+ textDirection: TextDirection.rtl,
+ children: [
+ Center(child: Text('选择其它方式更新APP', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0))),
+ IconButton(icon: Icon(Icons.close), onPressed: () => Navigator.of(context).pop()),
+ ],
+ ),
+ ),
+ Divider(height: 1.0),
+ Expanded(
+ child: ListView.builder(
+ itemCount: options.length,
+ itemBuilder: (BuildContext context, int index) {
+ var name = options[index];
+ return ListTile(
+ title: Text(name),
+ trailing: Icon(name.contains('浏览器') ? Icons.browser_updated_outlined : Icons.local_grocery_store_outlined),
+ onTap: () => Navigator.of(context).pop(name),
+ );
+ },
+ ),
+ ),
+ ]),
+ );
+ },
+ );
+ }
+}
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/model/UpdateAppEvent.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/model/UpdateAppEvent.dart
new file mode 100644
index 0000000..da3fbf3
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/model/UpdateAppEvent.dart
@@ -0,0 +1,83 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: wy
+ * @Date: 2020-07-30 14:10:44
+ * @LastEditors: wangyang 1147192855@qq.com
+ * @LastEditTime: 2022-09-28 18:20:11
+ */
+
+class UpdateAppEvent {
+ final String version;
+ final String title;
+ final String description;
+ final String link;
+ final bool upgrade;
+ final String deviceInfo;
+ final String appName;
+ final String packageName;
+ final Equipment equipment;
+ num? v;
+ num? lv;
+
+ UpdateAppEvent({
+ required this.version,
+ required this.title,
+ required this.description,
+ required this.link,
+ required this.upgrade,
+ required this.deviceInfo,
+ required this.appName,
+ required this.packageName,
+ this.v,
+ this.lv,
+ int type = 0,
+ }) : equipment = Equipment.values[type];
+
+ factory UpdateAppEvent.fromJson(Map json, String localVersion, String deviceInfo, String appName, String packageName,
+ {String keyStr = "version", String typeName = "packageNameType"}) {
+ String version = json[keyStr]; // 版本号
+ String? descriptionStr = json["description"];
+
+ String newDescription = '系统有更新，请立即下载';
+ bool upgrade = false;
+ num? v;
+ num? lv;
+ // 版本号
+ if (version != '') {
+ v = num.parse(version.replaceAll(".", ""));
+ lv = num.parse(localVersion.replaceAll(".", ""));
+
+ // if (lv < v) upgrade = true;
+ //当前版本不等于线上版本更新为线上版本
+ if (lv != v) upgrade = true;
+ }
+
+ // 升级说明
+ if (descriptionStr != null && descriptionStr.isNotEmpty) {
+ newDescription = descriptionStr;
+ }
+
+ return UpdateAppEvent(
+ version: version, // 版本号
+ title: json["title"] ?? "发现新版本", // title
+ description: newDescription, //说明
+ link: json["downloadPath"]??'', // 链接地址
+ upgrade: upgrade,
+ deviceInfo: deviceInfo,
+ appName: appName,
+ packageName: packageName,
+ type: json[typeName] ?? 0,
+ v: v,
+ lv: lv,
+ );
+ }
+
+ @override
+ String toString() {
+ return "UpdateAppEvent { version: $version, title: $title, description: $description, link: $link}";
+ }
+}
+
+// 设备枚举
+enum Equipment { other, android, ios, windows }
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart
new file mode 100644
index 0000000..34ab6aa
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart
@@ -0,0 +1,156 @@
+import 'dart:io';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/widgets.dart';
+import 'package:get/get.dart';
+import 'package:making_school_asignment_app/common/job/app_version.dart';
+import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart';
+import 'package:making_school_asignment_app/common/store/user_store.dart';
+import 'package:making_school_asignment_app/common/utils/permission_describe_util.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+import 'UpdateDialog.dart';
+import 'model/UpdateAppEvent.dart';
+
+class UpgradeLogic extends GetxController with RequestToolMixin {
+ Rx showUpgrade = false.obs; // 是否已经显示升级弹窗
+ Rx loadingApk = false.obs; // 是否已经显示升级弹窗
+ Rx downloadRatio = 0.0.obs; // 下载比例
+
+ // @override
+ // void onInit() {
+
+ // super.onInit();
+ // }
+
+ Future getUpdateAppEvent() async {
+ // 获取设备信息
+ String deviceInfo;
+ int deviceType;
+ if (Platform.isAndroid) {
+ deviceInfo = "android";
+ deviceType = 1;
+ } else if (Platform.isIOS) {
+ deviceInfo = "ios";
+ deviceType = 2;
+ } else if (Platform.isWindows) {
+ deviceInfo = "windows";
+ deviceType = 3;
+ } else {
+ return null;
+ }
+
+ AppVersion? result = await getClient().getLastAppVersion('making_school_asignment_app', deviceType);
+ if (result == null) return null;
+
+ //获取当前版本
+ PackageInfo packageInfo = await PackageInfo.fromPlatform();
+ //获取当前版本
+ String localVersion = packageInfo.version;
+ String appName = packageInfo.appName; //应用名称
+ String packageName = packageInfo.packageName; //包名称
+ // String buildNumber = packageInfo.buildNumber; //小版本号
+
+ Map json = {
+ 'downloadPath': Platform.isWindows ? '' : result.appFileUrl,
+ 'version': result.version,
+ 'systemType': deviceType,
+ 'description': result.description ?? 'APP新版本更新',
+ };
+ return UpdateAppEvent.fromJson(json, localVersion, deviceInfo, appName, packageName, typeName: 'systemType');
+ }
+
+ Future getAppUpgrade(BuildContext context) async {
+ if (!const bool.fromEnvironment('dart.vm.product')) return;
+
+ try {
+ showUpgrade.value = true;
+
+ final names = [
+ UserStore.to.userDetailInfo.value?.name,
+ UserStore.to.userDetailInfo.value?.account,
+ ].whereType().where((name) => name.isNotEmpty).toList();
+ if (names.contains('AppleTester')) return;
+
+ UpdateAppEvent? updateAppEvent = await getUpdateAppEvent();
+ if (updateAppEvent != null && updateAppEvent.upgrade) {
+ if (Platform.isAndroid) {
+ DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
+ AndroidDeviceInfo androidInfo = await deviceInfoPlugin.androidInfo;
+ Permission storagePermission;
+ if (androidInfo.version.sdkInt >= 33) {
+ storagePermission = Permission.manageExternalStorage;
+ } else {
+ storagePermission = Permission.storage;
+ }
+ await PermissionDescribeUtil.instance.toLaunchPermissionRequest(
+ Get.context ?? context,
+ title: '储存权限请求',
+ describe: "为了提供更好的服务，需要获取到存储权限用于保存APP升级文件APK，进行升级",
+ permissions: [storagePermission],
+ );
+ }
+
+ await UpdateDialog.showUpdateDialog(
+ Get.context ?? context,
+ updateAppEvent,
+ );
+ }
+ /**
+ // 获取设备信息
+ String deviceInfo;
+ int deviceType;
+ if (Platform.isAndroid) {
+ deviceInfo = "android";
+ deviceType = 1;
+ } else if (Platform.isIOS) {
+ deviceInfo = "ios";
+ deviceType = 2;
+ } else if (Platform.isWindows) {
+ deviceInfo = "windows";
+ deviceType = 3;
+ } else {
+ return false;
+ }
+
+ if (result != null) {
+ //获取当前版本
+ PackageInfo packageInfo = await PackageInfo.fromPlatform();
+ //获取当前版本
+ String localVersion = packageInfo.version;
+ String appName = packageInfo.appName; //应用名称
+ String packageName = packageInfo.packageName; //包名称
+ // String buildNumber = packageInfo.buildNumber; //小版本号
+
+ Map json = {'downloadPath': Platform.isWindows ? '' : result.appFileUrl, 'version': result.version, 'systemType': deviceType, 'description': result.description ?? 'APP新版本更新'};
+ UpdateAppEvent updateAppEvent = UpdateAppEvent.fromJson(json, localVersion, deviceInfo, appName, packageName, typeName: 'systemType');
+ if (updateAppEvent.upgrade) {
+ if (Platform.isAndroid) {
+ DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
+ AndroidDeviceInfo androidInfo = await deviceInfoPlugin.androidInfo;
+ Permission storagePermission;
+ if (androidInfo.version.sdkInt >= 33) {
+ storagePermission = Permission.manageExternalStorage;
+ } else {
+ storagePermission = Permission.storage;
+ }
+ await PermissionDescribeUtil.instance.toLaunchPermissionRequest(
+ Get.context ?? context,
+ title: '储存权限请求',
+ describe: "为了提供更好的服务，需要获取到存储权限用于保存APP升级文件APK，进行升级",
+ permissions: [storagePermission],
+ );
+ }
+
+ await UpdateDialog.showUpdateDialog(
+ Get.context ?? context,
+ updateAppEvent,
+ );
+ }
+ }
+ */
+ } finally {
+ showUpgrade.value = false;
+ }
+ }
+}
diff --git a/making_school_asignment_app/lib/common/utils/cached_network_img.dart b/making_school_asignment_app/lib/common/utils/cached_network_img.dart
new file mode 100644
index 0000000..36616c0
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/cached_network_img.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
+import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
+import 'package:functional_widget_annotation/functional_widget_annotation.dart';
+
+part 'cached_network_img.g.dart';
+
+@hwidget
+Widget $theCachedNetworkImage(ImageWidgetBuilder imageBuilder, {required String imageUrl, double? imgWidth}) {
+ UseCachedImgRefresh useImgRefsh = UseCachedImgRefresh.use();
+
+ return CachedNetworkImage(
+ key: useImgRefsh.imageKey.value,
+ cacheKey: imageUrl,
+ fit: BoxFit.fitWidth,
+ width: imgWidth ?? double.infinity,
+ imageUrl: imageUrl,
+ imageBuilder: imageBuilder,
+ placeholder: (context, url) => Center(child: SpinKitWave(color: Theme.of(context).primaryColor, size: 50.r)),
+ errorListener: (e) {
+ // print('图片报错.............$e');
+ },
+ errorWidget: (context, url, error) {
+ return GestureDetector(
+ onTap: () => (useImgRefsh.imageKey.value = UniqueKey()),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Image.asset('assets/images/test_paper_loading_failed.png'),
+ quickText('加载失败，点击重试', color: const Color.fromRGBO(148, 163, 182, 1), size: 12.sp),
+ ],
+ ),
+ );
+ },
+ );
+}
+
+// CachedNetworkImage 重新加载图片
+class UseCachedImgRefresh {
+ ValueNotifier refreshNumber;
+ ValueNotifier imageKey;
+
+ UseCachedImgRefresh._({required this.refreshNumber, required this.imageKey});
+
+ // 工厂构造函数
+ factory UseCachedImgRefresh.use() {
+ return UseCachedImgRefresh._(refreshNumber: useState(0), imageKey: useState(UniqueKey()));
+ }
+}
diff --git a/lib/common/utils/enum_untils.dart b/making_school_asignment_app/lib/common/utils/enum_untils.dart
similarity index 74%
rename from lib/common/utils/enum_untils.dart
rename to making_school_asignment_app/lib/common/utils/enum_untils.dart
index ff01799..106832b 100644
--- a/lib/common/utils/enum_untils.dart
+++ b/making_school_asignment_app/lib/common/utils/enum_untils.dart
@@ -1,7 +1,7 @@
-import 'package:school_asignment_app/common/job/enum_subject.dart';
-import 'package:school_asignment_app/common/store/user_store.dart';
+import 'package:making_school_asignment_app/common/job/enum_subject.dart';
+import 'package:making_school_asignment_app/common/store/user_store.dart';
-class EnumUtils{
+class EnumUtils {
static String formatSubject(int id) {
if (UserStore.to.subjectList.isEmpty || id == null) {
return '';
@@ -17,4 +17,4 @@ class EnumUtils{
EnumSubject item = UserStore.to.gradeList.firstWhere((element) => element.id == id);
return item.name ?? '';
}
-}
\ No newline at end of file
+}
diff --git a/making_school_asignment_app/lib/common/utils/event_bus_utils.dart b/making_school_asignment_app/lib/common/utils/event_bus_utils.dart
new file mode 100644
index 0000000..b7451d1
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/event_bus_utils.dart
@@ -0,0 +1,26 @@
+import 'package:event_bus/event_bus.dart';
+
+//订阅者回调签名
+typedef EventCallback = void Function(dynamic arg);
+
+///事件总线
+class EventBusUtils {
+ late final EventBus _eventBus;
+
+ // 单例模式
+ static final EventBusUtils _instance = EventBusUtils._internal();
+ factory EventBusUtils() => _instance;
+ EventBusUtils._internal() {
+ _eventBus = EventBus();
+ }
+
+ // 获取实例
+ EventBus getEventBus() {
+ return _eventBus;
+ }
+
+ // 发起事件
+ void toFire(T model) {
+ _eventBus.fire(model);
+ }
+}
diff --git a/making_school_asignment_app/lib/common/utils/my_time_util.dart b/making_school_asignment_app/lib/common/utils/my_time_util.dart
new file mode 100644
index 0000000..237cfbd
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/my_time_util.dart
@@ -0,0 +1,65 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'my_time_util.g.dart';
+
+// 毫秒转小时、分钟、秒的函数
+TimeUnitModel? convertMilliseconds(int milliseconds) {
+ try {
+ int hours = milliseconds ~/ (1000 * 60 * 60);
+ int minutes = (milliseconds % (1000 * 60 * 60)) ~/ (1000 * 60);
+ int seconds = (milliseconds % (1000 * 60)) ~/ 1000;
+
+ if ((milliseconds % 1000) > 500) seconds += 1;
+
+ return TimeUnitModel(hours, minutes, seconds);
+ } catch (e) {
+ print('时间转换报错');
+ }
+ return null;
+}
+
+// 毫秒转小时、分钟、秒的函数
+TimeUnitModel? convertSeconds(int totalSeconds) {
+ try {
+ int hours = totalSeconds ~/ 3600; // 整除3600得到小时数
+ int remainingSeconds = totalSeconds % 3600; // 取模3600得到剩余的秒数
+ int minutes = remainingSeconds ~/ 60; // 整除60得到分钟数
+ int seconds = remainingSeconds % 60; // 取模60得到最终的秒数
+
+ return TimeUnitModel(hours, minutes, seconds);
+ } catch (e) {
+ print('时间转换报错');
+ }
+ return null;
+}
+
+@JsonSerializable()
+class TimeUnitModel extends Object {
+ int hours;
+ int minutes;
+ int seconds;
+ TimeUnitModel(this.hours, this.minutes, this.seconds);
+
+ factory TimeUnitModel.fromJson(Map srcJson) => _$TimeUnitModelFromJson(srcJson);
+
+ Map toJson() => _$TimeUnitModelToJson(this);
+
+ @override
+ String toString() {
+ var timeStr = '';
+ if (hours > 0) {
+ timeStr += '${hours > 9 ? hours : '0' + hours.toString()} ';
+ }
+ if (minutes > 0) {
+ timeStr += '${minutes > 9 ? minutes : '0' + minutes.toString()}';
+ }
+
+ if (timeStr.length > 0) {
+ timeStr += ':${seconds > 9 ? seconds : '0' + seconds.toString()}';
+ } else {
+ timeStr += '00:${seconds > 9 ? seconds : '0' + seconds.toString()}';
+ }
+
+ return timeStr;
+ }
+}
diff --git a/making_school_asignment_app/lib/common/utils/permission_describe_util.dart b/making_school_asignment_app/lib/common/utils/permission_describe_util.dart
new file mode 100644
index 0000000..4c90103
--- /dev/null
+++ b/making_school_asignment_app/lib/common/utils/permission_describe_util.dart
@@ -0,0 +1,301 @@
+import 'dart:async';
+
+import 'package:app_settings/app_settings.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class PermissionDescribePage extends StatefulWidget {
+ final String title;
+ final String describe;
+ final List permissions;
+
+ const PermissionDescribePage(
+ {required this.title,
+ required this.describe,
+ required this.permissions,
+ super.key});
+
+ @override
+ State createState() => _PermissionDescribePageState();
+}
+
+class _PermissionDescribePageState extends State
+ with WidgetsBindingObserver {
+ Timer? _timerPermission;
+ bool theOpenAppSettings = false;
+ int theExecutionFrequency = 0;
+
+ @override
+ void initState() {
+ WidgetsBinding.instance.addObserver(this);
+
+ Future.delayed(const Duration(seconds: 3), () {
+ getCheckPermission(context);
+ });
+ super.initState();
+ }
+
+ @override
+ void didChangeAppLifecycleState(AppLifecycleState state) {
+ print("-didChangeAppLifecycleState-" + state.toString());
+ switch (state) {
+ case AppLifecycleState.inactive: // 处于这种状态的应用程序应该假设它们可能在任何时候暂停。
+ break;
+ case AppLifecycleState.resumed: //从后台切换前台，界面可见
+ if (theOpenAppSettings) {
+ getCheckPermission(context);
+ }
+ break;
+ case AppLifecycleState.paused: // 界面不可见，后台
+ break;
+ case AppLifecycleState.detached: // APP结束时调用
+ break;
+ case AppLifecycleState.hidden:
+ // TODO: Handle this case.
+ }
+ }
+
+ @override
+ void dispose() {
+ _timerPermission?.cancel();
+ WidgetsBinding.instance.removeObserver(this);
+ super.dispose();
+ }
+
+ void getCheckPermission(BuildContext context) async {
+ theOpenAppSettings = false;
+ theExecutionFrequency++;
+
+ List permissions = []; // 普通拒绝
+ List permanentRefusal = []; // 永久拒绝
+ for (var i = 0; i < widget.permissions.length; i++) {
+ var p = widget.permissions[i];
+ var status = await p.status;
+ var shouldShowRequestRationale = await p.shouldShowRequestRationale;
+ if (!status.isGranted) {
+ if (status.isDenied) {
+ if (shouldShowRequestRationale) {
+ /// 说明情况，再次發起权限请求（已经拒绝一次了）
+ await showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ title: quickText(widget.title, fontWeight: FontWeight.bold),
+ content: quickText(widget.describe, maxLines: 20),
+ actions: [
+ ElevatedButton(
+ onPressed: () async => Navigator.of(context).pop(),
+ child: const Text('我已知晓'),
+ )
+ ],
+ );
+ },
+ );
+ }
+ permissions.add(p);
+ } else if (await status.isPermanentlyDenied) {
+ permanentRefusal.add(p);
+ }
+ }
+ }
+
+ if (permissions.isNotEmpty) {
+ // 普通拒绝
+ permanentRefusal.addAll(await getStoragePermission(context, permissions));
+ }
+
+ if (permanentRefusal.isNotEmpty) {
+ /// 被永久拒绝了 需要弹出对话框说明 使用户自行操作
+ await showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ content: quickText(widget.describe, maxLines: 20),
+ title: quickText(widget.title, fontWeight: FontWeight.bold),
+ actions: [
+ ElevatedButton(
+ onPressed: () async {
+ Navigator.of(context).pop();
+ theOpenAppSettings = true;
+ await AppSettings.openAppSettings(asAnotherTask: true);
+ },
+ child: const Text('前往APP权限设置'),
+ )
+ ],
+ );
+ },
+ );
+ } else {
+ Navigator.of(Get.context ?? context).pop();
+ }
+ }
+
+ /// 权限发起请求
+ /// @param List permissions 权限集合
+ Future> getStoragePermission(
+ BuildContext context, List permissions,
+ [int executionFrequency = 0]) async {
+ Map statusRes = await permissions.request();
+
+ List permanentRefusal = []; // 永久拒绝
+
+ List