From 00ffbaf13746d3244f05b07647de832d69f6dc4a Mon Sep 17 00:00:00 2001 From: liweifeng Date: Thu, 24 Feb 2022 15:30:32 +0800 Subject: [PATCH] fixed 27fffa6 from https://gitee.com/zhongjianfei/aafwk_standard/pulls/854 adapt module source dir Signed-off-by: liweifeng Change-Id: I0aba0a7c5cb00e9ea2073942be0b4ddcba7b22ad --- interfaces/innerkits/form_manager/include/form_constants.h | 3 +++ services/formmgr/src/form_mgr_adapter.cpp | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/form_manager/include/form_constants.h b/interfaces/innerkits/form_manager/include/form_constants.h index 796d214f81f..51a1fd8269b 100644 --- a/interfaces/innerkits/form_manager/include/form_constants.h +++ b/interfaces/innerkits/form_manager/include/form_constants.h @@ -44,6 +44,9 @@ namespace Constants { const std::string ACTION_UPDATEATTIMER = "form_update_at_timer"; const std::string KEY_WAKEUP_TIME = "wakeUpTime"; const std::string KEY_ACTION_TYPE = "form_update_action_type"; + const std::string ABS_CODE_PATH = "/data/app/el1/bundle/public"; + const std::string LOCAL_CODE_PATH = "/data/storage/el1/bundle"; + const std::string LOCAL_BUNDLES = "/data/bundles"; const int TYPE_RESET_LIMIT = 1; const int TYPE_STATIC_UPDATE = 2; const int TYPE_DYNAMIC_UPDATE = 3; diff --git a/services/formmgr/src/form_mgr_adapter.cpp b/services/formmgr/src/form_mgr_adapter.cpp index ed8dd2c6584..1534979cd21 100644 --- a/services/formmgr/src/form_mgr_adapter.cpp +++ b/services/formmgr/src/form_mgr_adapter.cpp @@ -14,6 +14,7 @@ */ #include +#include #include "appexecfwk_errors.h" #include "app_log_wrapper.h" @@ -1209,7 +1210,9 @@ ErrCode FormMgrAdapter::CreateFormItemInfo(const BundleInfo &bundleInfo, if (formInfo.moduleName == item.moduleName) { itemInfo.AddHapSourceDirs(item.moduleSourceDir); } - itemInfo.AddModuleInfo(item.moduleName, item.moduleSourceDir); + auto moduleSourceDir = std::regex_replace(item.moduleSourceDir, std::regex(Constants::ABS_CODE_PATH), + Constants::LOCAL_BUNDLES); + itemInfo.AddModuleInfo(item.moduleName, moduleSourceDir); } return ERR_OK; } @@ -1247,7 +1250,7 @@ int FormMgrAdapter::SetNextRefreshTime(const int64_t formId, const int64_t nextT APP_LOGE("%{public}s, not self form:%{public}" PRId64 "", __func__, formId); return ERR_APPEXECFWK_FORM_OPERATION_NOT_SELF; } - + // check bundleName if (bundleName != formRecord.bundleName) { APP_LOGE("%{public}s, not match bundleName:%{public}s", __func__, bundleName.c_str()); -- Gitee