diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6b80195..a7fc0db 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,16 +23,8 @@ - - - - - - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6b80195..a7fc0db 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,16 +23,8 @@ - - - - - - diff --git a/app/src/main/java/com/casic/electric/detector/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/electric/detector/utils/GlideLoadEngine.kt deleted file mode 100644 index a894aa9..0000000 --- a/app/src/main/java/com/casic/electric/detector/utils/GlideLoadEngine.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.electric.detector.utils - -import android.content.Context -import android.widget.ImageView -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.casic.electric.detector.R -import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.utils.ActivityCompatHelper - -class GlideLoadEngine private constructor() : ImageEngine { - companion object { - val instance: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - GlideLoadEngine() - } - } - - override fun loadImage(context: Context, url: String, imageView: ImageView) { - if (!ActivityCompatHelper.assertValidRequest(context)) { - return - } - Glide.with(context).load(url).into(imageView) - } - - override fun loadImage( - context: Context, - imageView: ImageView, - url: String, - maxWidth: Int, - maxHeight: Int - ) { - if (!ActivityCompatHelper.assertValidRequest(context)) { - return - } - Glide.with(context) - .load(url) - .override(maxWidth, maxHeight) - .into(imageView) - } - - override fun loadAlbumCover(context: Context, url: String, imageView: ImageView) { - if (!ActivityCompatHelper.assertValidRequest(context)) { - return - } - Glide.with(context) - .asBitmap() - .load(url) - .override(180, 180) - .sizeMultiplier(0.5f) - .transform(CenterCrop(), RoundedCorners(8)) - .placeholder(R.drawable.ps_image_placeholder) - .error(R.mipmap.load_image_error) - .into(imageView) - } - - override fun pauseRequests(context: Context?) { - context?.let { Glide.with(it).pauseRequests() } - } - - override fun resumeRequests(context: Context?) { - context?.let { Glide.with(it).resumeRequests() } - } - - override fun loadGridImage(context: Context, url: String, imageView: ImageView) { - Glide.with(context) - .load(url) - .apply( - RequestOptions() - .placeholder(R.drawable.ps_image_placeholder) - .error(R.mipmap.load_image_error) - ) - .into(imageView) - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6b80195..a7fc0db 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,16 +23,8 @@ - - - - - - diff --git a/app/src/main/java/com/casic/electric/detector/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/electric/detector/utils/GlideLoadEngine.kt deleted file mode 100644 index a894aa9..0000000 --- a/app/src/main/java/com/casic/electric/detector/utils/GlideLoadEngine.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.casic.electric.detector.utils - -import android.content.Context -import android.widget.ImageView -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.casic.electric.detector.R -import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.utils.ActivityCompatHelper - -class GlideLoadEngine private constructor() : ImageEngine { - companion object { - val instance: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - GlideLoadEngine() - } - } - - override fun loadImage(context: Context, url: String, imageView: ImageView) { - if (!ActivityCompatHelper.assertValidRequest(context)) { - return - } - Glide.with(context).load(url).into(imageView) - } - - override fun loadImage( - context: Context, - imageView: ImageView, - url: String, - maxWidth: Int, - maxHeight: Int - ) { - if (!ActivityCompatHelper.assertValidRequest(context)) { - return - } - Glide.with(context) - .load(url) - .override(maxWidth, maxHeight) - .into(imageView) - } - - override fun loadAlbumCover(context: Context, url: String, imageView: ImageView) { - if (!ActivityCompatHelper.assertValidRequest(context)) { - return - } - Glide.with(context) - .asBitmap() - .load(url) - .override(180, 180) - .sizeMultiplier(0.5f) - .transform(CenterCrop(), RoundedCorners(8)) - .placeholder(R.drawable.ps_image_placeholder) - .error(R.mipmap.load_image_error) - .into(imageView) - } - - override fun pauseRequests(context: Context?) { - context?.let { Glide.with(it).pauseRequests() } - } - - override fun resumeRequests(context: Context?) { - context?.let { Glide.with(it).resumeRequests() } - } - - override fun loadGridImage(context: Context, url: String, imageView: ImageView) { - Glide.with(context) - .load(url) - .apply( - RequestOptions() - .placeholder(R.drawable.ps_image_placeholder) - .error(R.mipmap.load_image_error) - ) - .into(imageView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/electric/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/electric/detector/utils/LocaleConstant.kt index eafe665..4de12f2 100644 --- a/app/src/main/java/com/casic/electric/detector/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/electric/detector/utils/LocaleConstant.kt @@ -9,9 +9,6 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE )