Parcourir la source

门口机亮度默认100,不熄屏

weizhengliang il y a 3 semaines
Parent
commit
0dc8e81da2

+ 14 - 4
jni/logic/startLogic.cc

@@ -127,14 +127,16 @@ namespace {
 
 	void setBrightness(){
 
-		int dayLight = StoragePreferences::getInt(STORE_DAY_LIGHT,100);
+		BRIGHTNESSHELPER->setBrightness(100);
+
+		/*int dayLight = StoragePreferences::getInt(STORE_DAY_LIGHT,100);
 		int nightLight = StoragePreferences::getInt(STORE_NIGHT_LIGHT,10);
 
 		if (checkIsDay()){
 			BRIGHTNESSHELPER->setBrightness(dayLight);
 		} else {
 			BRIGHTNESSHELPER->setBrightness(nightLight);
-		}
+		}*/
 	}
 }
 
@@ -667,6 +669,10 @@ static void onUI_init(){
 //		sendProtocolTo(UART_TTYS3, (byte*)(sendMsg), strlen(sendMsg));
 //	}
 
+	//门口屏亮度设置
+    BRIGHTNESSHELPER->setBrightness(100);
+    LOGD("设置门口屏亮度100");
+
 #if 0
 	std::thread backend([](){
 		while (true) {
@@ -985,13 +991,17 @@ static bool onUI_Timer(int id){
 		break;
 
 	case SLEEP_STRAT_TIME_HANDLE: { 	// 息屏
-		if (isSleepTimerRegistered) {
+		//门口机不熄屏
+		isSleep = false;
+		BRIGHTNESSHELPER->screenOn();
+
+		/*if (isSleepTimerRegistered) {
 			isSleep = true;
 			BRIGHTNESSHELPER->screenOff();
 		} else {	// 如果是false的话,就需要关闭定时器
 			isSleep = false;
 			BRIGHTNESSHELPER->screenOn();
-		}
+		}*/
 	}
 		break;
 	case SYS_RESTART_TIME_HANDLE: {

+ 1 - 1
jni/logic/ui3Logic.cc

@@ -458,7 +458,7 @@ static bool onButtonClick_BtnRestart(ZKButton *pButton) {
 }
 static bool onButtonClick_BtnNetSetting(ZKButton *pButton) {
     LOGD(" ButtonClick BtnNetSetting !!!\n");
-//    EASYUICONTEXT->openActivity("EthernetSettingActivity");
+    //EASYUICONTEXT->openActivity("EthernetSettingActivity");
     EASYUICONTEXT->openActivity("NetSettingActivity");
     return false;
 }

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/startActivity.o


BIN
obj/service/time.o