openharmony/appexecfwk_standard
1
0
Fork 0
mirror of https://github.com/openharmony/appexecfwk_standard.git synced 2026-07-19 14:06:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1419 根据Want参数查询ability时，moduleName为空行为与bundleName、abilityName不一致

Browse Source 
Merge pull request !1419 from wangtiantian/bug_m
This commit is contained in:
openharmony_ci
2022-05-24 10:37:20 +00:00
committed by Gitee
parent 9221a359fb 83d7f5ccc2
commit 98c7730360
2 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp
+25 -11
View File
@@ -183,6 +183,26 @@ static void ConvertRemoteAbilityInfos(
}
}
static bool ParseModuleName(napi_env env, std::string &moduleName, napi_value args)
{
napi_status status;
napi_valuetype valueType;
napi_value prop = nullptr;
bool hasKey = false;
napi_has_named_property(env, args, "moduleName", &hasKey);
if (hasKey) {
status = napi_get_named_property(env, args, "moduleName", &prop);
napi_typeof(env, prop, &valueType);
if ((status == napi_ok) && (valueType == napi_string)) {
moduleName = GetStringFromNAPI(env, prop);
} else {
APP_LOGE("begin to parse ElementName moduleName failed");
return false;
}
}
return true;
}
static bool ParseElementName(napi_env env, OHOS::AppExecFwk::ElementName &elementName, napi_value args)
{
APP_LOGD("begin to parse ElementName");
@@ -212,17 +232,6 @@ static bool ParseElementName(napi_env env, OHOS::AppExecFwk::ElementName &elemen
return false;
}
prop = nullptr;
status = napi_get_named_property(env, args, "moduleName", &prop);
napi_typeof(env, prop, &valueType);
if (status == napi_ok && valueType == napi_string) {
std::string moduleName = GetStringFromNAPI(env, prop);
if (moduleName.empty()) {
APP_LOGE("err ElementName moduleName is empty");
return false;
}
elementName.SetModuleName(moduleName);
}
prop = nullptr;
status = napi_get_named_property(env, args, "abilityName", &prop);
napi_typeof(env, prop, &valueType);
if (status == napi_ok && valueType == napi_string) {
@@ -231,6 +240,11 @@ static bool ParseElementName(napi_env env, OHOS::AppExecFwk::ElementName &elemen
APP_LOGE("begin to parse ElementName abilityName failed");
return false;
}
std::string moduleName;
if (!ParseModuleName(env, moduleName, args)) {
return false;
}
elementName.SetModuleName(moduleName);
APP_LOGD("parse ElementName end");
return true;
}