From cfcd9ab2187d9ee3de15b2c88bf829d1f971b34f Mon Sep 17 00:00:00 2001 From: sunjiakun Date: Mon, 23 Dec 2024 20:44:43 +0800 Subject: [PATCH] repeat const string Signed-off-by: sunjiakun --- .../appexecfwk_base/src/ability_info.cpp | 4 +-- .../appexecfwk_base/src/application_info.cpp | 2 +- .../appexecfwk_base/src/bundle_info.cpp | 6 ++-- .../appexecfwk_base/src/bundle_pack_info.cpp | 28 +++++++++---------- .../appexecfwk_base/src/hap_module_info.cpp | 10 +++---- .../appexecfwk_base/src/shortcut_info.cpp | 10 +++---- .../src/bundle_mgr_service_event_handler.cpp | 2 +- services/bundlemgr/src/inner_bundle_info.cpp | 4 +-- 8 files changed, 32 insertions(+), 34 deletions(-) diff --git a/interfaces/inner_api/appexecfwk_base/src/ability_info.cpp b/interfaces/inner_api/appexecfwk_base/src/ability_info.cpp index 51b3c0d709..d9835f820b 100644 --- a/interfaces/inner_api/appexecfwk_base/src/ability_info.cpp +++ b/interfaces/inner_api/appexecfwk_base/src/ability_info.cpp @@ -32,6 +32,7 @@ namespace AppExecFwk { namespace { const char* JSON_KEY_PACKAGE = "package"; const char* JSON_KEY_NAME = "name"; +#define META_DATA_NAME JSON_KEY_NAME const char* JSON_KEY_APPLICATION_NAME = "applicationName"; const char* JSON_KEY_LABEL = "label"; const char* JSON_KEY_DESCRIPTION = "description"; @@ -68,6 +69,7 @@ const char* JSON_KEY_BACKGROUND_MODES = "backgroundModes"; const char* JSON_KEY_CUSTOMIZE_DATA = "customizeData"; const char* JSON_KEY_META_DATA = "metaData"; const char* JSON_KEY_META_VALUE = "value"; +#define META_DATA_VALUE JSON_KEY_META_VALUE const char* JSON_KEY_META_EXTRA = "extra"; const char* JSON_KEY_LABEL_ID = "labelId"; const char* JSON_KEY_DESCRIPTION_ID = "descriptionId"; @@ -85,8 +87,6 @@ const char* JSON_KEY_START_WINDOW_BACKGROUND_ID = "startWindowBackgroundId"; const char* JSON_KEY_COMPILE_MODE = "compileMode"; const char* META_DATA = "metadata"; const char* META_DATA_VALUEID = "valueId"; -const char* META_DATA_NAME = "name"; -const char* META_DATA_VALUE = "value"; const char* META_DATA_RESOURCE = "resource"; const char* SRC_ENTRANCE = "srcEntrance"; const char* IS_MODULE_JSON = "isModuleJson"; diff --git a/interfaces/inner_api/appexecfwk_base/src/application_info.cpp b/interfaces/inner_api/appexecfwk_base/src/application_info.cpp index f0cfd63507..f85160f1a7 100644 --- a/interfaces/inner_api/appexecfwk_base/src/application_info.cpp +++ b/interfaces/inner_api/appexecfwk_base/src/application_info.cpp @@ -36,6 +36,7 @@ namespace OHOS { namespace AppExecFwk { namespace { const char* APPLICATION_NAME = "name"; +#define APP_ENVIRONMENTS_NAME APPLICATION_NAME const char* APPLICATION_VERSION_CODE = "versionCode"; const char* APPLICATION_VERSION_NAME = "versionName"; const char* APPLICATION_MIN_COMPATIBLE_VERSION_CODE = "minCompatibleVersionCode"; @@ -127,7 +128,6 @@ const char* APPLICATION_APP_ENVIRONMENTS = "appEnvironments"; const char* APPLICATION_MULTI_APP_MODE = "multiAppMode"; const char* APPLICATION_MULTI_APP_MODE_TYPE = "multiAppModeType"; const char* APPLICATION_MULTI_APP_MODE_MAX_ADDITIONAL_NUMBER = "maxCount"; -const char* APP_ENVIRONMENTS_NAME = "name"; const char* APP_ENVIRONMENTS_VALUE = "value"; const char* APPLICATION_ORGANIZATION = "organization"; const char* APPLICATION_MAX_CHILD_PROCESS = "maxChildProcess"; diff --git a/interfaces/inner_api/appexecfwk_base/src/bundle_info.cpp b/interfaces/inner_api/appexecfwk_base/src/bundle_info.cpp index 98065fb8f3..81b7788a5a 100644 --- a/interfaces/inner_api/appexecfwk_base/src/bundle_info.cpp +++ b/interfaces/inner_api/appexecfwk_base/src/bundle_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -24,6 +24,7 @@ namespace OHOS { namespace AppExecFwk { namespace { const char* BUNDLE_INFO_NAME = "name"; +#define REQUESTPERMISSION_NAME BUNDLE_INFO_NAME const char* BUNDLE_INFO_LABEL = "label"; const char* BUNDLE_INFO_DESCRIPTION = "description"; const char* BUNDLE_INFO_VENDOR = "vendor"; @@ -44,6 +45,7 @@ const char* BUNDLE_INFO_MAX_SDK_VERSION = "maxSdkVersion"; const char* BUNDLE_INFO_MAIN_ENTRY = "mainEntry"; const char* BUNDLE_INFO_CPU_ABI = "cpuAbi"; const char* BUNDLE_INFO_APPID = "appId"; +#define SIGNATUREINFO_APPID BUNDLE_INFO_APPID const char* BUNDLE_INFO_COMPATIBLE_VERSION = "compatibleVersion"; const char* BUNDLE_INFO_TARGET_VERSION = "targetVersion"; const char* BUNDLE_INFO_RELEASE_TYPE = "releaseType"; @@ -64,7 +66,6 @@ const char* BUNDLE_INFO_MODULE_NAMES = "moduleNames"; const char* BUNDLE_INFO_MODULE_PUBLIC_DIRS = "modulePublicDirs"; const char* BUNDLE_INFO_MODULE_DIRS = "moduleDirs"; const char* BUNDLE_INFO_MODULE_RES_PATHS = "moduleResPaths"; -const char* REQUESTPERMISSION_NAME = "name"; const char* REQUESTPERMISSION_REASON = "reason"; const char* REQUESTPERMISSION_REASON_ID = "reasonId"; const char* REQUESTPERMISSION_USEDSCENE = "usedScene"; @@ -72,7 +73,6 @@ const char* REQUESTPERMISSION_ABILITIES = "abilities"; const char* REQUESTPERMISSION_ABILITY = "ability"; const char* REQUESTPERMISSION_WHEN = "when"; const char* REQUESTPERMISSION_MODULE_NAME = "moduleName"; -const char* SIGNATUREINFO_APPID = "appId"; const char* SIGNATUREINFO_FINGERPRINT = "fingerprint"; const char* BUNDLE_INFO_APP_INDEX = "appIndex"; const char* BUNDLE_INFO_ERROR_CODE = "errorCode"; diff --git a/interfaces/inner_api/appexecfwk_base/src/bundle_pack_info.cpp b/interfaces/inner_api/appexecfwk_base/src/bundle_pack_info.cpp index e80bc36655..d3e4857442 100644 --- a/interfaces/inner_api/appexecfwk_base/src/bundle_pack_info.cpp +++ b/interfaces/inner_api/appexecfwk_base/src/bundle_pack_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,23 +26,23 @@ namespace { // version const char* PACK_SUMMARY_APP_VERSION_CODE = "code"; const char* PACK_SUMMARY_APP_VERSION_NAME = "name"; +// module ablities +#define PACK_SUMMARY_MODULE_ABILITY_NAME PACK_SUMMARY_APP_VERSION_NAME +// module extensionAbilities +#define PACK_SUMMARY_MODULE_EXTENSION_ABILITIES_NAME PACK_SUMMARY_APP_VERSION_NAME +// module ablities forms +#define PACK_SUMMARY_MODULE_ABILITY_FORMS_NAME PACK_SUMMARY_APP_VERSION_NAME +#define PACK_PACKAGES_NAME PACK_SUMMARY_APP_VERSION_NAME const char* PACK_SUMMARY_APP_VERSION_MIN_COMPATIBLE_VERSION_CODE = "minCompatibleVersionCode"; // app const char* PACK_SUMMARY_APP_BUNDLE_VERSION = "version"; -// module ablities -const char* PACK_SUMMARY_MODULE_ABILITY_NAME = "name"; const char* PACK_SUMMARY_MODULE_ABILITY_LABEL = "label"; const char* PACK_SUMMARY_MODULE_ABILITY_VISIBLE = "visible"; const char* PACK_SUMMARY_MODULE_ABILITY_FORMS = "forms"; +#define PACK_SUMMARY_MODULE_EXTENSION_ABILITIES_FORMS PACK_SUMMARY_MODULE_ABILITY_FORMS -// module extensionAbilities -const char* PACK_SUMMARY_MODULE_EXTENSION_ABILITIES_NAME = "name"; -const char* PACK_SUMMARY_MODULE_EXTENSION_ABILITIES_FORMS = "forms"; - -// module ablities forms -const char* PACK_SUMMARY_MODULE_ABILITY_FORMS_NAME = "name"; const char* PACK_SUMMARY_MODULE_ABILITY_FORMS_TYPE = "type"; const char* PACK_SUMMARY_MODULE_ABILITY_FORMS_UPDATE_ENABLED = "updateEnabled"; const char* PACK_SUMMARY_MODULE_ABILITY_FORMS_SCHEDULE_DUPDATETIME = "scheduledUpdateTime"; @@ -53,8 +53,10 @@ const char* PACK_SUMMARY_MODULE_ABILITY_FORMS_DEFAULT_DIMENSION = "defaultDimens // module distro const char* PACK_SUMMARY_MODULE_DISTRO_MODULE_TYPE = "moduleType"; +#define PACK_PACKAGES_MODULE_TYPE PACK_SUMMARY_MODULE_DISTRO_MODULE_TYPE const char* PACK_SUMMARY_MODULE_DISTRO_INSTALLATION_FREE = "installationFree"; const char* PACK_SUMMARY_MODULE_DISTRO_DELIVERY_WITH_INSTALL = "deliveryWithInstall"; +#define PACK_PACKAGES_DELIVERY_WITH_INSTALL PACK_SUMMARY_MODULE_DISTRO_DELIVERY_WITH_INSTALL // module apiversion const char* PACK_SUMMARY_MODULE_API_VERSION_COMPATIBLE = "compatible"; @@ -64,6 +66,8 @@ const char* PACK_SUMMARY_MODULE_API_VERSION_TARGET = "target"; // package module const char* PACK_SUMMARY_MODULE_MAIN_ABILITY = "mainAbility"; const char* PACK_SUMMARY_MODULE_DEVICE_TYPE = "deviceType"; +// packages +#define PACK_PACKAGES_DEVICE_TYPE PACK_SUMMARY_MODULE_DEVICE_TYPE const char* PACK_SUMMARY_MODULE_ABILITIES = "abilities"; const char* PACK_SUMMARY_MODULE_DISTRO = "distro"; const char* PACK_SUMMARY_MODULE_API_VERSION = "apiVersion"; @@ -73,12 +77,6 @@ const char* PACK_SUMMARY_MODULE_EXTENSION_ABILITIES = "extensionAbilities"; const char* PACK_SUMMARY_APP = "app"; const char* PACK_SUMMARY_MODULE = "modules"; -// packages -const char* PACK_PACKAGES_DEVICE_TYPE = "deviceType"; -const char* PACK_PACKAGES_MODULE_TYPE = "moduleType"; -const char* PACK_PACKAGES_DELIVERY_WITH_INSTALL = "deliveryWithInstall"; -const char* PACK_PACKAGES_NAME = "name"; - // bundle pack info const char* BUNDLE_PACK_INFO_SUMMARY = "summary"; const char* BUNDLE_PACK_INFO_PACKAGES = "packages"; diff --git a/interfaces/inner_api/appexecfwk_base/src/hap_module_info.cpp b/interfaces/inner_api/appexecfwk_base/src/hap_module_info.cpp index 7046c698e0..17d3dc1988 100644 --- a/interfaces/inner_api/appexecfwk_base/src/hap_module_info.cpp +++ b/interfaces/inner_api/appexecfwk_base/src/hap_module_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,6 +26,8 @@ namespace OHOS { namespace AppExecFwk { namespace { const char* HAP_MODULE_INFO_NAME = "name"; +#define ROUTER_ITEM_KEY_NAME HAP_MODULE_INFO_NAME +#define APP_ENVIRONMENTS_NAME HAP_MODULE_INFO_NAME const char* HAP_MODULE_INFO_PACKAGE = "package"; const char* HAP_MODULE_INFO_DESCRIPTION = "description"; const char* HAP_MODULE_INFO_DESCRIPTION_ID = "descriptionId"; @@ -57,6 +59,7 @@ const char* HAP_MODULE_INFO_IS_REMOVABLE = "isRemovable"; const char* HAP_MODULE_INFO_MODULE_TYPE = "moduleType"; const char* HAP_MODULE_INFO_EXTENSION_INFOS = "extensionInfos"; const char* HAP_MODULE_INFO_META_DATA = "metadata"; +#define PROXY_DATA_METADATA HAP_MODULE_INFO_META_DATA const char* HAP_MODULE_INFO_DEPENDENCIES = "dependencies"; const char* HAP_MODULE_INFO_UPGRADE_FLAG = "upgradeFlag"; const char* HAP_MODULE_INFO_HAP_PATH = "hapPath"; @@ -69,12 +72,12 @@ const char* HAP_MODULE_INFO_MODULE_SOURCE_DIR = "moduleSourceDir"; const char* HAP_OVERLAY_MODULE_INFO = "overlayModuleInfos"; const char* HAP_MODULE_INFO_PRELOADS = "preloads"; const char* PRELOAD_ITEM_MODULE_NAME = "moduleName"; +#define ROUTER_ITEM_KEY_MODULE_NAME PRELOAD_ITEM_MODULE_NAME const char* HAP_MODULE_INFO_VERSION_CODE = "versionCode"; const char* HAP_MODULE_INFO_PROXY_DATAS = "proxyDatas"; const char* PROXY_DATA_URI = "uri"; const char* PROXY_DATA_REQUIRED_READ_PERMISSION = "requiredReadPermission"; const char* PROXY_DATA_REQUIRED_WRITE_PERMISSION = "requiredWritePermission"; -const char* PROXY_DATA_METADATA = "metadata"; const char* HAP_MODULE_INFO_BUILD_HASH = "buildHash"; const char* HAP_MODULE_INFO_ISOLATION_MODE = "isolationMode"; const char* HAP_MODULE_INFO_AOT_COMPILE_STATUS = "aotCompileStatus"; @@ -83,16 +86,13 @@ const char* HAP_MODULE_INFO_NATIVE_LIBRARY_FILE_NAMES = "nativeLibraryFileNames" const char* HAP_MODULE_INFO_FILE_CONTEXT_MENU = "fileContextMenu"; const char* HAP_MODULE_INFO_ROUTER_MAP = "routerMap"; const char* HAP_MODULE_INFO_ROUTER_ARRAY = "routerArray"; -const char* ROUTER_ITEM_KEY_NAME = "name"; const char* ROUTER_ITEM_KEY_PAGE_SOURCE_FILE = "pageSourceFile"; const char* ROUTER_ITEM_KEY_BUILD_FUNCTION = "buildFunction"; const char* ROUTER_ITEM_KEY_DATA = "data"; const char* ROUTER_ITEM_KEY_CUSTOM_DATA = "customData"; const char* ROUTER_ITEM_KEY_OHMURL = "ohmurl"; const char* ROUTER_ITEM_KEY_BUNDLE_NAME = "bundleName"; -const char* ROUTER_ITEM_KEY_MODULE_NAME = "moduleName"; const char* HAP_MODULE_INFO_APP_ENVIRONMENTS = "appEnvironments"; -const char* APP_ENVIRONMENTS_NAME = "name"; const char* APP_ENVIRONMENTS_VALUE = "value"; const char* HAP_MODULE_INFO_PACKAGE_NAME = "packageName"; const char* HAP_MODULE_INFO_APP_STARTUP = "appStartup"; diff --git a/interfaces/inner_api/appexecfwk_base/src/shortcut_info.cpp b/interfaces/inner_api/appexecfwk_base/src/shortcut_info.cpp index 39aecf1351..49898b85f1 100644 --- a/interfaces/inner_api/appexecfwk_base/src/shortcut_info.cpp +++ b/interfaces/inner_api/appexecfwk_base/src/shortcut_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -31,7 +31,9 @@ namespace { constexpr const char* JSON_KEY_BUNDLE_ID = "id"; constexpr const char* JSON_KEY_BUNDLE_HOST_ABILITY = "hostAbility"; constexpr const char* JSON_KEY_BUNDLE_ICON = "icon"; +#define ICON JSON_KEY_BUNDLE_ICON constexpr const char* JSON_KEY_BUNDLE_LABEL = "label"; +#define LABEL JSON_KEY_BUNDLE_LABEL constexpr const char* JSON_KEY_BUNDLE_DISABLE_MESSAGE = "disableMessage"; constexpr const char* JSON_KEY_BUNDLE_IS_STATIC = "isStatic"; constexpr const char* JSON_KEY_BUNDLE_IS_HOME_SHORTCUT = "isHomeShortcut"; @@ -42,16 +44,14 @@ constexpr const char* JSON_KEY_BUNDLE_TARGET_MODULE = "targetModule"; constexpr const char* JSON_KEY_BUNDLE_TARGET_CLASS = "targetClass"; constexpr const char* JSON_KEY_BUNDLE_PARAMETERS = "parameters"; constexpr const char* JSON_KEY_ICON_ID = "iconId"; +#define ICON_ID JSON_KEY_ICON_ID constexpr const char* JSON_KEY_LABEL_ID = "labelId"; +#define LABEL_ID JSON_KEY_LABEL_ID constexpr const char* JSON_KEY_APP_INDEX = "appIndex"; constexpr const char* JSON_KEY_SOURCE_TYPE = "sourceType"; constexpr const char* SHORTCUTS = "shortcuts"; constexpr const char* SHORTCUT_ID = "shortcutId"; constexpr const char* SHORTCUT_WANTS = "wants"; -constexpr const char* ICON = "icon"; -constexpr const char* ICON_ID = "iconId"; -constexpr const char* LABEL = "label"; -constexpr const char* LABEL_ID = "labelId"; } // namespace bool ShortcutInfo::ReadFromParcel(Parcel &parcel) diff --git a/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp b/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp index deb293d620..4ee593ead7 100644 --- a/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp +++ b/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp @@ -75,8 +75,8 @@ constexpr const char* MODULE_UPDATE_INSTALL_RESULT = "persist.moduleupdate.bms.i constexpr const char* HAP_PATH_DATA_AREA = "/data/app/el1/bundle/public"; constexpr const char* MODULE_UPDATE_INSTALL_RESULT_FALSE = "false"; constexpr const char* MODULE_UPDATE_PARAM_EMPTY = ""; +#define UNKNOWN MODULE_UPDATE_PARAM_EMPTY constexpr const char* FINGERPRINT = "fingerprint"; -constexpr const char* UNKNOWN = ""; constexpr const char* VALUE_TRUE = "true"; constexpr int8_t VERSION_LEN = 64; const std::vector FINGERPRINTS = { diff --git a/services/bundlemgr/src/inner_bundle_info.cpp b/services/bundlemgr/src/inner_bundle_info.cpp index a0857840c6..e99a69f24d 100644 --- a/services/bundlemgr/src/inner_bundle_info.cpp +++ b/services/bundlemgr/src/inner_bundle_info.cpp @@ -45,10 +45,12 @@ constexpr const char* NAME = "name"; constexpr const char* MODULE_PACKAGE = "modulePackage"; constexpr const char* MODULE_PATH = "modulePath"; constexpr const char* MODULE_NAME = "moduleName"; +#define EXT_RESOURCE_MODULE_NAME MODULE_NAME constexpr const char* MODULE_DESCRIPTION = "description"; constexpr const char* MODULE_DESCRIPTION_ID = "descriptionId"; constexpr const char* MODULE_ICON = "icon"; constexpr const char* MODULE_ICON_ID = "iconId"; +#define EXT_RESOURCE_ICON_ID MODULE_ICON_ID constexpr const char* MODULE_LABEL = "label"; constexpr const char* MODULE_LABEL_ID = "labelId"; constexpr const char* MODULE_DESCRIPTION_INSTALLATION_FREE = "installationFree"; @@ -124,8 +126,6 @@ constexpr const char* DATA_GROUP_INFOS = "dataGroupInfos"; constexpr const char* MODULE_FILE_CONTEXT_MENU = "fileContextMenu"; constexpr const char* MODULE_IS_ENCRYPTED = "isEncrypted"; constexpr const char* MODULE_ROUTER_MAP = "routerMap"; -constexpr const char* EXT_RESOURCE_MODULE_NAME = "moduleName"; -constexpr const char* EXT_RESOURCE_ICON_ID = "iconId"; constexpr const char* EXT_RESOURCE_FILE_PATH = "filePath"; constexpr const char* DEVELOPER_ID = "developerId"; constexpr const char* ODID = "odid"; -- Gitee