openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-20 20:20:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix screen napi check params

Browse Source 
Signed-off-by: zengqingyu <zengqingyu3@huawei.com>
Change-Id: I4796719e66a472f208b6c8a421ec88ca2015b37f
This commit is contained in:
zengqingyu
2022-02-17 12:06:58 +08:00
parent 9480234acb
commit 1d829d7cd3
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/napi/display_runtime/napi/js_screen.cpp
+30 -20
View File
@@ -66,19 +66,22 @@ NativeValue* JsScreen::RequestRotation(NativeEngine* engine, NativeCallbackInfo*
NativeValue* JsScreen::OnRequestRotation(NativeEngine& engine, NativeCallbackInfo& info)
{
WLOGFI("JsScreen::OnRequestRotation is called");
bool paramValidFlag = true;
Rotation rotation = Rotation::ROTATION_0;
if (info.argc != ARGC_ONE) {
WLOGFE("OnRequestRotation Params not match, info argc: %{public}zu", info.argc);
paramValidFlag = false;
} else {
if (!ConvertFromJsValue(engine, info.argv[0], rotation)) {
paramValidFlag = false;
WLOGFE("Failed to convert parameter to rotation");
}
}
AsyncTask::CompleteCallback complete =
[this, &info](NativeEngine& engine, AsyncTask& task, int32_t status) {
if (info.argc != ARGC_ONE) {
WLOGFE("Params not match");
task.Reject(engine, CreateJsError(engine, static_cast<int32_t>(DMError::DM_ERROR_INVALID_PARAM),
"JsScreen::OnRequestRotation failed."));
return;
}
Rotation rotation;
if (!ConvertFromJsValue(engine, info.argv[0], rotation)) {
WLOGFE("Failed to convert parameter to rotation");
[=](NativeEngine& engine, AsyncTask& task, int32_t status) {
if (!paramValidFlag) {
WLOGE("JsScreen::OnRequestRotation paramValidFlag error");
task.Reject(engine, CreateJsError(engine, static_cast<int32_t>(DMError::DM_ERROR_INVALID_PARAM),
"JsScreen::OnRequestRotation failed."));
return;
@@ -120,19 +123,26 @@ NativeValue* JsScreen::SetScreenActiveMode(NativeEngine* engine, NativeCallbackI
NativeValue* JsScreen::OnSetScreenActiveMode(NativeEngine& engine, NativeCallbackInfo& info)
{
WLOGFI("JsScreen::OnSetScreenActiveMode is called");
bool paramValidFlag = true;
uint32_t modeId = 0;
if (info.argc != ARGC_ONE) {
WLOGFE("Params not match");
return engine.CreateUndefined();
}
uint32_t modeId;
if (!ConvertFromJsValue(engine, info.argv[0], modeId)) {
WLOGFE("Failed to convert parameter to modeId");
return engine.CreateUndefined();
WLOGFE("OnSetScreenActiveMode Params not match %{public}zu", info.argc);
paramValidFlag = false;
} else {
if (!ConvertFromJsValue(engine, info.argv[0], modeId)) {
WLOGFE("Failed to convert parameter to modeId");
paramValidFlag = false;
}
}
AsyncTask::CompleteCallback complete =
[this, modeId](NativeEngine& engine, AsyncTask& task, int32_t status) {
[=](NativeEngine& engine, AsyncTask& task, int32_t status) {
if (!paramValidFlag) {
WLOGFE("JsScreen::OnSetScreenActiveMode paramValidFlag error");
task.Reject(engine, CreateJsError(engine, static_cast<int32_t>(DMError::DM_ERROR_INVALID_PARAM),
"JsScreen::OnSetScreenActiveMode failed."));
return;
}
bool res = screen_->SetScreenActiveMode(modeId);
if (res) {
task.Resolve(engine, CreateJsValue(engine, true));