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 { - return ArrayList().also { - it.add(ToUploadFile(File(Environment.getExternalStorageDirectory(), "MLog"))) + return if (isUploadExtraFile) { + ArrayList().also { + it.add(ToUploadFile(File(Environment.getExternalStorageDirectory(), "MLog"))) + } + } else { + emptyList() } } })