diff --git a/app/build.gradle b/app/build.gradle index d549156..d3ec387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,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 d549156..d3ec387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,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 a809bf6..f1a68ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,16 +20,21 @@ - - - + - + + + + + + + + @@ -92,8 +97,5 @@ - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d549156..d3ec387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,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 a809bf6..f1a68ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,16 +20,21 @@ - - - + - + + + + + + + + @@ -92,8 +97,5 @@ - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt index 07721fc..0b8926e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt @@ -1,26 +1,20 @@ package com.casic.br.operationsite.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.br.operationsite.R import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.interfaces.OnCallbackListener import com.luck.picture.lib.utils.ActivityCompatHelper class GlideLoadEngine private constructor() : ImageEngine { companion object { - val instance: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + val get: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { GlideLoadEngine() } } @@ -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 d549156..d3ec387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,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 a809bf6..f1a68ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,16 +20,21 @@ - - - + - + + + + + + + + @@ -92,8 +97,5 @@ - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt index 07721fc..0b8926e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt @@ -1,26 +1,20 @@ package com.casic.br.operationsite.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.br.operationsite.R import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.interfaces.OnCallbackListener import com.luck.picture.lib.utils.ActivityCompatHelper class GlideLoadEngine private constructor() : ImageEngine { companion object { - val instance: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + val get: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { GlideLoadEngine() } } @@ -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/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 3700a3d..aae1838 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -5,16 +5,17 @@ object LocaleConstant { val USER_PERMISSIONS = arrayOf( - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.CAMERA, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_PHONE_STATE, Manifest.permission.CHANGE_NETWORK_STATE, - Manifest.permission.WRITE_SETTINGS + Manifest.permission.WRITE_SETTINGS, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) const val SERVER_BASE_URL = "http://111.198.10.15:21409" diff --git a/app/build.gradle b/app/build.gradle index d549156..d3ec387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,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 a809bf6..f1a68ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,16 +20,21 @@ - - - + - + + + + + + + + @@ -92,8 +97,5 @@ - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt index 07721fc..0b8926e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/GlideLoadEngine.kt @@ -1,26 +1,20 @@ package com.casic.br.operationsite.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.br.operationsite.R import com.luck.picture.lib.engine.ImageEngine -import com.luck.picture.lib.interfaces.OnCallbackListener import com.luck.picture.lib.utils.ActivityCompatHelper class GlideLoadEngine private constructor() : ImageEngine { companion object { - val instance: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + val get: GlideLoadEngine by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { GlideLoadEngine() } } @@ -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/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 3700a3d..aae1838 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -5,16 +5,17 @@ object LocaleConstant { val USER_PERMISSIONS = arrayOf( - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.CAMERA, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_PHONE_STATE, Manifest.permission.CHANGE_NETWORK_STATE, - Manifest.permission.WRITE_SETTINGS + Manifest.permission.WRITE_SETTINGS, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) const val SERVER_BASE_URL = "http://111.198.10.15:21409" diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index d7d345c..82ebc9f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -40,8 +40,18 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_upload_activity.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_upload_activity.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_upload_activity.eventLocationView +import kotlinx.android.synthetic.main.activity_upload_activity.eventNameView +import kotlinx.android.synthetic.main.activity_upload_activity.inputLengthView +import kotlinx.android.synthetic.main.activity_upload_activity.locationImageView +import kotlinx.android.synthetic.main.activity_upload_activity.personNumberView +import kotlinx.android.synthetic.main.activity_upload_activity.rootView +import kotlinx.android.synthetic.main.activity_upload_activity.siteEditView +import kotlinx.android.synthetic.main.activity_upload_activity.uploadEventButton +import kotlinx.android.synthetic.main.activity_upload_activity.uploadPersonView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class UploadEventActivity : KotlinBaseActivity() { @@ -235,7 +245,7 @@ .setFilterMinFileSize(100) .setMaxSelectNum(3) .isDisplayCamera(false) - .setImageEngine(GlideLoadEngine.instance) + .setImageEngine(GlideLoadEngine.get) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { if (result == null) {