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 +428 -540
16 changed files with 428 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb4b5ae7a0 - Show all commits

BIN
making_school_asignment_app/android/app/src/main/res/drawable-v21/background.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 B

BIN
making_school_asignment_app/android/app/src/main/res/drawable/background.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 B

2
making_school_asignment_app/android/app/src/main/res/values-night-v31/styles.xml
View File

@ -6,7 +6,7 @@
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#42a5f5</item>
<item name="android:windowSplashScreenBackground">#eeeeee</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.

2
making_school_asignment_app/android/app/src/main/res/values-v31/styles.xml
View File

@ -6,7 +6,7 @@
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#42a5f5</item>
<item name="android:windowSplashScreenBackground">#eeeeee</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.

2
making_school_asignment_app/flutter_native_splash.yaml
View File

@ -5,7 +5,7 @@ flutter_native_splash:
# 如需恢复默认的白屏，执行如下命令
# flutter pub run flutter_native_splash:remove
# 设置闪屏页的默认态logo或背景图片路径
color: "#42a5f5"
color: "#eeeeee"
image_ios: assets/images/splash_native.png
background_image_android: assets/images/splash_native.png
android_12:

BIN
making_school_asignment_app/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 B

3
making_school_asignment_app/lib/main.dart
View File

@ -23,6 +23,7 @@ void main() async {
Get.testMode = true;
WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
/// 初始化本地存储
await Get.putAsync(() => StorageService().init());
@ -41,7 +42,7 @@ void main() async {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarColor: Colors.transparent, //状态栏背景颜色
statusBarIconBrightness: Brightness.dark // dark:一般显示黑色 light：一般显示白色
statusBarIconBrightness: Brightness.light // dark:一般显示黑色 light：一般显示白色
));
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.top, SystemUiOverlay.bottom]); // 屏幕刘海
await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]); // 屏幕强制竖屏

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

@ -1,6 +1,7 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
@ -36,7 +37,8 @@ class _StartPageState extends State<StartPage> with RequestToolMixin {
@override
void initState() {
super.initState();
FlutterNativeSplash.remove();
Future.delayed(const Duration(seconds: 3), () => FlutterNativeSplash.remove());
Get.put(HomeLogic());
Get.put(WorkLogic());
@ -87,6 +89,7 @@ class _StartPageState extends State<StartPage> with RequestToolMixin {
@override
Widget build(BuildContext context) {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarIconBrightness: Brightness.dark));
return WillPopScope(
child: Scaffold(
body: PageView(
@ -94,6 +97,11 @@ class _StartPageState extends State<StartPage> with RequestToolMixin {
physics: const BouncingScrollPhysics(),
onPageChanged: (index) {
_pageController._pageIndexState.pageIndex.value = index;
if (index == 2) {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarIconBrightness: Brightness.light));
} else {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarIconBrightness: Brightness.dark));
}
},
children: _bodyList,
),
@ -117,12 +125,15 @@ class _StartPageState extends State<StartPage> with RequestToolMixin {
),
],
//设置显示的模式
type: BottomNavigationBarType.fixed,
type: BottomNavigationBarType.shifting,
fixedColor: Theme.of(context).primaryColor,
unselectedItemColor: Colors.grey,
// unselectedItemColor: const Color.fromRGBO(80, 87, 103, 1),
// backgroundColor: Colors.white,
//设置当前的索引
currentIndex: _pageController._pageIndexState.pageIndex.value,
//tabBottom的点击监听
onTap: (index) {
print('appbar下标：${index}');
_pageController._pageIndexState.pageController.jumpToPage(index);
},
);

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

