|
@@ -182,7 +182,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
room_action_nurse.setOnClickListener {
|
|
room_action_nurse.setOnClickListener {
|
|
if (Constant.inNursing) {
|
|
if (Constant.inNursing) {
|
|
Constant.inNursing = false
|
|
Constant.inNursing = false
|
|
- SerialPortHelper.setDoorLight(1, "111") //白色
|
|
|
|
|
|
+ if ("rk3128".equals(Build.MODEL)) {
|
|
|
|
+ SerialPortHelper.setDoorLight(1, "111") //白色
|
|
|
|
+ }
|
|
room_action_nurse.text = "进入护理"
|
|
room_action_nurse.text = "进入护理"
|
|
room_action_nurse.setBackgroundResource(R.mipmap.bg_bottom_btn)
|
|
room_action_nurse.setBackgroundResource(R.mipmap.bg_bottom_btn)
|
|
tv_nursing.visibility = View.GONE
|
|
tv_nursing.visibility = View.GONE
|
|
@@ -191,7 +193,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
Constant.inNursing = true
|
|
Constant.inNursing = true
|
|
- SerialPortHelper.setDoorLight(1, "010") //绿色
|
|
|
|
|
|
+ if ("rk3128".equals(Build.MODEL)) {
|
|
|
|
+ SerialPortHelper.setDoorLight(1, "010") //绿色
|
|
|
|
+ }
|
|
room_action_nurse.text = "退出护理"
|
|
room_action_nurse.text = "退出护理"
|
|
room_action_nurse.setBackgroundResource(R.mipmap.ic_bottom_btn_bg)
|
|
room_action_nurse.setBackgroundResource(R.mipmap.ic_bottom_btn_bg)
|
|
tv_nursing.visibility = View.VISIBLE
|
|
tv_nursing.visibility = View.VISIBLE
|
|
@@ -653,7 +657,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
nursingInteId = interactionVO.id
|
|
nursingInteId = interactionVO.id
|
|
} else {
|
|
} else {
|
|
- DoorLightHelper.handleDoorLight(tcpModel)
|
|
|
|
|
|
+ if ("rk3128".equals(Build.MODEL)) {
|
|
|
|
+ DoorLightHelper.handleDoorLight(tcpModel)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|