调课补课的加回来了

nano71 · Dec 25, 2024 · f4154cd · f4154cd
1 parent b7d41d2
commit f4154cd
Show file tree

Hide file tree

Showing 20 changed files with 170 additions and 108 deletions.
diff --git a/android/local.properties b/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=C:\\sdk\\android-sdk
 flutter.sdk=C:\\sdk\\flutter
-flutter.buildMode=debug
-flutter.versionName=1.6.241211
+flutter.buildMode=release
+flutter.versionName=1.6.241225
 flutter.versionCode=75
diff --git a/lib/common/get.dart b/lib/common/get.dart
@@ -305,6 +305,9 @@ Future<dynamic> getSchedule() async {
 }
 
 Future<Map> getScheduleChanges(String id, Map schedule) async {
+  if ((AppData.persistentData["showScheduleChange"] ?? "0") == "0") {
+    return schedule;
+  }
   print('getScheduleChanges');
   print("获取课表变更(调课/停课/补课)");
   print('id: ' + id);

diff --git a/lib/data.dart b/lib/data.dart
@@ -67,6 +67,7 @@ class AppData {
     "threshold": "5",
     "showLessonTimeInList": "0",
     "showDayByWeekDay": "0",
+    "showScheduleChange": "0",
     "newVersion": "",
     "newBody": "",
     "newTime": "",

diff --git a/lib/pages/about.dart b/lib/pages/about.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_remix/flutter_remix.dart';
+import 'package:remixicon/remixicon.dart';
 
 import '/custom/expansiontile.dart' as CustomExpansionTile;
 import '/widget/bars.dart';
@@ -28,7 +28,7 @@ class _InfoPageState extends State<InfoPage> {
             publicTopBar(
               "说明",
               InkWell(
-                child: Icon(FlutterRemix.close_line, size: 24),
+                child: Icon(Remix.close_line, size: 24),
                 onTap: () {
                   Navigator.of(context).pop();
                 },

diff --git a/lib/pages/career.dart b/lib/pages/career.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_remix/flutter_remix.dart';
+import 'package:remixicon/remixicon.dart';
+
 import '/common/get.dart';
 import '/common/style.dart';
+import '/custom/expansiontile.dart' as CustomExpansionTile;
 import '/widget/bars.dart';
 import '/widget/dialog.dart';
-import '/custom/expansiontile.dart' as CustomExpansionTile;
-
 import '../config.dart';
 import '../data.dart';
 
@@ -182,7 +182,7 @@ class _CareerPageBodyState extends State<CareerPageBody> {
           publicTopBar(
             "我的大学生涯",
             InkWell(
-              child: Icon(FlutterRemix.close_line, size: 24),
+              child: Icon(Remix.close_line, size: 24),
               onTap: () {
                 if (type == 0) {
                   Navigator.of(context).pop();
@@ -207,7 +207,7 @@ class _CareerPageBodyState extends State<CareerPageBody> {
                 //       margin:  EdgeInsets.fromLTRB(16, 0, 0, 0),
                 //       padding:  EdgeInsets.fromLTRB(8, 8, 8, 8),
                 //       child: Icon(
-                //         FlutterRemix.checkbox_circle_line,
+                //         Remix.checkbox_circle_line,
                 //         size: 64,
                 //         color: Colors.white,
                 //       ),

diff --git a/lib/pages/login.dart b/lib/pages/login.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_remix/flutter_remix.dart';
 import 'package:http/http.dart';
+import 'package:remixicon/remixicon.dart';
 
 import '/common/cookie.dart';
 import '/common/get.dart';
@@ -177,7 +177,7 @@ class LoginPageState extends State<LoginPage> {
             publicTopBar(
                 "桂工助手N",
                 InkWell(
-                  child: Icon(FlutterRemix.close_line, size: 24),
+                  child: Icon(Remix.close_line, size: 24),
                   onTap: () {
                     Navigator.of(context).pop();
                   },
@@ -221,7 +221,7 @@ class LoginPageState extends State<LoginPage> {
                         controller: studentIdController,
                         decoration: InputDecoration(
                           icon: Icon(
-                            FlutterRemix.user_3_line,
+                            Remix.user_3_line,
                             color: studentIdFocusNode.hasFocus ? readColor() : null,
                           ),
                           border: InputBorder.none,
@@ -249,7 +249,7 @@ class LoginPageState extends State<LoginPage> {
                         controller: passwordController,
                         decoration: InputDecoration(
                           icon: Icon(
-                            FlutterRemix.key_line,
+                            Remix.key_line,
                             color: passwordFocusNode.hasFocus ? readColor() : null,
                           ),
                           border: InputBorder.none,
@@ -274,7 +274,7 @@ class LoginPageState extends State<LoginPage> {
                               controller: checkCodeController,
                               decoration: InputDecoration(
                                 icon: Icon(
-                                  FlutterRemix.magic_line,
+                                  Remix.magic_line,
                                   color: checkCodeFocusNode.hasFocus ? readColor() : null,
                                 ),
                                 border: InputBorder.none,

diff --git a/lib/pages/person.dart b/lib/pages/person.dart
@@ -1,13 +1,13 @@
+import 'package:badges/badges.dart' as badges;
 import 'package:flutter/material.dart';
-import 'package:flutter_remix/flutter_remix.dart';
+import 'package:remixicon/remixicon.dart';
+
 import '/pages/career.dart';
 import '/pages/queryClassRoom.dart';
 import '/pages/setting.dart';
 import '/pages/update.dart';
 import '/widget/bars.dart';
 import '/widget/icons.dart';
-import 'package:badges/badges.dart' as badges;
-
 import '../config.dart';
 import '../data.dart';
 import 'about.dart';
@@ -52,7 +52,7 @@ class MinePageState extends State<MinePage> {
                   );
                 },
                 child: mineItem(
-                  FlutterRemix.user_5_line,
+                  Remix.user_5_line,
                   EdgeInsets.fromLTRB(16, 14, 0, 14),
                   (AppData.persistentData["name"] != "" ? "更换账号" : "登录教务"),
                   readColor(),
@@ -67,7 +67,7 @@ class MinePageState extends State<MinePage> {
                     Navigator.of(context).push(MaterialPageRoute(builder: (context) => CareerPage()));
                   }
                 },
-                child: mineItem(FlutterRemix.timer_flash_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "课程生涯", readColor()),
+                child: mineItem(Remix.timer_flash_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "课程生涯", readColor()),
               ),
               InkWell(
                 onTap: () {
@@ -78,7 +78,7 @@ class MinePageState extends State<MinePage> {
                     Navigator.of(context).push(MaterialPageRoute(builder: (context) => QueryRoomPage()));
                   }
                 },
-                child: mineItem(FlutterRemix.building_4_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "教室查询", readColor()),
+                child: mineItem(Remix.building_4_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "教室查询", readColor()),
               ),
               topLine,
               InkWell(
@@ -88,20 +88,20 @@ class MinePageState extends State<MinePage> {
                   Navigator.of(context).push(MaterialPageRoute(builder: (context) => UpdatePage()));
                 },
                 child: AppData.hasNewVersion
-                    ? mineItem5(FlutterRemix.download_cloud_2_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "版本更新", readColor())
-                    : mineItem(FlutterRemix.download_cloud_2_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "版本更新", readColor()),
+                    ? mineItem5(Remix.download_cloud_2_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "版本更新", readColor())
+                    : mineItem(Remix.download_cloud_2_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "版本更新", readColor()),
               ),
               InkWell(
                 onTap: () {
                   Navigator.of(context).push(MaterialPageRoute(builder: (context) => InfoPage()));
                 },
-                child: mineItem(FlutterRemix.information_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "说明", readColor()),
+                child: mineItem(Remix.information_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "说明", readColor()),
               ),
               InkWell(
                 onTap: () {
                   Navigator.of(context).push(MaterialPageRoute(builder: (context) => SettingPage(title: "设置2")));
                 },
-                child: mineItem(FlutterRemix.settings_3_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "设置", readColor()),
+                child: mineItem(Remix.settings_3_line, EdgeInsets.fromLTRB(16, 14, 0, 14), "设置", readColor()),
               ),
             ],
           ),

diff --git a/lib/pages/queryClassRoom.dart b/lib/pages/queryClassRoom.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_remix/flutter_remix.dart';
+import 'package:remixicon/remixicon.dart';
 import '/common/get.dart';
 import '/data.dart';
 import '/widget/bars.dart';
@@ -40,7 +40,7 @@ class QueryRoomPageState extends State<QueryRoomPage> {
             publicTopBar(
               "教室查询",
               InkWell(
-                child: Icon(FlutterRemix.close_line, size: 24),
+                child: Icon(Remix.close_line, size: 24),
                 onTap: () {
                   Navigator.of(context).pop();
                 },
@@ -206,7 +206,7 @@ class QueryConditionCardState extends State<QueryConditionCard> {
                   height: 40,
                   child: DropdownButton(
                     enableFeedback: true,
-                    icon: Icon(FlutterRemix.arrow_right_s_line),
+                    icon: Icon(Remix.arrow_right_s_line),
                     iconSize: 16,
                     underline: Container(),
                     alignment: Alignment.centerRight,
@@ -247,7 +247,7 @@ class QueryConditionCardState extends State<QueryConditionCard> {
                     selectedItemBuilder: (context) {
                       return dropdownMenuItemList("weekOfSemester", true);
                     },
-                    icon: Icon(FlutterRemix.arrow_right_s_line),
+                    icon: Icon(Remix.arrow_right_s_line),
                     iconSize: 16,
                     underline: Container(),
                     alignment: Alignment.centerRight,
@@ -279,7 +279,7 @@ class QueryConditionCardState extends State<QueryConditionCard> {
                     selectedItemBuilder: (context) {
                       return dropdownMenuItemList("dayOfWeek", true);
                     },
-                    icon: Icon(FlutterRemix.arrow_right_s_line),
+                    icon: Icon(Remix.arrow_right_s_line),
                     iconSize: 16,
                     underline: Container(),
                     alignment: Alignment.centerRight,

diff --git a/lib/pages/queryExam.dart b/lib/pages/queryExam.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_remix/flutter_remix.dart';
+import 'package:remixicon/remixicon.dart';
+
 import '/common/get.dart';
 import '/config.dart';
 import '/widget/bars.dart';
 import '/widget/lists.dart';
-
 import '../data.dart';
 import 'career.dart';
 
@@ -114,7 +114,7 @@ class _QueryExamBodyState extends State<QueryExamBody> {
               "我的考试",
               InkWell(
                 child: Icon(
-                  FlutterRemix.close_line,
+                  Remix.close_line,
                   size: 24,
                   color: Colors.white,
                 ),

diff --git a/lib/pages/queryScore.dart b/lib/pages/queryScore.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_remix/flutter_remix.dart';
 import 'package:glutassistantn/widget/dialog.dart';
+import 'package:remixicon/remixicon.dart';
 
 import '/common/get.dart';
 import '/pages/setting.dart';
@@ -187,7 +187,7 @@ class _QueryBodyState extends State<QueryBody> {
               "成绩查询",
               InkWell(
                 child: Icon(
-                  FlutterRemix.close_line,
+                  Remix.close_line,
                   size: 24,
                   color: Colors.white,
                 ),
@@ -214,7 +214,7 @@ class _QueryBodyState extends State<QueryBody> {
                         children: [
                           DropdownButton(
                             enableFeedback: true,
-                            icon: Icon(FlutterRemix.arrow_down_s_line),
+                            icon: Icon(Remix.arrow_down_s_line),
                             iconSize: 16,
                             iconEnabledColor: Colors.white,
                             elevation: 0,
@@ -240,7 +240,7 @@ class _QueryBodyState extends State<QueryBody> {
                           ),
                           DropdownButton(
                             enableFeedback: true,
-                            icon: Icon(FlutterRemix.arrow_down_s_line),
+                            icon: Icon(Remix.arrow_down_s_line),
                             iconSize: 16,
                             iconEnabledColor: Colors.white,
                             elevation: 0,

diff --git a/lib/pages/scheduleManager.dart b/lib/pages/scheduleManager.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_remix/flutter_remix.dart';
+import 'package:remixicon/remixicon.dart';
+
 import '/widget/bars.dart';
 
 import '../config.dart';
@@ -34,7 +35,7 @@ class _ScheduleManagePageState extends State<ScheduleManagePage> {
             publicTopBar(
               "课程管理",
               InkWell(
-                child: Icon(FlutterRemix.close_line, size: 24),
+                child: Icon(Remix.close_line, size: 24),
                 onTap: () {
                   Navigator.of(context).pop();
                 },