diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1429d68..14f4cbd 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -293,9 +293,9 @@ val deviceCode = marker.options.title safetyTrees.forEach { if (it.deviceCode == deviceCode) { - deviceNameView.text = "设备名称:安全树-${it.deviceCode}" - alarmValueView.text = "甲烷浓度:${it.gasValue}" - timeView.text = "报警时间:${it.time}" + deviceNameView.text = "设备:${it.deviceCode}" + alarmValueView.text = "甲烷:${it.gasValue}ppm" + timeView.text = "时间:${it.time}" } } } @@ -315,11 +315,11 @@ if (it.workerId == workerId) { userHelmetCode = it.hatCode workerNameView.text = "名称:${it.workerName}" - heartRateView.text = "心率:${it.heartRate}BPM" + heartRateView.text = "心率:${it.heartRate}bpm" bloodOxygenView.text = "血氧:${it.bloodOxygen}%" - coValueView.text = "一氧化碳:${it.co}%VOL" - gasValueView.text = "甲烷:${it.gas}%VOL" - h2sValueView.text = "硫化氢:${it.co}PPM" + coValueView.text = "一氧化碳:${it.co}ppm" + gasValueView.text = "甲烷:${it.gas}ppm" + h2sValueView.text = "硫化氢:${it.co}ppm" o2ValueView.text = "氧气:${it.o2}%VOL" timeView.text = "时间:${it.time}" } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1429d68..14f4cbd 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -293,9 +293,9 @@ val deviceCode = marker.options.title safetyTrees.forEach { if (it.deviceCode == deviceCode) { - deviceNameView.text = "设备名称:安全树-${it.deviceCode}" - alarmValueView.text = "甲烷浓度:${it.gasValue}" - timeView.text = "报警时间:${it.time}" + deviceNameView.text = "设备:${it.deviceCode}" + alarmValueView.text = "甲烷:${it.gasValue}ppm" + timeView.text = "时间:${it.time}" } } } @@ -315,11 +315,11 @@ if (it.workerId == workerId) { userHelmetCode = it.hatCode workerNameView.text = "名称:${it.workerName}" - heartRateView.text = "心率:${it.heartRate}BPM" + heartRateView.text = "心率:${it.heartRate}bpm" bloodOxygenView.text = "血氧:${it.bloodOxygen}%" - coValueView.text = "一氧化碳:${it.co}%VOL" - gasValueView.text = "甲烷:${it.gas}%VOL" - h2sValueView.text = "硫化氢:${it.co}PPM" + coValueView.text = "一氧化碳:${it.co}ppm" + gasValueView.text = "甲烷:${it.gas}ppm" + h2sValueView.text = "硫化氢:${it.co}ppm" o2ValueView.text = "氧气:${it.o2}%VOL" timeView.text = "时间:${it.time}" } diff --git a/gradlew b/gradlew old mode 100755 new mode 100644