Merge branch 'v_1.0.1' of ssh://git.fairclip.cn:2222/FairClip/memowake-front into v_1.0.1

app/(tabs)/ask.tsx

@@ -20,6 +20,8 @@ import {
     TouchableOpacity,
     View
 } from 'react-native';
+import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import { runOnJS } from 'react-native-reanimated';
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 export default function AskScreen() {
@@ -46,6 +48,25 @@ export default function AskScreen() {
         }
     }, []);
 
+    const updateState = (value: string) => {
+        console.log('Received in JS:', value);
+        // 更新 React 状态或路由
+        router.replace(value);
+    };
+    // 右滑
+    const gesture = Gesture.Pan()
+        .onEnd((event) => {
+            const { translationX } = event;
+            const threshold = 100; // 滑动阈值
+
+            if (translationX > threshold) {
+                // 从左向右滑动，跳转页面
+                runOnJS(router.replace)("memo-list");
+            }
+        })
+        .minPointers(1)
+        .activeOffsetX([-10, 10]); // 在 X 方向触发的范围
+
     useEffect(() => {
         if (!isHello && userMessages.length > 0) {
             scrollToEnd();
@@ -236,6 +257,7 @@ export default function AskScreen() {
     );
 
     return (
+        <GestureDetector gesture={gesture}>
             <View style={[styles.container, { paddingTop: insets.top }]}>
                 {/* 导航栏 */}
                 <View style={[styles.navbar, isHello && styles.hiddenNavbar]}>
@@ -316,6 +338,7 @@ export default function AskScreen() {
                     </View>
                 </KeyboardAvoidingView>
             </View >
+        </GestureDetector>
     );
 }
 

app/(tabs)/setting.tsx

@@ -11,7 +11,7 @@ import { checkNotificationPermission, getLocationPermission, getPermissions, req
 import { ThemedText } from '@/components/ThemedText';
 import { useAuth } from '@/contexts/auth-context';
 import { fetchApi } from '@/lib/server-api-util';
-import { Address } from '@/types/user';
+import { Address, User, UserInfoDetails } from '@/types/user';
 import * as Location from 'expo-location';
 import { useFocusEffect, useRouter } from 'expo-router';
 import * as SecureStore from 'expo-secure-store';
@@ -20,8 +20,14 @@ import { useTranslation } from 'react-i18next';
 import { Linking, Platform, Pressable, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-const Setting = (props: { userInfo: any }) => {
+const Setting = (props: { userInfo: UserInfoDetails }) => {
-    const { userInfo } = props;
+    const [userInfo, setUserInfo] = useState<User | null>(null);
+
+    const getUserInfo = async () => {
+        const res = await fetchApi<User>("/iam/user-info");
+        setUserInfo(res);
+    }
+
     const insets = useSafeAreaInsets();
     const { t } = useTranslation();
     // 判断当前语言环境
@@ -200,6 +206,7 @@ const Setting = (props: { userInfo: any }) => {
     // 获取语言环境
     useEffect(() => {
         getLanguage();
+        getUserInfo()
     }, [])
 
     return (
@@ -220,7 +227,7 @@ const Setting = (props: { userInfo: any }) => {
                     <ScrollView style={styles.modalContent} showsVerticalScrollIndicator={false}>
                         {/* 用户信息 */}
                         <UserInfo
-                            userInfo={userInfo}
+                            userInfo={userInfo || {} as User}
                             setCurrentLocation={setCurrentLocation}
                             getCurrentLocation={getCurrentLocation}
                             isLoading={isLoading}

components/user-message.tsx/look.tsx

@@ -20,6 +20,7 @@ export default function Look(props: Props) {
     const { fileData, setFileData, isLoading, handleUser, avatar } = props;
     const { t } = useTranslation();
 
+
     return (
         <View className="flex-1 bg-textPrimary justify-between p-[2rem]">
             <View className="flex-1 justify-center items-center">
@@ -32,11 +33,11 @@ export default function Look(props: Props) {
                     {t('auth.userMessage.avatorText2', { ns: 'login' })}
                 </ThemedText>
                 {
-                    fileData[0]?.previewUrl
+                    fileData[0]?.preview || fileData[0]?.previewUrl
                         ?
                         <Image
                             className='rounded-full w-[10rem] h-[10rem]'
-                            source={{ uri: fileData[0].previewUrl }}
+                            source={{ uri: fileData[0].preview || fileData[0].previewUrl }}
                         />
                         :
                         avatar

lib/background-uploader/types.ts

@@ -99,6 +99,7 @@ export interface FileUploadItem {
   status: 'pending' | 'uploading' | 'success' | 'error'; // 统一状态
   error?: string | null;
   previewUrl: string; // 预览URL
+  preview: string; // 预览URL
   file?: File;
   type: 'image' | 'video';
   thumbnail?: string;  // 缩略图URL