From: xue <2144439972@qq.com> Date: Tue, 18 Nov 2025 03:33:13 +0000 (+0800) Subject: 增加时间同步 X-Git-Tag: V1.0.9_20251128_194606_LN~59 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=090e160f23f8c5124a1c66f92fa7b5478c354fff;p=mirrors%2FFD230.git 增加时间同步 --- diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h index 4c3af71cb..3773b7be4 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h @@ -37,6 +37,7 @@ namespace OHOS void timer_callback_toui_proc(); bool isDialogueing{false};//是否进入对话模式 bool powerKeyPressed{false};//电源键按下标志位,防止重复触发 + bool screenOnFromOff{false};//从息屏状态亮屏的标志位,防止松开时立即息屏 void SetDialogueing(bool dialogueing);//设置对话模式标志位 diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp index de0380887..dcbdebe38 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp @@ -44,6 +44,8 @@ #include #include "vibrator_service.h" #include "ai_media.h" +#include "ConfigModelC.h" +#include "ConfigModel.h" #define JUHEPINGTAI 0 #if JUHEPINGTAI #include "websocket_server_manager.h" @@ -89,7 +91,10 @@ m_networkStatus(0), m_networkType(0), m_hasNetwork(false), m_networkStatusChanged(false) { - // 初始化时加载提醒数据 + //设置屏幕亮度为20 + // cm_set_brightness(20); + // uapi_setScreenBrightness(MAX_BRIGHTNESS);//验证亮屏是否是底层 + // 初始化时加载提醒数据 // LoadRemindersFromFile(); //创建kv文件夹 // 读取绑定状态 @@ -1353,6 +1358,8 @@ view->UpdateTimeText(currentTime.c_str()); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TimeDisplayCallback: %s", currentTime.c_str()); } + int brightness = ConfigModel::GetInstance()->GetBrightness(); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TimeDisplayCallback: brightness=%d", brightness); // 处理提醒隐藏定时器 if (m_reminderHideActive) { @@ -2010,7 +2017,7 @@ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleCharacterConfigChange: 角色配置没有变化,不进行处理"); return; } - if(last_eyesShape_.empty() && last_hairColor_.empty() && last_eyesColor_.empty() && last_hairStyle_.empty() && !last_screenImageAsEmoji_) + if(eyesShape == "calm-eyes" && eyesColor == "amber" && hairColor == "warm-orange" && hairStyle == "curly-hair" && screenImageAsEmoji == false) { last_eyesShape_ = eyesShape_; last_hairColor_ = hairColor_;