marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
Conversation 0 Commits 179 Files Changed 699 +117 -188
16 changed files with 117 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fcee86343c - Show all commits

0
making_school_asignment_app/assets/images/ic_home_press.png → making_school_asignment_app/assets/images/ic_home_active.png
View File

Side by Side

After

Width:  |  Height:  |  Size: 797 B

0
making_school_asignment_app/assets/images/ic_mine_press.png → making_school_asignment_app/assets/images/ic_mine_active.png
View File

Side by Side

After

Width:  |  Height:  |  Size: 772 B

0
making_school_asignment_app/assets/images/ic_work_press.png → making_school_asignment_app/assets/images/ic_work_active.png
View File

Side by Side

After

Width:  |  Height:  |  Size: 888 B

0
making_school_asignment_app/assets/images/login_logo.png → making_school_asignment_app/assets/images/login_logo_icon.png
View File

Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

BIN
making_school_asignment_app/assets/images/out_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
making_school_asignment_app/assets/images/personal_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 KiB

BIN
making_school_asignment_app/assets/images/personal_bgi.png
View File

Binary file not shown.

6
making_school_asignment_app/lib/page/global_widget/start_page.dart
View File

@ -170,17 +170,17 @@ class _StartPageState extends State<StartPage> with RequestToolMixin {
BottomNavigationBarItem(
label: '作业',
icon: getItemIcon('assets/images/ic_home_normal.png'),
activeIcon: getItemIcon('assets/images/ic_home_press.png'),
activeIcon: getItemIcon('assets/images/ic_home_active.png'),
),
BottomNavigationBarItem(
label: '考试',
icon: getItemIcon('assets/images/ic_work_normal.png'),
activeIcon: getItemIcon('assets/images/ic_work_press.png'),
activeIcon: getItemIcon('assets/images/ic_work_active.png'),
),
BottomNavigationBarItem(
label: '我的',
icon: getItemIcon('assets/images/ic_mine_normal.png'),
activeIcon: getItemIcon('assets/images/ic_mine_press.png'),
activeIcon: getItemIcon('assets/images/ic_mine_active.png'),
),
],
//设置显示的模式

4
making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart
View File

@ -89,7 +89,7 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
return Icon(
const IconData(0xe635, fontFamily: "AlibabaIcon"),
size: iconSize,
color: _logicControl.pen.value ? actionColor : defaultColor,
color: _logicControl.pen.value ? Theme.of(context).primaryColor : defaultColor,
);
}),
onPressed: () => easyThrottle('homework_bottom_action_bar_annotations', () {
@ -211,7 +211,7 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
height: double.infinity,
child: TextButton(
onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.submit(context)),
child: quickText('提 交', size: 14.sp, color: const Color.fromRGBO(76, 199, 147, 1)),
child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor),
),
),
),

4
making_school_asignment_app/lib/page/home_page/children/homework_review/components/dropdown_switch_students_type.dart
View File

@ -115,7 +115,7 @@ class _DropdownSwitchStudentsTypeState extends State<DropdownSwitchStudentsType>
Icon(
const IconData(0xe63d, fontFamily: "AlibabaIcon"),
size: 12.sp,
color: e.isPriority ? const Color.fromRGBO(76, 199, 147, 1) : const Color.fromRGBO(164, 164, 164, 1),
color: e.isPriority ? Theme.of(context).primaryColor : const Color.fromRGBO(164, 164, 164, 1),
),
quickText('优先', size: 4.sp, color: Colors.white),
],
@ -142,7 +142,7 @@ class _DropdownSwitchStudentsTypeState extends State<DropdownSwitchStudentsType>
return Icon(
const IconData(0xe63d, fontFamily: "AlibabaIcon"),
size: 12.sp,
color: sateData.value?.priority ?? false ? const Color.fromRGBO(76, 199, 147, 1) : const Color.fromRGBO(164, 164, 164, 1),
color: sateData.value?.priority ?? false ? Theme.of(context).primaryColor : const Color.fromRGBO(164, 164, 164, 1),
);
}),
quickText('优先', size: 4.sp, color: Colors.white),

13
making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart
View File

