|
|
@@ -244,7 +244,7 @@ public:
|
|
|
partSetting.screenLight = root["screen_light"].asInt();
|
|
|
partSetting.roomCallBed = root["room_call_bed"].asInt();
|
|
|
|
|
|
- if (root.isMember("linux_bed_volume_native")) {
|
|
|
+ if (root["linux_door_volume_native"].size() != 0) {
|
|
|
partSetting.linuxDoorVolumeNative = root["linux_door_volume_native"].asInt();
|
|
|
partSetting.linuxDoorGainSize = root["linux_door_gain_size"].asInt();
|
|
|
|
|
|
@@ -293,21 +293,21 @@ public:
|
|
|
// 如果roomCallBed是0的话，那就隐藏
|
|
|
mCallBedButtonPtr->setVisible(roomCallBed);
|
|
|
|
|
|
- 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));
|
|
|
+ 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));
|
|
|
|
|
|
}
|
|
|
else {
|
|
|
// 如果roomCallBed是1的话，那就显示
|
|
|
mCallBedButtonPtr->setVisible(roomCallBed);
|
|
|
|
|
|
- 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));
|
|
|
+ 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));
|
|
|
mMoreButtonPtr->setPosition(LayoutPosition(869, 485, 140, 55));
|
|
|
}
|
|
|
}
|
|
|
@@ -347,7 +347,7 @@ public:
|
|
|
if (currentVersionNo < responseVersionNo) {
|
|
|
Intent* intent = new Intent();
|
|
|
intent->putExtra(appUpdate, "true");
|
|
|
- EASYUICONTEXT->openActivity("updateActivity", intent);
|
|
|
+ EASYUICONTEXT->openActivity("DeviceUpdateActivity", intent);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -791,7 +791,10 @@ static bool onmainActivityTouchEvent(const MotionEvent &ev) {
|
|
|
}
|
|
|
static int getListItemCount_BedListView(const ZKListView *pListView) {
|
|
|
//LOGD("getListItemCount_BedListView !\n");
|
|
|
- return frameBedList.size();
|
|
|
+ if (frameBedList.size() > 3) {
|
|
|
+ return frameBedList.size();
|
|
|
+ }
|
|
|
+ return 3;
|
|
|
}
|
|
|
|
|
|
static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
|
|
|
@@ -799,7 +802,7 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
|
|
|
if (frameBedList.size() > 0) {
|
|
|
string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
|
|
|
if (frameBedName == "") {
|
|
|
- pListItem->findSubItemByID(ID_MAIN_BedFrameTextView)->setText("");
|
|
|
+ pListItem->findSubItemByID(ID_MAIN_BedFrameTextView)->setText(LANGUAGEMANAGER->getValue("EmptyBed"));
|
|
|
} else {
|
|
|
int nPos = frameBedName.find("-");
|
|
|
if (nPos != -1) {
|
|
|
@@ -811,7 +814,7 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
|
|
|
// 用户相关
|
|
|
string customerName = frameBedList[index]["customer_name"].asString();
|
|
|
if (customerName == "") {
|
|
|
- pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText("");
|
|
|
+ pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(LANGUAGEMANAGER->getValue("EmptyCustomer"));
|
|
|
} else {
|
|
|
pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(customerName);
|
|
|
}
|
|
|
@@ -848,7 +851,34 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
|
|
|
pListItem->findSubItemByID(ID_MAIN_NurseName)->setText(frameBedList[index]["nurse_name"].asString());
|
|
|
|
|
|
|
|
|
-// // 护理项相关
|
|
|
+ // 护理项相关
|
|
|
+ Json::Value nurseConfigList = frameBedList[index]["nurse_config_dtos"];
|
|
|
+ for (int i = 0; i < 6; i++) {
|
|
|
+ int nurseOptionNumber = ID_MAIN_NurseOption1 + i * 2;
|
|
|
+ if (i == 5) {
|
|
|
+ nurseOptionNumber = ID_MAIN_NurseOption6;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (nurseConfigList.size() > 0 && nurseConfigList.size() >= i && nurseConfigList[i]["nurse_option_name"].asString() != "") {
|
|
|
+ //颜色
|
|
|
+ string nurseConfigColot = nurseConfigList[i]["nurse_color_rbg"].asString();
|
|
|
+ uint32_t bgColor = 0xFFF5F8FF;
|
|
|
+ if (nurseConfigColot != "") {
|
|
|
+ string rgbStr = "FF" + nurseConfigColot;
|
|
|
+ transform(rgbStr.begin(), rgbStr.end(), rgbStr.begin(), ::toupper);
|
|
|
+ bgColor = strtoul(("0x" + rgbStr).c_str(), NULL,16);
|
|
|
+ }
|
|
|
+ string nurseOptionName = nurseConfigList[i]["nurse_option_name"].asString();
|
|
|
+ pListItem->findSubItemByID(nurseOptionNumber)->setBackgroundColor(bgColor);
|
|
|
+ pListItem->findSubItemByID(nurseOptionNumber)->setText(nurseOptionName);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ pListItem->findSubItemByID(nurseOptionNumber)->setBackgroundColor(0xFFF5F8FF);
|
|
|
+ pListItem->findSubItemByID(nurseOptionNumber)->setText(LANGUAGEMANAGER->getValue("None"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
// Json::Value nurseConfigList = frameBedList[index]["nurse_config_dtos"];
|
|
|
// if (nurseConfigList.size() > 0) {
|
|
|
// for (int i = 0; i < 5; i++) {
|
vothin