Commit a1ae8112 authored by wanglei's avatar wanglei

...

parent d847feb0
......@@ -156,8 +156,8 @@ class MyApplication : BaseApplication() {
override fun onActivityPaused(activity: Activity) {
PAUSED_VALUE = 2
// LogEx.logDebug(TAG, "onActivityPaused")
PAUSED_VALUE = 2
lastTimePause = System.currentTimeMillis()
}
......
......@@ -2,13 +2,8 @@ package com.base.datarecovery.activity.recovery
import android.annotation.SuppressLint
import android.graphics.Color
import android.os.Bundle
import android.os.Environment
import androidx.activity.addCallback
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import com.base.datarecovery.R
import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.bean.ConstObject.SCAN_AUDIOS
......
......@@ -180,7 +180,6 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() {
showRecoveringDialog(lifecycleScope, list, dir, copyProgressAction = {
}, finish = {
adapter.toggleAllSelect(false)
startActivity(Intent(this, FileRecoveredActivity::class.java).apply {
putExtra("Number", list.size)
putExtra("ScanType", scanType)
......
......@@ -16,6 +16,7 @@ import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS
import com.base.datarecovery.bean.FolderBean
import com.base.datarecovery.bean.RecoveryBean
import com.base.datarecovery.bean.RecoveryBean.Companion.setAudioType
import com.base.datarecovery.bean.RecoveryBean.Companion.setType
import com.base.datarecovery.databinding.ActivityFileScanResultBinding
import com.base.datarecovery.help.BaseActivity
......@@ -202,6 +203,9 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
if (scanType == SCAN_DOCUMENTS) {
recoveryBean.setType()
}
if (scanType == SCAN_AUDIOS) {
recoveryBean.setAudioType()
}
hashMap[folder]?.add(recoveryBean)
return isNewFolder
}
......
......@@ -133,6 +133,9 @@ class FileTimeColumnsAdapter(
"DOC" -> R.mipmap.doc
"XLS" -> R.mipmap.xls
"PPT" -> R.mipmap.ppt
"MP3" -> R.mipmap.mp3
"WAV" -> R.mipmap.wav
"FLAC" -> R.mipmap.flac
else -> 0
}
binding.ivType.setImageResource(icon)
......
......@@ -2,9 +2,12 @@ package com.base.datarecovery.bean
import com.base.datarecovery.utils.FileHexEx.isDoc
import com.base.datarecovery.utils.FileHexEx.isDocx
import com.base.datarecovery.utils.FileHexEx.isFlac
import com.base.datarecovery.utils.FileHexEx.isMp3
import com.base.datarecovery.utils.FileHexEx.isPPT
import com.base.datarecovery.utils.FileHexEx.isPPTX
import com.base.datarecovery.utils.FileHexEx.isPdf
import com.base.datarecovery.utils.FileHexEx.isWav
import com.base.datarecovery.utils.FileHexEx.isXls
import com.base.datarecovery.utils.FileHexEx.isXlsx
import java.io.File
......@@ -32,5 +35,18 @@ data class RecoveryBean(
type = "PPT"
}
}
fun RecoveryBean.setAudioType() {
val file = File(path)
if (isMp3(file)) {
type = "MP3"
}
if (isWav(file)) {
type = "WAV"
}
if (isFlac(file)) {
type = "FLAC"
}
}
}
}
\ No newline at end of file
......@@ -16,7 +16,6 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
lateinit var launcher: ActivityLauncher
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
launcher = ActivityLauncher(this)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment