fix: split captcha client and correct tomorrow schedule (#153)

Author: imoscarz

lib/controller/classtable_controller.dart

@@ -256,7 +256,7 @@ class ClassTableController {
 
   List<HomeArrangement> getArrangementOfDay(DateTime updateTime) {
     final formatter = DateFormat(HomeArrangement.format);
-    final currentWeek = currentWeekComputedSignal.value;
+    final currentWeek = getCurrentWeek(updateTime);
     final classTableData = classTableComputedSignal.value;
     final arrangementSet = <HomeArrangement>{};
 

lib/page/homepage/home.dart

@@ -26,6 +26,7 @@ import 'package:watermeter/repository/preference.dart';
 import 'package:watermeter/repository/xidian_ids/ids_session.dart';
 import 'package:ming_cute_icons/ming_cute_icons.dart';
 import 'package:watermeter/page/login/jc_captcha.dart';
+import 'package:watermeter/repository/xidian_ids/slider_captcha_client.dart';
 import 'package:watermeter/repository/preference.dart' as preference;
 
 class PageInformation {
@@ -87,7 +88,10 @@ class _HomePageMasterState extends State<HomePageMaster>
         context: context,
         forceRetryLogin: true,
         sliderCaptcha: (String cookieStr) {
-          return SliderCaptchaClientProvider(cookie: cookieStr).solve(context);
+          return SliderCaptchaClientProvider(cookie: cookieStr).solve(
+            manualSolver: (provider) =>
+                solveSliderCaptchaManually(context, provider),
+          );
         },
       );
     } finally {
@@ -204,9 +208,10 @@ class _HomePageMasterState extends State<HomePageMaster>
           context: context,
           forceRetryLogin: true,
           sliderCaptcha: (String cookieStr) {
-            return SliderCaptchaClientProvider(
-              cookie: cookieStr,
-            ).solve(context);
+            return SliderCaptchaClientProvider(cookie: cookieStr).solve(
+              manualSolver: (provider) =>
+                  solveSliderCaptchaManually(context, provider),
+            );
           },
         );
       }

lib/page/homepage/homepage.dart

@@ -16,6 +16,7 @@ import 'package:watermeter/page/homepage/refresh.dart';
 import 'package:watermeter/repository/notification/course_reminder_service.dart';
 import 'package:watermeter/repository/logger.dart';
 import 'package:watermeter/page/login/jc_captcha.dart';
+import 'package:watermeter/repository/xidian_ids/slider_captcha_client.dart';
 
 class MainPage extends StatefulWidget {
   final Function()? changePage;
@@ -210,9 +211,10 @@ class _MainPageState extends State<MainPage> with TickerProviderStateMixin {
           await update(
             context: context,
             sliderCaptcha: (String cookieStr) {
-              return SliderCaptchaClientProvider(
-                cookie: cookieStr,
-              ).solve(context);
+              return SliderCaptchaClientProvider(cookie: cookieStr).solve(
+                manualSolver: (provider) =>
+                    solveSliderCaptchaManually(context, provider),
+              );
             },
           );
           if (context.mounted) {

lib/page/homepage/info_widget/classtable_card.dart

@@ -70,6 +70,10 @@ class _ClassTableCardState extends State<ClassTableCard> {
                 controller.homepageArrangementStateComputedSignal.value;
             final arrangements = controller.arrangementComputedSignal.value;
             final isTomorrow = controller.isTomorrowComputedSignal.value;
+            final updateTime = controller.updateTimeComputedSignal.value;
+            final displayTime = isTomorrow
+                ? updateTime.add(const Duration(days: 1))
+                : updateTime;
             final isAllSourcesLoading =
                 controller.isAllSourcesLoadingComputedSignal.value;
             final isPartialSourcesLoading =
@@ -78,8 +82,9 @@ class _ClassTableCardState extends State<ClassTableCard> {
             final havePhysicsExperiment =
                 controller.havePhysicsExperimentSignal.value;
             final isPostGraduate = controller.isPostGraduate;
-            final currentWeek =
-                classTableController.currentWeekComputedSignal.value;
+            final currentWeek = classTableController.getCurrentWeek(
+              displayTime,
+            );
             final semesterLength = classTableController
                 .classTableComputedSignal
                 .value
@@ -98,6 +103,7 @@ class _ClassTableCardState extends State<ClassTableCard> {
                 isTomorrow: isTomorrow,
                 emptyInfoText: _getEmptyInfoText(arrangementState),
                 arrangementState: arrangementState,
+                displayTime: displayTime,
                 currentWeek: currentWeek,
                 semesterLength: semesterLength,
               ),
@@ -121,6 +127,7 @@ class _ClassArrangementListView extends StatelessWidget {
   final bool isTomorrow;
   final String emptyInfoText;
   final ArrangementState arrangementState;
+  final DateTime displayTime;
   final int currentWeek;
   final int semesterLength;
 
@@ -129,6 +136,7 @@ class _ClassArrangementListView extends StatelessWidget {
     required this.isTomorrow,
     required this.emptyInfoText,
     required this.arrangementState,
+    required this.displayTime,
     required this.currentWeek,
     required this.semesterLength,
   });
@@ -196,12 +204,12 @@ class _ClassArrangementListView extends StatelessWidget {
                 String timeString = DateFormat(
                   "MMMd",
                   FlutterI18n.currentLocale(context).toString(),
-                ).format(DateTime.now());
+                ).format(displayTime);
 
                 String weekString = DateFormat(
                   "E",
                   FlutterI18n.currentLocale(context).toString(),
-                ).format(DateTime.now());
+                ).format(displayTime);
 
                 String weekInfo =
                     currentWeek >= 0 && currentWeek < semesterLength