diff --git a/app/build.gradle b/app/build.gradle
index 4b3aab9..2540c19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,7 +121,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'
//官方Json解析库
diff --git a/app/build.gradle b/app/build.gradle
index 4b3aab9..2540c19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,7 +121,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'
//官方Json解析库
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c25314..546b992 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,14 +14,21 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4b3aab9..2540c19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,7 +121,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'
//官方Json解析库
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c25314..546b992 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,14 +14,21 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt
index 0a80346..e8e0b43 100644
--- a/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt
+++ b/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt
@@ -1,19 +1,13 @@
package com.casic.xz.meterage.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.xz.meterage.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 4b3aab9..2540c19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,7 +121,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'
//官方Json解析库
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c25314..546b992 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,14 +14,21 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt
index 0a80346..e8e0b43 100644
--- a/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt
+++ b/app/src/main/java/com/casic/xz/meterage/utils/GlideLoadEngine.kt
@@ -1,19 +1,13 @@
package com.casic.xz.meterage.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.xz.meterage.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/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt
index 6a89587..95a1744 100644
--- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt
@@ -12,10 +12,11 @@
* */
val USER_PERMISSIONS = arrayOf(
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,
- Manifest.permission.MANAGE_EXTERNAL_STORAGE,
- Manifest.permission.CAMERA
)
val HOME_FUNC_IMAGE = intArrayOf(
R.mipmap.equipment,