diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6f006bd..ae46c3e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,4 +69,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6f006bd..ae46c3e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,4 +69,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 9f5fe1c..707c782 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.view import android.content.Context +import android.graphics.Color import android.os.CountDownTimer import android.os.Handler import android.util.Log @@ -126,12 +127,13 @@ override fun onAddImageClick() { BottomActionSheet.Builder() .setContext(context) + .setItemTextColor(Color.BLUE) .setActionItemTitle(listOf("拍照", "相册")) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { when (position) { - 0 -> selectPicture() - 1 -> takePicture() + 0 -> takePicture() + 1 -> selectPicture() } } }).build().show() @@ -211,27 +213,16 @@ } } - private fun selectPicture() { - PictureSelector.create(this) - .openGallery(SelectMimeType.ofImage()) - .isGif(false) - .isMaxSelectEnabledMask(true) - .setFilterMinFileSize(100) - .setMaxSelectNum(1) - .isDisplayCamera(false) - .setImageEngine(GlideLoadEngine.instance) + private fun takePicture() { + PictureSelector.create(this).openCamera(SelectMimeType.ofImage()) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { if (result == null) { - "选择照片失败,请重试".show(context) + "拍照失败,请重试".show(context) return } result[0].realPath.compressImage(context, object : OnImageCompressListener { override fun onSuccess(file: File) { - Log.d( - "Casic", "EntrustAddActivity => onSuccess: ${file.absolutePath}" - ) - ///storage/emulated/0/Android/data/com.casic.xz.meterage/files/Pictures/CompressImage/1677478115391211.jpeg //上传图片 uploadImageViewModel.uploadImage(image = file) } @@ -248,7 +239,7 @@ }) } - private fun takePicture() { + private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) .isGif(false) @@ -288,32 +279,19 @@ private val callback = Handler.Callback { if (it.what == 2022062901) { - analyticalSelectResults(it.obj as LocalMedia) + val result = it.obj as LocalMedia + result.realPath.compressImage(this, object : OnImageCompressListener { + override fun onSuccess(file: File) { + Log.d(kTag, "onSuccess: " + file.absolutePath) + //上传图片 + uploadImageViewModel.uploadImage(file) + } + + override fun onError(e: Throwable) { + e.printStackTrace() + } + }) } true } - - private fun analyticalSelectResults(result: LocalMedia) { - //压缩图片 -// val realPath = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { -// result.realPath -// } else { -// result.sandboxPath -// } -// Log.d(kTag, "初始路径:" + result.path) -// Log.d(kTag, "绝对路径:" + result.realPath) -// Log.d(kTag, "原图路径:" + result.originalPath) -// Log.d(kTag, "沙盒路径:" + result.sandboxPath) - result.realPath.compressImage(this, object : OnImageCompressListener { - override fun onSuccess(file: File) { - Log.d(kTag, "onSuccess: " + file.absolutePath) - //上传图片 - uploadImageViewModel.uploadImage(file) - } - - override fun onError(e: Throwable) { - e.printStackTrace() - } - }) - } } \ No newline at end of file