From 5dd8968fdc5e8f91b07473d2e15a251300aef409 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 28 May 2024 19:47:57 +0800 Subject: [PATCH] =?utf8?q?uiservice=20=E6=96=87=E4=BB=B6=E5=A4=B9=E6=9B=B4?= =?utf8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/uiservice/include/ui_service.h | 2 + .../nativeui/uiservice/src/ui_service.cpp | 41 +++++++++++-------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h b/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h index 5e442e726..823ad1844 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h +++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h @@ -47,6 +47,8 @@ typedef enum { SCREEN_TURN_ON_TO_UI, SCREEN_TURN_OFF_TO_UI, SCREEN_OFF_ENABLE_TO_UI, + UI_ADD_SLEEP_VETO, + UI_RM_SLEEP_VETO, } UiServiceMsgId; #define BUNDLE_NAME_LEN 128 diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp index b12fcf3a1..ed8408eb5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp @@ -20,7 +20,7 @@ #include "UiServersMsg.h" #include "ohos_init.h" #include "memory_adapter.h" -#include +#include #include "service_id_define.h" #include "bundle_install_msg.h" #include "graphic_service.h" @@ -31,6 +31,11 @@ #include "ui_screennotify.h" #include "HealthModel.h" +#include "errcode.h" +#include "pm_definition.h" +extern "C" errcode_t uapi_pm_add_sleep_veto(pm_id_t veto_id); +extern "C" errcode_t uapi_pm_remove_sleep_veto(pm_id_t veto_id); + #ifdef __cplusplus extern "C" { #endif @@ -50,7 +55,7 @@ static UiService g_uiService = { DEFAULT_IUNKNOWN_ENTRY_BEGIN, .SendMsg = SendMsg, DEFAULT_IUNKNOWN_ENTRY_END, - .identity = { -1, -1, NULL }, + .identity = { -1, -1, nullptr }, }; const int DATA_DIST_STACK_SIZE = 0xC00; @@ -137,17 +142,16 @@ void ServiceMsgProcess(Request *request) case JS_UNINSTALL_SUCESS_TO_UI: WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "bms msg_id = %d bundleName = %s", request->msgId, ((BundleData *)request->data)->bundleName); - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::ApplistModel::ApplistUpdate, - &OHOS::ApplistModel::GetInstance())); - + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::ApplistModel::ApplistUpdate, &OHOS::ApplistModel::GetInstance())); break; case BT_CONNECTED_TO_UI: - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::SettingModel::UpdateBlueToothConnectStatus, - &OHOS::SettingModel::GetInstance(), true)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdateBlueToothConnectStatus, &OHOS::SettingModel::GetInstance(), true)); break; case BT_DISCONNECTED_TO_UI: - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&OHOS::SettingModel::UpdateBlueToothConnectStatus, - &OHOS::SettingModel::GetInstance(), false)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdateBlueToothConnectStatus, &OHOS::SettingModel::GetInstance(), false)); break; case SCREEN_TURN_ON_TO_UI: ScreenTurnOn(request); @@ -158,7 +162,12 @@ void ServiceMsgProcess(Request *request) case SCREEN_OFF_ENABLE_TO_UI: ScreenOffEnable(request); break; - + case UI_ADD_SLEEP_VETO: + uapi_pm_add_sleep_veto(PM_ID_SCREEN); + break; + case UI_RM_SLEEP_VETO: + uapi_pm_remove_sleep_veto(PM_ID_SCREEN); + break; } SAMGR_FreeRequestMsg(request); } @@ -184,17 +193,17 @@ TaskConfig GetServiceTaskConfig(Service *service) static int32_t SendMsg(int32_t msgId, uint32_t msgValue, void *data, int32_t dataLen) { Request *request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, UI_SVR_ID, dataLen); - if (request == NULL) { + if (request == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "SAMGR_AllocRequestMsg failed"); return FALSE; } request->msgId = msgId; request->msgValue = msgValue; - if (data != NULL) { + if (data != nullptr) { (void)memcpy_s(request->data, dataLen, data, dataLen); } - int32_t ret = SAMGR_SendRequest(IUNKNOWN_GetIdentity(GET_IUNKNOWN(g_uiService)), request, NULL); + int32_t ret = SAMGR_SendRequest(IUNKNOWN_GetIdentity(GET_IUNKNOWN(g_uiService)), request, nullptr); if (ret != 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "SendMsg failed ret = %d ", ret); return FALSE; @@ -205,14 +214,14 @@ static int32_t SendMsg(int32_t msgId, uint32_t msgValue, void *data, int32_t dat void SendMsgToUIService(int32_t msgId, uint32_t msgValue, void *data, int32_t dataLen) { - UiServiceFeatureApi *comApi = NULL; + UiServiceFeatureApi *comApi = nullptr; IUnknown *iUnknown = SAMGR_GetInstance()->GetDefaultFeatureApi(UI_SERVICE); - if (iUnknown == NULL) { + if (iUnknown == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "GetDefaultFeatureApi failed"); return; } int result = iUnknown->QueryInterface(iUnknown, DEFAULT_VERSION, (void **)&comApi); - if (result != 0 || comApi == NULL) { + if (result != 0 || comApi == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "QueryInterface comApi failed"); return; } -- 2.17.1