diff --git a/app/build.gradle b/app/build.gradle index aca5500..81dccf6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' //高德导航、定位、地图三合一 diff --git a/app/build.gradle b/app/build.gradle index aca5500..81dccf6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' //高德导航、定位、地图三合一 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d9f19a0..cccda6d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -16,14 +17,21 @@ - - - - + + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index aca5500..81dccf6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' //高德导航、定位、地图三合一 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d9f19a0..cccda6d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -16,14 +17,21 @@ - - - - + + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt index 66bce56..f218f9a 100644 --- a/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt @@ -1,19 +1,13 @@ package com.casic.smarttube.utils import android.content.Context -import android.graphics.Bitmap -import android.graphics.drawable.Drawable import android.widget.ImageView -import androidx.annotation.Nullable import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestOptions -import com.bumptech.glide.request.target.CustomTarget -import com.bumptech.glide.request.transition.Transition import com.casic.smarttube.R import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.interfaces.OnCallbackListener import com.luck.picture.lib.utils.ActivityCompatHelper @@ -32,33 +26,20 @@ Glide.with(context).load(url).into(imageView); } - override fun loadImageBitmap( + override fun loadImage( context: Context, + imageView: ImageView, url: String, maxWidth: Int, - maxHeight: Int, - call: OnCallbackListener? + maxHeight: Int ) { if (!ActivityCompatHelper.assertValidRequest(context)) { return } Glide.with(context) - .asBitmap() - .override(maxWidth, maxHeight) .load(url) - .into(object : CustomTarget() { - override fun onResourceReady( - resource: Bitmap, @Nullable transition: Transition? - ) { - call?.onCall(resource) - } - - override fun onLoadFailed(@Nullable errorDrawable: Drawable?) { - call?.onCall(null) - } - - override fun onLoadCleared(@Nullable placeholder: Drawable?) {} - }) + .override(maxWidth, maxHeight) + .into(imageView) } override fun loadAlbumCover(context: Context, url: String, imageView: ImageView) { diff --git a/app/build.gradle b/app/build.gradle index aca5500..81dccf6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' //高德导航、定位、地图三合一 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d9f19a0..cccda6d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -16,14 +17,21 @@ - - - - + + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt index 66bce56..f218f9a 100644 --- a/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/smarttube/utils/GlideLoadEngine.kt @@ -1,19 +1,13 @@ package com.casic.smarttube.utils import android.content.Context -import android.graphics.Bitmap -import android.graphics.drawable.Drawable import android.widget.ImageView -import androidx.annotation.Nullable import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestOptions -import com.bumptech.glide.request.target.CustomTarget -import com.bumptech.glide.request.transition.Transition import com.casic.smarttube.R import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.interfaces.OnCallbackListener import com.luck.picture.lib.utils.ActivityCompatHelper @@ -32,33 +26,20 @@ Glide.with(context).load(url).into(imageView); } - override fun loadImageBitmap( + override fun loadImage( context: Context, + imageView: ImageView, url: String, maxWidth: Int, - maxHeight: Int, - call: OnCallbackListener? + maxHeight: Int ) { if (!ActivityCompatHelper.assertValidRequest(context)) { return } Glide.with(context) - .asBitmap() - .override(maxWidth, maxHeight) .load(url) - .into(object : CustomTarget() { - override fun onResourceReady( - resource: Bitmap, @Nullable transition: Transition? - ) { - call?.onCall(resource) - } - - override fun onLoadFailed(@Nullable errorDrawable: Drawable?) { - call?.onCall(null) - } - - override fun onLoadCleared(@Nullable placeholder: Drawable?) {} - }) + .override(maxWidth, maxHeight) + .into(imageView) } override fun loadAlbumCover(context: Context, url: String, imageView: ImageView) { diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt index 4e1a9b4..caf6683 100644 --- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt @@ -13,9 +13,11 @@ val USER_PERMISSIONS = arrayOf( Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_PHONE_STATE + Manifest.permission.READ_PHONE_STATE, Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) val POPUP_TITLES = arrayOf("标准地图", "卫星地图")