diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b54c37b..e4733a9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ android { applicationId = "com.donut.mixfile" minSdk = 24 targetSdk = 34 - versionCode = 70 - versionName = "1.8.10" + versionCode = 71 + versionName = "1.8.11" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/donut/mixfile/activity/VideoActivity.kt b/app/src/main/java/com/donut/mixfile/activity/VideoActivity.kt index df9fc91..9a94837 100644 --- a/app/src/main/java/com/donut/mixfile/activity/VideoActivity.kt +++ b/app/src/main/java/com/donut/mixfile/activity/VideoActivity.kt @@ -102,7 +102,7 @@ class VideoActivity : MixActivity("video") { playHistory.toMutableList().apply { add(0, VideoHistory(time, videoPlayerUrl)) if (this.size > 10) { - this.removeLast() + this.removeAt(this.lastIndex) } playHistory = this.distinct() } diff --git a/app/src/main/java/com/donut/mixfile/util/file/FileDialog.kt b/app/src/main/java/com/donut/mixfile/util/file/FileDialog.kt index 18f661f..7cc770f 100644 --- a/app/src/main/java/com/donut/mixfile/util/file/FileDialog.kt +++ b/app/src/main/java/com/donut/mixfile/util/file/FileDialog.kt @@ -34,7 +34,7 @@ fun showFileInfoDialog( shareInfo: MixShareInfo, onDismiss: () -> Unit = {} ) { - MixDialogBuilder("文件信息").apply { + MixDialogBuilder("文件信息",tag="file-info-${shareInfo.url}").apply { onDismiss(onDismiss) setContent { val dataLog = remember(shareInfo, favorites, uploadLogs) { diff --git a/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt b/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt index 5c6e241..145b0b3 100644 --- a/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt +++ b/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt @@ -17,9 +17,12 @@ import com.donut.mixfile.util.compressGzip import com.donut.mixfile.util.decompressGzip import com.donut.mixfile.util.formatFileSize import com.donut.mixfile.util.getCurrentTime +import com.donut.mixfile.util.hashSHA256 +import com.donut.mixfile.util.hashToMD5String import com.donut.mixfile.util.objects.ProgressContent import com.donut.mixfile.util.showErrorDialog import com.donut.mixfile.util.showToast +import com.donut.mixfile.util.toHex import com.donut.mixfile.util.toJsonString import io.ktor.client.plugins.onDownload import io.ktor.client.request.prepareGet @@ -72,7 +75,8 @@ fun showFileList(fileList: List) { val fileTotalSize = fileList.sumOf { it.size } MixDialogBuilder( "文件列表", - "共 ${fileList.size} 个文件 总大小: ${formatFileSize(fileTotalSize)}" + "共 ${fileList.size} 个文件 总大小: ${formatFileSize(fileTotalSize)}", + tag = "file-list-${fileList.joinToString { it.shareInfoData }.hashSHA256().toHex()}" ).apply { setContent { FileCardList(fileList)