|
@@ -176,9 +176,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
|
}
|
|
|
|
|
|
//益阳妇幼去掉部分菜单
|
|
|
- room_action_call_bed.visibility = View.GONE
|
|
|
- room_action_call.visibility = View.GONE
|
|
|
- room_action_language_set.visibility = View.GONE
|
|
|
+ //room_action_call_bed.visibility = View.GONE
|
|
|
+ //room_action_call.visibility = View.GONE
|
|
|
+ //room_action_language_set.visibility = View.GONE
|
|
|
|
|
|
//注册广播
|
|
|
regReceiver()
|
|
@@ -904,13 +904,13 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
|
|
|
|
//按钮名称显示
|
|
|
//益阳妇幼去掉呼叫护士功能
|
|
|
- /*if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
|
|
|
+ if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
|
|
|
room_action_call.visibility = View.VISIBLE
|
|
|
room_action_call.text = partSetting.doorNurseTitle
|
|
|
}
|
|
|
if (partSetting.doorNurseValid != null && partSetting.doorNurseValid == 0) {
|
|
|
room_action_call.visibility = View.GONE
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
if (!TextUtils.isEmpty(partSetting.doorNursingTitle)) {
|
|
|
room_action_nurse.visibility = View.VISIBLE
|
|
@@ -922,13 +922,13 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
|
|
|
}
|
|
|
|
|
|
//益阳妇幼去掉呼叫床位功能
|
|
|
- /*if (partSetting.roomCallBed != null && partSetting.roomCallBed == 0) {
|
|
|
+ if (partSetting.roomCallBed != null && partSetting.roomCallBed == 0) {
|
|
|
room_action_call_bed.visibility = View.GONE
|
|
|
//room_cancel_call.visibility = View.GONE
|
|
|
} else {
|
|
|
room_action_call_bed.visibility = View.VISIBLE
|
|
|
//room_cancel_call.visibility = View.VISIBLE
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
if (partSetting.boolDoorLightAlwaysOn != null && partSetting.boolDoorLightAlwaysOn == 1) {
|
|
|
SettingConfig.setDoorLightAlwaysOn(activity, 1)
|