From 8622b92e3e8d9163c5f43336db496669c72c9285 Mon Sep 17 00:00:00 2001 From: humeng Date: Fri, 25 Oct 2024 10:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E4=BB=B6=E5=90=8D&&?= =?UTF-8?q?=E5=88=86=E5=8C=85=E8=B7=AF=E7=94=B1=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: humeng --- BUILD.gn | 2 +- bundle.json | 8 ++++---- navpushpathhelper/navpushpathhelper.js | 13 +++++++------ navpushpathhelper/src/hsp_silentinstall.cpp | 2 +- navpushpathhelper/src/hsp_silentinstall_napi.cpp | 4 ++-- navpushpathhelper/src/navpushpathhelper.cpp | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 545b2db..e21eff4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -group("as_advanced_ui_component") { +group("advanced_ui_component") { deps = [ "atomicservicenavigation/interfaces:atomicservicenavigation", "atomicservicetabs/interfaces:atomicservicetabs", diff --git a/bundle.json b/bundle.json index 2f1102e..9f4cf86 100644 --- a/bundle.json +++ b/bundle.json @@ -1,13 +1,13 @@ { - "name": "@ohos/as_advanced_ui_component", + "name": "@ohos/advanced_ui_component", "version": "1.0.0", - "description": "as_advanced_ui_component", + "description": "advanced_ui_component", "publishAs": "code-segment", "segment": { - "destPath": "foundation/arkui/as_advanced_ui_component" + "destPath": "foundation/arkui/advanced_ui_component" }, "component": { - "name": "as_advanced_ui_component", + "name": "advanced_ui_component", "subsystem": "arkui", "syscap": [], "features": [], diff --git a/navpushpathhelper/navpushpathhelper.js b/navpushpathhelper/navpushpathhelper.js index 7d6fe2e..e91df36 100644 --- a/navpushpathhelper/navpushpathhelper.js +++ b/navpushpathhelper/navpushpathhelper.js @@ -34,7 +34,7 @@ export class NavPushPathHelper { } return new Promise((resolve, reject) => { navPushPathHelperApi.silentInstall(moduleName, () => { - navPushPathHelperApi.initRouteMap(); + navPushPathHelperApi.updateRouteMap(); this.navPathStack_?.pushPath(info, optionParam); resolve(); }, @@ -54,7 +54,7 @@ export class NavPushPathHelper { } return new Promise((resolve, reject) => { navPushPathHelperApi.silentInstall(moduleName, () => { - navPushPathHelperApi.initRouteMap(); + navPushPathHelperApi.updateRouteMap(); this.navPathStack_?.pushDestination(info, optionParam) .then(resolve).catch(reject); }, (error) => { @@ -73,7 +73,8 @@ export class NavPushPathHelper { } return new Promise((resolve, reject) => { navPushPathHelperApi.silentInstall(moduleName, () => { - navPushPathHelperApi.initRouteMap(); + hilog.info(0x3900, tag, `silentInstall success`); + navPushPathHelperApi.updateRouteMap(); this.navPathStack_?.pushPathByName(name, param, onPop, optionParam); resolve(); }, (error) => { @@ -92,7 +93,7 @@ export class NavPushPathHelper { } return new Promise((resolve, reject) => { navPushPathHelperApi.silentInstall(moduleName, () => { - navPushPathHelperApi.initRouteMap(); + navPushPathHelperApi.updateRouteMap(); this.navPathStack_?.pushDestinationByName(name, param, onPop, optionParam) .then(resolve).catch(reject); }, (error) => { @@ -111,7 +112,7 @@ export class NavPushPathHelper { } return new Promise((resolve, reject) => { navPushPathHelperApi.silentInstall(moduleName, () => { - navPushPathHelperApi.initRouteMap(); + navPushPathHelperApi.updateRouteMap(); this.navPathStack_?.replacePath(info, optionParam); resolve(); }, (error) => { @@ -131,7 +132,7 @@ export class NavPushPathHelper { return new Promise((resolve, reject) => { navPushPathHelperApi.silentInstall(moduleName, () => { hilog.info(0x3900, tag, `silentInstall success`); - navPushPathHelperApi.initRouteMap(); + navPushPathHelperApi.updateRouteMap(); this.navPathStack_?.replacePathByName(name, param, optionParam); resolve(); }, (error) => { diff --git a/navpushpathhelper/src/hsp_silentinstall.cpp b/navpushpathhelper/src/hsp_silentinstall.cpp index 8bc7eca..ac28f9a 100644 --- a/navpushpathhelper/src/hsp_silentinstall.cpp +++ b/navpushpathhelper/src/hsp_silentinstall.cpp @@ -106,7 +106,7 @@ bool HspSilentInstall::IsHspExist(const std::string &moduleName, const std::stri return false; } -void HspSilentInstall::InitRouteMap() +void HspSilentInstall::UpdateRouteMap() { auto container = OHOS::Ace::Container::CurrentSafely(); CHECK_NULL_VOID(container); diff --git a/navpushpathhelper/src/hsp_silentinstall_napi.cpp b/navpushpathhelper/src/hsp_silentinstall_napi.cpp index d6959c6..fdee451 100644 --- a/navpushpathhelper/src/hsp_silentinstall_napi.cpp +++ b/navpushpathhelper/src/hsp_silentinstall_napi.cpp @@ -56,9 +56,9 @@ napi_value HspSilentInstallNapi::IsHspExist(napi_env env, napi_callback_info inf return jsResult; } -napi_value HspSilentInstallNapi::InitRouteMap(napi_env env, napi_callback_info info) +napi_value HspSilentInstallNapi::UpdateRouteMap(napi_env env, napi_callback_info info) { - HspSilentInstall::InitRouteMap(); + HspSilentInstall::UpdateRouteMap(); return nullptr; } diff --git a/navpushpathhelper/src/navpushpathhelper.cpp b/navpushpathhelper/src/navpushpathhelper.cpp index 59496cb..2a562e3 100644 --- a/navpushpathhelper/src/navpushpathhelper.cpp +++ b/navpushpathhelper/src/navpushpathhelper.cpp @@ -34,7 +34,7 @@ namespace OHOS::NavPushPathHelper { napi_property_descriptor desc[] = { DECLARE_NAPI_FUNCTION("silentInstall", HspSilentInstallNapi::SilentInstall), DECLARE_NAPI_FUNCTION("isHspExist", HspSilentInstallNapi::IsHspExist), - DECLARE_NAPI_FUNCTION("initRouteMap", HspSilentInstallNapi::InitRouteMap), + DECLARE_NAPI_FUNCTION("updateRouteMap", HspSilentInstallNapi::UpdateRouteMap), }; NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc)); return exports; -- Gitee