chore: 合并一版代码

app/(tabs)/memo-list.tsx

@@ -3,7 +3,7 @@ import UploaderProgress from "@/components/file-upload/upload-progress/uploader-
 import AskNavbar from "@/components/layout/ask";
 import { endUploadSessionInDb, syncUploadSessionState } from "@/features/appState/appStateSlice";
 import { triggerManualUpload } from "@/lib/background-uploader/automatic";
-import { getUploadTasksSince, UploadTask } from "@/lib/db";
+import { exist_pending_tasks, getUploadTasksSince, UploadTask } from "@/lib/db";
 import { fetchApi } from "@/lib/server-api-util";
 import { useAppDispatch, useAppSelector } from "@/store";
 import { Chat } from "@/types/ask";
@@ -54,8 +54,11 @@ const MemoList = () => {
             let isActive = true;
             let interval: any = null;
 
-            const manageUploadState = async () => {
+            const manageUploadState = async (restore_session: boolean = false) => {
-                if (!isActive) return;
+                if (!isActive) {
+                    console.log('MemoList manageUploadState is not active');
+                    return;
+                }
 
                 // 首先，同步Redux中的会话开始时间
                 const action = await dispatch(syncUploadSessionState());
@@ -86,25 +89,35 @@ const MemoList = () => {
                 }
             };
 
-            const triggerAndMonitor = async () => {
+            const initializeUploadProcess = async () => {
-                console.log('MemoList focused, triggering foreground media upload check.');
+                // First, check if a session is already active.
+                const action = await dispatch(syncUploadSessionState());
+                const existingSessionStartTime = action.payload as number | null;
+                const existPendingTasks = await exist_pending_tasks();
+
+                if (existingSessionStartTime && existPendingTasks) {
+                    console.log('MemoList focused, existing session found. Monitoring progress.');
+                    // If a session exists, just start monitoring.
+                    manageUploadState(true); // Initial check
+                    interval = setInterval(manageUploadState, 2000);
+                } else {
+                    // If no session, then try to trigger a new upload.
+                    console.log('MemoList focused, no existing session. Triggering foreground media upload check.');
                     const now = new Date();
                     const oneDayAgo = new Date(now.getTime() - 24 * 60 * 60 * 1000);
 
-                // This now returns the start time string or null
+                    const newSessionStartTimeStr = await triggerManualUpload(oneDayAgo, now);
-                const sessionStartTimeStr = await triggerManualUpload(oneDayAgo, now);
 
-                // Only start monitoring if a session was actually started.
+                    if (newSessionStartTimeStr) {
-                if (sessionStartTimeStr) {
+                        console.log(`New upload session started with time: ${newSessionStartTimeStr}, beginning to monitor...`);
-                    console.log(`Upload session started with time: ${sessionStartTimeStr}, beginning to monitor...`);
+                        // A new session was started, so start monitoring.
-                    // Immediately check the state once, then the interval will take over.
+                        manageUploadState(); // Initial check
-                    // This ensures the progress bar appears instantly.
-                    manageUploadState();
                         interval = setInterval(manageUploadState, 2000);
                     }
+                }
             };
 
-            triggerAndMonitor();
+            initializeUploadProcess();
 
             return () => {
                 isActive = false;
@@ -115,11 +128,25 @@ const MemoList = () => {
         }, [dispatch])
     );
 
-    return (
+    const renderHeader = () => (
-        <View style={[styles.container, { paddingTop: insets.top }]}>
+        <>
+            {process.env.NODE_ENV === 'development' && <TouchableOpacity
+                className='mt-2 bg-red-500 items-center h-10 justify-center'
+                onPress={() => router.push('/debug')}
+            >
+                <Text className="text-white">
+                    进入db调试页面
+                </Text>
+            </TouchableOpacity>}
+
+            {/* 顶部标题和上传按钮 */}
+            <View style={styles.header}>
+                <Text style={styles.title}>Memo List</Text>
+            </View>
+
             {/* 上传进度展示区域 */}
-            {process.env.NODE_ENV === 'development' && uploadSessionStartTime && (
+            {uploadSessionStartTime && progressInfo.total > 0 && (
-                <View className="w-full h-20">
+                <View className="h-10 mt-6 mb-2 mx-4">
                     <UploaderProgress
                         imageUrl={progressInfo.image}
                         uploadedCount={progressInfo.completed}
@@ -127,27 +154,18 @@ const MemoList = () => {
                     />
                 </View>
             )}
+        </>
+    );
 
+    return (
+        <View style={[styles.container, { paddingTop: insets.top }]}>
             {/* <View className="w-full h-full">
                 <AutoUploadScreen />
             </View> */}
 
-            <TouchableOpacity
-                className='mt-2 bg-red-500 items-center h-10 justify-center'
-                onPress={() => router.push('/debug')}
-            >
-                <Text className="text-white">
-                    进入db调试页面
-                </Text>
-            </TouchableOpacity>
-
-            {/* 顶部标题和上传按钮 */}
-            <View style={styles.header}>
-                <Text style={styles.title}>Memo List</Text>
-            </View>
-
             {/* 历史对话 */}
             <FlatList
+                ListHeaderComponent={renderHeader}
                 data={historyList}
                 keyExtractor={(item) => item.session_id}
                 ItemSeparatorComponent={() => (

lib/db.ts

@@ -111,6 +111,13 @@ export async function getUploadTasksSince(timestamp: number): Promise<UploadTask
     return rows;
 }
 
+export async function exist_pending_tasks(): Promise<boolean> {
+    const rows = await db.getAllAsync<UploadTask>(
+        'SELECT * FROM upload_tasks WHERE status = "pending" OR status = "uploading"'
+    );
+    return rows.length > 0;
+}
+
 // 检查一组文件URI，返回那些在数据库中不存在或是未成功上传的文件的URI
 export async function filterExistingFiles(fileUris: string[]): Promise<string[]> {
     if (fileUris.length === 0) {