1. 修复现场整改时，问题状态是‘问题审核通过’而不是“整改未审核”的问题； 2. 修改任意拍照界面的多图片展示方式为Glide，减少内存溢出的可能性...

riku

2020-11-12 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734

 app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraViewModel.kt

@@ -3,6 +3,7 @@
import android.arch.lifecycle.MutableLiveData
import cn.flightfeather.thirdapp.bean.Mediafile
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
import cn.flightfeather.thirdapp.module.base.BaseViewModel
import cn.flightfeather.thirdapp.repository.InspectionRepository
import cn.flightfeather.thirdapp.repository.ProblemRepository
@@ -16,27 +17,42 @@
    private val inspectionRepository = InspectionRepository()
    private val problemRepository = ProblemRepository()

    val mediaFileList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
    //常规记录图片
    val routineRecordList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
    //铭牌图片
    val nameplateList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
    //监测设备图片
    val monitorDeviceList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }

    private val dataSet = listOf(
            Pair(MediaFileType.RoutineRecord, routineRecordList),
            Pair(MediaFileType.Nameplate, nameplateList),
            Pair(MediaFileType.MonitorDevice, monitorDeviceList)
    )

    /**
     * 获取任意拍照图片
     */
    fun getMediaFile(inspectionId: String) {
        inspectionRepository.getMediaFile(inspectionId, BUSINESS_TYPE_CAMERA, object : ResultCallBack<ArrayList<Mediafile>> {
            override fun onSuccess(result: ArrayList<Mediafile>?) {
                result?.let {
                    mediaFileList.value?.run {
                        clear()
                        addAll(it)
        dataSet.forEach {p ->
            inspectionRepository.getMediaFile(inspectionId, p.first.value, object : ResultCallBack<ArrayList<Mediafile>> {
                override fun onSuccess(result: ArrayList<Mediafile>?) {
                    result?.let {
                        p.second.value?.run {
                            clear()
                            add(0, Mediafile())//在列表头添加图片拍摄按钮
                            addAll(it)
                        }
                        p.second.value = p.second.value
                    }
                    mediaFileList.value = mediaFileList.value
                }
            }

            override fun onFailure() {
                override fun onFailure() {

            }
                }

        })
            })
        }
    }

    /**