修复无法设置录音音量的问题，设置门口机常亮，修改门口机首页内容

jni/logic/mainLogic.cc

@@ -244,7 +244,7 @@ public:
 			partSetting.screenLight = root["screen_light"].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.linuxDoorGainSize = root["linux_door_gain_size"].asInt();
 
@@ -293,21 +293,21 @@ public:
 			// 如果roomCallBed是0的话，那就隐藏
 			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 {
 			// 如果roomCallBed是1的话，那就显示
 			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));
 		}
 	}
@@ -791,10 +791,7 @@ static bool onmainActivityTouchEvent(const MotionEvent &ev) {
 }
 static int getListItemCount_BedListView(const ZKListView *pListView) {
     //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) {
@@ -802,7 +799,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(LANGUAGEMANAGER->getValue("EmptyBed"));
+			pListItem->findSubItemByID(ID_MAIN_BedFrameTextView)->setText("");
 		} else {
 			int nPos = frameBedName.find("-");
 			if (nPos != -1) {
@@ -814,7 +811,7 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 		// 用户相关
 		string customerName = frameBedList[index]["customer_name"].asString();
 		if (customerName == "") {
-			pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(LANGUAGEMANAGER->getValue("EmptyCustomer"));
+			pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText("");
 		} else {
 			pListItem->findSubItemByID(ID_MAIN_CustomerName)->setText(customerName);
 		}

jni/logic/startLogic.cc

@@ -705,6 +705,9 @@ static void onUI_init(){
 	// 启动的时候更改为tcp模式
 	StoragePreferences::putString(STORE_SIGNAL_TYPE, "TCP");
 
+	// 启动的时候更改为tcp模式
+	StoragePreferences::putBool(STORE_LIGHT, true);
+
 
 	//请求版本号
 //	if(UartContext::Uart3IsOpen()) {

jni/logic/statusbar.cc

@@ -271,6 +271,8 @@ int getTime(char* timeStr) {
 	return time;
 }
 
+int dayLight = 100;
+int nightLight = 100;
 void isTimeScale(char* timeStr) {
 	std::string dayTime = StoragePreferences::getString(STORE_DAY_START, "07:00:00");
 	std::string nightTime = StoragePreferences::getString(STORE_NIGHT_START, "18:00:00");
@@ -283,12 +285,24 @@ void isTimeScale(char* timeStr) {
 		if (day <= now && now <= night) {	// 这个时候，时间处于白天
 			if (isSleepTime) {	// isSleepTime就是定时任务开启，需要关闭
 				setSleepTimerRegistered(false);	// 关闭息屏功能
+//				dayLight = StoragePreferences::getInt(STORE_DAY_LIGHT, 100);
+//				if (dayLight > 100) {
+//					dayLight = 100;
+//				}
+//				LOGD("dayLight == %d", dayLight);
+				BRIGHTNESSHELPER->setBrightness(dayLight);
 				LOGD("白天开始时间小于晚上开始时间，切换至白天");
 			}
 		}
 		else {	// 这个时间处于晚上
 			if (!isSleepTime) {	// isSleepTime就是定时任务关闭，需要开启
 				setSleepTimerRegistered(true);	// 开启息屏功能
+//				nightLight = StoragePreferences::getInt(STORE_NIGHT_LIGHT, 100);
+//				if (nightLight > 100) {
+//					nightLight = 100;
+//				}
+//				LOGD("nightLight == %d", nightLight);
+				BRIGHTNESSHELPER->setBrightness(nightLight);
 				LOGD("白天开始时间小于晚上开始时间，切换至晚上");
 			}
 		}
@@ -297,11 +311,23 @@ void isTimeScale(char* timeStr) {
 		if (night <= now && now < day) {	// 这个其实是晚上时间
 			if (!isSleepTime) {	// isSleepTime就是定时任务关闭，需要开启
 				setSleepTimerRegistered(true);	// 开启息屏功能
+//				nightLight = StoragePreferences::getInt(STORE_NIGHT_LIGHT, 100);
+//				if (nightLight > 100) {
+//					nightLight = 100;
+//				}
+//				LOGD("nightLight == %d", nightLight);
+				BRIGHTNESSHELPER->setBrightness(nightLight);
 				LOGD("白天开始时间大于晚上开始时间，切换至晚上");
 			}
 		} else {
 			if (isSleepTime) {	// isSleepTime就是定时任务开启，需要关闭
 				setSleepTimerRegistered(false);	// 关闭息屏功能
+//				dayLight = StoragePreferences::getInt(STORE_DAY_LIGHT, 100);
+//				if (dayLight > 100) {
+//					dayLight = 100;
+//				}
+//				LOGD("dayLight == %d", dayLight);
+				BRIGHTNESSHELPER->setBrightness(dayLight);
 				LOGD("白天开始时间大于晚上开始时间，切换至白天");
 			}
 		}

jni/service/BusinessConfig.h

@@ -61,8 +61,8 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static std::string version = "v1.0.35";
-static int versionNo = 35;
+static std::string version = "v1.0.37";
+static int versionNo = 37;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;