From: Caisking <3449750381@qq.com> Date: Sat, 19 Oct 2024 11:11:40 +0000 (+0800) Subject: #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的) X-Git-Tag: fd230_release_V1.3.102~225 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=179f2a52df290af2a66af1215c0cedabdf7bdf91;p=mirrors%2FFD230.git #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的) --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index 4a88ed348..693efba74 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -553,20 +553,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadMessagesFromStorage failed!"); } - /*开机检查如果设置了密码锁,进行锁屏*/ - 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) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)"); - if (uapi_dev_runtime_get_lock_status() == 0) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is unlocked (lock status == 0)"); - uapi_dev_runtime_set_lock_status(1); // 上锁 - OHOS::MainModel::GetInstance().setDialState(OHOS::DialState::LOCK, true); - } - } + //更新主表盘配置 + MainModel::GetInstance().InitDialState(); // 开机增加震动 页面启动震动一次 ui_api_vibrate_once_func(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h index cc26587e9..a5781cdb4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h @@ -82,6 +82,7 @@ namespace OHOS bool getMessageActiveState(); void printDialStates(); void UpdateDialState(); + void InitDialState(); private: void InitDialSettingDefault(int Id); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index 3a4e3e877..ae2677280 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -16,6 +16,11 @@ #include "MainViewSample.h" #include "ui_service.h" #include "SetDialModel.h" +#include "dnotdisturb/include/DnotDisturbModel.h" +#include "custom_utils.h" + +extern "C" void uapi_dev_runtime_set_lock_status(uint8_t status); + namespace OHOS { static const int CARD_SETTING_VALUE_LEN = 32; @@ -525,6 +530,25 @@ namespace OHOS 管理状态:勿扰 睡眠 密码锁 */ + // 开机读取手表配置 + void MainModel::InitDialState(void) { + // 获取加锁状态 + 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) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)"); + uapi_dev_runtime_set_lock_status(1); // 上锁 + dialstateInfo[static_cast(DialState::LOCK)].active = true; // 设置锁定状态为真 + } + + // 判断勿扰模式 + dialstateInfo[static_cast(DialState::DO_NOT_DISTURB)].active = DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled(); + + // 判断睡眠状态 + } + // 接口 1: 设置某个状态的属性 void MainModel::setDialState(DialState state, bool value) {