diff --git a/app/build.gradle b/app/build.gradle index de1c5c9..82fe628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -91,7 +91,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 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' diff --git a/app/build.gradle b/app/build.gradle index de1c5c9..82fe628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -91,7 +91,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 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61b1380..ef36759 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -28,15 +29,21 @@ - - - - + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index de1c5c9..82fe628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -91,7 +91,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 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61b1380..ef36759 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -28,15 +29,21 @@ - - - - + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt index 17c2fd4..7a40052 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt @@ -1,24 +1,18 @@ package com.casic.app.smartwell.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.app.smartwell.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() } } @@ -30,33 +24,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 de1c5c9..82fe628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -91,7 +91,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 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61b1380..ef36759 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -28,15 +29,21 @@ - - - - + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt index 17c2fd4..7a40052 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt @@ -1,24 +1,18 @@ package com.casic.app.smartwell.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.app.smartwell.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() } } @@ -30,33 +24,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/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 3bc89e2..981b147 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -9,10 +9,11 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.CAMERA + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L diff --git a/app/build.gradle b/app/build.gradle index de1c5c9..82fe628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -91,7 +91,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 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61b1380..ef36759 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -28,15 +29,21 @@ - - - - + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt index 17c2fd4..7a40052 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt @@ -1,24 +1,18 @@ package com.casic.app.smartwell.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.app.smartwell.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() } } @@ -30,33 +24,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/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 3bc89e2..981b147 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -9,10 +9,11 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.CAMERA + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index ea47690..d562319 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -413,7 +413,7 @@ .setFilterMinFileSize(100) .setMaxSelectNum(3) .isDisplayCamera(false) - .setImageEngine(GlideLoadEngine.instance) + .setImageEngine(GlideLoadEngine.get) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { if (result == null) { diff --git a/app/build.gradle b/app/build.gradle index de1c5c9..82fe628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -91,7 +91,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 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61b1380..ef36759 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -28,15 +29,21 @@ - - - - + + + + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt index 17c2fd4..7a40052 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/GlideLoadEngine.kt @@ -1,24 +1,18 @@ package com.casic.app.smartwell.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.app.smartwell.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() } } @@ -30,33 +24,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/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 3bc89e2..981b147 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -9,10 +9,11 @@ Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.CAMERA + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index ea47690..d562319 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -413,7 +413,7 @@ .setFilterMinFileSize(100) .setMaxSelectNum(3) .isDisplayCamera(false) - .setImageEngine(GlideLoadEngine.instance) + .setImageEngine(GlideLoadEngine.get) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { if (result == null) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index e1da183..3601d3e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -40,9 +40,27 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -373,7 +391,7 @@ .setFilterMinFileSize(100) .setMaxSelectNum(3) .isDisplayCamera(false) - .setImageEngine(GlideLoadEngine.instance) + .setImageEngine(GlideLoadEngine.get) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { if (result == null) {