Merge branch 'project_1' into project_2

18034727885

2026-06-18 10c9a6e8e76feca89a701e09016679be1e014efa

 app/src/main/java/com/xw/yunwei/ui/task/normal/NormalTaskDetailActivity.kt

@@ -9,9 +9,7 @@
import com.amap.api.location.AMapLocation
import com.amap.api.maps.model.LatLng
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
@@ -21,16 +19,15 @@
import com.xw.common.base.ShowImgListDialog
import com.xw.common.custom.BatteryView.Companion.getBatteryColorByBatteryLife
import com.xw.common.utils.BindUtils.getUrls
import com.xw.common.utils.GlideEngine
import com.xw.common.utils.GpsHelper
import com.xw.common.utils.GpsHelper.Companion.navigate
import com.xw.common.utils.PictureCompressEngine
import com.xw.common.utils.ToastUtilCommon
import com.xw.yunwei.BR
import com.xw.yunwei.BaseBusinessActivity
import com.xw.yunwei.databinding.ActivityNormalTaskDetailBinding
import com.xw.yunwei.model.TaskNormalModel
import com.xw.yunwei.ui.work.car.detail.operations.charge.ChargeCarActivity
import com.xw.yunwei.utils.PictureSelectorFactory

/**
 * 常规任务详情页面
@@ -368,23 +365,16 @@
    // 进入图库
    @SuppressLint("SourceLockedOrientationActivity")
    private fun enterGallery() {
        PictureSelector.create(this)
            .openGallery(SelectMimeType.ofImage())
            .setImageEngine(GlideEngine.createGlideEngine())
            .setMaxSelectNum(viewModel.maxSize - viewModel.adapterCanEdit.data.size)
            .setImageSpanCount(4)
            .isPreviewImage(true)
            .isDisplayCamera(false)
            .setCompressEngine(PictureCompressEngine())
            .forResult(resultCallbackListener)
        PictureSelectorFactory.enterGallery(
            this,
            viewModel.maxSize - viewModel.adapterCanEdit.data.size,
            resultCallbackListener
        )
    }

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

    /** 图片选择结果回调 */