fix:小组件- PUSH

client/app/(onboarding)/_layout.tsx

@@ -12,7 +12,6 @@ export default function OnboardingLayout() {
       }}
     >
       <Stack.Screen name="onboarding" options={{ title: t('onboarding.title') }} />
-      <Stack.Screen name="push-prompt" options={{ title: t('push.title') }} />
     </Stack>
   );
 }

client/app/(onboarding)/onboarding.tsx

@@ -1,13 +1,17 @@
 import { useMemo, useState } from 'react';
 import { useRouter } from 'expo-router';
-import * as Notifications from 'expo-notifications';
 import { useTranslation } from 'react-i18next';
+import { Alert } from 'react-native';
+import * as Notifications from 'expo-notifications';
+import * as Device from 'expo-device';
 import { OnboardingLayout } from '@/components/onboarding/OnboardingLayout';
 import { NameInputStep } from '@/components/onboarding/NameInputStep';
 import { SelectionStep } from '@/components/onboarding/SelectionStep';
 import { ReminderStep } from '@/components/onboarding/ReminderStep';
 import { buildUserProfileFromQuestionnaire, mapOnboardingSelectionsToQuestionnaireAnswers } from '@/src/features/userProfileScoring';
+import { ensureDailyWidgetRecoUpToDate, syncWidgetConfig, syncWidgetUserProfileFromScoring } from '@/src/modules/dailyWidgetReco';
 import { fetchRecoFeed } from '@/src/services/recoApi';
