fix(course): compute semester weeks from time store

Author: bingling-sama

src/modules/courseTable/components/WeekSelector.tsx

@@ -10,7 +10,6 @@ import {
 
 import Modal from '@/components/modal';
 
-import useCourse from '@/store/course';
 import useTimeStore, { computeSemesterAndYear } from '@/store/time';
 import useVisualScheme from '@/store/visualScheme';
 
@@ -29,6 +28,7 @@ const SEMESTER_LABELS: Record<string, string> = {
 const WeekSelector: FC<WeekSelectorProps> = ({
   currentWeek,
   showWeekPicker,
+  totalWeeks,
   year,
   semester,
   semesterOptions,
@@ -37,7 +37,7 @@ const WeekSelector: FC<WeekSelectorProps> = ({
 }) => {
   const currentStyle = useVisualScheme(state => state.currentStyle);
   const getCurrentWeek = useTimeStore(state => state.getCurrentWeek);
-  const schoolTime = useCourse(state => state.schoolTime);
+  const schoolTime = useTimeStore(state => state.schoolTime);
 
   // 根据 schoolTime 推算真实当前学期
   const actualSemester = useMemo(
@@ -257,7 +257,7 @@ const WeekSelector: FC<WeekSelectorProps> = ({
             </View>
             {/* 周次选择区域 */}
             <View style={styles.weekGrid}>
-              {[...Array(20)].map((_, i) => (
+              {Array.from({ length: totalWeeks }).map((_, i) => (
                 <Pressable
                   key={i}
                   onPress={() => handleWeekSelect(i + 1)}

src/modules/courseTable/components/courseTable/StickyTop.tsx

@@ -3,7 +3,6 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import ThemeChangeText from '@/components/text';
 
-import useCourse from '@/store/course';
 import useCourseTableAppearance from '@/store/courseTableAppearance';
 import useTimeStore from '@/store/time';
 import useVisualScheme from '@/store/visualScheme';
@@ -17,7 +16,7 @@ import {
 export const StickyTop: React.FC = memo(function StickyTop() {
   const currentStyle = useVisualScheme(state => state.currentStyle);
   const { selectedWeek } = useTimeStore();
-  const schoolTime = useCourse(state => state.schoolTime);
+  const schoolTime = useTimeStore(state => state.schoolTime);
   const { backgroundUri } = useCourseTableAppearance();
   const [dates, setDates] = useState<string[]>([]);
 

src/modules/courseTable/components/courseTable/type.ts

@@ -63,6 +63,8 @@ export interface SemesterWeekParams {
 export interface WeekSelectorProps {
   currentWeek: number;
   showWeekPicker: boolean;
+  /** 当前学期总周数 */
+  totalWeeks: number;
   /** 当前学年，如 "2025" */
   year: string;
   /** 当前学期，"1" | "2" | "3" */

src/modules/courseTable/index.tsx

@@ -66,21 +66,17 @@ const CourseTablePage: FC = () => {
     return new ExtensionStorage('group.release-20240916');
   }, []);
 
-  const {
-    courses,
-    updateCourses,
-    setLastUpdate,
-    setHolidayTime,
-    schoolTime,
-    setSchoolTime,
-  } = useCourse();
+  const { courses, updateCourses, setLastUpdate } = useCourse();
   const {
     semester,
     setSemester,
     year,
     setYear,
     selectedWeek,
     setSelectedWeek,
+    setHolidayTime,
+    schoolTime,
+    setSchoolTime,
     showWeekPicker,
     setShowWeekPicker,
   } = useTimeStore();
@@ -93,6 +89,8 @@ const CourseTablePage: FC = () => {
     [studentId]
   );
 
+  const totalWeeks = useTimeStore(state => state.getSemesterWeekCount());
+
   const syncCoursesToWidget = useCallback(
     (nextCourses: courseType[]) => {
       extensionStorage.set(
@@ -227,6 +225,10 @@ const CourseTablePage: FC = () => {
     }
   }, [schoolTime]);
 
+  useEffect(() => {
+    setSelectedWeek(selectedWeek);
+  }, [selectedWeek, setSelectedWeek, totalWeeks]);
+
   // 启用 Live Activity 自动提醒
   useCourseLiveActivity(courses);
 
@@ -278,6 +280,7 @@ const CourseTablePage: FC = () => {
         <WeekSelector
           currentWeek={selectedWeek}
           showWeekPicker={showWeekPicker}
+          totalWeeks={totalWeeks}
           year={year}
           semester={semester}
           semesterOptions={semesterOptions}

src/store/course.ts

@@ -18,10 +18,6 @@ interface CourseState {
   updateCourseNote: (id: string, note: string) => void;
   lastUpdate: number;
   setLastUpdate: (time: number) => void;
-  holidayTime: number;
-  setHolidayTime: (_time: number) => void;
-  schoolTime: number;
-  setSchoolTime: (_time: number) => void;
 }
 
 const useCourse = create<CourseState>()(
@@ -66,10 +62,6 @@ const useCourse = create<CourseState>()(
         },
         lastUpdate: 0,
         setLastUpdate: (time: number) => set({ lastUpdate: time }),
-        holidayTime: 0,
-        setHolidayTime: (_time: number) => set({ holidayTime: _time }),
-        schoolTime: 0,
-        setSchoolTime: (_time: number) => set({ schoolTime: _time }),
       };
     },
     {

src/store/time.ts

@@ -2,7 +2,10 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
 import { create } from 'zustand';
 import { createJSONStorage, persist } from 'zustand/middleware';
 
-import useCourse from './course';
+import {
+  calculateSemesterWeekCount,
+  clampWeekToSemester,
+} from '@/utils/semesterWeeks';
 
 /**
  * 根据开学时间戳计算当前学期和学年
@@ -34,32 +37,48 @@ interface TimeState {
   setYear: (_year: string) => void;
   selectedWeek: number;
   setSelectedWeek: (_week: number) => void;
+  holidayTime: number;
+  setHolidayTime: (_time: number) => void;
+  schoolTime: number;
+  setSchoolTime: (_time: number) => void;
   showWeekPicker: boolean;
   setShowWeekPicker: (_opened: boolean) => void;
   getCurrentWeek: () => number;
+  getSemesterWeekCount: () => number;
   /** 根据开学时间戳计算并更新 semester/year */
   computeAndSetSemester: (_startTimestamp: number) => void;
 }
 
 const useTimeStore = create<TimeState>()(
   persist(
-    set => {
+    (set, get) => {
       return {
         semester: '',
         setSemester: (semester: string) => set({ semester }),
         year: '',
         setYear: (year: string) => set({ year }),
         selectedWeek: 1,
-        setSelectedWeek: (week: number) => set({ selectedWeek: week }),
+        setSelectedWeek: (week: number) => {
+          const totalWeeks = get().getSemesterWeekCount();
+          set({ selectedWeek: clampWeekToSemester(week, totalWeeks) });
+        },
+        holidayTime: 0,
+        setHolidayTime: (_time: number) => set({ holidayTime: _time }),
+        schoolTime: 0,
+        setSchoolTime: (_time: number) => set({ schoolTime: _time }),
         showWeekPicker: false,
         setShowWeekPicker: (showWeekPicker: boolean) =>
           set({ showWeekPicker: showWeekPicker }),
         getCurrentWeek: () => {
-          const startTimestamp = useCourse.getState().schoolTime * 1000;
+          const startTimestamp = get().schoolTime * 1000;
           const diffTime = new Date().getTime() - startTimestamp;
           const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
           return Math.floor(diffDays / 7) + 1;
         },
+        getSemesterWeekCount: () => {
+          const { schoolTime, holidayTime } = get();
+          return calculateSemesterWeekCount(schoolTime, holidayTime);
+        },
         computeAndSetSemester: (startTimestamp: number) => {
           const { semester, year } = computeSemesterAndYear(startTimestamp);
           set({ semester, year });

src/utils/semesterWeeks.ts

@@ -0,0 +1,18 @@
+const SECONDS_PER_WEEK = 7 * 24 * 60 * 60;
+
+export const DEFAULT_SEMESTER_WEEK_COUNT = 20;
+
+export const calculateSemesterWeekCount = (
+  schoolTime?: number,
+  holidayTime?: number
+) => {
+  if (!schoolTime || !holidayTime || holidayTime <= schoolTime) {
+    return DEFAULT_SEMESTER_WEEK_COUNT;
+  }
+
+  return Math.max(1, Math.ceil((holidayTime - schoolTime) / SECONDS_PER_WEEK));
+};
+
+export const clampWeekToSemester = (week: number, totalWeeks: number) => {
+  return Math.min(Math.max(week, 1), totalWeeks);
+};