修复学期结束导致的bug

nano71 · Jan 17, 2022 · 95e573e · 95e573e
1 parent 76b16af
commit 95e573e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/lib/common/init.dart b/lib/common/init.dart
@@ -25,6 +25,7 @@ initTodaySchedule() async {
   final String _week = writeData["week"].toString();
   Map _schedule = schedule;
   List toDay = [];
+  if (int.parse(_week) < 21)
   await _schedule[_week][DateTime.now().weekday.toString()].forEach((key, value) => {
         if (value[1] != "null")
           {

diff --git a/lib/pages/schedule.dart b/lib/pages/schedule.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:core';
 
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/cupertino.dart';
@@ -126,13 +127,11 @@ class SchedulePageState extends State<SchedulePage> with AutomaticKeepAliveClien
     double sY = _startPositionY;
     if (eY - sY < minValue || eY + sY < minValue) {
       if (sX - eX > minValue) {
-        if (_currentScheduleWeek == 20) {
-          _warning1();
-        } else {
+
           print("下一页");
           _currentScheduleWeek++;
           _findNewSchedule();
-        }
+
       } else if (eX - sX > minValue) {
         if (_currentScheduleWeek == 1) {
           _warning1();
@@ -222,6 +221,9 @@ class SchedulePageColumnState extends State<SchedulePageColumn> {
 
   @override
   Widget build(BuildContext context) {
+    if (int.parse(_findWeek) > 20) {
+      _findWeek = "20";
+    }
     return Expanded(
       child: Row(
         mainAxisSize: MainAxisSize.min,

diff --git a/lib/widget/cards.dart b/lib/widget/cards.dart
@@ -47,7 +47,9 @@ class HomeCardState extends State<HomeCard> with AutomaticKeepAliveClientMixin {
   }
 
   String _weekText() {
-    if (_week == 20) {
+    if (_week > 20) {
+      return "学期已经结束咯";
+    } else if (_week == 20) {
       return "学期即将结束";
     } else if (_week >= 15) {
       return "期末来临,复习为重";

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.220116+13
+version: 1.2.220117+14
 
 environment:
   sdk: ">=2.12.0 <3.0.0"