From: Caisking Date: Mon, 21 Jul 2025 06:02:33 +0000 (+0800) Subject: 修复息屏处理的notify X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~210^2~19 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=beb58c9a17273f8f4276a27ea72932c9db486db3;p=mirrors%2FFD230.git 修复息屏处理的notify --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/include/ui_screennotify.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/include/ui_screennotify.h index 39399a4f4..6d6077f39 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/include/ui_screennotify.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/include/ui_screennotify.h @@ -26,7 +26,6 @@ void notify_screen_on_event(void); void notify_screen_off_event(void); void notify_screen_aod_on_event(void); void notify_screen_aod_off_event(void); - /** * @brief 设置灭屏后slice的存活期,需要在slice对应的Presentor的OnStart方法中调用 * 默认存活期是5秒,灭屏超过5秒后再次亮屏会跳回主界面 @@ -36,11 +35,14 @@ void set_back_to_home_interval(uint32_t time_sec); /** * @brief 获取灭屏后slice的存活期,需要在slice对应的Presentor的OnStart方法中调用 - * 默认存活期是5秒,灭屏超过5秒后再次亮屏会跳回主界面 + * 默认存活期是5秒,灭屏超过10秒后再次亮屏会跳回主界面 * @param time_sec 获取的slice灭屏后的存活期时间 */ uint32_t get_back_to_home_interval(void); +void handleLockEnabled(uint16_t current_slice_id); +void handleLockDisabled(uint16_t current_slice_id); + #ifdef __cplusplus } #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp index 784c4c4a6..307f99e0f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp @@ -1,3 +1,4 @@ + #include #include #include "ability_state.h" @@ -14,95 +15,134 @@ #include "components/root_view.h" #include "notification_manager.h" #include "DialBinTypesV2.h" +#include +#include "ConfigModel.h" +#include + +extern "C" void uapi_dev_runtime_set_lock_status(uint8_t status); +extern "C" uint8_t uapi_dev_runtime_get_lock_status(void); #ifdef __cplusplus extern "C" { #endif -static uint32_t g_back_to_home_interval = 5; -// 需要屏蔽掉的slice,ignore_slice_ids数组中的slice灭屏超时后不会调转到默认界面 -uint16_t ignore_slice_ids[] = { +static uint32_t g_back_to_home_interval = 3; // 超时时间 3秒 +static const uint32_t g_screen_off_time_interval = 10; // 超时时间 10秒 +//息屏不上锁 +const uint16_t ignore_slice_ids[] = { VIEW_INVALID, - VIEW_SETTING, - VIEW_UISAMPLE, -#ifdef SUPPORT_ALIPAY_SEC - VIEW_MAIN_ALIPAY, -#endif + VIEW_SAVEBAT, // 省电模式 + VIEW_TRAININGCRAD, // 训练卡片 +}; +//息屏10秒回到主界面 +const uint16_t special_slice_ids[] = { + VIEW_ADD_CARD, //卡片管理 + VIEW_SET_DIAL, //表盘管理 + VIEW_HEART_CHART //心率检测 }; -static std::list g_callback; +static std::unordered_set g_callbacks; -static void ChangeToHomeView(void) -{ - screen_context_t *sc = power_display_get_screen_context(); - uint16_t current_slice_id = OHOS::NativeAbility::GetInstance().GetCurSliceId(); - for (uint16_t i = 0; i < sizeof(ignore_slice_ids) / sizeof(uint16_t); i++) { - if (ignore_slice_ids[i] == current_slice_id) { - return; - } - } - if (sc->screen_off_time_interval > g_back_to_home_interval) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "screen off time = %u", - sc->screen_off_time_interval); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetNativeAbilityState = %u", - OHOS::NativeAbility::GetInstance().GetNativeAbilityState()); - if (OHOS::NativeAbility::GetInstance().GetNativeAbilityState() == STATE_ACTIVE) { - if (current_slice_id != VIEW_MAIN) { // 主表盘 - OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - } else { - if (!OHOS::MainViewSample::GetInstance()->IsMainClockPage()) { - // 当前页面为主表盘的其他页面时,切换回主表盘页面 - OHOS::MainViewSample::GetInstance()->SwitchToClockPage(); - } - } - } +static bool isSliceIgnored(uint16_t slice_id) { + for (uint16_t id : ignore_slice_ids) { + if (id == slice_id) { + return true; } + } + return false; } +static void GuiEnterAod(bool entry) { + using namespace OHOS; + DisplayState newState = entry ? DisplayState::AOD : DisplayState::NORMAL; -static void GuiEnterAod(bool entry) -{ - using namespace OHOS; - DisplayState newState = entry ? DisplayState::AOD : DisplayState::NORMAL; - - uint16_t current_slice_id = NativeAbility::GetInstance().GetCurSliceId(); - for (uint16_t i = 0; i < sizeof(ignore_slice_ids) / sizeof(uint16_t); i++) { - if (ignore_slice_ids[i] == current_slice_id) { - return; - } + uint16_t current_slice_id = NativeAbility::GetInstance().GetCurSliceId(); + for (uint16_t i = 0; i < sizeof(ignore_slice_ids) / sizeof(uint16_t); i++) { + if (ignore_slice_ids[i] == current_slice_id) { + return; } - if (NativeAbility::GetInstance().GetNativeAbilityState() == STATE_ACTIVE) { - if (newState == DisplayState::AOD) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "enter aod"); - NativeAbility::GetInstance().ChangeSlice(VIEW_AOD); - } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "exit aod"); - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - } + } + if (NativeAbility::GetInstance().GetNativeAbilityState() == STATE_ACTIVE) { + if (newState == DisplayState::AOD) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "enter aod"); + NativeAbility::GetInstance().ChangeSlice(VIEW_AOD); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "exit aod"); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); } -}; + } +} +static void ChangeToHomeView(void) { + screen_context_t *sc = power_display_get_screen_context(); + uint16_t current_slice_id = + OHOS::NativeAbility::GetInstance().GetCurSliceId(); -void notify_screen_on_event(void) -{ - for (auto callback : g_callback) { - callback(SCREEN_STATUS_ON); - } - ChangeToHomeView(); - if (GraphicService::GetInstance()->IsNativeRunning() && !OHOS::NotificationManager::GetInstance()->HasNotifyShowing()) { - OHOS::NativeAbility::GetInstance().ResumeSlice(); // ensure that don't resume twice if switch to home + if (isSliceIgnored(current_slice_id)) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Current slice ID %u is ignored.", + current_slice_id); + return; + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Screen off time interval = %u %u", + sc->screen_off_time_interval, g_back_to_home_interval); + + if (sc->screen_off_time_interval > g_back_to_home_interval) { + int lockstate = OHOS::ConfigModel::GetInstance()->get_configData_int( + OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH); + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate); + + if (lockstate == 1) { + handleLockEnabled(current_slice_id); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Lock state is not enabled (lockstate != 1)."); } + } + if (sc->screen_off_time_interval > g_screen_off_time_interval) { + handleLockDisabled(current_slice_id); + } } -void notify_screen_off_event(void) -{ - for (auto callback : g_callback) { - callback(SCREEN_STATUS_OFF); - } - if (GraphicService::GetInstance()->IsNativeRunning()) { - OHOS::NativeAbility::GetInstance().StopSliceTransition(); // make sure to end slice transition before turning screen off. - OHOS::NativeAbility::GetInstance().PauseSlice(); +void handleLockEnabled(uint16_t current_slice_id) { + if (OHOS::NativeAbility::GetInstance().GetNativeAbilityState() == + STATE_ACTIVE) { + if (uapi_dev_runtime_get_lock_status() == 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Device is unlocked (lock status == 0)."); + OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + uapi_dev_runtime_set_lock_status(1); // 上锁 + OHOS::MainModel::GetInstance().setDialState(OHOS::DialState::LOCK, true); + } else if (current_slice_id == VIEW_CODED_LOCK) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Device is locked (lock status == 1) and current slice is " + "VIEW_CODED_LOCK."); + OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Device is in an inactive lock state or current slice is " + "not VIEW_CODED_LOCK."); } + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Native ability state is not active."); + } } +void handleLockDisabled(uint16_t current_slice_id) { + int lockstate = OHOS::ConfigModel::GetInstance()->get_configData_int( + OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH); + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate); + + if (lockstate == 0) { + for (uint16_t id : special_slice_ids) { + if (id == current_slice_id) { + OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + return; + } + } + } +} void notify_screen_aod_on_event(void) { GuiEnterAod(true); @@ -112,31 +152,37 @@ void notify_screen_aod_off_event(void) { GuiEnterAod(false); } +void notify_screen_on_event(void) { + for (auto callback : g_callbacks) { + callback(SCREEN_STATUS_ON); + } + ChangeToHomeView(); +} -void set_back_to_home_interval(uint32_t time_sec) -{ - g_back_to_home_interval = time_sec; +void notify_screen_off_event(void) { + for (auto callback : g_callbacks) { + callback(SCREEN_STATUS_OFF); + } } -uint32_t get_back_to_home_interval(void) -{ - return g_back_to_home_interval; +void set_back_to_home_interval(uint32_t time_sec) { + g_back_to_home_interval = time_sec; } -void registerNotifyScreenStatus(ScreenStatusNotifyCallback callback) -{ - if (callback != nullptr) { - g_callback.push_back(callback); - } +uint32_t get_back_to_home_interval(void) { return g_back_to_home_interval; } + +void registerNotifyScreenStatus(ScreenStatusNotifyCallback callback) { + if (callback != nullptr) { + g_callbacks.insert(callback); + } } -void deregisterNotifyScreenStatus(ScreenStatusNotifyCallback callback) -{ - if (callback != nullptr) { - g_callback.remove(callback); - } +void deregisterNotifyScreenStatus(ScreenStatusNotifyCallback callback) { + if (callback != nullptr) { + g_callbacks.erase(callback); + } } #ifdef __cplusplus } -#endif +#endif \ No newline at end of file