feat(push): integrate Honor and Xiaomi push plugins with related updates

2026-06-18 00:03:37 +08:00
parent b2979311bb
commit 96e8de18bf
20 changed files with 1088 additions and 265 deletions
--- a/src/screens/home/PostDetailScreen.tsx
+++ b/src/screens/home/PostDetailScreen.tsx
@@ -42,6 +42,7 @@ import { postService, commentService, authService, showPrompt, voteService } fro
 import { postSyncService } from '@/services/post';
 import { useCursorPagination } from '../../hooks/useCursorPagination';
 import { CommentItem, VoteCard, ReportDialog, ShareSheet, PostContentRenderer, PostMentionInput } from '../../components/business';
+import type { PostMentionInputHandle } from '../../components/business';
 import { Avatar, Button, Loading, EmptyState, Text, ImageGallery, ImageGrid, ImageGridItem, AdaptiveLayout, AppBackButton } from '../../components/common';
 import { useResponsive, useResponsiveValue, useResponsiveSpacing } from '../../hooks';
 import {
@@ -1271,10 +1272,22 @@ export const PostDetailScreen: React.FC = () => {
  // 回复评论
  const [replyingTo, setReplyingTo] = useState<Comment | null>(null);
  const [isComposerVisible, setIsComposerVisible] = useState(false);
+  const commentInputRef = useRef<PostMentionInputHandle>(null);
+
+  // 展开编辑器后自动聚焦输入框、唤起键盘，提升回复体验
+  const focusCommentInput = useCallback(() => {
+    // 展开态需要先渲染，延迟一帧再 focus，避免 ref 尚未挂载到真实 TextInput
+    requestAnimationFrame(() => {
+      setTimeout(() => {
+        commentInputRef.current?.focus();
+      }, 60);
+    });
+  }, []);

  const handleReply = (comment: Comment) => {
    setReplyingTo(comment);
    setIsComposerVisible(true);
+    focusCommentInput();
  };

  const handleCancelReply = () => {
@@ -1363,6 +1376,7 @@ export const PostDetailScreen: React.FC = () => {

  const openComposer = () => {
    setIsComposerVisible(true);
+    focusCommentInput();
  };

  const closeComposer = () => {
@@ -1471,6 +1485,7 @@ export const PostDetailScreen: React.FC = () => {

          {/* Text Input —— 小红书风格：无边框、自动扩展 */}
          <PostMentionInput
+            ref={commentInputRef}
            value={commentText}
            onChangeText={setCommentText}
            onSegmentsChange={setCommentSegments}
--- a/src/screens/message/components/ChatScreen/SegmentRenderer.tsx
+++ b/src/screens/message/components/ChatScreen/SegmentRenderer.tsx
@@ -476,23 +476,102 @@ const renderVideoSegment = (data: VideoSegmentData, isMe: boolean): React.ReactN
  return <VideoSegment key={`video-${data.url}`} data={data} isMe={isMe} />;
 };

+/**
+ * 根据 MIME 类型返回文件图标名与主题色
+ */
+function getFileVisual(mime?: string): { icon: string; color: string } {
+  if (!mime) return { icon: 'file-document-outline', color: '#5C6BC0' };
+  const m = mime.toLowerCase();
+  if (m === 'application/pdf') return { icon: 'file-pdf-box', color: '#E53935' };
+  if (m.includes('word') || m === 'application/msword') return { icon: 'file-word-box', color: '#1E88E5' };
+  if (m.includes('excel') || m === 'application/vnd.ms-excel' || m === 'text/csv') return { icon: 'file-excel-box', color: '#43A047' };
+  if (m.includes('powerpoint') || m === 'application/vnd.ms-powerpoint') return { icon: 'file-powerpoint-box', color: '#FB8C00' };
+  if (m === 'application/zip' || m.includes('compressed') || m.includes('rar') || m.includes('7z') || m.includes('gzip') || m.includes('tar')) {
+    return { icon: 'folder-zip-outline', color: '#8D6E63' };
+  }
+  if (m.startsWith('audio/')) return { icon: 'file-music-outline', color: '#8E24AA' };
+  if (m.startsWith('video/')) return { icon: 'file-video-outline', color: '#00897B' };
+  if (m.startsWith('image/')) return { icon: 'file-image-outline', color: '#FF6B35' };
+  if (m === 'application/json' || m === 'text/xml' || m === 'application/xml') return { icon: 'code-json', color: '#455A64' };
+  if (m === 'text/plain' || m === 'text/markdown') return { icon: 'file-document-outline', color: '#607D8B' };
+  return { icon: 'file-document-outline', color: '#5C6BC0' };
+}
+
+/**
+ * 打开/下载文件：移动端用浏览器在新页面打开 URL（系统会提示下载/预览），
+ * 此处不再依赖 expo-file-system（SDK 56 已废弃 downloadAsync）。
+ */
+async function openRemoteFile(url: string, name: string) {
+  if (!url) return;
+  try {
+    await Linking.openURL(url);
+  } catch (error) {
+    console.warn('打开文件失败:', error);
+  }
+}
+
 /**
 * 渲染文件 Segment
+ * 当 data.expired 为 true 时显示"文件已过期"失效态，禁用点击。
 */
 const FileSegmentBody: React.FC<{ data: FileSegmentData; isMe: boolean }> = ({ data, isMe }) => {
  const styles = useSegmentStyles();
  const themeColors = useAppColors();
+  const [downloading, setDownloading] = useState(false);
  const fileSize = data.size ? formatFileSize(data.size) : '';
+  const visual = getFileVisual(data.mime_type);
+  const isExpired = !!data.expired;
+
+  const handlePress = async () => {
+    if (isExpired || !data.url || downloading) return;
+    setDownloading(true);
+    try {
+      await openRemoteFile(data.url, data.name || 'file');
+    } finally {
+      setDownloading(false);
+    }
+  };
+
+  // 失效态：灰态卡片 + 时钟图标 + "文件已过期"，禁用点击
+  if (isExpired) {
+    return (
+      <View
+        style={[styles.fileContainer, styles.fileExpired, isMe ? styles.fileMe : styles.fileOther]}
+        pointerEvents="none"
+      >
+        <View style={[styles.fileIcon, { backgroundColor: 'rgba(150,150,150,0.15)' }]}>
+          <MaterialCommunityIcons
+            name="clock-alert-outline"
+            size={26}
+            color={themeColors.chat.textTertiary}
+          />
+        </View>
+        <View style={styles.fileInfo}>
+          <Text
+            style={[styles.fileName, styles.fileExpiredText]}
+            numberOfLines={1}
+          >
+            {data.name}
+          </Text>
+          <Text style={[styles.fileSize, styles.fileExpiredText]}>
+            文件已过期
+          </Text>
+        </View>
+      </View>
+    );
+  }
+
  return (
    <TouchableOpacity
      style={[styles.fileContainer, isMe ? styles.fileMe : styles.fileOther]}
+      onPress={handlePress}
      activeOpacity={0.7}
    >
-      <View style={styles.fileIcon}>
+      <View style={[styles.fileIcon, { backgroundColor: `${visual.color}22` }]}>
        <MaterialCommunityIcons
-          name="file-document"
-          size={28}
-          color={isMe ? themeColors.primary.contrast : themeColors.primary.main}
+          name={visual.icon as any}
+          size={26}
+          color={isMe ? themeColors.primary.contrast : visual.color}
        />
      </View>
      <View style={styles.fileInfo}>
@@ -502,8 +581,15 @@ const FileSegmentBody: React.FC<{ data: FileSegmentData; isMe: boolean }> = ({ d
        >
          {data.name}
        </Text>
-        {fileSize ? <Text style={styles.fileSize}>{fileSize}</Text> : null}
+        <Text style={styles.fileSize}>
+          {downloading ? '下载中…' : (fileSize || (data.mime_type || '文件'))}
+        </Text>
      </View>
+      <MaterialCommunityIcons
+        name={downloading ? 'progress-download' : 'download-outline'}
+        size={20}
+        color={isMe ? themeColors.primary.contrast : themeColors.chat.textTertiary}
+      />
    </TouchableOpacity>
  );
 };
@@ -1021,6 +1107,14 @@ function createSegmentStyles(colors: AppColors, fontSize: number = 16) {
    fontWeight: '500',
  },

+  // 文件过期失效态
+  fileExpired: {
+    opacity: 0.65,
+  },
+  fileExpiredText: {
+    color: colors.chat.textTertiary,
+  },
+
  // 链接 - QQ风格：卡片式设计
  linkContainer: {
    borderRadius: 16,
--- a/src/screens/message/components/ChatScreen/constants.ts
+++ b/src/screens/message/components/ChatScreen/constants.ts
@@ -171,20 +171,13 @@ export const MORE_ACTIONS: MoreAction[] = [
    color: '#26A69A',
    gradientColors: ['#4DB6AC', '#00897B'],
  },
-  { 
-    id: 'file', 
-    icon: 'file-document', 
-    name: '文件', 
+  {
+    id: 'file',
+    icon: 'file-document',
+    name: '文件',
    color: '#5C6BC0',
    gradientColors: ['#7986CB', '#3F51B5'],
  },
-  { 
-    id: 'location', 
-    icon: 'map-marker', 
-    name: '位置', 
-    color: '#EC407A',
-    gradientColors: ['#F06292', '#D81B60'],
-  },
 ];

 // 消息撤回时间限制（毫秒）
--- a/src/screens/message/components/ChatScreen/useChatScreen.ts
+++ b/src/screens/message/components/ChatScreen/useChatScreen.ts
@@ -20,7 +20,9 @@ import {
 import { useLocalSearchParams, router } from 'expo-router';
 import { formatChatTime } from '@/utils/formatTime';
 import * as ImagePicker from 'expo-image-picker';
-import { GroupMemberResponse, MessageSegment, TextSegmentData, ImageSegmentData, AtSegmentData, ReplySegmentData, MessageStatus } from '../../../../types/dto';
+import * as DocumentPicker from 'expo-document-picker';
+import { Linking } from 'react-native';
+import { GroupMemberResponse, MessageSegment, TextSegmentData, ImageSegmentData, FileSegmentData, AtSegmentData, ReplySegmentData, MessageStatus } from '../../../../types/dto';
 import { messageService } from '@/services/message';
 import { uploadService } from '@/services/upload';
 import { ApiError } from '@/services/core';
@@ -1049,6 +1051,38 @@ export const useChatScreen = (props?: ChatScreenProps) => {
    return segments;
  }, []);

+  /**
+   * 构建文件消息的 segments 数组
+   */
+  const buildFileSegments = useCallback((
+    fileUrl: string,
+    name: string,
+    size?: number,
+    mimeType?: string,
+    replyToMessage?: GroupMessage | null,
+  ): MessageSegment[] => {
+    const segments: MessageSegment[] = [];
+
+    if (replyToMessage) {
+      segments.push({
+        type: 'reply',
+        data: { id: replyToMessage.id, seq: replyToMessage.seq } as ReplySegmentData
+      });
+    }
+
+    segments.push({
+      type: 'file',
+      data: {
+        url: fileUrl,
+        name,
+        size,
+        mime_type: mimeType,
+      } as FileSegmentData
+    });
+
+    return segments;
+  }, []);
+
  // 【新架构】发送消息（支持纯文字、纯多图、图文同条）
  const handleSend = useCallback(async () => {
    const trimmedText = inputText.trim();
@@ -1253,6 +1287,89 @@ export const useChatScreen = (props?: ChatScreenProps) => {
    setActivePanel('none');
  }, [pendingAttachments.length]);

+  // 选择并发送文件（单选，立即上传后发送）
+  const handlePickFile = useCallback(async () => {
+    if (!conversationId) {
+      setActivePanel('none');
+      return;
+    }
+
+    if (isGroupChat && isMuted) {
+      Alert.alert('无法发送', muteAll ? '当前群组已开启全员禁言' : '你已被管理员禁言');
+      setActivePanel('none');
+      return;
+    }
+
+    setActivePanel('none');
+
+    try {
+      const result = await DocumentPicker.getDocumentAsync({
+        multiple: false,
+        copyToCacheDirectory: true,
+      });
+      if (result.canceled || !result.assets || result.assets.length === 0) {
+        return;
+      }
+
+      const asset = result.assets[0];
+      setUploadingAttachments(true);
+
+      const uploaded = await uploadService.uploadFile(
+        {
+          uri: asset.uri,
+          name: asset.name,
+          type: asset.mimeType || undefined,
+        },
+        'chat'
+      );
+
+      if (!uploaded?.url) {
+        Alert.alert('上传失败', getSendErrorMessage(null, '文件上传失败，请重试'));
+        return;
+      }
+
+      const segments = buildFileSegments(
+        uploaded.url,
+        uploaded.name || asset.name,
+        uploaded.size ?? asset.size,
+        uploaded.mime_type ?? asset.mimeType,
+        replyingTo,
+      );
+
+      setSending(true);
+      try {
+        if (isGroupChat && effectiveGroupId) {
+          await messageService.sendMessageByAction('group', conversationId, segments);
+        } else {
+          await sendMessageViaManager(segments);
+        }
+        setReplyingTo(null);
+        setTimeout(() => scrollToLatest(false, false, 'send-file'), 100);
+      } catch (error) {
+        console.error('发送文件消息失败:', error);
+        Alert.alert('发送失败', getSendErrorMessage(error, '消息发送失败，请重试'));
+      } finally {
+        setSending(false);
+      }
+    } catch (error) {
+      console.error('选择文件失败:', error);
+      Alert.alert('错误', getSendErrorMessage(error, '选择文件失败'));
+    } finally {
+      setUploadingAttachments(false);
+    }
+  }, [
+    conversationId,
+    isGroupChat,
+    isMuted,
+    muteAll,
+    effectiveGroupId,
+    replyingTo,
+    buildFileSegments,
+    sendMessageViaManager,
+    scrollToLatest,
+    getSendErrorMessage,
+  ]);
+
  // 处理更多功能
  const handleMoreAction = useCallback((actionId: string) => {
    switch (actionId) {
@@ -1281,17 +1398,12 @@ export const useChatScreen = (props?: ChatScreenProps) => {
        handleTakePhoto();
        break;
      case 'file':
-        Alert.alert('提示', '文件功能即将上线');
-        setActivePanel('none');
-        break;
-      case 'location':
-        Alert.alert('提示', '位置功能即将上线');
-        setActivePanel('none');
+        handlePickFile();
        break;
      default:
        setActivePanel('none');
    }
-  }, [handlePickImage, handleTakePhoto, isGroupChat, otherUser, conversationId]);
+  }, [handlePickImage, handleTakePhoto, handlePickFile, isGroupChat, otherUser, conversationId]);

  // 插入表情
  const handleInsertEmoji = useCallback((emoji: string) => {
--- a/src/screens/profile/AccountDeletionScreen.tsx
+++ b/src/screens/profile/AccountDeletionScreen.tsx
@@ -1,8 +1,10 @@
 import { StatusBar } from 'expo-status-bar';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
  ActivityIndicator,
  Alert,
+  KeyboardAvoidingView,
+  Platform,
  ScrollView,
  StyleSheet,
  TextInput,
@@ -13,7 +15,7 @@ import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 import { useRouter } from 'expo-router';
 import { authService } from '../../services';
-import { spacing, borderRadius, fontSizes, useAppColors, type AppColors } from '../../theme';
+import { spacing, fontSizes, useAppColors, type AppColors } from '../../theme';
 import { Text, SimpleHeader } from '../../components/common';
 import { useResponsive, useResponsiveSpacing } from '../../hooks';
 import { useAuthStore } from '../../stores';
@@ -33,6 +35,9 @@ function createAccountDeletionStyles(colors: AppColors) {
      alignItems: 'center',
      justifyContent: 'center',
    },
+    keyboardView: {
+      flex: 1,
+    },
    scrollContent: {
      paddingVertical: spacing.lg,
    },
@@ -41,53 +46,153 @@ function createAccountDeletionStyles(colors: AppColors) {
      alignSelf: 'center',
      width: '100%',
    },
-    section: {
-      marginBottom: spacing['2xl'],
+
+    // 顶部叙述区：左对齐、有呼吸感
+    heroSection: {
+      paddingHorizontal: spacing['2xl'],
+      paddingTop: spacing.md,
+      paddingBottom: spacing.xl,
    },
-    // 警告卡片 - 扁平化风格
-    warningCard: {
-      backgroundColor: colors.error.light + '20',
-      borderRadius: 14,
-      padding: spacing.lg,
-      marginHorizontal: spacing['2xl'],
-      marginBottom: spacing.xl,
-    },
-    warningTitle: {
-      fontWeight: '700',
-      fontSize: fontSizes.md,
+    heroEyebrow: {
+      fontSize: 13,
+      color: colors.text.hint,
+      letterSpacing: 1,
      marginBottom: spacing.sm,
-      color: colors.error.main,
    },
-    warningText: {
-      color: colors.error.dark,
-      marginBottom: spacing.xs,
-      fontSize: fontSizes.sm,
-    },
-    // 状态卡片 - 扁平化风格
-    statusCard: {
-      backgroundColor: colors.warning.light + '30',
-      borderRadius: 14,
-      padding: spacing.lg,
-      marginHorizontal: spacing['2xl'],
-      marginBottom: spacing.xl,
-    },
-    statusTitle: {
+    heroTitle: {
+      fontSize: 24,
      fontWeight: '700',
-      fontSize: fontSizes.md,
+      color: colors.text.primary,
+      lineHeight: 32,
      marginBottom: spacing.sm,
-      color: colors.warning.dark,
    },
-    daysText: {
+    heroDesc: {
+      fontSize: 15,
+      color: colors.text.secondary,
+      lineHeight: 22,
+    },
+
+    // 倒计时区：圆环 + 数字 + 文案，替代"大数字 + 标签"卡片
+    countdownSection: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      paddingHorizontal: spacing['2xl'],
+      paddingVertical: spacing.lg,
+    },
+    countdownRing: {
+      width: 88,
+      height: 88,
+      borderRadius: 44,
+      borderWidth: 4,
+      borderColor: colors.warning.main,
+      alignItems: 'center',
+      justifyContent: 'center',
+      marginRight: spacing.lg,
+    },
+    countdownNumber: {
      fontSize: 32,
      fontWeight: '700',
      color: colors.warning.dark,
-      textAlign: 'center',
-      marginVertical: spacing.md,
+      lineHeight: 36,
    },
-    // 内容区域
-    sectionContent: {
-      marginHorizontal: spacing['2xl'],
-      marginBottom: spacing.xl,
+    countdownUnit: {
+      fontSize: 11,
+      color: colors.text.secondary,
+      marginTop: -2,
+    },
+    countdownTextWrap: {
+      flex: 1,
+    },
+    countdownTitle: {
+      fontSize: 16,
+      fontWeight: '600',
+      color: colors.text.primary,
+      marginBottom: 4,
+    },
+    countdownDesc: {
+      fontSize: 13,
+      color: colors.text.secondary,
+      lineHeight: 19,
+    },
+
+    // 引导文 + 列表（无背景、无圆角，自然排版）
+    guideSection: {
+      paddingHorizontal: spacing['2xl'],
+      paddingTop: spacing.lg,
+    },
+    guideLabel: {
+      fontSize: 13,
+      color: colors.text.secondary,
+      fontWeight: '500',
+      marginBottom: spacing.md,
+    },
+    guideItem: {
+      flexDirection: 'row',
+      alignItems: 'flex-start',
+      paddingVertical: 10,
+    },
+    guideIcon: {
+      marginRight: spacing.md,
+      marginTop: 2,
+    },
+    guideTextWrap: {
+      flex: 1,
+    },
+    guideTitle: {
+      fontSize: 15,
+      fontWeight: '500',
+      color: colors.text.primary,
+      marginBottom: 2,
+    },
+    guideDesc: {
+      fontSize: 13,
+      color: colors.text.secondary,
+      lineHeight: 19,
+    },
+    guideDivider: {
+      height: StyleSheet.hairlineWidth,
+      backgroundColor: colors.divider,
+      marginLeft: spacing['2xl'] + 22 + spacing.md,
+    },
+
+    // 注意事项（无填色，仅左侧色条）
+    noticeSection: {
+      flexDirection: 'row',
+      alignItems: 'flex-start',
+      paddingHorizontal: spacing['2xl'],
+      paddingTop: spacing.lg,
+      paddingBottom: spacing.md,
+    },
+    noticeBar: {
+      width: 3,
+      alignSelf: 'stretch',
+      backgroundColor: colors.error.main,
+      borderRadius: 2,
+      marginRight: spacing.md,
+    },
+    noticeTextWrap: {
+      flex: 1,
+    },
+    noticeTitle: {
+      fontSize: 14,
+      fontWeight: '600',
+      color: colors.error.main,
+      marginBottom: 4,
+    },
+    noticeDesc: {
+      fontSize: 13,
+      color: colors.text.secondary,
+      lineHeight: 20,
+    },
+
+    // 表单区（与 AccountSecurity 风格一致：分节标题 + 输入框）
+    formSection: {
+      marginTop: spacing.lg,
+    },
+    sectionHeader: {
+      paddingHorizontal: spacing['2xl'],
+      marginBottom: spacing.sm,
+      marginTop: spacing.sm,
    },
    sectionTitle: {
      fontWeight: '600',
@@ -95,47 +200,40 @@ function createAccountDeletionStyles(colors: AppColors) {
      color: colors.text.secondary,
      textTransform: 'uppercase',
      letterSpacing: 0.5,
-      marginBottom: spacing.md,
    },
-    listItem: {
+
+    // 输入框
+    inputWrapper: {
      flexDirection: 'row',
-      alignItems: 'flex-start',
-      marginBottom: spacing.sm,
-    },
-    listBullet: {
-      marginRight: spacing.sm,
-      marginTop: 2,
-    },
-    // 输入框 - 扁平化风格
-    input: {
+      alignItems: 'center',
      backgroundColor: colors.background.default,
      borderRadius: 14,
-      padding: spacing.md,
-      fontSize: 16,
+      paddingHorizontal: spacing.lg,
+      height: 56,
+      marginHorizontal: spacing['2xl'],
+      marginBottom: spacing.md,
+    },
+    inputIcon: {
+      marginRight: spacing.sm,
+    },
+    input: {
+      flex: 1,
      color: colors.text.primary,
+      fontSize: fontSizes.md,
      height: 56,
    },
-    // 按钮行
+    eyeButton: {
+      padding: 4,
+      marginLeft: 4,
+    },
+
+    // 按钮行：次按钮在左、危险按钮在右，与全站保持一致
    buttonRow: {
      flexDirection: 'row',
      gap: spacing.md,
      marginTop: spacing.lg,
      marginHorizontal: spacing['2xl'],
    },
-    // 扁平化按钮
-    primaryButton: {
-      flex: 1,
-      height: 56,
-      borderRadius: 14,
-      backgroundColor: colors.primary.main,
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    primaryButtonText: {
-      color: colors.text.inverse,
-      fontSize: fontSizes.md,
-      fontWeight: '600',
-    },
    secondaryButton: {
      flex: 1,
      height: 56,
@@ -165,11 +263,38 @@ function createAccountDeletionStyles(colors: AppColors) {
      fontWeight: '600',
    },
    buttonDisabled: {
-      opacity: 0.6,
+      opacity: 0.5,
    },
-    cancelButton: {
-      marginTop: spacing.lg,
+    primaryButton: {
+      height: 56,
+      borderRadius: 14,
+      backgroundColor: colors.primary.main,
+      alignItems: 'center',
+      justifyContent: 'center',
      marginHorizontal: spacing['2xl'],
+      marginTop: spacing.md,
+    },
+    primaryButtonText: {
+      color: colors.text.inverse,
+      fontSize: fontSizes.md,
+      fontWeight: '600',
+    },
+
+    // 页脚：联系客服
+    footer: {
+      alignItems: 'center',
+      marginTop: spacing.xl,
+      paddingHorizontal: spacing['2xl'],
+    },
+    footerText: {
+      fontSize: 13,
+      color: colors.text.hint,
+      lineHeight: 20,
+      textAlign: 'center',
+    },
+    footerLink: {
+      color: colors.primary.main,
+      fontWeight: '500',
    },
  });
 }
@@ -185,9 +310,9 @@ export const AccountDeletionScreen: React.FC = () => {
  const [loading, setLoading] = useState(true);
  const [submitting, setSubmitting] = useState(false);
  const [password, setPassword] = useState('');
+  const [showPassword, setShowPassword] = useState(false);

  const scrollBottomInset = isMobile ? 64 + 24 + insets.bottom + spacing.md : spacing.md;
-
  const responsivePadding = useResponsiveSpacing({ xs: 8, sm: 12, md: 16, lg: 24, xl: 32 });

  const loadStatus = useCallback(async () => {
@@ -284,121 +409,244 @@ export const AccountDeletionScreen: React.FC = () => {
    );
  }

+  // 待注销状态
+  if (status?.is_pending_deletion) {
+    return (
+      <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
+        <StatusBar style="auto" />
+        <SimpleHeader title="注销账号" onBack={() => router.back()} />
+        <ScrollView
+          contentContainerStyle={[
+            styles.scrollContent,
+            { paddingBottom: scrollBottomInset, paddingHorizontal: responsivePadding },
+          ]}
+          showsVerticalScrollIndicator={false}
+        >
+          <View style={styles.content}>
+            {/* 顶部叙述 */}
+            <View style={styles.heroSection}>
+              <Text style={styles.heroEyebrow}>ACCOUNT · 注销申请中</Text>
+              <Text style={styles.heroTitle}>我们将在倒计时结束后清除你的账号</Text>
+              <Text style={styles.heroDesc}>
+                在此期间，你随时可以撤销申请，账号会立即恢复正常使用。
+              </Text>
+            </View>
+
+            {/* 倒计时 */}
+            <View style={styles.countdownSection}>
+              <View style={styles.countdownRing}>
+                <Text style={styles.countdownNumber}>{status.cool_down_days || 90}</Text>
+                <Text style={styles.countdownUnit}>天</Text>
+              </View>
+              <View style={styles.countdownTextWrap}>
+                <Text style={styles.countdownTitle}>距离永久删除</Text>
+                <Text style={styles.countdownDesc}>
+                  再次登录或点击下方按钮可立即取消注销。
+                </Text>
+              </View>
+            </View>
+
+            {/* 取消按钮 */}
+            <TouchableOpacity
+              style={[
+                styles.primaryButton,
+                submitting && styles.buttonDisabled,
+              ]}
+              onPress={handleCancelDeletion}
+              disabled={submitting}
+              activeOpacity={0.9}
+            >
+              {submitting ? (
+                <ActivityIndicator size="small" color={colors.text.inverse} />
+              ) : (
+                <Text style={styles.primaryButtonText}>撤销注销申请</Text>
+              )}
+            </TouchableOpacity>
+
+            {/* 页脚 */}
+            <View style={styles.footer}>
+              <Text style={styles.footerText}>
+                如有疑虑可联系<Text style={styles.footerLink}> 客服 </Text>获取帮助
+              </Text>
+            </View>
+          </View>
+        </ScrollView>
+      </SafeAreaView>
+    );
+  }
+
+  // 正常状态：申请注销
  return (
    <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
      <StatusBar style="auto" />
      <SimpleHeader title="注销账号" onBack={() => router.back()} />
-      <ScrollView contentContainerStyle={[styles.scrollContent, { paddingBottom: scrollBottomInset, paddingHorizontal: responsivePadding }]}>
-        <View style={styles.content}>
-          {status?.is_pending_deletion ? (
-            <View style={styles.section}>
-              <View style={styles.statusCard}>
-                <Text variant="body" style={styles.statusTitle}>
-                  账号注销申请中
-                </Text>
-                <Text variant="body" color={colors.text.secondary}>
-                  您的账号将在以下天数后永久删除：
-                </Text>
-                <Text variant="body" style={styles.daysText}>
-                  {status.cool_down_days || 90} 天
-                </Text>
-                <Text variant="caption" color={colors.text.secondary}>
-                  在此期间，您可以通过重新登录或点击下方按钮来取消注销申请。
-                </Text>
-                <TouchableOpacity
-                  style={[styles.secondaryButton, styles.cancelButton, submitting && styles.buttonDisabled]}
-                  onPress={handleCancelDeletion}
-                  disabled={submitting}
-                >
-                  {submitting ? (
-                    <ActivityIndicator size="small" color={colors.text.primary} />
-                  ) : (
-                    <Text style={styles.secondaryButtonText}>取消注销申请</Text>
-                  )}
-                </TouchableOpacity>
+      <KeyboardAvoidingView
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        style={styles.keyboardView}
+      >
+        <ScrollView
+          contentContainerStyle={[
+            styles.scrollContent,
+            { paddingBottom: scrollBottomInset, paddingHorizontal: responsivePadding },
+          ]}
+          showsVerticalScrollIndicator={false}
+          keyboardShouldPersistTaps="handled"
+        >
+          <View style={styles.content}>
+            {/* 顶部叙述 */}
+            <View style={styles.heroSection}>
+              <Text style={styles.heroEyebrow}>ACCOUNT · 注销</Text>
+              <Text style={styles.heroTitle}>在离开之前，我们想让你知道这些</Text>
+              <Text style={styles.heroDesc}>
+                注销并非立即生效，提交后你有 90 天的冷静期，反悔了随时可以回来。
+              </Text>
+            </View>
+
+            {/* 注销影响 - 列表式（无背景） */}
+            <View style={styles.guideSection}>
+              <Text style={styles.guideLabel}>注销后会发生什么</Text>
+
+              <View style={styles.guideItem}>
+                <MaterialCommunityIcons
+                  name="account-remove-outline"
+                  size={22}
+                  color={colors.error.main}
+                  style={styles.guideIcon}
+                />
+                <View style={styles.guideTextWrap}>
+                  <Text style={styles.guideTitle}>个人资料会被清除</Text>
+                  <Text style={styles.guideDesc}>头像、昵称、简介等所有个人信息都将被永久删除。</Text>
+                </View>
+              </View>
+              <View style={styles.guideDivider} />
+
+              <View style={styles.guideItem}>
+                <MaterialCommunityIcons
+                  name="message-text-outline"
+                  size={22}
+                  color={colors.warning.main}
+                  style={styles.guideIcon}
+                />
+                <View style={styles.guideTextWrap}>
+                  <Text style={styles.guideTitle}>历史内容会保留</Text>
+                  <Text style={styles.guideDesc}>你发布的帖子、评论将保留，但作者会显示为「已注销用户」。</Text>
+                </View>
+              </View>
+              <View style={styles.guideDivider} />
+
+              <View style={styles.guideItem}>
+                <MaterialCommunityIcons
+                  name="heart-broken-outline"
+                  size={22}
+                  color={colors.error.main}
+                  style={styles.guideIcon}
+                />
+                <View style={styles.guideTextWrap}>
+                  <Text style={styles.guideTitle}>关注关系被解绑</Text>
+                  <Text style={styles.guideDesc}>你关注的人、粉丝、收藏、点赞等社交关系会被一并清除。</Text>
+                </View>
+              </View>
+              <View style={styles.guideDivider} />
+
+              <View style={styles.guideItem}>
+                <MaterialCommunityIcons
+                  name="clock-time-four-outline"
+                  size={22}
+                  color={colors.text.secondary}
+                  style={styles.guideIcon}
+                />
+                <View style={styles.guideTextWrap}>
+                  <Text style={styles.guideTitle}>90 天冷静期</Text>
+                  <Text style={styles.guideDesc}>期间重新登录即可撤销申请，账号会立刻恢复。</Text>
+                </View>
              </View>
            </View>
-          ) : (
-            <View style={styles.section}>
-              {/* 警告卡片 */}
-              <View style={styles.warningCard}>
-                <Text variant="body" style={styles.warningTitle}>
-                  警告：账号注销后将无法恢复
+
+            {/* 红色提示 - 左侧细线代替大色块 */}
+            <View style={styles.noticeSection}>
+              <View style={styles.noticeBar} />
+              <View style={styles.noticeTextWrap}>
+                <Text style={styles.noticeTitle}>这是不可恢复的操作</Text>
+                <Text style={styles.noticeDesc}>
+                  90 天后所有数据将被永久删除，届时无法通过任何方式找回。请确认你已备份好需要保留的内容。
                </Text>
-                <Text variant="body" style={styles.warningText}>
-                  注销后，您的账号将在90天后永久删除。
-                </Text>
-                <Text variant="body" style={styles.warningText}>
-                  在此期间，您可以通过重新登录来取消注销。
+              </View>
+            </View>
+
+            {/* 密码确认 */}
+            <View style={styles.formSection}>
+              <View style={styles.sectionHeader}>
+                <Text variant="caption" style={styles.sectionTitle}>
+                  身份验证
                </Text>
              </View>

-              {/* 注销说明 */}
-              <View style={styles.sectionContent}>
-                <Text style={styles.sectionTitle}>注销后将发生什么</Text>
-                <View style={styles.listItem}>
-                  <MaterialCommunityIcons name="close-circle" size={16} color={colors.error.main} style={styles.listBullet} />
-                  <Text variant="body" color={colors.text.secondary}>
-                    您的个人资料将被删除
-                  </Text>
-                </View>
-                <View style={styles.listItem}>
-                  <MaterialCommunityIcons name="information" size={16} color={colors.warning.main} style={styles.listBullet} />
-                  <Text variant="body" color={colors.text.secondary}>
-                    您发布的帖子、评论将保留，但显示为「已注销用户」
-                  </Text>
-                </View>
-                <View style={styles.listItem}>
-                  <MaterialCommunityIcons name="close-circle" size={16} color={colors.error.main} style={styles.listBullet} />
-                  <Text variant="body" color={colors.text.secondary}>
-                    您的关注、粉丝关系将被清除
-                  </Text>
-                </View>
-                <View style={styles.listItem}>
-                  <MaterialCommunityIcons name="close-circle" size={16} color={colors.error.main} style={styles.listBullet} />
-                  <Text variant="body" color={colors.text.secondary}>
-                    您的收藏、点赞记录将被删除
-                  </Text>
-                </View>
-              </View>
-
-              {/* 密码确认 */}
-              <View style={styles.sectionContent}>
-                <Text style={styles.sectionTitle}>请输入密码确认</Text>
+              <View style={styles.inputWrapper}>
+                <MaterialCommunityIcons
+                  name="lock-outline"
+                  size={20}
+                  color={colors.text.secondary}
+                  style={styles.inputIcon}
+                />
                <TextInput
                  style={styles.input}
-                  placeholder="请输入密码"
+                  placeholder="请输入登录密码以确认"
                  placeholderTextColor={colors.text.hint}
-                  secureTextEntry
+                  secureTextEntry={!showPassword}
                  value={password}
                  onChangeText={setPassword}
+                  autoCapitalize="none"
+                  returnKeyType="done"
                />
-              </View>
-
-              {/* 按钮行 */}
-              <View style={styles.buttonRow}>
                <TouchableOpacity
-                  style={styles.secondaryButton}
-                  onPress={() => router.back()}
+                  onPress={() => setShowPassword(!showPassword)}
+                  style={styles.eyeButton}
                >
-                  <Text style={styles.secondaryButtonText}>返回</Text>
-                </TouchableOpacity>
-                <TouchableOpacity
-                  style={[styles.dangerButton, submitting && styles.buttonDisabled]}
-                  onPress={handleRequestDeletion}
-                  disabled={submitting || !password.trim()}
-                >
-              {submitting ? (
-                <ActivityIndicator size="small" color={colors.text.inverse} />
-              ) : (
-                    <Text style={styles.dangerButtonText}>确认注销</Text>
-                  )}
+                  <MaterialCommunityIcons
+                    name={showPassword ? 'eye-off-outline' : 'eye-outline'}
+                    size={20}
+                    color={colors.text.hint}
+                  />
                </TouchableOpacity>
              </View>
            </View>
-          )}
-        </View>
-      </ScrollView>
+
+            {/* 按钮行 */}
+            <View style={styles.buttonRow}>
+              <TouchableOpacity
+                style={styles.secondaryButton}
+                onPress={() => router.back()}
+                activeOpacity={0.8}
+              >
+                <Text style={styles.secondaryButtonText}>再想想</Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                style={[
+                  styles.dangerButton,
+                  (submitting || !password.trim()) && styles.buttonDisabled,
+                ]}
+                onPress={handleRequestDeletion}
+                disabled={submitting || !password.trim()}
+                activeOpacity={0.9}
+              >
+                {submitting ? (
+                  <ActivityIndicator size="small" color={colors.text.inverse} />
+                ) : (
+                  <Text style={styles.dangerButtonText}>确认申请注销</Text>
+                )}
+              </TouchableOpacity>
+            </View>
+
+            {/* 页脚 */}
+            <View style={styles.footer}>
+              <Text style={styles.footerText}>
+                遇到问题？可以联系<Text style={styles.footerLink}> 客服 </Text>
+                我们会帮你处理
+              </Text>
+            </View>
+          </View>
+        </ScrollView>
+      </KeyboardAvoidingView>
    </SafeAreaView>
  );
 };
--- a/src/screens/profile/NotificationSettingsScreen.tsx
+++ b/src/screens/profile/NotificationSettingsScreen.tsx
@@ -175,37 +175,6 @@ export const NotificationSettingsScreen: React.FC = () => {
    }
  };

-  const handleAutoStartModeChange = async (mode: AutoStartMode) => {
-    if (mode === AutoStartMode.BACKGROUND) {
-      Alert.alert(
-        '后台消息接收',
-        getAutoStartDescription() + '\n\n开启后，应用可在后台接收消息推送。',
-        [
-          { text: '取消', style: 'cancel' },
-          {
-            text: '同意并开启',
-            onPress: async () => {
-              await setAutoStartMode(AutoStartMode.BACKGROUND);
-              setAutoStartModeState(AutoStartMode.BACKGROUND);
-              setAutoStartConsented(true);
-              // 重新初始化后台服务以应用新设置
-              const { reinitBackgroundService } = await import('@/services/background');
-              await reinitBackgroundService();
-              Alert.alert('已开启', '后台消息接收已开启。您可随时在设置中关闭。');
-            },
-          },
-        ]
-      );
-    } else {
-      await setAutoStartMode(AutoStartMode.SILENT);
-      setAutoStartModeState(AutoStartMode.SILENT);
-      setAutoStartConsented(false);
-      // 重新初始化后台服务以应用新设置
-      const { reinitBackgroundService } = await import('@/services/background');
-      await reinitBackgroundService();
-    }
-  };
-
  const syncModeOptions: { mode: BackgroundSyncMode; title: string; subtitle: string; icon: string }[] = [
    {
      mode: BackgroundSyncMode.DISABLED,