diff --git a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt index 68673ca..75f989b 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt @@ -104,9 +104,13 @@ } val alarmValue = if (item.alarmType == "1") { - "${item.alarmValue}" + item.alarmValue } else { - "${item.alarmValue * 100}%" + if (item.alarmValue == "") { + "0" + } else { + "${item.alarmValue.toInt() * 100}%" + } } holder.setText(R.id.alarmCodeView, item.alarmCode) .setText(R.id.alarmTimeView, alarmTime) diff --git a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt index 68673ca..75f989b 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt @@ -104,9 +104,13 @@ } val alarmValue = if (item.alarmType == "1") { - "${item.alarmValue}" + item.alarmValue } else { - "${item.alarmValue * 100}%" + if (item.alarmValue == "") { + "0" + } else { + "${item.alarmValue.toInt() * 100}%" + } } holder.setText(R.id.alarmCodeView, item.alarmCode) .setText(R.id.alarmTimeView, alarmTime) diff --git a/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java b/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java index 8e0519a..b629608 100644 --- a/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java +++ b/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java @@ -59,10 +59,10 @@ private String alarmLongitude; private String alarmPicture; private String alarmStatus; - private int alarmThresh; + private String alarmThresh; private String alarmTime; private String alarmType; - private int alarmValue; + private String alarmValue; private String alarmVideo; private String cancelResult; private String cancelTime; @@ -120,11 +120,11 @@ this.alarmStatus = alarmStatus; } - public int getAlarmThresh() { + public String getAlarmThresh() { return alarmThresh; } - public void setAlarmThresh(int alarmThresh) { + public void setAlarmThresh(String alarmThresh) { this.alarmThresh = alarmThresh; } @@ -144,11 +144,11 @@ this.alarmType = alarmType; } - public int getAlarmValue() { + public String getAlarmValue() { return alarmValue; } - public void setAlarmValue(int alarmValue) { + public void setAlarmValue(String alarmValue) { this.alarmValue = alarmValue; } diff --git a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt index 68673ca..75f989b 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/AlarmAdapter.kt @@ -104,9 +104,13 @@ } val alarmValue = if (item.alarmType == "1") { - "${item.alarmValue}" + item.alarmValue } else { - "${item.alarmValue * 100}%" + if (item.alarmValue == "") { + "0" + } else { + "${item.alarmValue.toInt() * 100}%" + } } holder.setText(R.id.alarmCodeView, item.alarmCode) .setText(R.id.alarmTimeView, alarmTime) diff --git a/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java b/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java index 8e0519a..b629608 100644 --- a/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java +++ b/app/src/main/java/com/casic/br/ktd/model/AlarmListModel.java @@ -59,10 +59,10 @@ private String alarmLongitude; private String alarmPicture; private String alarmStatus; - private int alarmThresh; + private String alarmThresh; private String alarmTime; private String alarmType; - private int alarmValue; + private String alarmValue; private String alarmVideo; private String cancelResult; private String cancelTime; @@ -120,11 +120,11 @@ this.alarmStatus = alarmStatus; } - public int getAlarmThresh() { + public String getAlarmThresh() { return alarmThresh; } - public void setAlarmThresh(int alarmThresh) { + public void setAlarmThresh(String alarmThresh) { this.alarmThresh = alarmThresh; } @@ -144,11 +144,11 @@ this.alarmType = alarmType; } - public int getAlarmValue() { + public String getAlarmValue() { return alarmValue; } - public void setAlarmValue(int alarmValue) { + public void setAlarmValue(String alarmValue) { this.alarmValue = alarmValue; } diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index eec97a0..7ef2752 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -195,85 +195,6 @@ } } - - var lat = "" - var lng = "" - var address = "" - var speed = 0.0f - fileViewModel.resultModel.observe(this) { - if (it.code == 200) { - LocationHelper.get.obtainLocation( - this, object : LocationHelper.ILocationListener { - override fun onAMapLocationGet(aMapLocation: AMapLocation) { - lat = aMapLocation.latitude.toString() - lng = aMapLocation.longitude.toString() - address = aMapLocation.address - speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() - - if (it.data.endsWith(".png")) { - alarmViewModel.addAlarm( - taskId, - deviceId, - "甲烷浓度超过阈值", - lat, - lng, - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - it.data, - "0", - "1", - "", - dataModel?.methane.toString(), - ) - } else { - alarmViewModel.addAlarm( - taskId, - deviceId, - "甲烷浓度超过阈值", - lat, - lng, - System.currentTimeMillis().timestampToCompleteDate(), - gasAlarmRule.toString(), - "", - "0", - "1", - it.data, - dataModel?.methane.toString(), - ) - isRecordingVideo = false - } - } - }, true - ) - } - } - - alarmViewModel.resultModel.observe(this) { - if (it.code == 200) { - //上传经纬度以及甲烷浓度 - val deviceStatus = if (dataModel?.methaneState == "正常") { - "1" - } else { - "0" - } - - pointViewModel.uploadPointDetail( - taskId, - it.data.toString(), - lat, - lng, - speed.toString(), - deviceStatus, - "1", - dataModel?.methane.toString(), - dataModel?.vertical.toString(), - address, - dataModel?.horizontal.toString(), - System.currentTimeMillis().timestampToCompleteDate() - ) - } - } - /** * 配置云台设备 * */ @@ -292,20 +213,25 @@ /** * 高德周期定位 * */ + var lat = "" + var lng = "" + var address = "" + var speed = 0.0f LocationHelper.get.obtainLocation(this, object : LocationHelper.ILocationListener { override fun onAMapLocationGet(aMapLocation: AMapLocation) { - val longitude = aMapLocation.longitude.toString() - val latitude = aMapLocation.latitude.toString() + lng = aMapLocation.longitude.toString() + lat = aMapLocation.latitude.toString() + address = aMapLocation.address //发送位置信息给UDP服务端 - udpClient.send("$longitude, $latitude") + udpClient.send("$lng, $lat") //速度 转为 km/h speed = decimalFormat.format(aMapLocation.speed * 3.6).toFloat() binding.carSpeedView.text = String.format("${speed}Km/h") - val latLng = LatLng(latitude.toDouble(), longitude.toDouble()) + val latLng = LatLng(lat.toDouble(), lng.toDouble()) latlngs.add(latLng) //移动到指定经纬度 @@ -343,6 +269,69 @@ } }, false) + fileViewModel.resultModel.observe(this) { + if (it.code == 200) { + if (it.data.endsWith(".png")) { + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + it.data, + "0", + "1", + "", + dataModel?.methane.toString(), + ) + } else { + alarmViewModel.addAlarm( + taskId, + deviceId, + "甲烷浓度超过阈值", + lat, + lng, + System.currentTimeMillis().timestampToCompleteDate(), + gasAlarmRule.toString(), + "", + "0", + "1", + it.data, + dataModel?.methane.toString(), + ) + isRecordingVideo = false + } + } + } + + alarmViewModel.resultModel.observe(this) { + if (it.code == 200) { + //上传经纬度以及甲烷浓度 + val deviceStatus = if (dataModel?.methaneState == "正常") { + "1" + } else { + "0" + } + + pointViewModel.uploadPointDetail( + taskId, + it.data.toString(), + lat, + lng, + speed.toString(), + deviceStatus, + "1", + dataModel?.methane.toString(), + dataModel?.vertical.toString(), + address, + dataModel?.horizontal.toString(), + System.currentTimeMillis().timestampToCompleteDate() + ) + } + } + /** * TCP初始化 * ***/ @@ -782,7 +771,7 @@ val videoPath = "/${createVideoFileDir()}/${timeFormat.format(Date())}.mp4" Log.d(kTag, "开始抓取视频 => $videoPath") hkSDK.NET_DVR_SaveRealData(returnUserId, videoPath) - object : CountDownTimer(15 * 1000, 1000) { + object : CountDownTimer(10 * 1000, 1000) { override fun onTick(l: Long) { }