@ -212,8 +212,7 @@ Widget $totalSubmitCountView(
fontFamily: "AlibabaIcon"),
size: 12.sp,
color: e.isPriority
? const Color.fromRGBO(
76, 199, 147, 1)
? Theme.of(context).primaryColor
: const Color.fromRGBO(
164, 164, 164, 1),
),
@ -244,7 +243,7 @@ Widget $totalSubmitCountView(
color: const Color.fromRGBO(117, 117, 117, 1), size: 10.sp),
),
quickText(data.annotatedCount,
color: const Color.fromRGBO(76, 199, 147, 1),
color: Theme.of(context).primaryColor,
size: 12.sp,
fontWeight: FontWeight.bold),
quickText('/',
@ -390,7 +389,7 @@ Widget $scoringQuestionsView(
child: Icon(
size: 22.sp,
color: studentScore.value == 2
? const Color.fromRGBO(255, 152, 0, 1)
? const Color(0xFF54971F)
: const Color.fromRGBO(114, 114, 114, 1),
const IconData(0xe62b, fontFamily: "AlibabaIcon"),
),
@ -416,7 +415,7 @@ Widget $scoringQuestionsView(
child: Icon(
size: 22.sp,
color: studentScore.value == 1
? const Color.fromRGBO(255, 152, 0, 1)
? const Color(0xFF54971F)
: const Color.fromRGBO(114, 114, 114, 1),
const IconData(0xe62c, fontFamily: "AlibabaIcon"),
),
@ -442,7 +441,7 @@ Widget $scoringQuestionsView(
child: Icon(
size: 22.sp,
color: studentScore.value == 0
? const Color.fromRGBO(255, 152, 0, 1)
? const Color(0xFF54971F)
: const Color.fromRGBO(114, 114, 114, 1),
const IconData(0xe62a, fontFamily: "AlibabaIcon"),
),
@ -472,7 +471,7 @@ Widget $scoringQuestionsView(
percent: item.correctRate / 100,
barRadius: Radius.circular(1.2.r),
alignment: MainAxisAlignment.center,
progressColor: const Color.fromRGBO(76, 199, 147, 0.6),
progressColor: Theme.of(context).primaryColor,
backgroundColor: const Color(0xFFB8C7CB).withOpacity(0.35),
center: quickText("${item.correctRate}%",
size: 5.sp,

184
making_school_asignment_app/lib/page/home_page/children/my_info.dart
View File

@ -83,7 +83,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
width: double.infinity,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/personal_bgi.png'),
image: AssetImage('assets/images/personal_bg.png'),
fit: BoxFit.cover,
),
),
@ -99,24 +99,20 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
child: Scaffold(
backgroundColor: Colors.transparent,
body: Column(
children: [
Stack(
alignment: const FractionalOffset(0.04, 0.1),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
height: 180.h,
alignment: Alignment.center,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
height: 150.h,
padding: EdgeInsets.only(left: 20.r,right: 20.r),
// alignment: Alignment.center,
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
height: 10.r,
),
Image.asset(
'assets/images/default_user_dead.png',
),
SizedBox(
height: 10.r,
width: 5.w,
),
InkWell(
onTap: () {
@ -129,26 +125,26 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
child: Text(
userInfo.value?.name ?? '请前往登录',
style: TextStyle(
fontSize: 13.sp, color: Colors.white),
fontSize: 16.sp, color: const Color(0xFF332A2A),fontWeight: FontWeight.w500),
),
),
),
const Spacer(),
InkWell(
onTap: (){
_showAlertDialog(context);
},
child: Image.asset('assets/images/out_icon.png'),
)
],
),
),
/* InkWell(
onTap: () => Get.back(),
child: Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white, size: 24.sp),
),*/
],
),
SizedBox(height: 14.h),
Container(
margin:
EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
margin: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w),
padding:
EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
height: 180.h,
EdgeInsets.symmetric(vertical: 15.h, horizontal: 16.w),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.w)),
color: Colors.white,
@ -161,10 +157,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
)
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('账号', style: personalInfoTitleStly),
@ -172,11 +165,25 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
style: personalInfoValStly)
],
),
Container(
height: 1.w,
color: const Color.fromRGBO(240, 243, 255, 1),
),
Row(
Container(
margin: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w),
padding:
EdgeInsets.symmetric(vertical: 15.h, horizontal: 16.w),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.w)),
color: Colors.white,
boxShadow: const [
BoxShadow(
color: Color.fromRGBO(46, 91, 255, 0.1),
offset: Offset.zero, //阴影y轴偏移量
blurRadius: 20, //阴影模糊程度
spreadRadius: 10, //阴影扩散程度
)
],
),
child:Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('所在学校', style: personalInfoTitleStly),
@ -184,44 +191,25 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
style: personalInfoValStly)
],
),
/* Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('担任职位', style: personalInfoTitleStly),
SizedBox(width: 20.w),
Expanded(
child: Text(
userInfo.value?.gender??'',
maxLines: 2,
textAlign: TextAlign.right,
overflow: TextOverflow.ellipsis,
style: personalInfoValStly,
),
)
],
),
Container(height: 1.w, color: const Color.fromRGBO(240, 243, 255, 1)),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('所授科目', style: personalInfoTitleStly),
Expanded(
child: Text(
userState.subjectIds.map((e) => getSubjectEnumName(e)).toList().join(','),
maxLines: 2,
textAlign: TextAlign.right,
overflow: TextOverflow.ellipsis,
style: personalInfoValStly,
),
)
],
),*/
Container(
height: 1.w,
color: const Color.fromRGBO(240, 243, 255, 1)),
Padding(
padding: EdgeInsets.only(top: 10.h),
child: InkWell(
margin: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w),
padding:
EdgeInsets.symmetric(vertical: 15.h, horizontal: 16.w),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.w)),
color: Colors.white,
boxShadow: const [
BoxShadow(
color: Color.fromRGBO(46, 91, 255, 0.1),
offset: Offset.zero, //阴影y轴偏移量
blurRadius: 20, //阴影模糊程度
spreadRadius: 10, //阴影扩散程度
)
],
),
child:InkWell(
onTap: () {
Get.toNamed(Routes.otherPage);
},
@ -237,67 +225,9 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
],
),
),
)
],
),
),
Expanded(
child: Column(
children: [
const Expanded(child: SizedBox()),
Container(
margin: EdgeInsets.only(bottom: 40.h),
alignment: Alignment.bottomCenter,
child: InkWell(
child: Container(
padding: EdgeInsets.symmetric(vertical: 14.h),
margin: EdgeInsets.only(right: 16.w, left: 16.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(6.w),
),
color: Colors.white,
boxShadow: [
BoxShadow(
color:
const Color.fromRGBO(46, 91, 255, 0.2),
offset: Offset(2.w, 2.h), //阴影y轴偏移量
blurRadius: 14, //阴影模糊程度
spreadRadius: 0.5, //阴影扩散程度
)
],
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.exit_to_app_outlined,
size: 13.sp,
color:
const Color.fromRGBO(148, 163, 182, 1),
),
Container(
width: 6.w,
),
Text(
'退出登录',
style: TextStyle(
color: const Color.fromRGBO(
148, 163, 182, 1),
fontSize: 13.sp),
),
],
),
),
onTap: () {
_showAlertDialog(context);
},
),
),
],
),
),
],
),
),

