feat: 更新 UI 样式以及消息通知
This commit is contained in:
@@ -16,7 +16,7 @@ import { WaterRecordSource } from '@/services/waterRecords';
|
|||||||
import { store } from '@/store';
|
import { store } from '@/store';
|
||||||
import { rehydrateUser, setPrivacyAgreed } from '@/store/userSlice';
|
import { rehydrateUser, setPrivacyAgreed } from '@/store/userSlice';
|
||||||
import { createWaterRecordAction } from '@/store/waterSlice';
|
import { createWaterRecordAction } from '@/store/waterSlice';
|
||||||
import { MoodNotificationHelpers, NutritionNotificationHelpers } from '@/utils/notificationHelpers';
|
import { DailySummaryNotificationHelpers, MoodNotificationHelpers, NutritionNotificationHelpers } from '@/utils/notificationHelpers';
|
||||||
import { clearPendingWaterRecords, syncPendingWidgetChanges } from '@/utils/widgetDataSync';
|
import { clearPendingWaterRecords, syncPendingWidgetChanges } from '@/utils/widgetDataSync';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
@@ -54,6 +54,21 @@ function Bootstrapper({ children }: { children: React.ReactNode }) {
|
|||||||
await notificationService.initialize();
|
await notificationService.initialize();
|
||||||
console.log('通知服务初始化成功');
|
console.log('通知服务初始化成功');
|
||||||
|
|
||||||
|
// 注册午餐提醒(12:00)
|
||||||
|
await NutritionNotificationHelpers.scheduleDailyLunchReminder(profile.name || '');
|
||||||
|
console.log('午餐提醒已注册');
|
||||||
|
|
||||||
|
// 注册晚餐提醒(18:00)
|
||||||
|
await NutritionNotificationHelpers.scheduleDailyDinnerReminder(profile.name || '');
|
||||||
|
console.log('晚餐提醒已注册');
|
||||||
|
|
||||||
|
// 注册心情提醒(21:00)
|
||||||
|
await MoodNotificationHelpers.scheduleDailyMoodReminder(profile.name || '');
|
||||||
|
console.log('心情提醒已注册');
|
||||||
|
|
||||||
|
await DailySummaryNotificationHelpers.scheduleDailySummaryNotification(profile.name || '')
|
||||||
|
|
||||||
|
|
||||||
// 初始化快捷动作
|
// 初始化快捷动作
|
||||||
await setupQuickActions();
|
await setupQuickActions();
|
||||||
console.log('快捷动作初始化成功');
|
console.log('快捷动作初始化成功');
|
||||||
@@ -104,33 +119,6 @@ function Bootstrapper({ children }: { children: React.ReactNode }) {
|
|||||||
}
|
}
|
||||||
}, [userDataLoaded, privacyAgreed]);
|
}, [userDataLoaded, privacyAgreed]);
|
||||||
|
|
||||||
// 当用户数据加载完成且用户名存在时,注册所有提醒
|
|
||||||
React.useEffect(() => {
|
|
||||||
const registerAllReminders = async () => {
|
|
||||||
try {
|
|
||||||
await notificationService.initialize();
|
|
||||||
// 注册午餐提醒(12:00)
|
|
||||||
await NutritionNotificationHelpers.scheduleDailyLunchReminder(profile.name || '');
|
|
||||||
console.log('午餐提醒已注册');
|
|
||||||
|
|
||||||
// 注册晚餐提醒(18:00)
|
|
||||||
await NutritionNotificationHelpers.scheduleDailyDinnerReminder(profile.name || '');
|
|
||||||
console.log('晚餐提醒已注册');
|
|
||||||
|
|
||||||
// 注册心情提醒(21:00)
|
|
||||||
await MoodNotificationHelpers.scheduleDailyMoodReminder(profile.name || '');
|
|
||||||
console.log('心情提醒已注册');
|
|
||||||
|
|
||||||
|
|
||||||
console.log('喝水提醒后台任务已注册');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('注册提醒失败:', error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
registerAllReminders();
|
|
||||||
}, [userDataLoaded, profile?.name]);
|
|
||||||
|
|
||||||
const handlePrivacyAgree = () => {
|
const handlePrivacyAgree = () => {
|
||||||
dispatch(setPrivacyAgreed());
|
dispatch(setPrivacyAgreed());
|
||||||
setShowPrivacyModal(false);
|
setShowPrivacyModal(false);
|
||||||
|
|||||||
@@ -13,15 +13,12 @@ import React, { useEffect, useRef, useState } from 'react';
|
|||||||
import {
|
import {
|
||||||
Alert,
|
Alert,
|
||||||
Animated,
|
Animated,
|
||||||
Dimensions,
|
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
Text,
|
Text,
|
||||||
TouchableOpacity,
|
TouchableOpacity,
|
||||||
View
|
View
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
|
|
||||||
const { width } = Dimensions.get('window');
|
|
||||||
|
|
||||||
type VoiceRecordState = 'idle' | 'listening' | 'processing' | 'result' | 'analyzing';
|
type VoiceRecordState = 'idle' | 'listening' | 'processing' | 'result' | 'analyzing';
|
||||||
|
|
||||||
export default function VoiceRecordScreen() {
|
export default function VoiceRecordScreen() {
|
||||||
@@ -43,21 +40,6 @@ export default function VoiceRecordScreen() {
|
|||||||
const glowAnimation = useRef(new Animated.Value(0)).current;
|
const glowAnimation = useRef(new Animated.Value(0)).current;
|
||||||
const progressAnimation = useRef(new Animated.Value(0)).current;
|
const progressAnimation = useRef(new Animated.Value(0)).current;
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
// 初始化语音识别
|
|
||||||
Voice.onSpeechStart = onSpeechStart;
|
|
||||||
Voice.onSpeechRecognized = onSpeechRecognized;
|
|
||||||
Voice.onSpeechEnd = onSpeechEnd;
|
|
||||||
Voice.onSpeechError = onSpeechError;
|
|
||||||
Voice.onSpeechResults = onSpeechResults;
|
|
||||||
Voice.onSpeechPartialResults = onSpeechPartialResults;
|
|
||||||
Voice.onSpeechVolumeChanged = onSpeechVolumeChanged;
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
Voice.destroy().then(Voice.removeAllListeners);
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// 启动脉动动画
|
// 启动脉动动画
|
||||||
const startPulseAnimation = () => {
|
const startPulseAnimation = () => {
|
||||||
Animated.loop(
|
Animated.loop(
|
||||||
@@ -149,7 +131,6 @@ export default function VoiceRecordScreen() {
|
|||||||
setIsListening(false);
|
setIsListening(false);
|
||||||
setRecordState('idle');
|
setRecordState('idle');
|
||||||
stopAnimations();
|
stopAnimations();
|
||||||
Alert.alert('录音失败', '请检查麦克风权限或稍后重试');
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const onSpeechResults = (event: any) => {
|
const onSpeechResults = (event: any) => {
|
||||||
@@ -171,16 +152,33 @@ export default function VoiceRecordScreen() {
|
|||||||
scaleAnimation.setValue(Math.min(scale, 1.5));
|
scaleAnimation.setValue(Math.min(scale, 1.5));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// 初始化语音识别
|
||||||
|
Voice.onSpeechStart = onSpeechStart;
|
||||||
|
Voice.onSpeechRecognized = onSpeechRecognized;
|
||||||
|
Voice.onSpeechEnd = onSpeechEnd;
|
||||||
|
Voice.onSpeechError = onSpeechError;
|
||||||
|
Voice.onSpeechResults = onSpeechResults;
|
||||||
|
Voice.onSpeechPartialResults = onSpeechPartialResults;
|
||||||
|
Voice.onSpeechVolumeChanged = onSpeechVolumeChanged;
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
Voice.destroy().then(Voice.removeAllListeners);
|
||||||
|
};
|
||||||
|
}, [onSpeechStart, onSpeechRecognized, onSpeechEnd, onSpeechError, onSpeechResults, onSpeechPartialResults, onSpeechVolumeChanged]);
|
||||||
|
|
||||||
|
|
||||||
// 开始录音
|
// 开始录音
|
||||||
const startRecording = async () => {
|
const startRecording = async () => {
|
||||||
try {
|
try {
|
||||||
setRecognizedText('');
|
setRecognizedText('');
|
||||||
setRecordState('idle');
|
|
||||||
triggerHapticFeedback('impactMedium');
|
triggerHapticFeedback('impactMedium');
|
||||||
|
|
||||||
await Voice.start('zh-CN'); // 设置为中文识别
|
await Voice.start('zh-CN'); // 设置为中文识别
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('启动语音识别失败:', error);
|
console.log('启动语音识别失败:', error);
|
||||||
|
setRecordState('idle');
|
||||||
Alert.alert('录音失败', '无法启动语音识别,请检查权限设置');
|
Alert.alert('录音失败', '无法启动语音识别,请检查权限设置');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -196,10 +194,27 @@ export default function VoiceRecordScreen() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// 重新录音
|
// 重新录音
|
||||||
const retryRecording = () => {
|
const retryRecording = async () => {
|
||||||
|
// 停止所有动画
|
||||||
|
stopAnimations();
|
||||||
|
|
||||||
|
// 重置所有状态
|
||||||
setRecognizedText('');
|
setRecognizedText('');
|
||||||
|
setAnalysisProgress(0);
|
||||||
|
setIsListening(false);
|
||||||
setRecordState('idle');
|
setRecordState('idle');
|
||||||
|
|
||||||
|
// 确保语音识别已停止
|
||||||
|
try {
|
||||||
|
await Voice.stop();
|
||||||
|
} catch {
|
||||||
|
// 忽略停止错误,可能已经停止了
|
||||||
|
}
|
||||||
|
|
||||||
|
// 延迟一点再开始新的录音,确保状态完全重置
|
||||||
|
setTimeout(() => {
|
||||||
startRecording();
|
startRecording();
|
||||||
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
// 确认并分析食物文本
|
// 确认并分析食物文本
|
||||||
@@ -277,15 +292,15 @@ export default function VoiceRecordScreen() {
|
|||||||
const getStatusText = () => {
|
const getStatusText = () => {
|
||||||
switch (recordState) {
|
switch (recordState) {
|
||||||
case 'idle':
|
case 'idle':
|
||||||
return '点击开始录音';
|
return '轻触麦克风开始录音';
|
||||||
case 'listening':
|
case 'listening':
|
||||||
return '正在聆听...';
|
return '正在聆听中,请开始说话...';
|
||||||
case 'processing':
|
case 'processing':
|
||||||
return 'AI处理中...';
|
return 'AI正在处理语音内容...';
|
||||||
case 'analyzing':
|
case 'analyzing':
|
||||||
return 'AI大模型分析中...';
|
return 'AI大模型深度分析营养成分中...';
|
||||||
case 'result':
|
case 'result':
|
||||||
return '识别完成';
|
return '语音识别完成,请确认结果';
|
||||||
default:
|
default:
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@@ -344,7 +359,17 @@ export default function VoiceRecordScreen() {
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<View style={styles.content}>
|
<View style={styles.content}>
|
||||||
{/* 录音动画区域 */}
|
{/* 上半部分:介绍 */}
|
||||||
|
<View style={styles.topSection}>
|
||||||
|
<View style={styles.introContainer}>
|
||||||
|
<Text style={[styles.introDescription, { color: colorTokens.textSecondary }]}>
|
||||||
|
通过语音描述您的饮食内容,AI将智能分析营养成分和卡路里
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
{/* 中间部分:录音动画区域 */}
|
||||||
|
<View style={styles.middleSection}>
|
||||||
<View style={styles.animationContainer}>
|
<View style={styles.animationContainer}>
|
||||||
{/* 背景波浪效果 */}
|
{/* 背景波浪效果 */}
|
||||||
{recordState === 'listening' && (
|
{recordState === 'listening' && (
|
||||||
@@ -447,8 +472,10 @@ export default function VoiceRecordScreen() {
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
</View>
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
{/* 状态文本 */}
|
{/* 下半部分:状态文本和示例 */}
|
||||||
|
<View style={styles.bottomSection}>
|
||||||
<View style={styles.statusContainer}>
|
<View style={styles.statusContainer}>
|
||||||
<Text style={[styles.statusText, { color: colorTokens.text }]}>
|
<Text style={[styles.statusText, { color: colorTokens.text }]}>
|
||||||
{getStatusText()}
|
{getStatusText()}
|
||||||
@@ -460,6 +487,28 @@ export default function VoiceRecordScreen() {
|
|||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* 食物记录示例 */}
|
||||||
|
{recordState === 'idle' && (
|
||||||
|
<BlurView intensity={20} tint={theme} style={styles.examplesContainer}>
|
||||||
|
<View style={styles.examplesContent}>
|
||||||
|
<Text style={[styles.examplesTitle, { color: colorTokens.text }]}>
|
||||||
|
记录示例:
|
||||||
|
</Text>
|
||||||
|
<View style={styles.examplesList}>
|
||||||
|
<Text style={[styles.exampleText, { color: colorTokens.textSecondary }]}>
|
||||||
|
“今早吃了两个煎蛋、一片全麦面包和一杯牛奶”
|
||||||
|
</Text>
|
||||||
|
<Text style={[styles.exampleText, { color: colorTokens.textSecondary }]}>
|
||||||
|
“午饭吃了红烧肉约150克、米饭一小碗、青菜一份”
|
||||||
|
</Text>
|
||||||
|
<Text style={[styles.exampleText, { color: colorTokens.textSecondary }]}>
|
||||||
|
“晚饭吃了蒸蛋羹、紫菜蛋花汤、小米粥一碗”
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</BlurView>
|
||||||
|
)}
|
||||||
|
|
||||||
{recordState === 'analyzing' && (
|
{recordState === 'analyzing' && (
|
||||||
<View style={styles.analysisProgressContainer}>
|
<View style={styles.analysisProgressContainer}>
|
||||||
<Text style={[styles.progressText, { color: colorTokens.text }]}>
|
<Text style={[styles.progressText, { color: colorTokens.text }]}>
|
||||||
@@ -484,6 +533,7 @@ export default function VoiceRecordScreen() {
|
|||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
{/* 识别结果 */}
|
{/* 识别结果 */}
|
||||||
{recognizedText && (
|
{recognizedText && (
|
||||||
@@ -528,17 +578,46 @@ const styles = StyleSheet.create({
|
|||||||
flex: 1,
|
flex: 1,
|
||||||
},
|
},
|
||||||
content: {
|
content: {
|
||||||
|
flex: 1,
|
||||||
|
paddingHorizontal: 20,
|
||||||
|
paddingTop: 20,
|
||||||
|
paddingBottom: 40,
|
||||||
|
},
|
||||||
|
topSection: {
|
||||||
|
alignItems: 'center',
|
||||||
|
paddingBottom: 20,
|
||||||
|
},
|
||||||
|
middleSection: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
|
minHeight: 200,
|
||||||
|
},
|
||||||
|
bottomSection: {
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
introContainer: {
|
||||||
|
alignItems: 'center',
|
||||||
paddingHorizontal: 20,
|
paddingHorizontal: 20,
|
||||||
},
|
},
|
||||||
|
introTitle: {
|
||||||
|
fontSize: 24,
|
||||||
|
fontWeight: 'bold',
|
||||||
|
marginBottom: 8,
|
||||||
|
textAlign: 'center',
|
||||||
|
},
|
||||||
|
introDescription: {
|
||||||
|
fontSize: 16,
|
||||||
|
lineHeight: 24,
|
||||||
|
textAlign: 'center',
|
||||||
|
paddingHorizontal: 10,
|
||||||
|
},
|
||||||
animationContainer: {
|
animationContainer: {
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
marginBottom: 40,
|
|
||||||
height: 200,
|
height: 200,
|
||||||
width: 200,
|
width: 200,
|
||||||
|
flex: 1,
|
||||||
},
|
},
|
||||||
waveRing: {
|
waveRing: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
@@ -573,7 +652,7 @@ const styles = StyleSheet.create({
|
|||||||
},
|
},
|
||||||
statusContainer: {
|
statusContainer: {
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
marginBottom: 30,
|
paddingHorizontal: 20,
|
||||||
},
|
},
|
||||||
statusText: {
|
statusText: {
|
||||||
fontSize: 18,
|
fontSize: 18,
|
||||||
@@ -585,6 +664,35 @@ const styles = StyleSheet.create({
|
|||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
lineHeight: 20,
|
lineHeight: 20,
|
||||||
},
|
},
|
||||||
|
examplesContainer: {
|
||||||
|
marginTop: 24,
|
||||||
|
marginHorizontal: 20,
|
||||||
|
borderRadius: 16,
|
||||||
|
overflow: 'hidden',
|
||||||
|
},
|
||||||
|
examplesContent: {
|
||||||
|
padding: 20,
|
||||||
|
backgroundColor: 'rgba(255, 255, 255, 0.9)',
|
||||||
|
borderRadius: 16,
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
examplesTitle: {
|
||||||
|
fontSize: 16,
|
||||||
|
fontWeight: '600',
|
||||||
|
marginBottom: 16,
|
||||||
|
},
|
||||||
|
examplesList: {
|
||||||
|
paddingHorizontal: 10,
|
||||||
|
gap: 8,
|
||||||
|
},
|
||||||
|
exampleText: {
|
||||||
|
fontSize: 14,
|
||||||
|
lineHeight: 22,
|
||||||
|
textAlign: 'center',
|
||||||
|
paddingHorizontal: 12,
|
||||||
|
paddingVertical: 8,
|
||||||
|
marginVertical: 4,
|
||||||
|
},
|
||||||
resultContainer: {
|
resultContainer: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
bottom: 100,
|
bottom: 100,
|
||||||
|
|||||||
BIN
assets/images/icons/icon-broadcast.png
Normal file
BIN
assets/images/icons/icon-broadcast.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
BIN
assets/images/icons/icon-camera.png
Normal file
BIN
assets/images/icons/icon-camera.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
assets/images/icons/icon-food.png
Normal file
BIN
assets/images/icons/icon-food.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
@@ -10,6 +10,7 @@ import {
|
|||||||
import { useNotifications } from '../hooks/useNotifications';
|
import { useNotifications } from '../hooks/useNotifications';
|
||||||
import { ThemedText } from './ThemedText';
|
import { ThemedText } from './ThemedText';
|
||||||
import { ThemedView } from './ThemedView';
|
import { ThemedView } from './ThemedView';
|
||||||
|
import { DailySummaryTest } from './DailySummaryTest';
|
||||||
|
|
||||||
export const NotificationTest: React.FC = () => {
|
export const NotificationTest: React.FC = () => {
|
||||||
const {
|
const {
|
||||||
@@ -246,6 +247,9 @@ export const NotificationTest: React.FC = () => {
|
|||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* 每日总结推送测试 */}
|
||||||
|
<DailySummaryTest userName="测试用户" />
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
</ThemedView>
|
</ThemedView>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { AnimatedNumber } from '@/components/AnimatedNumber';
|
import { AnimatedNumber } from '@/components/AnimatedNumber';
|
||||||
import { FloatingFoodOverlay } from '@/components/FloatingFoodOverlay';
|
|
||||||
import { ROUTES } from '@/constants/Routes';
|
import { ROUTES } from '@/constants/Routes';
|
||||||
import { NutritionSummary } from '@/services/dietRecords';
|
import { NutritionSummary } from '@/services/dietRecords';
|
||||||
import { triggerLightHaptic } from '@/utils/haptics';
|
import { triggerLightHaptic } from '@/utils/haptics';
|
||||||
@@ -7,7 +6,7 @@ import { NutritionGoals, calculateRemainingCalories } from '@/utils/nutrition';
|
|||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import { router } from 'expo-router';
|
import { router } from 'expo-router';
|
||||||
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Animated, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
|
import { Animated, Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
|
||||||
import Svg, { Circle } from 'react-native-svg';
|
import Svg, { Circle } from 'react-native-svg';
|
||||||
|
|
||||||
const AnimatedCircle = Animated.createAnimatedComponent(Circle);
|
const AnimatedCircle = Animated.createAnimatedComponent(Circle);
|
||||||
@@ -107,7 +106,6 @@ export function NutritionRadarCard({
|
|||||||
onMealPress
|
onMealPress
|
||||||
}: NutritionRadarCardProps) {
|
}: NutritionRadarCardProps) {
|
||||||
const [currentMealType] = useState<'breakfast' | 'lunch' | 'dinner' | 'snack'>('breakfast');
|
const [currentMealType] = useState<'breakfast' | 'lunch' | 'dinner' | 'snack'>('breakfast');
|
||||||
const [showFoodOverlay, setShowFoodOverlay] = useState(false);
|
|
||||||
|
|
||||||
const nutritionStats = useMemo(() => {
|
const nutritionStats = useMemo(() => {
|
||||||
return [
|
return [
|
||||||
@@ -138,25 +136,12 @@ export function NutritionRadarCard({
|
|||||||
router.push(ROUTES.NUTRITION_RECORDS);
|
router.push(ROUTES.NUTRITION_RECORDS);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleAddFood = () => {
|
|
||||||
triggerLightHaptic();
|
|
||||||
setShowFoodOverlay(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TouchableOpacity style={styles.card} onPress={handleNavigateToRecords} activeOpacity={0.8}>
|
<TouchableOpacity style={styles.card} onPress={handleNavigateToRecords} activeOpacity={0.8}>
|
||||||
<View style={styles.cardHeader}>
|
<View style={styles.cardHeader}>
|
||||||
<Text style={styles.cardTitle}>饮食分析</Text>
|
<Text style={styles.cardTitle}>饮食分析</Text>
|
||||||
<View style={styles.cardRightContainer}>
|
|
||||||
<Text style={styles.cardSubtitle}>更新: {dayjs(nutritionSummary?.updatedAt).format('MM-DD HH:mm')}</Text>
|
<Text style={styles.cardSubtitle}>更新: {dayjs(nutritionSummary?.updatedAt).format('MM-DD HH:mm')}</Text>
|
||||||
<TouchableOpacity style={styles.addButton} onPress={handleAddFood}>
|
|
||||||
{/* <Ionicons name="add" size={16} color="#514b4bff" /> */}
|
|
||||||
<Text style={{
|
|
||||||
fontSize: 12,
|
|
||||||
color: 'white'
|
|
||||||
}}>添加+</Text>
|
|
||||||
</TouchableOpacity>
|
|
||||||
</View>
|
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
<View style={styles.contentContainer}>
|
<View style={styles.contentContainer}>
|
||||||
@@ -228,12 +213,59 @@ export function NutritionRadarCard({
|
|||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{/* 食物添加悬浮窗 */}
|
{/* 添加食物选项 */}
|
||||||
<FloatingFoodOverlay
|
<View style={styles.foodOptionsContainer}>
|
||||||
visible={showFoodOverlay}
|
<TouchableOpacity
|
||||||
onClose={() => setShowFoodOverlay(false)}
|
style={styles.foodOptionItem}
|
||||||
mealType={currentMealType}
|
onPress={() => {
|
||||||
|
triggerLightHaptic();
|
||||||
|
router.push(`/food/camera?mealType=${currentMealType}`);
|
||||||
|
}}
|
||||||
|
activeOpacity={0.7}
|
||||||
|
>
|
||||||
|
<View style={[styles.foodOptionIcon]}>
|
||||||
|
<Image
|
||||||
|
source={require('@/assets/images/icons/icon-camera.png')}
|
||||||
|
style={styles.foodOptionImage}
|
||||||
/>
|
/>
|
||||||
|
</View>
|
||||||
|
<Text style={styles.foodOptionText}>AI识别</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.foodOptionItem}
|
||||||
|
onPress={() => {
|
||||||
|
triggerLightHaptic();
|
||||||
|
router.push(`${ROUTES.FOOD_LIBRARY}?mealType=${currentMealType}`);
|
||||||
|
}}
|
||||||
|
activeOpacity={0.7}
|
||||||
|
>
|
||||||
|
<View style={[styles.foodOptionIcon]}>
|
||||||
|
<Image
|
||||||
|
source={require('@/assets/images/icons/icon-food.png')}
|
||||||
|
style={styles.foodOptionImage}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<Text style={styles.foodOptionText}>食物库</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.foodOptionItem}
|
||||||
|
onPress={() => {
|
||||||
|
triggerLightHaptic();
|
||||||
|
router.push(`${ROUTES.VOICE_RECORD}?mealType=${currentMealType}`);
|
||||||
|
}}
|
||||||
|
activeOpacity={0.7}
|
||||||
|
>
|
||||||
|
<View style={[styles.foodOptionIcon]}>
|
||||||
|
<Image
|
||||||
|
source={require('@/assets/images/icons/icon-broadcast.png')}
|
||||||
|
style={styles.foodOptionImage}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<Text style={styles.foodOptionText}>一句话记录</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
);
|
);
|
||||||
@@ -264,11 +296,6 @@ const styles = StyleSheet.create({
|
|||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
color: '#192126',
|
color: '#192126',
|
||||||
},
|
},
|
||||||
cardRightContainer: {
|
|
||||||
flexDirection: 'row',
|
|
||||||
alignItems: 'center',
|
|
||||||
gap: 4,
|
|
||||||
},
|
|
||||||
cardSubtitle: {
|
cardSubtitle: {
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
color: '#9AA3AE',
|
color: '#9AA3AE',
|
||||||
@@ -416,26 +443,53 @@ const styles = StyleSheet.create({
|
|||||||
mealEmoji: {
|
mealEmoji: {
|
||||||
fontSize: 24,
|
fontSize: 24,
|
||||||
},
|
},
|
||||||
addButton: {
|
|
||||||
width: 52,
|
|
||||||
height: 26,
|
|
||||||
borderRadius: 16,
|
|
||||||
backgroundColor: '#7b7be2ff',
|
|
||||||
marginLeft: 8,
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'center',
|
|
||||||
shadowColor: '#000',
|
|
||||||
shadowOffset: {
|
|
||||||
width: 0,
|
|
||||||
height: 2,
|
|
||||||
},
|
|
||||||
shadowOpacity: 0.1,
|
|
||||||
shadowRadius: 4,
|
|
||||||
elevation: 2,
|
|
||||||
},
|
|
||||||
mealName: {
|
mealName: {
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
color: '#64748B',
|
color: '#64748B',
|
||||||
fontWeight: '600',
|
fontWeight: '600',
|
||||||
},
|
},
|
||||||
|
// 食物选项样式
|
||||||
|
foodOptionsContainer: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
justifyContent: 'space-around',
|
||||||
|
marginTop: 12,
|
||||||
|
paddingTop: 12,
|
||||||
|
borderTopWidth: 1,
|
||||||
|
borderTopColor: '#F1F5F9',
|
||||||
|
gap: 16,
|
||||||
|
},
|
||||||
|
foodOptionItem: {
|
||||||
|
alignItems: 'center',
|
||||||
|
flex: 1,
|
||||||
|
},
|
||||||
|
foodOptionIcon: {
|
||||||
|
width: 24,
|
||||||
|
height: 24,
|
||||||
|
borderRadius: 16,
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
marginBottom: 6,
|
||||||
|
shadowColor: '#000',
|
||||||
|
shadowOffset: {
|
||||||
|
width: 0,
|
||||||
|
height: 2,
|
||||||
|
},
|
||||||
|
shadowOpacity: 0.15,
|
||||||
|
shadowRadius: 4,
|
||||||
|
elevation: 4,
|
||||||
|
},
|
||||||
|
foodOptionEmoji: {
|
||||||
|
fontSize: 14,
|
||||||
|
},
|
||||||
|
foodOptionImage: {
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
resizeMode: 'contain',
|
||||||
|
},
|
||||||
|
foodOptionText: {
|
||||||
|
fontSize: 10,
|
||||||
|
fontWeight: '500',
|
||||||
|
color: '#192126',
|
||||||
|
textAlign: 'center',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,9 +4,8 @@ import { useAppDispatch, useAppSelector } from '@/hooks/redux';
|
|||||||
import { useAuthGuard } from '@/hooks/useAuthGuard';
|
import { useAuthGuard } from '@/hooks/useAuthGuard';
|
||||||
import { useColorScheme } from '@/hooks/useColorScheme';
|
import { useColorScheme } from '@/hooks/useColorScheme';
|
||||||
import { fetchWeightHistory } from '@/store/userSlice';
|
import { fetchWeightHistory } from '@/store/userSlice';
|
||||||
import { BMI_CATEGORIES, canCalculateBMI, getBMIResult } from '@/utils/bmi';
|
import { BMI_CATEGORIES } from '@/utils/bmi';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import dayjs from 'dayjs';
|
|
||||||
import { LinearGradient } from 'expo-linear-gradient';
|
import { LinearGradient } from 'expo-linear-gradient';
|
||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
@@ -18,20 +17,12 @@ import {
|
|||||||
TouchableOpacity,
|
TouchableOpacity,
|
||||||
View
|
View
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
import Animated, {
|
import Svg, { Circle, Path } from 'react-native-svg';
|
||||||
Extrapolation,
|
|
||||||
interpolate,
|
|
||||||
runOnJS,
|
|
||||||
useAnimatedStyle,
|
|
||||||
useSharedValue,
|
|
||||||
withTiming,
|
|
||||||
} from 'react-native-reanimated';
|
|
||||||
import Svg, { Circle, Line, Path, Text as SvgText } from 'react-native-svg';
|
|
||||||
|
|
||||||
const { width: screenWidth } = Dimensions.get('window');
|
const { width: screenWidth } = Dimensions.get('window');
|
||||||
const CARD_WIDTH = screenWidth - 40; // 减去左右边距
|
const CARD_WIDTH = screenWidth - 40; // 减去左右边距
|
||||||
const CHART_WIDTH = CARD_WIDTH - 36; // 减去卡片内边距
|
const CHART_WIDTH = CARD_WIDTH - 36; // 减去卡片内边距
|
||||||
const CHART_HEIGHT = 100;
|
const CHART_HEIGHT = 60;
|
||||||
const PADDING = 10;
|
const PADDING = 10;
|
||||||
|
|
||||||
|
|
||||||
@@ -40,12 +31,8 @@ export function WeightHistoryCard() {
|
|||||||
const userProfile = useAppSelector((s) => s.user.profile);
|
const userProfile = useAppSelector((s) => s.user.profile);
|
||||||
const weightHistory = useAppSelector((s) => s.user.weightHistory);
|
const weightHistory = useAppSelector((s) => s.user.weightHistory);
|
||||||
|
|
||||||
const [showChart, setShowChart] = useState(false);
|
|
||||||
const [showBMIModal, setShowBMIModal] = useState(false);
|
const [showBMIModal, setShowBMIModal] = useState(false);
|
||||||
|
|
||||||
// 动画相关状态
|
|
||||||
const animationProgress = useSharedValue(0);
|
|
||||||
const [isAnimating, setIsAnimating] = useState(false);
|
|
||||||
|
|
||||||
const { pushIfAuthedElseLogin } = useAuthGuard();
|
const { pushIfAuthedElseLogin } = useAuthGuard();
|
||||||
const colorScheme = useColorScheme();
|
const colorScheme = useColorScheme();
|
||||||
@@ -53,15 +40,6 @@ export function WeightHistoryCard() {
|
|||||||
|
|
||||||
const hasWeight = userProfile?.weight && parseFloat(userProfile.weight) > 0;
|
const hasWeight = userProfile?.weight && parseFloat(userProfile.weight) > 0;
|
||||||
|
|
||||||
// BMI 计算
|
|
||||||
const canCalculate = canCalculateBMI(
|
|
||||||
userProfile?.weight ? parseFloat(userProfile.weight) : undefined,
|
|
||||||
userProfile?.height ? parseFloat(userProfile.height) : undefined
|
|
||||||
);
|
|
||||||
|
|
||||||
const bmiResult = canCalculate && userProfile?.weight && userProfile?.height
|
|
||||||
? getBMIResult(parseFloat(userProfile.weight), parseFloat(userProfile.height))
|
|
||||||
: null;
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (hasWeight) {
|
if (hasWeight) {
|
||||||
@@ -81,115 +59,14 @@ export function WeightHistoryCard() {
|
|||||||
pushIfAuthedElseLogin(ROUTES.WEIGHT_RECORDS);
|
pushIfAuthedElseLogin(ROUTES.WEIGHT_RECORDS);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleShowBMIModal = () => {
|
|
||||||
setShowBMIModal(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleHideBMIModal = () => {
|
const handleHideBMIModal = () => {
|
||||||
setShowBMIModal(false);
|
setShowBMIModal(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
// 切换图表显示状态的动画函数
|
|
||||||
const navigateToWeightRecords = () => {
|
const navigateToWeightRecords = () => {
|
||||||
pushIfAuthedElseLogin(ROUTES.WEIGHT_RECORDS);
|
pushIfAuthedElseLogin(ROUTES.WEIGHT_RECORDS);
|
||||||
};
|
};
|
||||||
|
|
||||||
const toggleChart = () => {
|
|
||||||
if (isAnimating) return; // 防止动画期间重复触发
|
|
||||||
|
|
||||||
setIsAnimating(true);
|
|
||||||
const newShowChart = !showChart;
|
|
||||||
setShowChart(newShowChart);
|
|
||||||
|
|
||||||
animationProgress.value = withTiming(
|
|
||||||
newShowChart ? 1 : 0,
|
|
||||||
{
|
|
||||||
duration: 350,
|
|
||||||
},
|
|
||||||
(finished) => {
|
|
||||||
if (finished) {
|
|
||||||
runOnJS(setIsAnimating)(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
// 动画容器的高度动画
|
|
||||||
const containerAnimatedStyle = useAnimatedStyle(() => {
|
|
||||||
// 只有在展开状态时才应用固定高度
|
|
||||||
if (animationProgress.value === 0) {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
const height = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 1],
|
|
||||||
[80, 200], // 从摘要高度到图表高度,适应毛玻璃背景
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
height,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
// 摘要信息的动画样式
|
|
||||||
const summaryAnimatedStyle = useAnimatedStyle(() => {
|
|
||||||
const opacity = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 0.4, 1],
|
|
||||||
[1, 0.2, 0],
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
const scale = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 1],
|
|
||||||
[1, 0.9],
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
const translateY = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 1],
|
|
||||||
[0, -20],
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
opacity,
|
|
||||||
transform: [{ scale }, { translateY }],
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
// 图表容器的动画样式
|
|
||||||
const chartAnimatedStyle = useAnimatedStyle(() => {
|
|
||||||
const opacity = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 0.6, 1],
|
|
||||||
[0, 0.2, 1],
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
const scale = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 1],
|
|
||||||
[0.9, 1],
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
const translateY = interpolate(
|
|
||||||
animationProgress.value,
|
|
||||||
[0, 1],
|
|
||||||
[20, 0],
|
|
||||||
Extrapolation.CLAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
opacity,
|
|
||||||
transform: [{ scale }, { translateY }],
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// 如果没有体重数据,显示引导卡片
|
// 如果没有体重数据,显示引导卡片
|
||||||
@@ -263,7 +140,7 @@ export function WeightHistoryCard() {
|
|||||||
const x = PADDING + (index / Math.max(sortedHistory.length - 1, 1)) * (CHART_WIDTH - 2 * PADDING);
|
const x = PADDING + (index / Math.max(sortedHistory.length - 1, 1)) * (CHART_WIDTH - 2 * PADDING);
|
||||||
const normalizedWeight = (parseFloat(item.weight) - minWeight) / weightRange;
|
const normalizedWeight = (parseFloat(item.weight) - minWeight) / weightRange;
|
||||||
// 减少顶部边距,压缩留白
|
// 减少顶部边距,压缩留白
|
||||||
const y = PADDING + 15 + (1 - normalizedWeight) * (CHART_HEIGHT - 2 * PADDING - 30);
|
const y = PADDING + 8 + (1 - normalizedWeight) * (CHART_HEIGHT - 2 * PADDING - 16);
|
||||||
return { x, y, weight: item.weight, date: item.createdAt };
|
return { x, y, weight: item.weight, date: item.createdAt };
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -282,133 +159,48 @@ export function WeightHistoryCard() {
|
|||||||
<TouchableOpacity style={styles.card} onPress={navigateToWeightRecords} activeOpacity={0.8}>
|
<TouchableOpacity style={styles.card} onPress={navigateToWeightRecords} activeOpacity={0.8}>
|
||||||
<View style={styles.cardHeader}>
|
<View style={styles.cardHeader}>
|
||||||
<Text style={styles.cardTitle}>体重记录</Text>
|
<Text style={styles.cardTitle}>体重记录</Text>
|
||||||
<View style={styles.headerButtons}>
|
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.chartToggleButton}
|
style={styles.addButton}
|
||||||
onPress={(e) => {
|
onPress={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
toggleChart();
|
navigateToCoach();
|
||||||
}}
|
}}
|
||||||
activeOpacity={0.8}
|
activeOpacity={0.8}
|
||||||
>
|
>
|
||||||
<Ionicons
|
<Ionicons name="add" size={18} color={Colors.light.primary} />
|
||||||
name={showChart ? "chevron-up" : "chevron-down"}
|
|
||||||
size={16}
|
|
||||||
color={Colors.light.primary}
|
|
||||||
/>
|
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
|
||||||
|
|
||||||
{/* 动画容器 */}
|
{/* 默认显示图表 */}
|
||||||
{sortedHistory.length > 0 && (
|
{sortedHistory.length > 0 && (
|
||||||
<Animated.View style={[styles.animationContainer, containerAnimatedStyle]}>
|
<View style={styles.chartContainer}>
|
||||||
{/* 默认信息显示 - 带动画 */}
|
|
||||||
<Animated.View style={[styles.summaryInfo, summaryAnimatedStyle]}>
|
|
||||||
<View style={styles.summaryBackground}>
|
|
||||||
<View style={styles.summaryRow}>
|
|
||||||
<View style={styles.summaryItem}>
|
|
||||||
<Text style={styles.summaryLabel}>当前体重</Text>
|
|
||||||
<Text style={styles.summaryValue}>{userProfile.weight}kg</Text>
|
|
||||||
</View>
|
|
||||||
<View style={styles.summaryItem}>
|
|
||||||
<Text style={styles.summaryLabel}>记录天数</Text>
|
|
||||||
<Text style={styles.summaryValue}>{sortedHistory.length}天</Text>
|
|
||||||
</View>
|
|
||||||
<View style={styles.summaryItem}>
|
|
||||||
<Text style={styles.summaryLabel}>变化范围</Text>
|
|
||||||
<Text style={styles.summaryValue}>
|
|
||||||
{minWeight.toFixed(1)}-{maxWeight.toFixed(1)}
|
|
||||||
</Text>
|
|
||||||
</View>
|
|
||||||
{bmiResult && (
|
|
||||||
<View style={styles.summaryItem}>
|
|
||||||
<Text style={styles.summaryLabel}>BMI</Text>
|
|
||||||
<View style={styles.bmiValueContainer}>
|
|
||||||
<Text style={[styles.bmiValue, { color: bmiResult.color }]}>
|
|
||||||
{bmiResult.value}
|
|
||||||
</Text>
|
|
||||||
<TouchableOpacity
|
|
||||||
onPress={(e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
handleShowBMIModal();
|
|
||||||
}}
|
|
||||||
style={styles.bmiInfoButton}
|
|
||||||
hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
|
|
||||||
>
|
|
||||||
<Ionicons name="information-circle-outline" size={12} color="#9AA3AE" />
|
|
||||||
</TouchableOpacity>
|
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
</Animated.View>
|
|
||||||
|
|
||||||
{/* 图表容器 - 带动画 */}
|
|
||||||
<Animated.View style={[styles.chartContainer, chartAnimatedStyle]}>
|
|
||||||
<Svg width={CHART_WIDTH} height={CHART_HEIGHT + 15}>
|
<Svg width={CHART_WIDTH} height={CHART_HEIGHT + 15}>
|
||||||
{/* 背景网格线 */}
|
{/* 背景网格线 */}
|
||||||
{[0, 1, 2, 3, 4].map(i => (
|
|
||||||
<Line
|
|
||||||
key={`grid-${i}`}
|
|
||||||
x1={PADDING}
|
|
||||||
y1={PADDING + 15 + i * (CHART_HEIGHT - 2 * PADDING - 30) / 4}
|
|
||||||
x2={CHART_WIDTH - PADDING}
|
|
||||||
y2={PADDING + 15 + i * (CHART_HEIGHT - 2 * PADDING - 30) / 4}
|
|
||||||
stroke="#F0F0F0"
|
|
||||||
strokeWidth={1}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
|
|
||||||
{/* 折线 */}
|
{/* 更抽象的折线 - 减小线宽和显示的细节 */}
|
||||||
<Path
|
<Path
|
||||||
d={singlePointPath}
|
d={singlePointPath}
|
||||||
stroke={Colors.light.accentGreen}
|
stroke={Colors.light.accentGreen}
|
||||||
strokeWidth={3}
|
strokeWidth={2}
|
||||||
fill="none"
|
fill="none"
|
||||||
strokeLinecap="round"
|
strokeLinecap="round"
|
||||||
strokeLinejoin="round"
|
strokeLinejoin="round"
|
||||||
|
opacity={0.8}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* 数据点和标签 */}
|
{/* 简化的数据点 - 更小更精致 */}
|
||||||
{points.map((point, index) => {
|
{points.map((point, index) => {
|
||||||
const isLastPoint = index === points.length - 1;
|
const isLastPoint = index === points.length - 1;
|
||||||
const isFirstPoint = index === 0;
|
|
||||||
const showLabel = isFirstPoint || isLastPoint || points.length <= 3 || points.length === 1;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={index}>
|
<React.Fragment key={index}>
|
||||||
<Circle
|
<Circle
|
||||||
cx={point.x}
|
cx={point.x}
|
||||||
cy={point.y}
|
cy={point.y}
|
||||||
r={isLastPoint ? 6 : 4}
|
r={isLastPoint ? 3 : 2}
|
||||||
fill={Colors.light.accentGreen}
|
fill={Colors.light.accentGreen}
|
||||||
stroke="#FFFFFF"
|
opacity={0.9}
|
||||||
strokeWidth={2}
|
|
||||||
/>
|
/>
|
||||||
{/* 体重标签 - 只在关键点显示 */}
|
|
||||||
{showLabel && (
|
|
||||||
<>
|
|
||||||
<Circle
|
|
||||||
cx={point.x}
|
|
||||||
cy={point.y - 15}
|
|
||||||
r={10}
|
|
||||||
fill="rgba(255,255,255,0.9)"
|
|
||||||
stroke={Colors.light.accentGreen}
|
|
||||||
strokeWidth={1}
|
|
||||||
/>
|
|
||||||
<SvgText
|
|
||||||
x={point.x}
|
|
||||||
y={point.y - 12}
|
|
||||||
fontSize="9"
|
|
||||||
fill="#192126"
|
|
||||||
textAnchor="middle"
|
|
||||||
>
|
|
||||||
{point.weight}
|
|
||||||
</SvgText>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -416,32 +208,21 @@ export function WeightHistoryCard() {
|
|||||||
|
|
||||||
</Svg>
|
</Svg>
|
||||||
|
|
||||||
{/* 图表底部信息 */}
|
{/* 精简的图表信息 */}
|
||||||
<View style={styles.chartInfo}>
|
<View style={styles.chartInfo}>
|
||||||
<View style={styles.infoItem}>
|
<View style={styles.infoItem}>
|
||||||
<Text style={styles.infoLabel}>当前体重</Text>
|
<Text style={styles.infoLabel}>{userProfile.weight}kg</Text>
|
||||||
<Text style={styles.infoValue}>{userProfile.weight}kg</Text>
|
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.infoItem}>
|
<View style={styles.infoItem}>
|
||||||
<Text style={styles.infoLabel}>记录天数</Text>
|
<Text style={styles.infoLabel}>{sortedHistory.length}天</Text>
|
||||||
<Text style={styles.infoValue}>{sortedHistory.length}天</Text>
|
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.infoItem}>
|
<View style={styles.infoItem}>
|
||||||
<Text style={styles.infoLabel}>变化范围</Text>
|
<Text style={styles.infoLabel}>
|
||||||
<Text style={styles.infoValue}>
|
|
||||||
{minWeight.toFixed(1)}-{maxWeight.toFixed(1)}kg
|
{minWeight.toFixed(1)}-{maxWeight.toFixed(1)}kg
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
</View>
|
||||||
{/* 最近记录时间 */}
|
|
||||||
{sortedHistory.length > 0 && (
|
|
||||||
<Text style={styles.lastRecordText}>
|
|
||||||
最近记录:{dayjs(sortedHistory[sortedHistory.length - 1].createdAt).format('MM/DD HH:mm')}
|
|
||||||
</Text>
|
|
||||||
)}
|
|
||||||
</Animated.View>
|
|
||||||
</Animated.View>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* BMI 信息弹窗 */}
|
{/* BMI 信息弹窗 */}
|
||||||
@@ -627,37 +408,10 @@ const styles = StyleSheet.create({
|
|||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
fontWeight: '700',
|
fontWeight: '700',
|
||||||
},
|
},
|
||||||
animationContainer: {
|
|
||||||
position: 'relative',
|
|
||||||
overflow: 'hidden',
|
|
||||||
minHeight: 80, // 增加最小高度以容纳毛玻璃背景
|
|
||||||
},
|
|
||||||
summaryInfo: {
|
|
||||||
position: 'absolute',
|
|
||||||
width: '100%',
|
|
||||||
marginTop: 8,
|
|
||||||
},
|
|
||||||
summaryBackground: {
|
|
||||||
backgroundColor: 'rgba(248, 250, 252, 0.8)', // 毛玻璃背景色
|
|
||||||
borderRadius: 12,
|
|
||||||
padding: 12,
|
|
||||||
shadowColor: '#000',
|
|
||||||
shadowOffset: {
|
|
||||||
width: 0,
|
|
||||||
height: 1,
|
|
||||||
},
|
|
||||||
shadowOpacity: 0.06,
|
|
||||||
shadowRadius: 3,
|
|
||||||
elevation: 1,
|
|
||||||
// 添加边框增强毛玻璃效果
|
|
||||||
borderWidth: 0.5,
|
|
||||||
borderColor: 'rgba(255, 255, 255, 0.8)',
|
|
||||||
},
|
|
||||||
chartContainer: {
|
chartContainer: {
|
||||||
position: 'absolute',
|
|
||||||
width: '100%',
|
width: '100%',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
minHeight: 100,
|
marginTop: 12,
|
||||||
},
|
},
|
||||||
chartInfo: {
|
chartInfo: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
@@ -668,67 +422,15 @@ const styles = StyleSheet.create({
|
|||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
infoLabel: {
|
infoLabel: {
|
||||||
fontSize: 12,
|
fontSize: 11,
|
||||||
color: '#687076',
|
color: '#687076',
|
||||||
marginBottom: 4,
|
fontWeight: '500',
|
||||||
},
|
},
|
||||||
infoValue: {
|
infoValue: {
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
fontWeight: '700',
|
fontWeight: '700',
|
||||||
color: '#192126',
|
color: '#192126',
|
||||||
},
|
},
|
||||||
lastRecordText: {
|
|
||||||
fontSize: 12,
|
|
||||||
color: '#687076',
|
|
||||||
textAlign: 'center',
|
|
||||||
marginTop: 4,
|
|
||||||
},
|
|
||||||
summaryRow: {
|
|
||||||
flexDirection: 'row',
|
|
||||||
justifyContent: 'space-between',
|
|
||||||
marginBottom: 0,
|
|
||||||
flexWrap: 'wrap',
|
|
||||||
gap: 8,
|
|
||||||
},
|
|
||||||
summaryItem: {
|
|
||||||
alignItems: 'center',
|
|
||||||
flex: 1,
|
|
||||||
minWidth: 0,
|
|
||||||
},
|
|
||||||
summaryLabel: {
|
|
||||||
fontSize: 12,
|
|
||||||
color: '#687076',
|
|
||||||
marginBottom: 3,
|
|
||||||
},
|
|
||||||
summaryValue: {
|
|
||||||
fontSize: 14,
|
|
||||||
marginTop: 2,
|
|
||||||
fontWeight: '600',
|
|
||||||
color: '#192126',
|
|
||||||
},
|
|
||||||
|
|
||||||
// BMI 相关样式
|
|
||||||
bmiValueContainer: {
|
|
||||||
flexDirection: 'row',
|
|
||||||
alignItems: 'center',
|
|
||||||
gap: 1,
|
|
||||||
},
|
|
||||||
bmiValue: {
|
|
||||||
fontSize: 12,
|
|
||||||
fontWeight: '700',
|
|
||||||
},
|
|
||||||
bmiInfoButton: {
|
|
||||||
padding: 0,
|
|
||||||
},
|
|
||||||
bmiStatusBadge: {
|
|
||||||
paddingHorizontal: 8,
|
|
||||||
paddingVertical: 2,
|
|
||||||
borderRadius: 8,
|
|
||||||
},
|
|
||||||
bmiStatusText: {
|
|
||||||
fontSize: 10,
|
|
||||||
fontWeight: '700',
|
|
||||||
},
|
|
||||||
|
|
||||||
// BMI 弹窗样式
|
// BMI 弹窗样式
|
||||||
bmiModalContainer: {
|
bmiModalContainer: {
|
||||||
|
|||||||
16
package.json
16
package.json
@@ -12,7 +12,7 @@
|
|||||||
"lint": "expo lint"
|
"lint": "expo lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/ui": "~0.2.0-beta.1",
|
"@expo/ui": "~0.2.0-beta.2",
|
||||||
"@expo/vector-icons": "^15.0.2",
|
"@expo/vector-icons": "^15.0.2",
|
||||||
"@react-native-async-storage/async-storage": "^2.2.0",
|
"@react-native-async-storage/async-storage": "^2.2.0",
|
||||||
"@react-native-community/datetimepicker": "^8.4.4",
|
"@react-native-community/datetimepicker": "^8.4.4",
|
||||||
@@ -27,22 +27,22 @@
|
|||||||
"@types/lodash": "^4.17.20",
|
"@types/lodash": "^4.17.20",
|
||||||
"cos-js-sdk-v5": "^1.6.0",
|
"cos-js-sdk-v5": "^1.6.0",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"expo": "^54.0.1",
|
"expo": "^54.0.7",
|
||||||
"expo-apple-authentication": "~8.0.6",
|
"expo-apple-authentication": "~8.0.6",
|
||||||
"expo-background-task": "~1.0.6",
|
"expo-background-task": "~1.0.7",
|
||||||
"expo-blur": "~15.0.6",
|
"expo-blur": "~15.0.7",
|
||||||
"expo-camera": "~17.0.7",
|
"expo-camera": "~17.0.7",
|
||||||
"expo-constants": "~18.0.8",
|
"expo-constants": "~18.0.8",
|
||||||
"expo-font": "~14.0.8",
|
"expo-font": "~14.0.8",
|
||||||
"expo-glass-effect": "^0.1.2",
|
"expo-glass-effect": "^0.1.3",
|
||||||
"expo-haptics": "~15.0.6",
|
"expo-haptics": "~15.0.6",
|
||||||
"expo-image": "~3.0.7",
|
"expo-image": "~3.0.8",
|
||||||
"expo-image-picker": "~17.0.7",
|
"expo-image-picker": "~17.0.7",
|
||||||
"expo-linear-gradient": "~15.0.6",
|
"expo-linear-gradient": "~15.0.6",
|
||||||
"expo-linking": "~8.0.7",
|
"expo-linking": "~8.0.8",
|
||||||
"expo-notifications": "~0.32.11",
|
"expo-notifications": "~0.32.11",
|
||||||
"expo-quick-actions": "^5.0.0",
|
"expo-quick-actions": "^5.0.0",
|
||||||
"expo-router": "~6.0.1",
|
"expo-router": "~6.0.4",
|
||||||
"expo-splash-screen": "~31.0.8",
|
"expo-splash-screen": "~31.0.8",
|
||||||
"expo-status-bar": "~3.0.7",
|
"expo-status-bar": "~3.0.7",
|
||||||
"expo-symbols": "~1.0.6",
|
"expo-symbols": "~1.0.6",
|
||||||
|
|||||||
@@ -80,13 +80,6 @@ async function executeStandReminderTask(): Promise<void> {
|
|||||||
const state = store.getState();
|
const state = store.getState();
|
||||||
const userProfile = state.user.profile;
|
const userProfile = state.user.profile;
|
||||||
|
|
||||||
// 检查时间限制(工作时间内提醒,避免深夜或清晨打扰)
|
|
||||||
const currentHour = new Date().getHours();
|
|
||||||
if (currentHour < 9 || currentHour >= 21) {
|
|
||||||
console.log(`当前时间${currentHour}点,不在站立提醒时间范围内,跳过站立提醒`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取用户名
|
// 获取用户名
|
||||||
const userName = userProfile?.name || '朋友';
|
const userName = userProfile?.name || '朋友';
|
||||||
|
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ type CalendarTrigger = DailyTrigger | WeeklyTrigger | MonthlyTrigger;
|
|||||||
export class NotificationService {
|
export class NotificationService {
|
||||||
private static instance: NotificationService;
|
private static instance: NotificationService;
|
||||||
private isInitialized = false;
|
private isInitialized = false;
|
||||||
|
private isIniting = false
|
||||||
|
|
||||||
private constructor() { }
|
private constructor() { }
|
||||||
|
|
||||||
@@ -72,9 +73,10 @@ export class NotificationService {
|
|||||||
* 初始化推送通知服务
|
* 初始化推送通知服务
|
||||||
*/
|
*/
|
||||||
async initialize(): Promise<void> {
|
async initialize(): Promise<void> {
|
||||||
if (this.isInitialized) return;
|
if (this.isInitialized || this.isIniting) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
this.isIniting = true
|
||||||
// 请求通知权限
|
// 请求通知权限
|
||||||
const { status: existingStatus } = await Notifications.getPermissionsAsync();
|
const { status: existingStatus } = await Notifications.getPermissionsAsync();
|
||||||
let finalStatus = existingStatus;
|
let finalStatus = existingStatus;
|
||||||
@@ -89,13 +91,6 @@ export class NotificationService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取推送令牌(用于远程推送,本地推送不需要)
|
|
||||||
// if (Platform.OS !== 'web') {
|
|
||||||
// const token = await Notifications.getExpoPushTokenAsync({
|
|
||||||
// projectId: 'your-project-id', // 需要替换为实际的Expo项目ID
|
|
||||||
// });
|
|
||||||
// console.log('推送令牌:', token.data);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// 设置通知监听器
|
// 设置通知监听器
|
||||||
this.setupNotificationListeners();
|
this.setupNotificationListeners();
|
||||||
@@ -107,6 +102,8 @@ export class NotificationService {
|
|||||||
console.log('推送通知服务初始化成功');
|
console.log('推送通知服务初始化成功');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('推送通知服务初始化失败:', error);
|
console.error('推送通知服务初始化失败:', error);
|
||||||
|
} finally {
|
||||||
|
this.isIniting = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -945,7 +945,7 @@ export class StandReminderHelpers {
|
|||||||
|
|
||||||
// 检查时间范围(工作时间内提醒,避免深夜或清晨打扰)
|
// 检查时间范围(工作时间内提醒,避免深夜或清晨打扰)
|
||||||
const currentHour = new Date().getHours();
|
const currentHour = new Date().getHours();
|
||||||
if (currentHour < 9 || currentHour >= 21) {
|
if (currentHour < 9 || currentHour >= 22) {
|
||||||
console.log(`当前时间${currentHour}点,不在站立提醒时间范围内`);
|
console.log(`当前时间${currentHour}点,不在站立提醒时间范围内`);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -1014,6 +1014,305 @@ export class StandReminderHelpers {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每日总结通知助手
|
||||||
|
*/
|
||||||
|
export class DailySummaryNotificationHelpers {
|
||||||
|
/**
|
||||||
|
* 获取当日数据汇总
|
||||||
|
*/
|
||||||
|
static async getDailySummaryData(date: string = new Date().toISOString().split('T')[0]) {
|
||||||
|
try {
|
||||||
|
console.log('获取每日汇总数据:', date);
|
||||||
|
|
||||||
|
// 动态导入相关服务,避免循环依赖
|
||||||
|
const { getDietRecords } = await import('@/services/dietRecords');
|
||||||
|
const { getDailyMoodCheckins } = await import('@/services/moodCheckins');
|
||||||
|
const { getWaterRecords } = await import('@/services/waterRecords');
|
||||||
|
const { workoutsApi } = await import('@/services/workoutsApi');
|
||||||
|
|
||||||
|
// 设置日期范围
|
||||||
|
const startDate = new Date(`${date}T00:00:00.000Z`).toISOString();
|
||||||
|
const endDate = new Date(`${date}T23:59:59.999Z`).toISOString();
|
||||||
|
|
||||||
|
// 并行获取各项数据
|
||||||
|
const [dietData, moodData, waterData, workoutData] = await Promise.allSettled([
|
||||||
|
getDietRecords({ startDate, endDate, limit: 100 }),
|
||||||
|
getDailyMoodCheckins(date),
|
||||||
|
getWaterRecords({ date, limit: 100 }),
|
||||||
|
workoutsApi.getTodayWorkout()
|
||||||
|
]);
|
||||||
|
|
||||||
|
// 处理饮食数据
|
||||||
|
const dietSummary = {
|
||||||
|
hasRecords: false,
|
||||||
|
mealCount: 0,
|
||||||
|
recordCount: 0
|
||||||
|
};
|
||||||
|
if (dietData.status === 'fulfilled' && dietData.value.records.length > 0) {
|
||||||
|
dietSummary.hasRecords = true;
|
||||||
|
dietSummary.recordCount = dietData.value.records.length;
|
||||||
|
dietSummary.mealCount = new Set(dietData.value.records.map(r => r.mealType)).size;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理心情数据
|
||||||
|
const moodSummary = {
|
||||||
|
hasRecords: false,
|
||||||
|
recordCount: 0,
|
||||||
|
latestMood: null as string | null
|
||||||
|
};
|
||||||
|
if (moodData.status === 'fulfilled' && moodData.value.length > 0) {
|
||||||
|
moodSummary.hasRecords = true;
|
||||||
|
moodSummary.recordCount = moodData.value.length;
|
||||||
|
moodSummary.latestMood = moodData.value[0].moodType;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理饮水数据
|
||||||
|
const waterSummary = {
|
||||||
|
hasRecords: false,
|
||||||
|
recordCount: 0,
|
||||||
|
totalAmount: 0,
|
||||||
|
completionRate: 0
|
||||||
|
};
|
||||||
|
if (waterData.status === 'fulfilled' && waterData.value.records.length > 0) {
|
||||||
|
waterSummary.hasRecords = true;
|
||||||
|
waterSummary.recordCount = waterData.value.records.length;
|
||||||
|
waterSummary.totalAmount = waterData.value.records.reduce((sum, r) => sum + r.amount, 0);
|
||||||
|
// 假设默认目标是2000ml,实际应该从用户设置获取
|
||||||
|
const dailyGoal = 2000;
|
||||||
|
waterSummary.completionRate = Math.round((waterSummary.totalAmount / dailyGoal) * 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理锻炼数据
|
||||||
|
const workoutSummary = {
|
||||||
|
hasWorkout: false,
|
||||||
|
isCompleted: false,
|
||||||
|
exerciseCount: 0,
|
||||||
|
completedCount: 0,
|
||||||
|
duration: 0
|
||||||
|
};
|
||||||
|
if (workoutData.status === 'fulfilled' && workoutData.value) {
|
||||||
|
workoutSummary.hasWorkout = true;
|
||||||
|
workoutSummary.isCompleted = workoutData.value.status === 'completed';
|
||||||
|
workoutSummary.exerciseCount = workoutData.value.exercises?.length || 0;
|
||||||
|
workoutSummary.completedCount = workoutData.value.exercises?.filter(e => e.status === 'completed').length || 0;
|
||||||
|
if (workoutData.value.completedAt && workoutData.value.startedAt) {
|
||||||
|
workoutSummary.duration = Math.round((new Date(workoutData.value.completedAt).getTime() - new Date(workoutData.value.startedAt).getTime()) / (1000 * 60));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
date,
|
||||||
|
diet: dietSummary,
|
||||||
|
mood: moodSummary,
|
||||||
|
water: waterSummary,
|
||||||
|
workout: workoutSummary
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('获取每日汇总数据失败:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 生成每日总结推送消息
|
||||||
|
*/
|
||||||
|
static generateDailySummaryMessage(userName: string, summaryData: any): { title: string; body: string } {
|
||||||
|
const { diet, mood, water, workout } = summaryData;
|
||||||
|
|
||||||
|
// 计算完成的项目数量
|
||||||
|
const completedItems = [];
|
||||||
|
const encouragementItems = [];
|
||||||
|
|
||||||
|
// 饮食记录检查
|
||||||
|
if (diet.hasRecords) {
|
||||||
|
completedItems.push(`记录了${diet.mealCount}餐饮食`);
|
||||||
|
} else {
|
||||||
|
encouragementItems.push('饮食记录');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 心情记录检查
|
||||||
|
if (mood.hasRecords) {
|
||||||
|
completedItems.push(`记录了心情状态`);
|
||||||
|
} else {
|
||||||
|
encouragementItems.push('心情记录');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 饮水记录检查
|
||||||
|
if (water.hasRecords) {
|
||||||
|
if (water.completionRate >= 80) {
|
||||||
|
completedItems.push(`完成了${water.completionRate}%的饮水目标`);
|
||||||
|
} else {
|
||||||
|
completedItems.push(`喝水${water.completionRate}%`);
|
||||||
|
encouragementItems.push('多喝水');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
encouragementItems.push('饮水记录');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 锻炼记录检查
|
||||||
|
if (workout.hasWorkout) {
|
||||||
|
if (workout.isCompleted) {
|
||||||
|
completedItems.push(`完成了${workout.duration}分钟锻炼`);
|
||||||
|
} else {
|
||||||
|
completedItems.push(`开始了锻炼训练`);
|
||||||
|
encouragementItems.push('完成锻炼');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
encouragementItems.push('运动锻炼');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 生成标题和内容
|
||||||
|
let title = '今日健康总结';
|
||||||
|
let body = '';
|
||||||
|
|
||||||
|
if (completedItems.length > 0) {
|
||||||
|
if (completedItems.length >= 3) {
|
||||||
|
// 完成度很高的鼓励
|
||||||
|
const titles = ['今天表现棒极了!', '健康习惯养成中!', '今日收获满满!'];
|
||||||
|
title = titles[Math.floor(Math.random() * titles.length)];
|
||||||
|
body = `${userName},今天您${completedItems.join('、')},真的很棒!`;
|
||||||
|
|
||||||
|
if (encouragementItems.length > 0) {
|
||||||
|
body += `明天在${encouragementItems.join('、')}方面再加把劲哦~`;
|
||||||
|
} else {
|
||||||
|
body += '继续保持这样的好习惯!🌟';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 中等完成度的鼓励
|
||||||
|
title = '今日健康小结';
|
||||||
|
body = `${userName},今天您${completedItems.join('、')},已经很不错了!`;
|
||||||
|
|
||||||
|
if (encouragementItems.length > 0) {
|
||||||
|
body += `明天记得关注一下${encouragementItems.join('、')},让健康生活更完整~`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 完成度较低的温柔提醒
|
||||||
|
const titles = ['明天是新的开始', '健康从每一天开始', '小步前进也是进步'];
|
||||||
|
title = titles[Math.floor(Math.random() * titles.length)];
|
||||||
|
body = `${userName},今天可能比较忙碌。明天记得关注${encouragementItems.slice(0, 2).join('和')},每一个小改变都是向健康生活迈进的一步~💪`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { title, body };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送每日总结推送
|
||||||
|
*/
|
||||||
|
static async sendDailySummaryNotification(userName: string, date?: string): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
console.log('开始发送每日总结推送...');
|
||||||
|
|
||||||
|
// 检查是否启用了通知
|
||||||
|
if (!(await getNotificationEnabled())) {
|
||||||
|
console.log('用户未启用通知功能,跳过每日总结推送');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取当日数据汇总
|
||||||
|
const summaryData = await this.getDailySummaryData(date);
|
||||||
|
console.log('每日汇总数据:', summaryData);
|
||||||
|
|
||||||
|
// 生成推送消息
|
||||||
|
const { title, body } = this.generateDailySummaryMessage(userName, summaryData);
|
||||||
|
|
||||||
|
// 发送通知
|
||||||
|
await notificationService.sendImmediateNotification({
|
||||||
|
title,
|
||||||
|
body,
|
||||||
|
data: {
|
||||||
|
type: 'daily_summary',
|
||||||
|
date: summaryData.date,
|
||||||
|
summaryData,
|
||||||
|
url: '/statistics' // 跳转到统计页面
|
||||||
|
},
|
||||||
|
sound: true,
|
||||||
|
priority: 'normal',
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('每日总结推送发送成功');
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('发送每日总结推送失败:', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 安排每日总结推送(每天晚上9点)
|
||||||
|
*/
|
||||||
|
static async scheduleDailySummaryNotification(
|
||||||
|
userName: string,
|
||||||
|
hour: number = 21,
|
||||||
|
minute: number = 0
|
||||||
|
): Promise<string | null> {
|
||||||
|
try {
|
||||||
|
// 检查是否已经存在每日总结提醒
|
||||||
|
const existingNotifications = await notificationService.getAllScheduledNotifications();
|
||||||
|
|
||||||
|
const existingSummaryReminder = existingNotifications.find(
|
||||||
|
notification =>
|
||||||
|
notification.content.data?.type === 'daily_summary_reminder' &&
|
||||||
|
notification.content.data?.isDailyReminder === true
|
||||||
|
);
|
||||||
|
|
||||||
|
if (existingSummaryReminder) {
|
||||||
|
console.log('每日总结推送已存在,跳过重复注册:', existingSummaryReminder.identifier);
|
||||||
|
return existingSummaryReminder.identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建每日总结推送通知
|
||||||
|
const notificationId = await notificationService.scheduleCalendarRepeatingNotification(
|
||||||
|
{
|
||||||
|
title: '今日健康总结',
|
||||||
|
body: `${userName},来看看今天的健康生活总结吧~每一份记录都是成长的足迹!✨`,
|
||||||
|
data: {
|
||||||
|
type: 'daily_summary_reminder',
|
||||||
|
isDailyReminder: true,
|
||||||
|
url: '/statistics'
|
||||||
|
},
|
||||||
|
sound: true,
|
||||||
|
priority: 'normal',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'DAILY' as any,
|
||||||
|
hour: hour,
|
||||||
|
minute: minute,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log('每日总结推送已安排,ID:', notificationId);
|
||||||
|
return notificationId;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('安排每日总结推送失败:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 取消每日总结推送
|
||||||
|
*/
|
||||||
|
static async cancelDailySummaryNotification(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const notifications = await notificationService.getAllScheduledNotifications();
|
||||||
|
|
||||||
|
for (const notification of notifications) {
|
||||||
|
if (notification.content.data?.type === 'daily_summary_reminder' &&
|
||||||
|
notification.content.data?.isDailyReminder === true) {
|
||||||
|
await notificationService.cancelNotification(notification.identifier);
|
||||||
|
console.log('已取消每日总结推送:', notification.identifier);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('取消每日总结推送失败:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通知模板
|
* 通知模板
|
||||||
*/
|
*/
|
||||||
@@ -1140,4 +1439,50 @@ export const NotificationTemplates = {
|
|||||||
priority: 'high' as const,
|
priority: 'high' as const,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
dailySummary: {
|
||||||
|
reminder: (userName: string) => ({
|
||||||
|
title: '今日健康总结',
|
||||||
|
body: `${userName},来看看今天的健康生活总结吧~每一份记录都是成长的足迹!✨`,
|
||||||
|
data: {
|
||||||
|
type: 'daily_summary_reminder',
|
||||||
|
url: '/statistics'
|
||||||
|
},
|
||||||
|
sound: true,
|
||||||
|
priority: 'normal' as const,
|
||||||
|
}),
|
||||||
|
highCompletion: (userName: string, completedItems: string[]) => ({
|
||||||
|
title: '今天表现棒极了!',
|
||||||
|
body: `${userName},今天您${completedItems.join('、')},真的很棒!继续保持这样的好习惯!🌟`,
|
||||||
|
data: {
|
||||||
|
type: 'daily_summary',
|
||||||
|
completedItems,
|
||||||
|
url: '/statistics'
|
||||||
|
},
|
||||||
|
sound: true,
|
||||||
|
priority: 'normal' as const,
|
||||||
|
}),
|
||||||
|
mediumCompletion: (userName: string, completedItems: string[], encouragementItems: string[]) => ({
|
||||||
|
title: '今日健康小结',
|
||||||
|
body: `${userName},今天您${completedItems.join('、')},已经很不错了!明天记得关注一下${encouragementItems.join('、')},让健康生活更完整~`,
|
||||||
|
data: {
|
||||||
|
type: 'daily_summary',
|
||||||
|
completedItems,
|
||||||
|
encouragementItems,
|
||||||
|
url: '/statistics'
|
||||||
|
},
|
||||||
|
sound: true,
|
||||||
|
priority: 'normal' as const,
|
||||||
|
}),
|
||||||
|
lowCompletion: (userName: string, encouragementItems: string[]) => ({
|
||||||
|
title: '明天是新的开始',
|
||||||
|
body: `${userName},今天可能比较忙碌。明天记得关注${encouragementItems.slice(0, 2).join('和')},每一个小改变都是向健康生活迈进的一步~💪`,
|
||||||
|
data: {
|
||||||
|
type: 'daily_summary',
|
||||||
|
encouragementItems,
|
||||||
|
url: '/statistics'
|
||||||
|
},
|
||||||
|
sound: true,
|
||||||
|
priority: 'normal' as const,
|
||||||
|
}),
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user