Browse Source

sample: 修复读取相册崩溃

drake 1 năm trước cách đây
mục cha
commit
8940ec3c4d

+ 2 - 3
sample/src/main/java/com/drake/net/sample/contract/AlbumSelectContract.kt

@@ -6,9 +6,9 @@ import android.net.Uri
 import android.provider.MediaStore
 import androidx.activity.result.contract.ActivityResultContract
 
-class AlbumSelectContract : ActivityResultContract<Unit, AlbumSelectContract.AlbumSelectResult>() {
+class AlbumSelectContract : ActivityResultContract<Unit?, AlbumSelectContract.AlbumSelectResult>() {
 
-    override fun createIntent(context: Context, input: Unit): Intent {
+    override fun createIntent(context: Context, input: Unit?): Intent {
         val intent = Intent(Intent.ACTION_PICK)
         intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
         return intent
@@ -17,7 +17,6 @@ class AlbumSelectContract : ActivityResultContract<Unit, AlbumSelectContract.Alb
     class AlbumSelectResult(val code: Int, val uri: Uri?)
 
     override fun parseResult(resultCode: Int, intent: Intent?): AlbumSelectResult {
-        println("AlbumSelectContract >>> selected = ${intent?.data}")
         return AlbumSelectResult(resultCode, intent?.data)
     }
 }

+ 1 - 1
sample/src/main/java/com/drake/net/sample/ui/fragment/UploadFileFragment.kt

@@ -21,7 +21,7 @@ import java.io.File
 class UploadFileFragment : EngineFragment<FragmentUploadFileBinding>(R.layout.fragment_upload_file) {
     private val albumSelectLauncher = registerForActivityResult(AlbumSelectContract()) {
         when (it.code) {
-            Activity.RESULT_CANCELED -> TipUtils.toast("图片选择取消")
+            Activity.RESULT_CANCELED -> TipUtils.toast("取消图片选择")
             Activity.RESULT_OK -> uploadUri(it.uri)
         }
     }