+import { getExpoPushTokenOrThrow, registerPushToken, setPushPreferences } from '@/src/services/pushApi';
 import {
   recordRecoFeedServed,
   setOnboardingCompleted,
@@ -15,6 +19,7 @@ import {
   setDailyReminderSettings,
   setUserProfileScoring,
   setRecoFeedCache,
+  setPushPromptState,
 } from '@/src/storage/appStorage';
 
 type Step =
@@ -50,9 +55,8 @@ export default function OnboardingScreen() {
   }, [t, currentStep]);
 
   async function onFinish() {
-    // 请求推送权限
-    const { status } = await Notifications.requestPermissionsAsync();
-    const pushEnabled = status === 'granted';
+    // 用户选择每日次数 > 0：在此页直接触发系统通知权限（已移除单独的 push 引导页）。
+    const wantsPush = reminderTimes > 0;
 
     // 将 Onboarding 选择映射为标准问卷枚举（允许跳过）
     const answers = mapOnboardingSelectionsToQuestionnaireAnswers(selections);
@@ -61,6 +65,13 @@ export default function OnboardingScreen() {
     const scoringProfile = buildUserProfileFromQuestionnaire(answers);
     await setUserProfileScoring(scoringProfile);
 
+    // 同步到 App Group：供 iOS Widget 拉取与展示
+    await syncWidgetConfig();
+    await syncWidgetUserProfileFromScoring(scoringProfile);
+
+    // 可选：前台辅助拉取一次“每日推荐”，提升小组件首次展示的成功率与一致性（失败不阻塞）
+    await ensureDailyWidgetRecoUpToDate({ reason: 'onboarding_finish', scoringProfile });
+
     // Onboarding 结束后预拉取一次 Feed 文案（失败不阻塞进入首页）
     try {
       const lang = i18n.language?.toLowerCase().startsWith('zh') ? 'tc' : 'en';
@@ -96,10 +107,49 @@ export default function OnboardingScreen() {
     });
     await setDailyReminderSettings({
       timesPerDay: reminderTimes,
-      pushEnabled: pushEnabled
+      // 这里表示“用户意愿”，不代表系统权限一定已 granted
+      pushEnabled: wantsPush,
     });
     await setOnboardingCompleted(true);
-    router.replace('/(app)/home');
+
+    // 用户选择 0 次（关闭）或跳过：直接进入首页
+    if (!wantsPush) {
+      await setPushPromptState('skipped');
+      router.replace('/(app)/home');
+      return;
+    }
+
+    // 用户想要 Push：请求系统权限并尽量完成 token/偏好上报（失败不阻塞进入首页）
+    await setPushPromptState('unknown');
+    try {
+      const { status } = await Notifications.requestPermissionsAsync();
+      if (status !== 'granted') {
+        await setPushPromptState('skipped');
+        return;
+      }
+
+      // iOS 模拟器通常无法获取 Expo Push Token（系统限制），此时不要提示“失败”，而是明确告知需要真机测试。
+      if (Device.osName === 'iOS' && !Device.isDevice) {
+        Alert.alert('提示', '当前为 iOS 模拟器，无法获取推送 Token。请使用真机测试推送功能。');
+        await setPushPromptState('unknown');
+        return;
+      }
+
+      // 1) 获取 Expo Push Token
+      const expoPushToken = await getExpoPushTokenOrThrow();
+      // 2) 上报 token 到后端（幂等）
+      await registerPushToken({ pushToken: expoPushToken });
+      // 3) 上报推送偏好（幂等）
+      await setPushPreferences({ enabled: wantsPush, timesPerDay: reminderTimes });
+
+      await setPushPromptState('enabled');
+    } catch (e) {
+      // 失败不阻塞进入首页；但这里给出更明确的文案（常见原因：模拟器/网络/后端异常）
+      Alert.alert(t('push.errorTitle'), t('push.errorDesc'));
+      await setPushPromptState('unknown');
+    } finally {
+      router.replace('/(app)/home');
+    }
   }
 
   const onNext = () => {
@@ -121,6 +171,10 @@ export default function OnboardingScreen() {
     const scoringProfile = buildUserProfileFromQuestionnaire({});
     await setUserProfileScoring(scoringProfile);
 
+    // 同步到 App Group：供 iOS Widget 使用（失败不阻塞）
+    await syncWidgetConfig();
+    await syncWidgetUserProfileFromScoring(scoringProfile);
+
     // 标记已完成，避免下次启动再次进入 Onboarding
     await setOnboardingCompleted(true);
     router.replace('/(app)/home');
@@ -173,6 +227,11 @@ export default function OnboardingScreen() {
           value={reminderTimes}
           onChange={setReminderTimes}
           onFinish={onFinish}
+          onSkip={() => {
+            // 跳过每日提醒：视为 0 次（关闭）
+            setReminderTimes(0);
+            onFinish();
+          }}
         />
       )}
     </OnboardingLayout>

client/app/(onboarding)/push-prompt.tsx

@@ -1,74 +0,0 @@
-import { useState } from 'react';
-import { Alert, Pressable, StyleSheet, Text, View } from 'react-native';
-import { useRouter } from 'expo-router';
-import { useTranslation } from 'react-i18next';
-import * as Notifications from 'expo-notifications';
-
-import { setPushPromptState } from '@/src/storage/appStorage';
-
-export default function PushPromptScreen() {
-  const router = useRouter();
-  const { t } = useTranslation();
-  const [loading, setLoading] = useState(false);
-
-  async function goHome() {
-    router.replace('/(app)/home');
-  }
-
-  async function onLater() {
-    await setPushPromptState('skipped');
-    await goHome();
-  }
-
-  async function onEnableNow() {
-    // 触发系统权限申请（可失败，但不阻塞进入主功能）
-    setLoading(true);
-    try {
-      await Notifications.requestPermissionsAsync();
-      await setPushPromptState('enabled');
-      await goHome();
-    } catch (e) {
-      Alert.alert(t('push.errorTitle'), t('push.errorDesc'));
-      await goHome();
-    } finally {
-      setLoading(false);
-    }
-  }
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.card}>
-        <Text style={styles.title}>{t('push.cardTitle')}</Text>
-        <Text style={styles.desc}>{t('push.cardDesc')}</Text>
-      </View>
-
-      <View style={styles.actions}>
-        <Pressable style={[styles.btn, styles.secondary]} onPress={onLater} disabled={loading}>
-          <Text style={[styles.btnText, styles.secondaryText]}>{t('push.later')}</Text>
-        </Pressable>
-        <Pressable style={[styles.btn, styles.primary]} onPress={onEnableNow} disabled={loading}>
-          <Text style={styles.btnText}>{loading ? t('push.loading') : t('push.enable')}</Text>
-        </Pressable>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: { flex: 1, padding: 20, justifyContent: 'center', gap: 16 },
-  card: {
-    borderRadius: 18,
-    padding: 20,
-    backgroundColor: '#111827',
-    gap: 10
-  },
-  title: { color: 'white', fontSize: 20, fontWeight: '700' },
-  desc: { color: '#E5E7EB', fontSize: 15, lineHeight: 21 },
-  actions: { flexDirection: 'row', gap: 12 },
-  btn: { flex: 1, paddingVertical: 14, borderRadius: 14, alignItems: 'center' },
-  primary: { backgroundColor: '#16A34A' },
-  secondary: { backgroundColor: '#F3F4F6' },
-  btnText: { fontSize: 16, fontWeight: '600', color: '#FFFFFF' },
-  secondaryText: { color: '#111827' }
-});
-