@ -66,118 +66,108 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
);
return OrientationBuilder(builder: (BuildContext context, Orientation orientation) {
return AnnotatedRegion(
value: const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
systemNavigationBarIconBrightness: Brightness.light,
statusBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.dark,
),
child: Stack(
children: [
SizedBox(
height: double.infinity,
child: Column(
children: [
Container(
height: 220.h,
width: double.infinity,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/personal_bgi.png'),
fit: BoxFit.cover,
),
return Stack(
children: [
SizedBox(
height: double.infinity,
child: Column(
children: [
Container(
height: 220.h,
width: double.infinity,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/personal_bgi.png'),
fit: BoxFit.cover,
),
),
Expanded(
child: Container(
color: const Color.fromRGBO(248, 248, 248, 1),
))
],
),
),
Expanded(
child: Container(
color: const Color.fromRGBO(248, 248, 248, 1),
))
],
),
SafeArea(
child: Scaffold(
backgroundColor: Colors.transparent,
body: Column(
children: [
Stack(
alignment: const FractionalOffset(0.04, 0.1),
children: [
Container(
height: 180.h,
alignment: Alignment.center,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: 10.r,
),
Image.asset(
'assets/images/default_user_dead.png',
),
SizedBox(
height: 10.r,
),
InkWell(
onTap: () {
/*if (tokenState == '' || userState.id == '') {
),
SafeArea(
child: Scaffold(
backgroundColor: Colors.transparent,
body: Column(
children: [
Stack(
alignment: const FractionalOffset(0.04, 0.1),
children: [
Container(
height: 180.h,
alignment: Alignment.center,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: 10.r,
),
Image.asset(
'assets/images/default_user_dead.png',
),
SizedBox(
height: 10.r,
),
InkWell(
onTap: () {
/*if (tokenState == '' || userState.id == '') {
toLoginPage(context);
}*/
},
child: Container(
margin: EdgeInsets.only(top: 0.h),
child: Text(
userInfo.value?.name ?? '请前往登录',
style: TextStyle(fontSize: 13.sp, color: Colors.white),
),
},
child: Container(
margin: EdgeInsets.only(top: 0.h),
child: Text(
userInfo.value?.name ?? '请前往登录',
style: TextStyle(fontSize: 13.sp, color: Colors.white),
),
),
],
),
),
],
),
/* InkWell(
),
/* 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),
padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
height: 180.h,
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, //阴影扩散程度
)
],
),
SizedBox(height: 14.h),
Container(
margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
height: 180.h,
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: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Text('账号', style: personalInfoTitleStly), Text(userInfo.value?.name ?? '请前往登录', style: personalInfoValStly)],
),
Container(
height: 1.w,
color: const Color.fromRGBO(240, 243, 255, 1),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('所在学校', style: personalInfoTitleStly),
Text(userInfo.value?.schoolName ?? '', style: personalInfoValStly)
],
),
/* Row(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Text('账号', style: personalInfoTitleStly), Text(userInfo.value?.name ?? '请前往登录', style: personalInfoValStly)],
),
Container(
height: 1.w,
color: const Color.fromRGBO(240, 243, 255, 1),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Text('所在学校', style: personalInfoTitleStly), Text(userInfo.value?.schoolName ?? '', style: personalInfoValStly)],
),
/* Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('担任职位', style: personalInfoTitleStly),
@ -209,87 +199,86 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
)
],
),*/
Container(height: 1.w, color: const Color.fromRGBO(240, 243, 255, 1)),
Padding(
padding: EdgeInsets.only(top: 10.h),
child: InkWell(
onTap: () {
Get.toNamed(Routes.otherPage);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('其他', style: personalInfoTitleStly),
Icon(
Icons.arrow_forward_ios,
color: const Color.fromRGBO(80, 87, 103, 1),
size: 13.sp,
Container(height: 1.w, color: const Color.fromRGBO(240, 243, 255, 1)),
Padding(
padding: EdgeInsets.only(top: 10.h),
child: InkWell(
onTap: () {
Get.toNamed(Routes.otherPage);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('其他', style: personalInfoTitleStly),
Icon(
Icons.arrow_forward_ios,
color: const Color.fromRGBO(80, 87, 103, 1),
size: 13.sp,
)
],
),
),
)
],
),
),
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, //阴影扩散程度
)
],
),
),
)
],
),
),
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),
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),
),
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),
),
],
),
Container(
width: 6.w,
),
Text(
'退出登录',
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 13.sp),
),
],
),
onTap: () {
_showAlertDialog(context);
},
),
onTap: () {
_showAlertDialog(context);
},
),
],
),
),
],
),
],
),
),
],
),
),
],
),
),
],
);
});
}

73
making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart
View File

