Fixes #1:Sleep-Tracker:小组件刷新逻辑调整;入睡时间显示调整

Author: BlackCCCat

Sleep-Tracker/tabs/TrendsTab.tsx

@@ -16,7 +16,7 @@ import {
 } from "scripting"
 import { buildDashboardBundle, type DashboardDay } from "../data/dashboard"
 import { MetricTile, SoftCard } from "../components/common"
-import { palette, scoreEmoji, scoreLabel, scoreTone, stageColor } from "../theme"
+import { bedtimeEmoji, bedtimeTone, palette, scoreLabel, scoreTone, stageColor } from "../theme"
 import type { SleepTrackerSettings, SleepTrackerSnapshot } from "../types"
 import {
   addDays,
@@ -342,52 +342,38 @@ function buildStageSummary(days: DashboardDay[]) {
   ]
 }
 
-function calendarScoreBackground(score: number | null): string {
-  if (score == null) return "#D9DCE8"
-  if (score >= 85) return "#80D9B8"
-  if (score >= 75) return "#FDB44E"
-  if (score >= 65) return "#FF9C7B"
-  return "#FF7B7B"
-}
-
 function calendarBucketLabel(bucket: TrendBucket, mode: TrendMode): string {
   if (mode === "year" || mode === "all") return bucket.label
   return formatMonthDayFromKey(bucket.key).replace("月", "/").replace("日", "")
 }
 
 function buildCalendarItems(buckets: TrendBucket[], mode: TrendMode, placeholder = false) {
-  const placeholderTimes = ["22:41", "23:14", "22:58", "23:37", "22:26", "23:05"]
-  const placeholderScores = [92, 84, 77, 69, 88, 73]
-
-  return buckets.map((bucket, index) => {
+  return buckets.map((bucket) => {
     if (placeholder) {
       return {
         key: bucket.key,
         label: calendarBucketLabel(bucket, mode),
         bedtime: null,
         emoji: null,
-        background: calendarScoreBackground(null),
+        background: bedtimeTone(null),
       }
     }
 
     const daysWithBedtime = bucket.days.filter((day) => day.bedtimeISO)
     const bedtimeValues = daysWithBedtime
       .map((day) => wrappedMinutes(day.bedtimeISO))
       .filter((value): value is number => value != null)
-    const scores = daysWithBedtime
-      .map((day) => day.sleepScore)
-      .filter((value): value is number => value != null)
-    const averageScore = scores.length ? average(scores) : null
+    const displayBedtime = bedtimeValues.length ? average(bedtimeValues) : null
 
     return {
       key: bucket.key,
       label: calendarBucketLabel(bucket, mode),
       bedtime:
         mode === "week" || mode === "month"
           ? formatClockFromISO(daysWithBedtime[0]?.bedtimeISO)
-          : formatWrappedClock(bedtimeValues.length ? average(bedtimeValues) : null),
-      emoji: scoreEmoji(averageScore),
-      background: calendarScoreBackground(averageScore),
+          : formatWrappedClock(displayBedtime),
+      emoji: bedtimeEmoji(displayBedtime),
+      background: bedtimeTone(displayBedtime),
     }
   })
 }

Sleep-Tracker/theme.ts

@@ -65,6 +65,24 @@ export function scoreEmoji(score: number | null): string {
   return "😣"
 }
 
+export function bedtimeEmoji(minutes: number | null): string {
+  if (minutes == null || !Number.isFinite(minutes)) return "😴"
+  if (minutes <= 23 * 60 + 30) return "😄"
+  if (minutes <= 24 * 60 + 30) return "🙂"
+  if (minutes <= 25 * 60 + 30) return "😐"
+  if (minutes <= 26 * 60 + 30) return "😕"
+  return "😣"
+}
+
+export function bedtimeTone(minutes: number | null): string {
+  if (minutes == null || !Number.isFinite(minutes)) return "#D9DCE8"
+  if (minutes <= 23 * 60 + 30) return "#80D9B8"
+  if (minutes <= 24 * 60 + 30) return "#A9C7FF"
+  if (minutes <= 25 * 60 + 30) return "#FDB44E"
+  if (minutes <= 26 * 60 + 30) return "#FF9C7B"
+  return "#FF7B7B"
+}
+
 export function scoreTone(score: number | null): string {
   if (score == null) return "secondaryLabel"
   if (score >= 85) return palette.accentDeep

Sleep-Tracker/widget.tsx

@@ -28,7 +28,7 @@ import {
 import {
   loadSleepTrackerSettings,
 } from "./data/settings"
-import { palette, scoreEmoji, scoreTone } from "./theme"
+import { bedtimeEmoji, bedtimeTone, palette, scoreTone } from "./theme"
 import {
   average,
   chunkArray,
@@ -47,13 +47,37 @@ const BG_SMALL = { style: "systemBackground" as any, shape: { type: "rect" as co
 const BG_LARGE = { style: "systemBackground" as any, shape: { type: "rect" as const, cornerRadius: 24 } }
 const CHART_HIDDEN = { chartLegend: "hidden" as const }
 const WIDGET_QUERY_DAYS = 60
+const WIDGET_RELOAD_TIMES = [
+  { hour: 0, minute: 5 },
+  { hour: 7, minute: 30 },
+  { hour: 9, minute: 30 },
+  { hour: 12, minute: 30 },
+  { hour: 18, minute: 30 },
+]
 
 // ── Helpers ──
 
+function reloadDateAt(base: Date, hour: number, minute: number): Date {
+  return new Date(base.getFullYear(), base.getMonth(), base.getDate(), hour, minute)
+}
+
+function nextReloadDate(now = new Date()): Date {
+  for (const item of WIDGET_RELOAD_TIMES) {
+    const candidate = reloadDateAt(now, item.hour, item.minute)
+    if (candidate.getTime() > now.getTime() + 60 * 1000) {
+      return candidate
+    }
+  }
+
+  const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1)
+  const firstReload = WIDGET_RELOAD_TIMES[0]
+  return reloadDateAt(tomorrow, firstReload.hour, firstReload.minute)
+}
+
 function reloadPolicy() {
   return {
     policy: "after" as const,
-    date: new Date(Date.now() + 3 * 60 * 60 * 1000),
+    date: nextReloadDate(),
   }
 }
 
@@ -186,14 +210,6 @@ function formatWrappedClock(minutes: number | null): string {
   return `${`${Math.floor(n / 60)}`.padStart(2, "0")}:${`${n % 60}`.padStart(2, "0")}`
 }
 
-function bedtimeBadgeTone(score: number | null) {
-  if (score == null) return "tertiarySystemFill"
-  if (score >= 85) return "#80D9B8"
-  if (score >= 75) return "#FDB44E"
-  if (score >= 65) return "#FF9C7B"
-  return "#FF7B7B"
-}
-
 function bedtimeSummary(days: DashboardDay[]) {
   const sleepDays = days.filter((day) => day.bedtimeISO)
   const bedtimeValues = sleepDays.map((day) => wrappedMinutes(day.bedtimeISO)).filter((value): value is number => value != null)
@@ -221,9 +237,9 @@ function BedtimeStrip(props: { days: DashboardDay[]; count: number; rows?: numbe
               <Text
                 font={{ size: 22 } as any}
                 frame={{ width: 34, height: 34, alignment: "center" as any }}
-                background={{ style: bedtimeBadgeTone(day.sleepScore) as any, shape: { type: "rect", cornerRadius: 17 } } as any}
+                background={{ style: bedtimeTone(wrappedMinutes(day.bedtimeISO)) as any, shape: { type: "rect", cornerRadius: 17 } } as any}
               >
-                {day.bedtimeISO ? scoreEmoji(day.sleepScore) : "—"}
+                {day.bedtimeISO ? bedtimeEmoji(wrappedMinutes(day.bedtimeISO)) : "—"}
               </Text>
               <Text font="caption2" foregroundStyle="secondaryLabel" lineLimit={1}>
                 {day.bedtimeISO ? formatClockFromISO(day.bedtimeISO) : "--"}