richard/digital-pilates
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 适配 headerbar ios26

Browse Source
This commit is contained in:
richarjiang
2025-10-14 16:31:19 +08:00
parent cf069f3537
commit 435f5cc65c
41 changed files with 493 additions and 5445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
components/WorkoutSummaryCard.tsx
View File

@@ -15,8 +15,7 @@ import {
getWorkoutTypeDisplayName,
HealthPermissionStatus,
removeHealthPermissionListener,
WorkoutActivityType,
WorkoutData,
WorkoutData
} from '@/utils/health';
import { logger } from '@/utils/logger';
@@ -39,21 +38,6 @@ const DEFAULT_SUMMARY: WorkoutSummary = {
lastWorkout: null,
};
const iconByWorkoutType: Partial<Record<WorkoutActivityType, keyof typeof MaterialCommunityIcons.glyphMap>> = {
[WorkoutActivityType.Running]: 'run',
[WorkoutActivityType.Walking]: 'walk',
[WorkoutActivityType.Cycling]: 'bike',
[WorkoutActivityType.Swimming]: 'swim',
[WorkoutActivityType.Yoga]: 'meditation',
[WorkoutActivityType.FunctionalStrengthTraining]: 'weight-lifter',
[WorkoutActivityType.TraditionalStrengthTraining]: 'dumbbell',
[WorkoutActivityType.CrossTraining]: 'arm-flex',
[WorkoutActivityType.MixedCardio]: 'heart-pulse',
[WorkoutActivityType.HighIntensityIntervalTraining]: 'run-fast',
[WorkoutActivityType.Flexibility]: 'meditation',
[WorkoutActivityType.Cooldown]: 'meditation',
[WorkoutActivityType.Other]: 'arm-flex',
};
export const WorkoutSummaryCard: React.FC<WorkoutSummaryCardProps> = ({ date, style }) => {
const router = useRouter();
@@ -86,34 +70,36 @@ export const WorkoutSummaryCard: React.FC<WorkoutSummaryCardProps> = ({ date, st
return;
}
const startDate = dayjs(targetDate).startOf('day').toDate();
// 修改：获取从过去30天到选中日期之间的运动记录
const startDate = dayjs(targetDate).subtract(30, 'day').startOf('day').toDate();
const endDate = dayjs(targetDate).endOf('day').toDate();
const workouts = await fetchWorkoutsForDateRange(startDate, endDate, 50);
const workouts = await fetchWorkoutsForDateRange(startDate, endDate, 1);
console.log('workouts', workouts);
const workoutsInRange = workouts
// 筛选出选中日期及以前的运动记录，并按结束时间排序（最新在前）
const workoutsBeforeDate = workouts
.filter((workout) => {
// 额外防护：确保锻炼记录确实落在当天
// 确保锻炼记录在选中日期或之前
const workoutDate = dayjs(workout.startDate);
return workoutDate.isSame(dayjs(targetDate), 'day');
return workoutDate.isSameOrBefore(dayjs(targetDate), 'day');
})
// 依据结束时间排序，最新在前
.sort((a, b) => dayjs(b.endDate || b.startDate).valueOf() - dayjs(a.endDate || a.startDate).valueOf());
const totalCalories = workoutsInRange.reduce((total, workout) => total + (workout.totalEnergyBurned || 0), 0);
const totalMinutes = Math.round(
workoutsInRange.reduce((total, workout) => total + (workout.duration || 0), 0) / 60
);
// 只获取最近的一次运动记录
const lastWorkout = workoutsBeforeDate.length > 0 ? workoutsBeforeDate[0] : null;
const lastWorkout = workoutsInRange.length > 0 ? workoutsInRange[0] : null;
// 如果有最近一次运动记录，只使用这一条记录来计算总卡路里和总分钟数
const totalCalories = lastWorkout ? (lastWorkout.totalEnergyBurned || 0) : 0;
const totalMinutes = lastWorkout ? Math.round((lastWorkout.duration || 0) / 60) : 0;
// 只包含最近一次运动记录
const recentWorkouts = lastWorkout ? [lastWorkout] : [];
if (isMountedRef.current) {
setSummary({
totalCalories,
totalMinutes,
workouts: workoutsInRange,
workouts: recentWorkouts,
lastWorkout,
});
setResetToken((token) => token + 1);
@@ -153,10 +139,6 @@ export const WorkoutSummaryCard: React.FC<WorkoutSummaryCardProps> = ({ date, st
router.push('/workout/history');
}, [router]);
const handleAddPress = useCallback(() => {
router.push('/workout/create-session');
}, [router]);
const cardContent = useMemo(() => {
const hasWorkouts = summary.workouts.length > 0;
const lastWorkout = summary.lastWorkout;
@@ -213,7 +195,7 @@ export const WorkoutSummaryCard: React.FC<WorkoutSummaryCardProps> = ({ date, st
<View style={styles.headerRow}>
<View style={styles.titleRow}>
<Image source={require('@/assets/images/icons/icon-fitness.png')} style={styles.titleIcon} />
<Text style={styles.titleText}>健身</Text>
<Text style={styles.titleText}>近期锻炼</Text>
</View>
</View>