|
@@ -244,7 +244,7 @@ public:
|
|
partSetting.screenLight = root["screen_light"].asInt();
|
|
partSetting.screenLight = root["screen_light"].asInt();
|
|
partSetting.roomCallBed = root["room_call_bed"].asInt();
|
|
partSetting.roomCallBed = root["room_call_bed"].asInt();
|
|
|
|
|
|
- if (root["linux_door_volume_native"].size() != 0) {
|
|
|
|
|
|
+ if (root.isMember("linux_bed_volume_native")) {
|
|
partSetting.linuxDoorVolumeNative = root["linux_door_volume_native"].asInt();
|
|
partSetting.linuxDoorVolumeNative = root["linux_door_volume_native"].asInt();
|
|
partSetting.linuxDoorGainSize = root["linux_door_gain_size"].asInt();
|
|
partSetting.linuxDoorGainSize = root["linux_door_gain_size"].asInt();
|
|
|
|
|
|
@@ -293,21 +293,21 @@ public:
|
|
// 如果roomCallBed是0的话,那就隐藏
|
|
// 如果roomCallBed是0的话,那就隐藏
|
|
mCallBedButtonPtr->setVisible(roomCallBed);
|
|
mCallBedButtonPtr->setVisible(roomCallBed);
|
|
|
|
|
|
- mCallNurseButtonPtr->setPosition(LayoutPosition(869, 160, 140, 55));
|
|
|
|
- mCallCencelButtonPtr->setPosition(LayoutPosition(869, 241, 140, 55));
|
|
|
|
- mHelpButtonPtr->setPosition(LayoutPosition(869, 323, 140, 55));
|
|
|
|
- mNursingButtonPtr->setPosition(LayoutPosition(869, 404, 140, 55));
|
|
|
|
- mMoreButtonPtr->setPosition(LayoutPosition(869, 485, 140, 55));
|
|
|
|
|
|
+ mCallNurseButtonPtr->setPosition(LayoutPosition(869, 120, 140, 55));
|
|
|
|
+ mCallCencelButtonPtr->setPosition(LayoutPosition(869, 205, 140, 55));
|
|
|
|
+ mHelpButtonPtr->setPosition(LayoutPosition(869, 290, 140, 55));
|
|
|
|
+ mNursingButtonPtr->setPosition(LayoutPosition(869, 375, 140, 55));
|
|
|
|
+ mMoreButtonPtr->setPosition(LayoutPosition(869, 460, 140, 55));
|
|
|
|
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
// 如果roomCallBed是1的话,那就显示
|
|
// 如果roomCallBed是1的话,那就显示
|
|
mCallBedButtonPtr->setVisible(roomCallBed);
|
|
mCallBedButtonPtr->setVisible(roomCallBed);
|
|
|
|
|
|
- mCallNurseButtonPtr->setPosition(LayoutPosition(869, 225, 140, 55));
|
|
|
|
- mCallCencelButtonPtr->setPosition(LayoutPosition(869, 290, 140, 55));
|
|
|
|
- mHelpButtonPtr->setPosition(LayoutPosition(869, 355, 140, 55));
|
|
|
|
- mNursingButtonPtr->setPosition(LayoutPosition(869, 420, 140, 55));
|
|
|
|
|
|
+ mCallNurseButtonPtr->setPosition(LayoutPosition(869, 185, 140, 55));
|
|
|
|
+ mCallCencelButtonPtr->setPosition(LayoutPosition(869, 260, 140, 55));
|
|
|
|
+ mHelpButtonPtr->setPosition(LayoutPosition(869, 335, 140, 55));
|
|
|
|
+ mNursingButtonPtr->setPosition(LayoutPosition(869, 410, 140, 55));
|
|
mMoreButtonPtr->setPosition(LayoutPosition(869, 485, 140, 55));
|
|
mMoreButtonPtr->setPosition(LayoutPosition(869, 485, 140, 55));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -791,10 +791,7 @@ static bool onmainActivityTouchEvent(const MotionEvent &ev) {
|
|
}
|
|
}
|
|
static int getListItemCount_BedListView(const ZKListView *pListView) {
|
|
static int getListItemCount_BedListView(const ZKListView *pListView) {
|
|
//LOGD("getListItemCount_BedListView !\n");
|
|
//LOGD("getListItemCount_BedListView !\n");
|
|
- if (frameBedList.size() > 3) {
|
|
|
|
- return frameBedList.size();
|
|
|
|
- }
|
|
|
|
- return 3;
|
|
|
|
|
|
+ return frameBedList.size();
|
|
}
|
|
}
|
|
|
|
|
|
static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
|
|
static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
|
|
@@ -802,7 +799,7 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
|
|
if (frameBedList.size() > 0) {
|
|
if (frameBedList.size() > 0) {
|
|
string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
|
|
string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
|
|
if (frameBedName == "") {
|
|
if (frameBedName == "") {
|
|
- pListItem->findSubItemByID(ID_MAIN_BedFrameTextView)->setText(LANGUAGEMANAGER->getValue("EmptyBed"));
|
|
|
|
|
|
+ pListItem->findSubItemByID(ID_MAIN_BedFrameTextView)->setText("");
|
|
} else {
|
|
} else {
|
|
int nPos = frameBedName.find("-");
|
|
int nPos = frameBedName.find("-");
|
|
if (nPos != -1) {
|
|
if (nPos != -1) {
|
|
@@ -814,7 +811,7 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
|
|
// 用户相关
|
|
// 用户相关
|
|
string customerName = frameBedList[index]["customer_name"].asString();
|
|
string customerName = frameBedList[index]["customer_name"].asString();
|
|
if (customerName == "") {
|
|
if (customerName == "") {
|
|
- pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(LANGUAGEMANAGER->getValue("EmptyCustomer"));
|
|
|
|
|
|
+ pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText("");
|
|
} else {
|
|
} else {
|
|
pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(customerName);
|
|
pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(customerName);
|
|
}
|
|
}
|