...

app/src/main/java/com/base/browserwhite/ui/activity/mediabrowser/MediaBrowserActivity.kt

@@ -47,15 +47,17 @@ class MediaBrowserActivity : BaseActivity<ActivityMediaBrowserBinding>() {
                 adapter = MediaAdapter(1, clickAction = { bean ->
                     if (tittle == "Picture") {
                         startActivity(Intent(this, MediaImageDetailActivity::class.java).apply {
+                            putExtra("uri", bean.uri.toString())
                             putExtra("path", bean.path)
+                            putExtra("mimeType", bean.mimeType)
                         })
                     } else {
                         LogEx.logDebug(TAG, "uri=${bean.uri}")
-                        val videoIntent = Intent(this, MediaVideoDetailActivity::class.java)
-                        videoIntent.putExtra("uri", bean.uri.toString())
-                        videoIntent.putExtra("path", bean.path)
-                        videoIntent.putExtra("mimeType", bean.mimeType)
-                        startActivity(videoIntent)
+                        startActivity(Intent(this, MediaVideoDetailActivity::class.java).apply {
+                            putExtra("uri", bean.uri.toString())
+                            putExtra("path", bean.path)
+                            putExtra("mimeType", bean.mimeType)
+                        })
                     }
                 })
                 binding.rv.layoutManager = GridLayoutManager(this, 4).apply {

app/src/main/java/com/base/browserwhite/ui/activity/mediabrowser/MediaImageDetailActivity.kt

@@ -2,6 +2,7 @@ package com.base.browserwhite.ui.activity.mediabrowser
 
 import android.graphics.Color
 import android.net.Uri
+import androidx.activity.addCallback
 import androidx.core.view.updatePadding
 import com.base.browserwhite.databinding.ActivityMediaImageDetailBinding
 import com.base.browserwhite.ui.activity.BaseActivity
@@ -37,6 +38,10 @@ class MediaImageDetailActivity : BaseActivity<ActivityMediaImageDetailBinding>()
 
     override fun initListener() {
         super.initListener()
+        onBackPressedDispatcher.addCallback {
+            finish()
+        }
+        binding.ivFanhui.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
 
         binding.ivDelete.setOnClickListener {
             showDeleteTipDialog {