fix:小组件- PUSH

2026-02-03 17:43:58 +08:00
parent d742b398ef
commit c1c2c6197d
66 changed files with 4888 additions and 479 deletions
--- a/client/components/home/DailyReminderModal.tsx
+++ b/client/components/home/DailyReminderModal.tsx
@@ -39,13 +39,17 @@ export default function DailyReminderModal({ visible, onClose }: Props) {
  }, [visible]);

  function clamp(next: number) {
-    return Math.min(10, Math.max(1, next));
+    // 需求：0～5（0 表示关闭）
+    return Math.min(5, Math.max(0, next));
  }

  async function onOk() {
    if (loading) return;
    setLoading(true);
-    const next: DailyReminderSettings = { timesPerDay, pushEnabled };
+    const next: DailyReminderSettings = {
+      timesPerDay: Math.min(5, Math.max(0, Math.round(timesPerDay))),
+      pushEnabled: Boolean(pushEnabled) && timesPerDay > 0,
+    };
    await setDailyReminderSettings(next);
    setLoading(false);
    onClose();
--- a/client/components/home/ProfileModal.tsx
+++ b/client/components/home/ProfileModal.tsx
@@ -3,6 +3,7 @@ import { Alert, FlatList, Image, Pressable, StyleSheet, Text, View, Platform, Di
 import { useTranslation } from 'react-i18next';
 import { LinearGradient } from 'expo-linear-gradient';
 import { Switch } from 'react-native';
+import * as WebBrowser from 'expo-web-browser';
 import Animated, {
  Easing,
  FadeIn,
@@ -39,6 +40,8 @@ import SelectedIcon from '@/assets/images/icon/selected_icon.svg';
 import QuestionIcon from '@/assets/images/home/Profile/widget/question_icon.svg';
 import * as Notifications from 'expo-notifications';
 import { changeLanguage } from '@/src/i18n';
+import { fetchLegalLinks } from '@/src/services/legalApi';
+import { getExpoPushTokenOrThrow, registerPushToken, setPushPreferences } from '@/src/services/pushApi';

 const { width } = Dimensions.get('window');

@@ -80,6 +83,7 @@ export default function ProfileModal({ visible, name: propName, onClose }: Props
  const [page, setPage] = useState<Page>('root');
  const [navDirection, setNavDirection] = useState<NavDirection>('forward');
  const [currentName, setCurrentName] = useState(propName);
+  const [legalLinks, setLegalLinks] = useState<{ privacy?: string; terms?: string }>({});
  const isRoot = page === 'root';

  // 当弹窗打开时，尝试从存储中获取最新的昵称，确保与 onboarding 同步
@@ -90,6 +94,16 @@ export default function ProfileModal({ visible, name: propName, onClose }: Props
          setCurrentName(profile.name);
        }
      });
+
+      // 打开弹窗时拉取协议链接（由后端按语言下发；默认 EN）
+      fetchLegalLinks()
+        .then((res) => {
+          setLegalLinks({ privacy: res.privacyPolicyUrl, terms: res.termsOfUseUrl });
+        })
+        .catch((e) => {
+          if (__DEV__) console.log('[LegalLinks] 拉取失败（ProfileModal）:', e);
+          setLegalLinks({});
+        });
    } else {
      setNavDirection('back');
      setPage('root');
@@ -123,6 +137,18 @@ export default function ProfileModal({ visible, name: propName, onClose }: Props
    handleClose();
  }

+  const openLink = useCallback(
+    async (url?: string) => {
+      if (!url) return;
+      try {
+        await WebBrowser.openBrowserAsync(url);
+      } catch (error) {
+        Alert.alert(t('common.error'), t('common.openLinkError'));
+      }
+    },
+    [t],
+  );
+
  const title = useMemo(() => {
    if (page === 'favorites') return t('profile.favorites');
    if (page === 'dailyReminder') return t('dailyReminder.title');
@@ -182,6 +208,8 @@ export default function ProfileModal({ visible, name: propName, onClose }: Props
              onOpenWidget={() => go('widget', 'forward')}
              onOpenDailyReminder={() => go('dailyReminder', 'forward')}
              onOpenLanguage={() => go('language', 'forward')}
+              onOpenPrivacy={() => openLink(legalLinks.privacy)}
+              onOpenTerms={() => openLink(legalLinks.terms)}
            />
          ) : page === 'favorites' ? (
            <FavoritesPage visible={visible} page={page} />
@@ -211,12 +239,16 @@ function RootPage({
  onOpenWidget,
  onOpenDailyReminder,
  onOpenLanguage,
+  onOpenPrivacy,
+  onOpenTerms,
 }: {
  name?: string;
  onOpenFavorites: () => void;
  onOpenWidget: () => void;
  onOpenDailyReminder: () => void;
  onOpenLanguage: () => void;
+  onOpenPrivacy: () => void;
+  onOpenTerms: () => void;
 }) {
  const { t } = useTranslation();
  return (
@@ -244,12 +276,12 @@ function RootPage({
        <ListItem
          icon={<PrivacyIcon width={22} height={22} />}
          title={t('profile.privacy')}
-          onPress={() => toastTodo(t)}
+          onPress={onOpenPrivacy}
        />
        <ListItem
          icon={<TermsIcon width={22} height={22} />}
          title={t('profile.terms')}
-          onPress={() => toastTodo(t)}
+          onPress={onOpenTerms}
        />
        <ListItem
          icon={<LanguageIcon width={22} height={22} />}
@@ -373,13 +405,15 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
    (async () => {
      // 1. 获取本地存储设置
      const s = await getDailyReminderSettings();
-      
-      // 【测试模式】：强制模拟无权限状态
-      const granted = false; 
-      
+
+      // 2. 获取系统通知权限（用于 UI 展示/引导）
+      const settings = await Notifications.getPermissionsAsync();
+      const granted = settings.status === 'granted';
+
      if (cancelled) return;
      setTimesPerDay(s.timesPerDay);
-      setPushEnabled(granted); 
+      // pushEnabled 表示用户意愿；若系统未授权则强制展示为关闭
+      setPushEnabled(Boolean(s.pushEnabled) && granted);
      setHasSystemPermission(granted);
      setLoading(false);
    })();
@@ -412,6 +446,16 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
      if (status === 'granted') {
        setPushEnabled(true);
        setHasSystemPermission(true);
+
+        // 获取 token 并上报后端（幂等）
+        try {
+          const expoPushToken = await getExpoPushTokenOrThrow();
+          await registerPushToken({ pushToken: expoPushToken });
+          await setPushPreferences({ enabled: true, timesPerDay });
+        } catch (e) {
+          const msg = e instanceof Error ? e.message : String(e);
+          Alert.alert(t('common.notice'), msg);
+        }
      } else {
        setPushEnabled(false);
        setHasSystemPermission(false);
@@ -419,18 +463,35 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
      }
    } else {
      setPushEnabled(false);
+      // 关闭时尝试同步到后端（不阻塞）
+      try {
+        await setPushPreferences({ enabled: false, timesPerDay: 0 });
+      } catch {
+        // ignore
+      }
    }
  };

  function clamp(next: number) {
-    return Math.min(10, Math.max(1, next));
+    // 需求：0～5（0 表示关闭）
+    return Math.min(5, Math.max(0, next));
  }

  async function onOk() {
    if (loading) return;
    setLoading(true);
-    const next: DailyReminderSettings = { timesPerDay, pushEnabled };
+    const nextTimes = Math.min(5, Math.max(0, Math.round(timesPerDay)));
+    const nextEnabled = Boolean(pushEnabled) && nextTimes > 0;
+    const next: DailyReminderSettings = { timesPerDay: nextTimes, pushEnabled: nextEnabled };
    await setDailyReminderSettings(next);
+
+    // 同步后端偏好（幂等；失败不阻塞）
+    try {
+      await setPushPreferences({ enabled: nextEnabled, timesPerDay: nextTimes });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      console.warn('[PushPreferences] 同步失败', msg);
+    }
    setLoading(false);
    onDone();
  }
@@ -464,24 +525,22 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
        </Pressable>
      </View>

-      {!hasSystemPermission && (
-        <View style={styles.remindRow}>
-          <View style={styles.rowLeft}>
-            <View style={styles.rowIcon}>
-              <RemindIcon width={18} height={18} />
-            </View>
-            <Text style={styles.rowText}>{t('dailyReminder.pushLabel')}</Text>
-          </View>
-          <View style={styles.rowRight}>
-            <Switch 
-              value={pushEnabled} 
-              onValueChange={handleTogglePush}
-              trackColor={{ false: '#D1D1D6', true: '#4CD964' }}
-              ios_backgroundColor="#D1D1D6"
-            />
+      <View style={styles.remindRow}>
+        <View style={styles.rowLeft}>
+          <View style={styles.rowIcon}>
+            <RemindIcon width={18} height={18} />
          </View>
+          <Text style={styles.rowText}>{t('dailyReminder.pushLabel')}</Text>
        </View>
-      )}
+        <View style={styles.rowRight}>
+          <Switch
+            value={pushEnabled}
+            onValueChange={handleTogglePush}
+            trackColor={{ false: '#D1D1D6', true: '#4CD964' }}
+            ios_backgroundColor="#D1D1D6"
+          />
+        </View>
+      </View>

      <Pressable onPress={onOk} disabled={loading} style={styles.okPressable}>
        <LinearGradient
@@ -537,7 +596,8 @@ function WidgetHowToPage() {
  const flatListRef = useRef<FlatList>(null);
  const [activeIndex, setActiveIndex] = useState(0);
  const [isManual, setIsManual] = useState(false);
-  const timerRef = useRef<NodeJS.Timeout | null>(null);
+  // React Native 环境下 setInterval 返回值类型与 Node 不同，这里用 ReturnType 兼容
+  const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);

  const images = currentLang === 'en' ? [
    { id: '1', src: require('@/assets/images/home/Profile/widget/Widget_description1_en.png'), desc: t('widget.howToDesc1') },
--- a/client/components/onboarding/ReminderStep.tsx
+++ b/client/components/onboarding/ReminderStep.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { View, StyleSheet, TouchableOpacity, Text, Platform, Dimensions } from 'react-native';
+import { useTranslation } from 'react-i18next';
 import { OnboardingColors } from '@/constants/OnboardingTheme';
 import AddIcon from '@/assets/images/icon/add_icon.svg';
 import ReduceIcon from '@/assets/images/icon/reduce_icon.svg';
@@ -11,11 +12,15 @@ interface ReminderStepProps {
  value: number;
  onChange: (value: number) => void;
  onFinish: () => void;
+  onSkip: () => void;
 }

-export function ReminderStep({ value, onChange, onFinish }: ReminderStepProps) {
+export function ReminderStep({ value, onChange, onFinish, onSkip }: ReminderStepProps) {
+  const { t } = useTranslation();
+
  const handleReduce = () => {
-    if (value > 1) onChange(value - 1);
+    // 允许 0～5；0 表示关闭每日提醒
+    if (value > 0) onChange(value - 1);
  };

  const handleAdd = () => {
@@ -31,7 +36,7 @@ export function ReminderStep({ value, onChange, onFinish }: ReminderStepProps) {

        <View style={styles.numberWrapper}>
          <Text style={styles.numberText}>{value}</Text>
-          <Text style={styles.unitText}>次</Text>
+          <Text style={styles.unitText}>{t('dailyReminder.timesUnit')}</Text>
        </View>

        <TouchableOpacity onPress={handleAdd} activeOpacity={0.7}>
@@ -43,6 +48,10 @@ export function ReminderStep({ value, onChange, onFinish }: ReminderStepProps) {
        <TouchableOpacity onPress={onFinish} activeOpacity={0.8}>
          <BtnClicked width={87} height={57} />
        </TouchableOpacity>
+
+        <TouchableOpacity onPress={onSkip} activeOpacity={0.8} style={styles.skipBtn}>
+          <Text style={styles.skipText}>{t('onboarding.skip')}</Text>
+        </TouchableOpacity>
      </View>
    </View>
  );
@@ -86,4 +95,16 @@ const styles = StyleSheet.create({
    bottom: height * 0.12,
    alignItems: 'center',
  }
+  ,
+  skipBtn: {
+    marginTop: 14,
+    paddingVertical: 10,
+    paddingHorizontal: 18,
+  },
+  skipText: {
+    color: OnboardingColors.textPrimary,
+    fontSize: 15,
+    fontWeight: '600',
+    opacity: 0.85,
+  },
 });