Merge branch 'project_1' into project_2

18034727885

2026-06-18 10c9a6e8e76feca89a701e09016679be1e014efa

 app/src/main/java/com/xw/yunwei/ui/work/checkInMission/viewmodel/CruiseCheckInOperationViewModel.kt

@@ -8,16 +8,12 @@
import androidx.lifecycle.MutableLiveData
import com.amap.location.support.util.TextUtils
import com.blankj.utilcode.util.UriUtils
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.PictureMimeType
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.xw.common.CommonDialog
import com.xw.common.base.BaseViewModel
import com.xw.common.base.ShowImgListDialog
import com.xw.common.utils.GlideEngine
import com.xw.common.utils.PictureCompressEngine
import com.xw.common.utils.ToastUtilCommon
import com.xw.yunwei.model.CheckInMissionPointInfo
import com.xw.yunwei.model.UploadModel
@@ -25,6 +21,7 @@
import com.xw.yunwei.net.WorkRepository
import com.xw.yunwei.ui.dialog.CruiseCheckInSuccessDialog
import com.xw.yunwei.ui.work.checkInMission.CruiseCheckInMissionCompleteActivity
import com.xw.yunwei.utils.PictureSelectorFactory
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import okhttp3.MediaType.Companion.toMediaType
@@ -110,24 +107,15 @@
    // 进入图库
    @SuppressLint("SourceLockedOrientationActivity")
    private fun enterGallery(context: Context) {
        PictureSelector.create(context)
            .openGallery(SelectMimeType.ofImage())
            .setImageEngine(GlideEngine.createGlideEngine())
            .setMaxSelectNum(
                (pictureMax.value ?: 1) - (operationPictures.value?.count { it.isNotEmpty() } ?: 0))
            .setImageSpanCount(4)
            .isPreviewImage(true)
            .isDisplayCamera(false)
            .setCompressEngine(PictureCompressEngine())
            .forResult(this)
        PictureSelectorFactory.enterGallery(
            context,
            (pictureMax.value ?: 1) - (operationPictures.value?.count { it.isNotEmpty() } ?: 0),
            this)
    }

    // 拍照
    private fun takeAPhotograph(context: Context) {
        PictureSelector.create(context)
            .openCamera(SelectMimeType.ofImage())
            .setCompressEngine(PictureCompressEngine())
            .forResultActivity(this)
        PictureSelectorFactory.takeAPhotograph(context,this)
    }

    override fun onResult(result: ArrayList<LocalMedia>?) {