mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
23 changed files with 71 additions and 29 deletions
Showing only changes of commit ff3243695f - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 KiB

View File

@ -3,10 +3,9 @@
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<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:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.

View File

@ -7,6 +7,7 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.

View File

@ -2,13 +2,11 @@
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:forceDarkAllowed">false</item>
<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:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenIconBackgroundColor">#4CC793</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your

View File

@ -7,6 +7,7 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 KiB

View File

@ -8,6 +8,7 @@ flutter_native_splash:
background_image: assets/images/splash_native.png
android_12:
image: assets/images/splash.png
color: '#42a5f5'
icon_background_color: "#4CC793"
android_gravity: center
android: true
ios: true
android_gravity: fill
ios_content_mode: scaleToFill

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

View File

@ -17,7 +17,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>

View File

@ -100,7 +100,7 @@ abstract class RetrofitClient {
//
@GET("/api/hms/HmsReport/GetQuestionStudentState")
Future<List<Students>> getQuestionStudentState(
@Query('HomeworkId') String homeworkId, @Query('TemplateId') int templateId, @Query('QuestionNo') int questionNo);
@Query('HomeworkId') String homeworkId, @Query('TemplateId') int templateId, @Query('QuestionNo') String questionNo);
//
@POST("/api/hms/Homework/Collect")

View File

@ -207,7 +207,7 @@ class _KnowledgePointState extends State<KnowledgePoint> {
child: quickText('知识点掌握情况', color: const Color.fromRGBO(92, 92, 92, 1), size: 14.sp, fontWeight: FontWeight.bold),
),
Expanded(
child: ListView(
child: widget.knowsList.isNotEmpty? ListView(
children: widget.knowsList.value.map((item) {
return Container(
margin: EdgeInsets.only(bottom: 15.h, left: 15.r, right: 15.r),
@ -263,11 +263,11 @@ class _KnowledgePointState extends State<KnowledgePoint> {
int okCount = stu.queDtls!.where((w) => w.state == 3).length;
int ttlCount = stu.queDtls!.length;
stu.okRate = Utils.calcRate(okCount, ttlCount);
/*stu.queDtls!.sort((a, b) {
int num1 = a.questionNo;
int num2 = b.questionNo;
stu.queDtls!.sort((a, b) {
String num1 = a.questionNo;
String num2 = b.questionNo;
return num1.compareTo(num2);
});*/
});
}
showPeopleListDialog(
@ -289,7 +289,7 @@ class _KnowledgePointState extends State<KnowledgePoint> {
],
),
);
}).toList()),
}).toList()): MyEmptyWidget(imgWidth: 100.r, imgHeight: 100.r, font: 8.sp),
),
],
));

View File

@ -110,8 +110,8 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
children: List.generate(item.kgtStu!.length, (index) {
Dtls kgInfo = item.kgtStu![index];
return Container(
width: 14.r,
height: 14.r,
width: 20.r,
height: 20.r,
decoration: BoxDecoration(
color: kgInfo.state == 0
? const Color(0xFFD3D3D3)
@ -120,7 +120,7 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
: kgInfo.state == 2
? const Color(0xFFFF7474)
: const Color(0xFF4CC793),
borderRadius: BorderRadius.all(Radius.circular(7.r))),
borderRadius: BorderRadius.all(Radius.circular(10.r))),
child: Center(
child: Text(
kgInfo.questionNo.toString(),

View File

@ -446,8 +446,8 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
KgtList subjective =
item.kgtList[i];
return Container(
width: 20.r,
height: 20.r,
width: 25.r,
height: 25.r,
decoration: BoxDecoration(
color: Colors.transparent,
border: Border.all(
@ -459,7 +459,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
: subjective.state == 2
? Color(0xFFFF7474)
: Color(0xFF666666)),
borderRadius: BorderRadius.all(Radius.circular(10.r))),
borderRadius: BorderRadius.all(Radius.circular(12.5.r))),
child: Center(
child: Text(
subjective.questionNo
@ -524,8 +524,8 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
ZgtList subjective =
item.zgtList[i];
return Container(
width: 20.r,
height: 20.r,
width: 25.r,
height: 25.r,
decoration: BoxDecoration(
color: Colors.transparent,
border: Border.all(
@ -537,7 +537,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
: subjective.state == 2
? Color(0xFFFF7474)
: Color(0xFF666666)),
borderRadius: BorderRadius.all(Radius.circular(10.r))),
borderRadius: BorderRadius.all(Radius.circular(12.5.r))),
child: Center(
child: Text(
subjective.questionNo

View File

@ -93,7 +93,7 @@ dependencies:
auto_updater: ^0.2.1
permission_handler: ^11.0.1
flutter_distributor: ^0.4.5
flutter_native_splash: 2.2.9
flutter_native_splash: ^2.4.1
dev_dependencies:
flutter_test:

View File

@ -76,6 +76,50 @@
@ -164,8 +208,6 @@
}
</script>
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
<link rel="stylesheet" type="text/css" href="splash/style.css">
<script src="splash/splash.js"></script>
</head>
<body>