2
making_school_asignment_app/lib/page/home_page/children/read_over/widget/top_user_info.dart
View File

@ -34,7 +34,7 @@ class TopUserInfo extends StatelessWidget {
alignment: Alignment.center,
color: const Color.fromRGBO(163, 211, 255, 1),
padding: EdgeInsets.all(1.r),
child: Image.asset('assets/images/login_logo.png', width: 32.w, height: 32.w),
child: Image.asset('assets/images/login_logo_icon.png', width: 32.w, height: 32.w),
),
),
Container(

2
making_school_asignment_app/lib/page/home_page/widget/top_user_info.dart
View File

@ -34,7 +34,7 @@ class TopUserInfo extends StatelessWidget {
alignment: Alignment.center,
color: const Color.fromRGBO(163, 211, 255, 1),
padding: EdgeInsets.all(1.r),
child: Image.asset('assets/images/login_logo.png', width: 32.w, height: 32.w),
child: Image.asset('assets/images/login_logo_icon.png', width: 32.w, height: 32.w),
),
),
Container(

2
making_school_asignment_app/lib/page/login_page/children/register.dart
View File

@ -123,7 +123,7 @@ class _RegisterState extends State<Register> with RequestToolMixin {
child: SizedBox(
height: 86.w,
width: 86.w,
child: Image.asset('assets/images/login_logo.png', fit: BoxFit.cover),
child: Image.asset('assets/images/login_logo_icon.png', fit: BoxFit.cover),
),
),
Container(

2
making_school_asignment_app/lib/page/login_page/login_view.dart
View File

@ -75,7 +75,7 @@ class _LoginPageState extends State<LoginPage> {
child: SizedBox(
height: 77.w,
width: 77.w,
child: Image.asset('assets/images/login_logo.png',
child: Image.asset('assets/images/login_logo_icon.png',
fit: BoxFit.cover),
),
),