|
@@ -162,24 +162,36 @@ static void updateNetState(){
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- EEthConnState connState = ETHERNETMANAGER->getConnState();
|
|
|
- switch (connState){
|
|
|
- case E_ETH_DISCONNECTED: // 以太网断开
|
|
|
- mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
- break;
|
|
|
- case E_ETH_CONNECTING: // 以太网连接中
|
|
|
- mPainter1Ptr->setBackgroundColor(0xFF2F9DF1);
|
|
|
- break;
|
|
|
- case E_ETH_CONNECTED: // 以太网连接
|
|
|
- mPainter1Ptr->setBackgroundColor(0xFF37C127);
|
|
|
- break;
|
|
|
- case E_ETH_DISCONNECTING: // 以太网断开连接中
|
|
|
- mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
- break;
|
|
|
- case E_ETH_CONN_UNKNOWN: // 以太网未知
|
|
|
- mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
+ ENetChannel channel = NETMANAGER->getConnChannel();
|
|
|
+ switch (channel) {
|
|
|
+ case E_NET_CHANNEL_ETHERNET:
|
|
|
+ if (ETHERNETMANAGER->isConnected()) {
|
|
|
+ mPainter1Ptr->setBackgroundColor(0xFF37C127);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
+// EEthConnState connState = ETHERNETMANAGER->getConnState();
|
|
|
+// switch (connState){
|
|
|
+// case E_ETH_DISCONNECTED: // 以太网断开
|
|
|
+// mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
+// break;
|
|
|
+// case E_ETH_CONNECTING: // 以太网连接中
|
|
|
+// mPainter1Ptr->setBackgroundColor(0xFF2F9DF1);
|
|
|
+// break;
|
|
|
+// case E_ETH_CONNECTED: // 以太网连接
|
|
|
+// mPainter1Ptr->setBackgroundColor(0xFF37C127);
|
|
|
+// break;
|
|
|
+// case E_ETH_DISCONNECTING: // 以太网断开连接中
|
|
|
+// mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
+// break;
|
|
|
+// case E_ETH_CONN_UNKNOWN: // 以太网未知
|
|
|
+// mPainter1Ptr->setBackgroundColor(0xFF949494);
|
|
|
+// break;
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
void OnRegisterStateChanged(voip::Telephone* telephone, int code){
|
|
@@ -271,6 +283,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 +297,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, 70);
|
|
|
+ if (nightLight > 100) {
|
|
|
+ nightLight = 100;
|
|
|
+ }
|
|
|
+ LOGD("nightLight == %d", nightLight);
|
|
|
+ BRIGHTNESSHELPER->setBrightness(nightLight);
|
|
|
LOGD("白天开始时间小于晚上开始时间,切换至晚上");
|
|
|
}
|
|
|
}
|
|
@@ -297,11 +323,23 @@ void isTimeScale(char* timeStr) {
|
|
|
if (night <= now && now < day) { // 这个其实是晚上时间
|
|
|
if (!isSleepTime) { // isSleepTime就是定时任务关闭,需要开启
|
|
|
setSleepTimerRegistered(true); // 开启息屏功能
|
|
|
+ nightLight = StoragePreferences::getInt(STORE_NIGHT_LIGHT, 70);
|
|
|
+ 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("白天开始时间大于晚上开始时间,切换至白天");
|
|
|
}
|
|
|
}
|
|
@@ -428,6 +466,7 @@ static void onUI_init(){
|
|
|
|
|
|
ping_thread.run("ping");
|
|
|
|
|
|
+ StoragePreferences::putBool(STORE_LIGHT, true);
|
|
|
isLight = StoragePreferences::getBool(STORE_LIGHT, false);
|
|
|
}
|
|
|
|