diff --git a/application/AppScope/app.json b/application/AppScope/app.json index 6dd83f4fdaed00e33acd04b80cbdea3a9511f885..d98cf43d465e75a9327e0b0741870def01cb03de 100644 --- a/application/AppScope/app.json +++ b/application/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000042, - "versionName": "1.0.42", + "versionCode": 10000043, + "versionName": "1.0.43", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/AppScope/app.json5 b/application/AppScope/app.json5 index e43d9ffcb46007f31983bfaa7a7c9a0a1034375a..6f9175cb4395e374d5f743b05aff4792e2a08e2b 100644 --- a/application/AppScope/app.json5 +++ b/application/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000042, - "versionName": "1.0.42", + "versionCode": 10000043, + "versionName": "1.0.43", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets index d23a0413c1bc7a8cd5eb003d57516bc6cb5d0e2e..1d4c2e5496e336055b5c7bc1b2ca343859389801 100644 --- a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets +++ b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets @@ -51,16 +51,20 @@ export default class ContinueSwitchAbility extends UIExtensionAbility { let startReason = ''; let isShowBack = pushParams?.includes('isShowBack') ? (pushParams.includes('isShowBack:false') ? false : true) : true; - let navigationMode = NavigationMode.Auto; + let navigationMode = NavigationMode.Stack; if (parameters) { startReason = parameters.startReason as string; navigationMode = parameters.navigationMode as NavigationMode; + logger.info(`${TAG} origin transfer. startReason: ${startReason}, navigationMode: ${navigationMode}`); } if (startReason === 'from_search' && navigationMode === NavigationMode.Split) { logger.info(`${TAG} navigationMode: ${navigationMode}`); isShowBack = false; + } else if (navigationMode === NavigationMode.Stack) { + logger.info(`${TAG} NavigationMode is Stack. navigationMode: ${navigationMode}`); + isShowBack = true; } AppStorage.setOrCreate('continueSession', session);