diff --git a/app/build.gradle b/app/build.gradle index 7806868..c305d3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { signingConfigs { release { - storeFile file("/Users/a203/Desktop/AndroidProjects/MethaneInspection/app/Inspection.jks") + storeFile file("Inspection.jks") storePassword '123456789' keyAlias 'appKey' keyPassword '123456789' @@ -92,7 +92,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' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' def vm_version = '2.5.1' diff --git a/app/build.gradle b/app/build.gradle index 7806868..c305d3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { signingConfigs { release { - storeFile file("/Users/a203/Desktop/AndroidProjects/MethaneInspection/app/Inspection.jks") + storeFile file("Inspection.jks") storePassword '123456789' keyAlias 'appKey' keyPassword '123456789' @@ -92,7 +92,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' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' def vm_version = '2.5.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aabdb67..219d5e2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,17 +17,31 @@ - - - + + + + + + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7806868..c305d3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { signingConfigs { release { - storeFile file("/Users/a203/Desktop/AndroidProjects/MethaneInspection/app/Inspection.jks") + storeFile file("Inspection.jks") storePassword '123456789' keyAlias 'appKey' keyPassword '123456789' @@ -92,7 +92,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' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' def vm_version = '2.5.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aabdb67..219d5e2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,17 +17,31 @@ - - - + + + + + + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt index 2ecb109..96fff91 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt @@ -1,19 +1,13 @@ -package com.casic.xz.meterage.utils +package com.casic.birmm.inspect.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.birmm.inspect.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 7806868..c305d3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { signingConfigs { release { - storeFile file("/Users/a203/Desktop/AndroidProjects/MethaneInspection/app/Inspection.jks") + storeFile file("Inspection.jks") storePassword '123456789' keyAlias 'appKey' keyPassword '123456789' @@ -92,7 +92,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' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' def vm_version = '2.5.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aabdb67..219d5e2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,17 +17,31 @@ - - - + + + + + + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt index 2ecb109..96fff91 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/GlideLoadEngine.kt @@ -1,19 +1,13 @@ -package com.casic.xz.meterage.utils +package com.casic.birmm.inspect.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.birmm.inspect.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/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 0fb2cb5..a844016 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -13,15 +13,17 @@ Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CAMERA, Manifest.permission.CALL_PHONE, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令