From 4d0d422774865cfa19d84a82b32b0c2243af9066 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 19 Jul 2024 17:46:41 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][=E5=85=A8=E9=87=8F=E6=97=A5=E5=BF=97]?=
 =?UTF-8?q?=20=E8=A2=AB=E5=8A=A8=E4=B8=8A=E4=BC=A0=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E4=BC=A0=E9=A2=9D=E5=A4=96=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=EF=BC=8C=E9=98=B2=E6=AD=A2=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E8=BF=87=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo_core_function_devatools/DevaToolsProvider.kt |  3 +++
 .../logcat/MoGoLogRecordProviderImpl.kt               | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
index 55986b65a6..7c4684d8b6 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
@@ -242,10 +242,13 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
                     }
                     var isUploadSuccess = false
                     try {
+                        MoGoLogRecordProviderImpl.isUploadExtraFile = false
                         CallerDevaToolsManager.logcat()?.upload(startTime, endTime)
                         isUploadSuccess = true
                     } catch (t: Throwable) {
                         t.printStackTrace()
+                    } finally {
+                        MoGoLogRecordProviderImpl.isUploadExtraFile = true
                     }
                     if(isUploadSuccess){
                         crashDir.deleteRecursively()
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
index 10b764edd5..8a3c6045d0 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
@@ -39,6 +39,9 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider,
 
     companion object {
         private const val TAG = "MoGoLogRecordProviderImpl"
+
+        @Volatile
+        var isUploadExtraFile = true
     }
 
     private val flag by lazy { AtomicBoolean(false) }
@@ -143,8 +146,12 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider,
         )
         builder.extraFilesToUpload(object : IExtraFileToUpload {
             override fun filesToUpload(): List<ToUploadFile> {
-                return ArrayList<ToUploadFile>().also {
-                    it.add(ToUploadFile(File(Environment.getExternalStorageDirectory(), "MLog")))
+                return if (isUploadExtraFile) {
+                    ArrayList<ToUploadFile>().also {
+                        it.add(ToUploadFile(File(Environment.getExternalStorageDirectory(), "MLog")))
+                    }
+                } else {
+                    emptyList()
                 }
             }
         })