修改显示方式

jni/logic/mainLogic.cc

@@ -719,37 +719,31 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 			name->setText(customerName);
 		}
 
-		if (partSetting.customerAgeHiddenOnDoor != 0) {
-			if (frameBedList[index]["customer_age"].asString() == "") {
-				age->setText("");
-			} else {
-				age->setText("*" + frameBedList[index]["customer_age_unit"].asString());
-			}
-
-			sex->setText("*****");
-			sex->setTextColor(0x37B643);
-			sex->setBackgroundPic("9/lightGreen.9.png");
-		}
-		else {
-			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
+		age->setText(frameBedList[index]["customer_age_unit"].asString() + ": " + frameBedList[index]["customer_age"].asString());
 
-			string customerSex = frameBedList[index]["customer_sex"].asString();
-			if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
-				sex->setText(LANGUAGEMANAGER->getValue("Woman"));
-				sex->setTextColor(0xFF9F9F);
-				sex->setBackgroundPic("9/lightRed.9.png");
-			}
-			else if (customerSex == "1") {
-				sex->setText(LANGUAGEMANAGER->getValue("Man"));
-				sex->setTextColor(0x3A78EF);
-				sex->setBackgroundPic("9/lightBlue.9.png");
-			}
-			else {
-				sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
-				sex->setTextColor(0x37B643);
-				sex->setBackgroundPic("9/lightGreen.9.png");
-			}
-		}
+//		if (partSetting.customerAgeHiddenOnDoor != 0) {
+//			sex->setText("*****");
+//			sex->setTextColor(0x37B643);
+//			sex->setBackgroundPic("9/lightGreen.9.png");
+//		}
+//		else {
+//			string customerSex = frameBedList[index]["customer_sex"].asString();
+//			if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
+//				sex->setText(LANGUAGEMANAGER->getValue("Woman"));
+//				sex->setTextColor(0xFF9F9F);
+//				sex->setBackgroundPic("9/lightRed.9.png");
+//			}
+//			else if (customerSex == "1") {
+//				sex->setText(LANGUAGEMANAGER->getValue("Man"));
+//				sex->setTextColor(0x3A78EF);
+//				sex->setBackgroundPic("9/lightBlue.9.png");
+//			}
+//			else {
+//				sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+//				sex->setTextColor(0x37B643);
+//				sex->setBackgroundPic("9/lightGreen.9.png");
+//			}
+//		}
 
 		// 医生护士相关
 		if (rightTitleInfo["doctor_valid"] != 1){