@ -27,9 +27,7 @@ class ReadOverPage extends StatefulWidget {
class _ReadOverPageState extends State<ReadOverPage> {
final logic = Get.find<ReadOverLogic>();
final state = Get
.find<ReadOverLogic>()
.state;
final state = Get.find<ReadOverLogic>().state;
@override
Widget build(BuildContext context) {
@ -39,7 +37,7 @@ class _ReadOverPageState extends State<ReadOverPage> {
systemNavigationBarDividerColor: null,
statusBarColor: Colors.white,
systemNavigationBarIconBrightness: Brightness.light,
statusBarIconBrightness: Brightness.dark,
statusBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.light,
),
child: Scaffold(
@ -50,10 +48,7 @@ class _ReadOverPageState extends State<ReadOverPage> {
children: <Widget>[
Container(
color: Colors.white,
margin: EdgeInsets.only(top: MediaQuery
.of(context)
.padding
.top),
margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
padding: EdgeInsets.only(bottom: 9.h, top: 4.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
@ -98,12 +93,10 @@ class _ReadOverPageState extends State<ReadOverPage> {
color: const Color(0xFF4CC793),
),
// labelColor: const Color.fromRGBO(45, 56, 76, 1),
indicator: const UnderlineTabIndicator(
indicator: const UnderlineTabIndicator(
borderSide: BorderSide(
width: 0, // 设置边界宽度为0，从而去除下划线
color: Colors.transparent
),
width: 0, // 设置边界宽度为0，从而去除下划线
color: Colors.transparent),
),
onTap: (index) {
state.tabIndex.value = index;
@ -122,23 +115,14 @@ class _ReadOverPageState extends State<ReadOverPage> {
width: 140.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: state.tabIndex.value == 0
? const Color.fromRGBO(
255, 255, 255, 1)
: null,
borderRadius: BorderRadius.all(
Radius.circular(8.r)),
color: state.tabIndex.value == 0 ? const Color.fromRGBO(255, 255, 255, 1) : null,
borderRadius: BorderRadius.all(Radius.circular(8.r)),
),
child: quickText(
'待批阅',
size: 14.sp,
color: state.tabIndex.value == 0 ? Theme
.of(context)
.primaryColor : const Color.fromRGBO(
80, 94, 110, 1),
fontWeight: state.tabIndex.value == 0
? FontWeight.bold
: null,
color: state.tabIndex.value == 0 ? Theme.of(context).primaryColor : const Color.fromRGBO(80, 94, 110, 1),
fontWeight: state.tabIndex.value == 0 ? FontWeight.bold : null,
),
);
}),
@ -151,23 +135,14 @@ class _ReadOverPageState extends State<ReadOverPage> {
width: 140.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: state.tabIndex.value == 1
? const Color.fromRGBO(
255, 255, 255, 1)
: null,
borderRadius: BorderRadius.all(
Radius.circular(8.r)),
color: state.tabIndex.value == 1 ? const Color.fromRGBO(255, 255, 255, 1) : null,
borderRadius: BorderRadius.all(Radius.circular(8.r)),
),
child: quickText(
'已批阅',
size: 14.sp,
color: state.tabIndex.value == 1 ? Theme
.of(context)
.primaryColor : const Color.fromRGBO(
80, 94, 110, 1),
fontWeight: state.tabIndex.value == 1
? FontWeight.bold
: null,
color: state.tabIndex.value == 1 ? Theme.of(context).primaryColor : const Color.fromRGBO(80, 94, 110, 1),
fontWeight: state.tabIndex.value == 1 ? FontWeight.bold : null,
),
);
}),
@ -180,22 +155,22 @@ class _ReadOverPageState extends State<ReadOverPage> {
flex: 1,
child: InkWell(
onTap: () {
Get.toNamed(Routes.studentHistoryWorkPage,
arguments: {'page': 'set'});
Get.toNamed(Routes.studentHistoryWorkPage, arguments: {'page': 'set'});
},
child: Icon(
const IconData(0xe63e, fontFamily: "AlibabaIcon"),
color: const Color.fromRGBO(44, 48, 63, 1),
size: 24.sp),
child: Icon(const IconData(0xe63e, fontFamily: "AlibabaIcon"), color: const Color.fromRGBO(44, 48, 63, 1), size: 24.sp),
),
),
],
),
),
Expanded(child: Obx(() {
return AnnotateList(tabIndex: state.tabIndex.value,assessType: 0,);
}),),
Expanded(
child: Obx(() {
return AnnotateList(
tabIndex: state.tabIndex.value,
assessType: 0,
);
}),
),
],
);
},

233
making_school_asignment_app/lib/page/home_page/home_view.dart
View File

