From 8006b0d07760c4406cdc24718dc9d46e1c395bf0 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Thu, 29 Jan 2026 18:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shelves/activity/HomeActivity.kt          |  2 +-
 .../intelligent/shelves/utils/CrashHandler.kt |  2 +-
 .../intelligent/shelves/utils/FileLogger.kt   | 30 ++++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
index e265ae5..1dd50e9 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
@@ -760,7 +760,7 @@ class HomeActivity : BaseActivity() {
      * 过期时间定时任务
      */
     private fun overdueTask() {
-        overdueTaskJob = taskExecutor.startIntervalTaskWithInitialDelay(5 * 1000L, 10 * 1000L) {
+        overdueTaskJob = taskExecutor.startIntervalTaskWithInitialDelay(5 * 1000L, 5 * 60* 1000L) {
             updateOverdueState()
         }
     }
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/utils/CrashHandler.kt b/app/src/main/java/com/shuwei/intelligent/shelves/utils/CrashHandler.kt
index 06174fd..db07709 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/utils/CrashHandler.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/utils/CrashHandler.kt
@@ -28,7 +28,7 @@ class CrashHandler private constructor(private val context: Context) :
 
     companion object {
         private const val TAG = "CrashHandler"
-        private const val CRASH_REPORTS_DIR = "crash_reports"
+        const val CRASH_REPORTS_DIR = "crash_reports"
         private const val LOG_LINES = 500 // 收集最近500行日志
 
         @Volatile
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/utils/FileLogger.kt b/app/src/main/java/com/shuwei/intelligent/shelves/utils/FileLogger.kt
index 4a8d548..0047d5c 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/utils/FileLogger.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/utils/FileLogger.kt
@@ -1,6 +1,7 @@
 package com.shuwei.intelligent.shelves.utils
 
 import android.content.Context
+import com.shuwei.intelligent.shelves.utils.CrashHandler.Companion.CRASH_REPORTS_DIR
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -80,17 +81,38 @@ class FileLogger(private val context: Context) {
         return readLogsByName(fileName)
     }
     fun readLogsByName(fileName: String): List<String> {
-        return try {
+        try {
             val input = context.openFileInput(fileName)
             val reader = BufferedReader(InputStreamReader(input))
-            reader.useLines { lines ->
-                lines.toList()
+            val list: MutableList<String> = reader.useLines { lines ->
+                lines.toList().toMutableList()
             }
+
+//            val input2 = FileInputStream(getCrashDir(context))
+//            val reader2 = BufferedReader(InputStreamReader(input2))
+//            val list2: MutableList<String> = reader2.useLines {lines ->
+//                lines.toList().toMutableList()
+//            }
+//            list.addAll(list2)
+            return list
         } catch (e: FileNotFoundException) {
-            emptyList()
+            return emptyList()
         }
     }
 
+    public fun getCrashDir(context: Context):File {
+        //val crashDir = File(context.getExternalFilesDir(null), CRASH_REPORTS_DIR)
+        var crashDir = File(context.filesDir, CRASH_REPORTS_DIR)
+        if (!crashDir.exists()) {
+            crashDir.mkdirs()
+        }
+
+        if (!(crashDir.exists())) {
+            crashDir = File(context.cacheDir, CRASH_REPORTS_DIR)
+        }
+        return crashDir
+    }
+
     /**
      * 获取所有日志文件列表
      */