1. 修改巡查界面刚进入快速点击巡查功能按钮导致崩溃问题； 2. 修复技防措施的地址记录信息有加号的问题

riku

2020-12-21 29c6cb0031e3d1aac2e326b3a83fa78bcd380890

1. 修改巡查界面刚进入快速点击巡查功能按钮导致崩溃问题；
2. 修复技防措施的地址记录信息有加号的问题

 app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt

@@ -7,10 +7,13 @@
enum class MediaFileType(val value: Int, val des: String) {
    Problem(1, "问题"),
    TechnicalPrevention(2,"技防措施"),

    MonitorDevice(3, "监测设备"),
    ManageDevice(4, "治理设备"),

    RoutineRecord(5, "常规记录"),
    Signature(6, "签字"),

    Nameplate(7, "铭牌"),
    Others(99,"其他")
}

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

@@ -130,7 +130,7 @@

        super.onCreate(savedInstanceState)

        initIconViewPager()
//        initIconViewPager()
        initLocation()

        ll_show_hide_detail.setOnClickListener(this)
@@ -311,6 +311,7 @@
            result = result.and(it)
        }
        if (result) {
            initIconViewPager()
            showMenu()
            refreshMenuStatus(taskStatus)

@@ -604,8 +605,8 @@
                    timerTaskRunning = true
                }

                val lng = round(longitudeCurrent * 1000) / 1000
                val lat = round(latitudeCurrent * 1000) / 1000
                val lng = round(longitudeCurrent * 1000000) / 1000000
                val lat = round(latitudeCurrent * 1000000) / 1000000

                viewModel.inspection.value?.apply {
                    if (extension1 == null) {
@@ -624,7 +625,7 @@
                        val l1 = LatLng(lat, lng)
                        val l2 = LatLng(last[1], last[0])
                        val distance = AMapUtils.calculateLineDistance(l1, l2)
                        if (distance >= 5) {
                        if (distance >= 1) {
                            extension1 = "${extension1};${lng},${lat}"
                            //道路监测点和道路类型的场景，直接展示轨迹；其余场景只有管理员和政府部门可以查看
                            if (

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

@@ -92,7 +92,7 @@
                    intent.putExtra("gitlistVo", viewModel.gitList.value?.get(position))
                    intent.putExtra("subTask", subTask)
                    intent.putExtra("inspectionGuid", inspection?.guid)
                    intent.putExtra("scenseAddress", "${scene?.cityname ?: ""} + ${scene?.districtname?:""} + ${scene?.townname?:""} + ${scene?.location?:""}")
                    intent.putExtra("scenseAddress", "${scene?.cityname ?: ""}${scene?.districtname?:""}${scene?.townname?:""}${scene?.location?:""}")
                    startActivity(intent)
                }