@ -24,28 +24,27 @@ class HomePage extends StatefulWidget {
State<HomePage> createState() => _HomePageState();
}
class _HomePageState extends State<HomePage>
with AutomaticKeepAliveClientMixin {
class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
final logic = Get.find<HomeLogic>();
final state = Get.find<HomeLogic>().state;
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarIconBrightness: Brightness.dark,
systemStatusBarContrastEnforced: false,
));
}
@override
Widget build(BuildContext context) {
super.build(context);
var spaceWidth = SizedBox(height: ScreenUtil().screenWidth / 30);
return SafeArea(
child: AnnotatedRegion(
value: const SystemUiOverlayStyle(
systemNavigationBarColor: Color(0xFF000000),
systemNavigationBarDividerColor: null,
statusBarColor: Colors.white,
systemNavigationBarIconBrightness: Brightness.light,
statusBarIconBrightness: Brightness.dark,
statusBarBrightness: Brightness.light,
),
child: OrientationBuilder(
builder: (BuildContext context, Orientation orientation) {
return EasyRefresh(
@ -82,28 +81,19 @@ class _HomePageState extends State<HomePage>
SizedBox(height: MediaQuery.of(context).padding.top / 2),
Obx(() {
return $TermRow([
EntranceModel(
title: '作业批阅',
image: 'assets/images/job_home_marking.png',
navigationUrl: Routes.readOverPage),
EntranceModel(title: '作业批阅', image: 'assets/images/job_home_marking.png', navigationUrl: Routes.readOverPage),
EntranceModel(
title: '学生历史作业',
image: 'assets/images/job_home_history.png',
navigationUrl: Routes.studentHistoryWorkPage,
page: 'history',
),
EntranceModel(
title: '知识点点掌握',
image: 'assets/images/job_home_knowledge.png',
navigationUrl: Routes.knowledgePointsGraspPage)
EntranceModel(title: '知识点点掌握', image: 'assets/images/job_home_knowledge.png', navigationUrl: Routes.knowledgePointsGraspPage)
], state.totalCount.value);
}),
spaceWidth,
$TermRow([
EntranceModel(
title: '答题轨迹',
image: 'assets/images/job_home_answer_record.png',
navigationUrl: Routes.answerTrajectoryPage),
EntranceModel(title: '答题轨迹', image: 'assets/images/job_home_answer_record.png', navigationUrl: Routes.answerTrajectoryPage),
EntranceModel(
title: '优先批阅设定',
image: 'assets/images/job_home_youxian.png',
@ -127,18 +117,16 @@ class _HomePageState extends State<HomePage>
padding: EdgeInsets.symmetric(horizontal: 12.w),
child: state.workList.isNotEmpty
? Column(
children:
List.generate(state.workList.length, (index) {
children: List.generate(state.workList.length, (index) {
Items item = state.workList[index];
return InkWell(
onTap: () {
Get.toNamed(Routes.annotateClassPage,
arguments: {
'id': item.id,
'name': item.name,
'grade': item.grade,
'subject': item.subject,
});
Get.toNamed(Routes.annotateClassPage, arguments: {
'id': item.id,
'name': item.name,
'grade': item.grade,
'subject': item.subject,
});
},
child: Container(
margin: EdgeInsets.only(bottom: 15.h),
@ -146,18 +134,14 @@ class _HomePageState extends State<HomePage>
children: [
SizedBox(height: 4.h),
Container(
padding: EdgeInsets.symmetric(
vertical: 15.h, horizontal: 10.w),
padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 10.w),
width: double.infinity,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(6.r),
color: const Color.fromRGBO(
255, 255, 255, 1),
borderRadius: BorderRadius.circular(6.r),
color: const Color.fromRGBO(255, 255, 255, 1),
boxShadow: const [
BoxShadow(
color: Color.fromRGBO(
210, 216, 241, 1),
color: Color.fromRGBO(210, 216, 241, 1),
offset: Offset.zero, //阴影y轴偏移量
blurRadius: 5.8, //阴影模糊程度
spreadRadius: 0, //阴影扩散程度
@ -165,59 +149,34 @@ class _HomePageState extends State<HomePage>
],
),
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
crossAxisAlignment:
CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Utils.isPad()
? 32.w
: 38.w,
width: Utils.isPad() ? 32.w : 38.w,
height: 18.h,
alignment: Alignment.center,
padding: EdgeInsets.only(
left: Utils.isPad()
? 2.w
: 3.w),
padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w),
decoration: BoxDecoration(
color: state.type == 1
? const Color(
0xFF4CC793)
: const Color.fromRGBO(
255, 175, 56, 1),
borderRadius:
BorderRadius.only(
topLeft:
Radius.circular(14.r),
topRight:
Radius.circular(3.r),
bottomLeft:
Radius.circular(4.r),
bottomRight:
Radius.circular(4.r),
color: state.type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(14.r),
topRight: Radius.circular(3.r),
bottomLeft: Radius.circular(4.r),
bottomRight: Radius.circular(4.r),
),
),
margin: EdgeInsets.only(
top: 3.h, right: 4.w),
child: quickText(
state.type == 1
? '作业'
: '考试',
color: Colors.white,
size: 10.sp),
margin: EdgeInsets.only(top: 3.h, right: 4.w),
child: quickText(state.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp),
),
Expanded(
child: quickText(
item.name,
maxLines: 2,
size: Utils.isPad()
? 14.sp
: 16.sp,
color: const Color.fromRGBO(
70, 70, 70, 1),
size: Utils.isPad() ? 14.sp : 16.sp,
color: const Color.fromRGBO(70, 70, 70, 1),
fontWeight: FontWeight.bold,
),
)
@ -225,54 +184,30 @@ class _HomePageState extends State<HomePage>
),
SizedBox(height: 10.h),
Row(
crossAxisAlignment:
CrossAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
quickText(
EnumUtils.formatSubject(
item.subject),
color: const Color.fromRGBO(
97, 97, 97, 1),
EnumUtils.formatSubject(item.subject),
color: const Color.fromRGBO(97, 97, 97, 1),
size: 12.sp,
),
quickText(' / ',
color: const Color.fromRGBO(
130, 130, 130, 1),
size: 11.sp,
fontWeight:
FontWeight.w500),
color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp, fontWeight: FontWeight.w500),
Row(
crossAxisAlignment:
CrossAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
quickText('题量：',
color: const Color
.fromRGBO(
130, 130, 130, 1),
size: 11.sp),
quickText('题量：', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp),
quickText(
'${item.questionCount! - item.annotateCount!}',
color:
const Color.fromRGBO(
97, 97, 97, 1),
color: const Color.fromRGBO(97, 97, 97, 1),
size: 13.sp,
),
],
),
quickText(' / ',
color: const Color.fromRGBO(
130, 130, 130, 1),
size: 11.sp,
fontWeight:
FontWeight.w500),
quickText(
DateTime.parse(
item.publishTime)
.toString()
.substring(0, 10),
color: const Color.fromRGBO(
97, 97, 97, 1),
size: 12.sp),
color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp, fontWeight: FontWeight.w500),
quickText(DateTime.parse(item.publishTime).toString().substring(0, 10),
color: const Color.fromRGBO(97, 97, 97, 1), size: 12.sp),
],
),
SizedBox(height: 10.h),
@ -281,41 +216,24 @@ class _HomePageState extends State<HomePage>
Expanded(
child: Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
10.r),
borderRadius: BorderRadius.circular(10.r),
),
child:
LinearPercentIndicator(
child: LinearPercentIndicator(
padding: EdgeInsets.zero,
animation: true,
lineHeight: 8.h,
animationDuration: 2500,
percent: item
.annotateRate ==
null
? 0
: item.annotateRate! /
100,
progressColor:
const Color(
0xFF4CC793),
backgroundColor:
const Color(
0xFFE8E8E8),
barRadius:
Radius.circular(10.r),
percent: item.annotateRate == null ? 0 : item.annotateRate! / 100,
progressColor: const Color(0xFF4CC793),
backgroundColor: const Color(0xFFE8E8E8),
barRadius: Radius.circular(10.r),
),
),
),
SizedBox(
width: 10.r,
),
quickText(
'${item.annotateRate!.toStringAsFixed(0)}%',
size: 10.sp,
color: const Color(
0xFF464646)),
quickText('${item.annotateRate!.toStringAsFixed(0)}%', size: 10.sp, color: const Color(0xFF464646)),
],
),
// FavoriteButton(jobTaskItem.id, jobTaskItem.title),
@ -336,7 +254,7 @@ class _HomePageState extends State<HomePage>
);
},
),
));
);
}
@override
@ -352,11 +270,7 @@ class EntranceModel extends Object {
String navigationUrl;
String? page;
EntranceModel(
{required this.title,
required this.image,
required this.navigationUrl,
this.page});
EntranceModel({required this.title, required this.image, required this.navigationUrl, this.page});
}
@swidget
@ -365,8 +279,7 @@ Widget $termRow(BuildContext context, List<EntranceModel> items, int? data) {
Widget childWidget;
switch (leng) {
case 1:
childWidget =
Row(children: [Expanded(child: $TermItem(items[0], data!))]);
childWidget = Row(children: [Expanded(child: $TermItem(items[0], data!))]);
break;
case 2:
childWidget = Row(children: [
@ -401,13 +314,11 @@ Widget $termRow(BuildContext context, List<EntranceModel> items, int? data) {
childWidget = Container();
}
return Container(
padding: EdgeInsets.symmetric(horizontal: 14.w), child: childWidget);
return Container(padding: EdgeInsets.symmetric(horizontal: 14.w), child: childWidget);
}
@swidget
Widget $termItem(BuildContext context, EntranceModel e, int data,
{double? theHeight}) {
Widget $termItem(BuildContext context, EntranceModel e, int data, {double? theHeight}) {
bool isJob = e.title == '作业批阅';
return Material(
@ -436,14 +347,10 @@ Widget $termItem(BuildContext context, EntranceModel e, int data,
badgeStyle: badges.BadgeStyle(
badgeColor: const Color.fromRGBO(255, 105, 105, 1),
shape: badges.BadgeShape.square,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10.r),
topRight: Radius.circular(8.5.r),
bottomRight: Radius.circular(8.5.r)),
borderRadius: BorderRadius.only(topLeft: Radius.circular(10.r), topRight: Radius.circular(8.5.r), bottomRight: Radius.circular(8.5.r)),
// borderSide: BorderSide(color: Colors.white, width: 2),
elevation: 1,
padding: EdgeInsets.symmetric(
horizontal: Utils.isPad() ? 11.w : 16.w, vertical: 2.h),
padding: EdgeInsets.symmetric(horizontal: Utils.isPad() ? 11.w : 16.w, vertical: 2.h),
),
position: badges.BadgePosition.topEnd(top: 10.r, end: 10.r),
child: Container(
@ -466,25 +373,17 @@ Widget $termItem(BuildContext context, EntranceModel e, int data,
? Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(e.image,
height: 32.r, width: 32.r, fit: BoxFit.cover),
Image.asset(e.image, height: 32.r, width: 32.r, fit: BoxFit.cover),
SizedBox(height: 6.r),
quickText(e.title,
size: 12.sp,
color: const Color.fromRGBO(79, 79, 79, 1),
fontWeight: FontWeight.w500),
quickText(e.title, size: 12.sp, color: const Color.fromRGBO(79, 79, 79, 1), fontWeight: FontWeight.w500),
],
)
: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(e.image,
height: 32.r, width: 32.r, fit: BoxFit.cover),
Image.asset(e.image, height: 32.r, width: 32.r, fit: BoxFit.cover),
SizedBox(width: 6.r),
quickText(e.title,
size: 12.sp,
color: const Color.fromRGBO(79, 79, 79, 1),
fontWeight: FontWeight.w500),
quickText(e.title, size: 12.sp, color: const Color.fromRGBO(79, 79, 79, 1), fontWeight: FontWeight.w500),
],
),
),

7
making_school_asignment_app/lib/page/login_page/login_logic.dart
View File

@ -1,5 +1,6 @@
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart';
import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart';
@ -26,13 +27,13 @@ class LoginLogic extends GetxController with RequestToolMixin {
void onInit() {
super.onInit();
/* state.userNameController = TextEditingController()
/* state.userNameController = TextEditingController()
..addListener(userNameListener);
state.passwordController = TextEditingController();*/
String account = StorageService.to.read(AppStorageKey.account.value)?? '';
String account = StorageService.to.read(AppStorageKey.account.value) ?? '';
String pwd = StorageService.to.read(AppStorageKey.pwd.value) ?? '';
if (account != '' && pwd != '') {
if (account != '' && pwd != '') {
state.userNameController.text = account;
state.passwordController.text = pwd;
state.keepPwd.value = true;

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

@ -24,6 +24,7 @@ class _LoginPageState extends State<LoginPage> {
@override
void initState() {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarIconBrightness: Brightness.light));
Future.delayed(Duration.zero, () => upgradeLogic.getAppUpgrade(context));
super.initState();
}
@ -36,6 +37,7 @@ class _LoginPageState extends State<LoginPage> {
@override
Widget build(BuildContext context) {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarIconBrightness: Brightness.light));
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
@ -127,8 +129,8 @@ class _LoginPageState extends State<LoginPage> {
border: InputBorder.none,
isDense: true,
prefixIconConstraints: BoxConstraints(
minHeight:10.w,
minWidth: 10.h,
minHeight: 10.w,
minWidth: 10.h,
),
prefixIcon: Padding(
padding: EdgeInsets.only(right: 5.r),
@ -168,7 +170,7 @@ class _LoginPageState extends State<LoginPage> {
decoration: InputDecoration(
hintText: "请输入密码",
prefixIconConstraints: BoxConstraints(
minHeight:10.w,
minHeight: 10.w,
minWidth: 10.h,
),
prefixIcon: Padding(
@ -180,17 +182,17 @@ class _LoginPageState extends State<LoginPage> {
),
),
suffixIconConstraints: BoxConstraints(
minHeight:10.w,
minHeight: 10.w,
minWidth: 10.h,
),
suffixIcon: InkWell(
onTap: (){
onTap: () {
state.isShowPwd.value = !state.isShowPwd.value;
},
child: Padding(
padding: EdgeInsets.only(right: 5.r),
child: Image.asset(
state.isShowPwd.value ? 'assets/images/eye_default.png':'assets/images/eye_active.png',
state.isShowPwd.value ? 'assets/images/eye_default.png' : 'assets/images/eye_active.png',
width: 15.r,
height: 15.r,
),
@ -214,7 +216,7 @@ class _LoginPageState extends State<LoginPage> {
SizedBox(
height: 22.h,
),
Row(
Row(
children: [
Container(
width: 25.w,
@ -228,10 +230,8 @@ class _LoginPageState extends State<LoginPage> {
value: state.keepPwd.value,
onChanged: (value) {
// Get.focusScope?.nextFocus();
FocusScope.of(context).requestFocus(
state.pwdFocus);
FocusScope.of(context).requestFocus(
state.theFocus);
FocusScope.of(context).requestFocus(state.pwdFocus);
FocusScope.of(context).requestFocus(state.theFocus);
state.keepPwd.value = value ?? false;
},
),
@ -241,12 +241,10 @@ class _LoginPageState extends State<LoginPage> {
InkWell(
onTap: () {
Utils.hideKeyboard();
Get.focusScope?.nextFocus();
Get.focusScope?.nextFocus();
FocusScope.of(context).requestFocus(
state.pwdFocus);
FocusScope.of(context).requestFocus(
state.theFocus);
Get.focusScope?.nextFocus();
FocusScope.of(context).requestFocus(state.pwdFocus);
FocusScope.of(context).requestFocus(state.theFocus);
state.keepPwd.value = !state.keepPwd.value;
},
child: Text(
@ -319,7 +317,10 @@ class _LoginPageState extends State<LoginPage> {
onTap: () {
Get.toNamed(Routes.agreementPage, arguments: {"type": AGREEMENT_KEY.USER_AGREEMENT.name});
},
child: quickText('请仔细阅读', size: 11.sp,),
child: quickText(
'请仔细阅读',
size: 11.sp,
),
),
InkWell(
onTap: () {

251
making_school_asignment_app/lib/page/work_page/work_view.dart
View File

@ -27,139 +27,140 @@ class _WorkPageState extends State<WorkPage> with AutomaticKeepAliveClientMixin
@override
bool get wantKeepAlive => true;
@override
void initState() {
// TODO: implement initState
super.initState();
}
@override
Widget build(BuildContext context) {
super.build(context);
return AnnotatedRegion(
value: const SystemUiOverlayStyle(
systemNavigationBarColor: Color(0xFF000000),
systemNavigationBarDividerColor: null,
statusBarColor: Colors.white,
systemNavigationBarIconBrightness: Brightness.light,
statusBarIconBrightness: Brightness.dark,
statusBarBrightness: Brightness.light,
),
child: Scaffold(
backgroundColor: const Color.fromRGBO(244, 244, 244, 1),
body: OrientationBuilder(
builder: (BuildContext context, Orientation orientation) {
return Column(
children: <Widget>[
Container(
color: Colors.white,
margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
padding: EdgeInsets.only(bottom: 9.h, top: 4.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 1,
child: Container(
alignment: Alignment.centerLeft,
padding: EdgeInsets.only(left: 10.w),
)),
Expanded(
flex: 4,
child: Container(
padding: EdgeInsets.symmetric(vertical: 2.h),
alignment: Alignment.center,
decoration: BoxDecoration(
color: const Color.fromRGBO(243, 243, 243, 1),
borderRadius: BorderRadius.circular(8.r),
),
child: TabBar(
padding: EdgeInsets.zero,
indicatorPadding: EdgeInsets.zero,
indicatorWeight: 0,
labelPadding: EdgeInsets.symmetric(horizontal: 2.w),
controller: logic.tabController,
unselectedLabelStyle: TextStyle(
fontSize: 14.sp,
color: const Color.fromRGBO(69, 83, 100, 1),
),
labelStyle: TextStyle(
fontSize: 14.sp,
color: const Color(0xFF4CC793),
),
// labelColor: const Color.fromRGBO(45, 56, 76, 1),
indicator: const BoxDecoration(),
onTap: (index) {
state.tabIndex.value = index;
if (index == 1 && state.completedToRefresh) {
// 已阅卷
// _refreshController2.callRefresh();
state.completedToRefresh = false;
}
},
tabs: <Widget>[
Tab(
iconMargin: EdgeInsets.zero,
height: 34.h,
child: Obx(() {
return Container(
width: 140.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: state.tabIndex.value == 0 ? const Color.fromRGBO(255, 255, 255, 1) : null,
borderRadius: BorderRadius.all(Radius.circular(8.r)),
),
child: quickText(
'待批阅',
size: 14.sp,
color: state.tabIndex.value == 0 ? Theme.of(context).primaryColor : const Color.fromRGBO(80, 94, 110, 1),
fontWeight: state.tabIndex.value == 0 ? FontWeight.bold : null,
),
);
}),
),
Tab(
iconMargin: EdgeInsets.zero,
height: 34.h,
child: Obx(() {
return Container(
width: 140.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: state.tabIndex.value == 1 ? const Color.fromRGBO(255, 255, 255, 1) : null,
borderRadius: BorderRadius.all(Radius.circular(8.r)),
),
child: quickText(
'已批阅',
size: 14.sp,
color: state.tabIndex.value == 1 ? Theme.of(context).primaryColor : const Color.fromRGBO(80, 94, 110, 1),
fontWeight: state.tabIndex.value == 1 ? FontWeight.bold : null,
),
);
}),
),
],
),
),
),
Expanded(
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarIconBrightness: Brightness.dark,
systemStatusBarContrastEnforced: false,
));
return Scaffold(
backgroundColor: const Color.fromRGBO(244, 244, 244, 1),
body: OrientationBuilder(
builder: (BuildContext context, Orientation orientation) {
return Column(
children: <Widget>[
Container(
color: Colors.white,
margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
padding: EdgeInsets.only(bottom: 9.h, top: 4.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Get.toNamed(Routes.studentHistoryWorkPage, arguments: {'page': 'set'});
child: Container(
alignment: Alignment.centerLeft,
padding: EdgeInsets.only(left: 10.w),
)),
Expanded(
flex: 4,
child: Container(
padding: EdgeInsets.symmetric(vertical: 2.h),
alignment: Alignment.center,
decoration: BoxDecoration(
color: const Color.fromRGBO(243, 243, 243, 1),
borderRadius: BorderRadius.circular(8.r),
),
child: TabBar(
padding: EdgeInsets.zero,
indicatorPadding: EdgeInsets.zero,
indicatorWeight: 0,
labelPadding: EdgeInsets.symmetric(horizontal: 2.w),
controller: logic.tabController,
unselectedLabelStyle: TextStyle(
fontSize: 14.sp,
color: const Color.fromRGBO(69, 83, 100, 1),
),
labelStyle: TextStyle(
fontSize: 14.sp,
color: const Color(0xFF4CC793),
),
// labelColor: const Color.fromRGBO(45, 56, 76, 1),
indicator: const BoxDecoration(),
onTap: (index) {
state.tabIndex.value = index;
if (index == 1 && state.completedToRefresh) {
// 已阅卷
// _refreshController2.callRefresh();
state.completedToRefresh = false;
}
},
child: Icon(const IconData(0xe63e, fontFamily: "AlibabaIcon"), color: const Color.fromRGBO(44, 48, 63, 1), size: 24.sp),
tabs: <Widget>[
Tab(
iconMargin: EdgeInsets.zero,
height: 34.h,
child: Obx(() {
return Container(
width: 140.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: state.tabIndex.value == 0 ? const Color.fromRGBO(255, 255, 255, 1) : null,
borderRadius: BorderRadius.all(Radius.circular(8.r)),
),
child: quickText(
'待批阅',
size: 14.sp,
color: state.tabIndex.value == 0 ? Theme.of(context).primaryColor : const Color.fromRGBO(80, 94, 110, 1),
fontWeight: state.tabIndex.value == 0 ? FontWeight.bold : null,
),
);
}),
),
Tab(
iconMargin: EdgeInsets.zero,
height: 34.h,
child: Obx(() {
return Container(
width: 140.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: state.tabIndex.value == 1 ? const Color.fromRGBO(255, 255, 255, 1) : null,
borderRadius: BorderRadius.all(Radius.circular(8.r)),
),
child: quickText(
'已批阅',
size: 14.sp,
color: state.tabIndex.value == 1 ? Theme.of(context).primaryColor : const Color.fromRGBO(80, 94, 110, 1),
fontWeight: state.tabIndex.value == 1 ? FontWeight.bold : null,
),
);
}),
),
],
),
),
],
),
),
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Get.toNamed(Routes.studentHistoryWorkPage, arguments: {'page': 'set'});
},
child: Icon(const IconData(0xe63e, fontFamily: "AlibabaIcon"), color: const Color.fromRGBO(44, 48, 63, 1), size: 24.sp),
),
),
],
),
Expanded(
child: Obx(() {
return AnnotateList(
tabIndex: state.tabIndex.value,
assessType: 1,
);
}),
),
],
);
},
),
),
Expanded(
child: Obx(() {
return AnnotateList(
tabIndex: state.tabIndex.value,
assessType: 1,
);
}),
),
],
);
},
),
);
}

2
making_school_asignment_app/pubspec.yaml
View File

@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1
version: 1.0.1+2
environment:
sdk: '>=3.4.1 <4.0.0'

12
making_school_asignment_app/web/index.html
View File

@ -157,6 +157,16 @@
@ -176,7 +186,7 @@
body {
margin: 0;
min-height: 100%;
background-color: #42a5f5;
background-color: #eeeeee;
background-size: 100% 100%;
}