注释掉息屏功能

jni/logic/startLogic.cc

@@ -537,24 +537,24 @@ void setSleepTimerRegistered(bool result) {
 		return;
 	}
 
-	if (result != isSleepTimerRegistered) {	// 与定时任务不同时，才进行处理
-		if (isSleepTimerRegistered) {	// 与定时任务开关进行判断，如果定时任务开启，那就要关闭
-			isSleepTimerRegistered = result;
-			mActivityPtr->unregisterUserTimer(SLEEP_STRAT_TIME_HANDLE);		// 关闭定时器
-			if (isSleep) {
-				isSleep = false;
-				BRIGHTNESSHELPER->screenOn();
-			}
-			LOGD("关闭息屏");
-		} else {	// 如果定时任务关着，那就要打开
-			isSleepTimerRegistered = result;
-			int sleepTime = StoragePreferences::getInt(STORE_SLEEP_TIME, 3);
-			if (sleepTime > 0) {
-				mActivityPtr->registerUserTimer(SLEEP_STRAT_TIME_HANDLE, sleepTime * 60 * 1000);
-				LOGD("开启息屏");
-			}
-		}
-	}
+//	if (result != isSleepTimerRegistered) {	// 与定时任务不同时，才进行处理
+//		if (isSleepTimerRegistered) {	// 与定时任务开关进行判断，如果定时任务开启，那就要关闭
+//			isSleepTimerRegistered = result;
+//			mActivityPtr->unregisterUserTimer(SLEEP_STRAT_TIME_HANDLE);		// 关闭定时器
+//			if (isSleep) {
+//				isSleep = false;
+//				BRIGHTNESSHELPER->screenOn();
+//			}
+//			LOGD("关闭息屏");
+//		} else {	// 如果定时任务关着，那就要打开
+//			isSleepTimerRegistered = result;
+//			int sleepTime = StoragePreferences::getInt(STORE_SLEEP_TIME, 3);
+//			if (sleepTime > 0) {
+//				mActivityPtr->registerUserTimer(SLEEP_STRAT_TIME_HANDLE, sleepTime * 60 * 1000);
+//				LOGD("开启息屏");
+//			}
+//		}
+//	}
 }
 
 void scrrenOn() {

jni/logic/statusbar.cc

@@ -304,53 +304,53 @@ void isTimeScale(char* timeStr) {
 	bool isSleepTime =  getSleepTimerRegistered();
 	if (day <= night) {		// 在白天时间小于晚上时间的时候
 		if (day <= now && now <= night) {	// 这个时候，时间处于白天
-			if (isSleepTime) {	// isSleepTime就是定时任务开启，需要关闭
-				setSleepTimerRegistered(false);	// 关闭息屏功能
+			BRIGHTNESSHELPER->setBrightness(dayLight);
+//			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("白天开始时间小于晚上开始时间，切换至白天");
-			}
+//				LOGD("白天开始时间小于晚上开始时间，切换至白天");
+//			}
 		}
 		else {	// 这个时间处于晚上
-			if (!isSleepTime) {	// isSleepTime就是定时任务关闭，需要开启
-				setSleepTimerRegistered(true);	// 开启息屏功能
+			BRIGHTNESSHELPER->setBrightness(nightLight);
+//			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("白天开始时间小于晚上开始时间，切换至晚上");
-			}
+//				LOGD("白天开始时间小于晚上开始时间，切换至晚上");
+//			}
 		}
 
 	} else {	// 这里是day > night时间的时候
 		if (night <= now && now < day) {	// 这个其实是晚上时间
-			if (!isSleepTime) {	// isSleepTime就是定时任务关闭，需要开启
-				setSleepTimerRegistered(true);	// 开启息屏功能
+			BRIGHTNESSHELPER->setBrightness(nightLight);
+//			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("白天开始时间大于晚上开始时间，切换至晚上");
-			}
+//				LOGD("白天开始时间大于晚上开始时间，切换至晚上");
+//			}
 		} else {
-			if (isSleepTime) {	// isSleepTime就是定时任务开启，需要关闭
-				setSleepTimerRegistered(false);	// 关闭息屏功能
+			BRIGHTNESSHELPER->setBrightness(dayLight);
+//			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("白天开始时间大于晚上开始时间，切换至白天");
-			}
+//				LOGD("白天开始时间大于晚上开始时间，切换至白天");
+//			}
 		}
 	}
 }

jni/service/BusinessConfig.h

@@ -62,8 +62,8 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static std::string version = "v1.0.39";
-static int versionNo = 39;
+static std::string version = "v1.0.40";
+static int versionNo = 40;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;