Commit 02e3bfb6 authored by wanglei's avatar wanglei

...

parent 2a06da57
...@@ -26,6 +26,7 @@ import com.base.datarecovery.utils.BarUtils ...@@ -26,6 +26,7 @@ import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.utils.FileHexEx import com.base.datarecovery.utils.FileHexEx
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import com.base.datarecovery.view.DialogViews.showGerPermission
import com.base.datarecovery.view.FileScanDialog import com.base.datarecovery.view.FileScanDialog
import com.google.gson.Gson import com.google.gson.Gson
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
...@@ -82,9 +83,11 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() { ...@@ -82,9 +83,11 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
if (checkStorePermission()) { if (checkStorePermission()) {
beginScan() beginScan()
} else { } else {
requestStorePermission(launcher, result = { showGerPermission() {
if (it) beginScan() else finishToMain() requestStorePermission(launcher, result = {
}) if (it) beginScan() else finishToMain()
})
}
} }
} }
......
...@@ -15,8 +15,8 @@ object PermissionDialog { ...@@ -15,8 +15,8 @@ object PermissionDialog {
val dialog = BottomSheetDialog(this) val dialog = BottomSheetDialog(this)
val binding = DialogPermissionBottomsheetBinding.inflate(LayoutInflater.from(this)) val binding = DialogPermissionBottomsheetBinding.inflate(LayoutInflater.from(this))
dialog.setContentView(binding.root) dialog.setContentView(binding.root)
dialog.setCanceledOnTouchOutside(false) // dialog.setCanceledOnTouchOutside(false)
dialog.setCancelable(false) // dialog.setCancelable(false)
dialog.show() dialog.show()
val parentView = binding.root.parent as View val parentView = binding.root.parent as View
......
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