diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 982dd89..dda7b12 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -164,9 +164,12 @@ if (it.code == 200) { it.data.forEach { worker -> if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { - val value = - "CO:${worker.co}ppm, CH4:${worker.gas}ppm, H2S:${worker.co}ppm, O2:${worker.o2}%VOL" - Log.d(kTag, "value: $value") + binding.heartRateView.text = "心率:${worker.heartRate}bpm" + binding.bloodOxygenView.text = "血氧:${worker.bloodOxygen}%" + binding.coValueView.text = "一氧化碳:${worker.co}ppm" + binding.gasValueView.text = "甲烷:${worker.gas}ppm" + binding.h2sValueView.text = "硫化氢:${worker.co}ppm" + binding.o2ValueView.text = "氧气:${worker.o2}%VOL" } } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 982dd89..dda7b12 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -164,9 +164,12 @@ if (it.code == 200) { it.data.forEach { worker -> if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { - val value = - "CO:${worker.co}ppm, CH4:${worker.gas}ppm, H2S:${worker.co}ppm, O2:${worker.o2}%VOL" - Log.d(kTag, "value: $value") + binding.heartRateView.text = "心率:${worker.heartRate}bpm" + binding.bloodOxygenView.text = "血氧:${worker.bloodOxygen}%" + binding.coValueView.text = "一氧化碳:${worker.co}ppm" + binding.gasValueView.text = "甲烷:${worker.gas}ppm" + binding.h2sValueView.text = "硫化氢:${worker.co}ppm" + binding.o2ValueView.text = "氧气:${worker.o2}%VOL" } } } diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml new file mode 100644 index 0000000..4198d22 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 982dd89..dda7b12 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -164,9 +164,12 @@ if (it.code == 200) { it.data.forEach { worker -> if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { - val value = - "CO:${worker.co}ppm, CH4:${worker.gas}ppm, H2S:${worker.co}ppm, O2:${worker.o2}%VOL" - Log.d(kTag, "value: $value") + binding.heartRateView.text = "心率:${worker.heartRate}bpm" + binding.bloodOxygenView.text = "血氧:${worker.bloodOxygen}%" + binding.coValueView.text = "一氧化碳:${worker.co}ppm" + binding.gasValueView.text = "甲烷:${worker.gas}ppm" + binding.h2sValueView.text = "硫化氢:${worker.co}ppm" + binding.o2ValueView.text = "氧气:${worker.o2}%VOL" } } } diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml new file mode 100644 index 0000000..4198d22 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_guardians.xml b/app/src/main/res/layout/activity_guardians.xml index 5403809..4474864 100644 --- a/app/src/main/res/layout/activity_guardians.xml +++ b/app/src/main/res/layout/activity_guardians.xml @@ -89,12 +89,81 @@ app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:spanCount="3" /> - + android:background="@drawable/bg_stroke_layout_radius_5" + android:orientation="vertical" + android:padding="@dimen/dp_5"> + + + + + + + + + + + + + + + + + + + + + +