From f95b7ac63e74b46c8069496c923bc0eed52f6ab5 Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Thu, 17 Jul 2025 20:03:07 +0800 Subject: [PATCH 1/3] fix pad small window issue Signed-off-by: dengxiaoyu --- .../main/ets/continueswitchability/ContinueSwitchAbility.ets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets index d23a0413..0c4ba305 100644 --- a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets +++ b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets @@ -61,6 +61,9 @@ export default class ContinueSwitchAbility extends UIExtensionAbility { if (startReason === 'from_search' && navigationMode === NavigationMode.Split) { logger.info(`${TAG} navigationMode: ${navigationMode}`); isShowBack = false; + } else { + logger.info(`${TAG} NavigationMode is not Split. navigationMode: ${navigationMode}`); + isShowBack = true; } AppStorage.setOrCreate('continueSession', session); -- Gitee From fd5e9bfcb2072d7f627aae9f82d78139990d0fbd Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Thu, 17 Jul 2025 20:05:22 +0800 Subject: [PATCH 2/3] add version change Signed-off-by: dengxiaoyu --- application/AppScope/app.json | 4 ++-- application/AppScope/app.json5 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/AppScope/app.json b/application/AppScope/app.json index 6dd83f4f..d98cf43d 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 e43d9ffc..6f9175cb 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, -- Gitee From 14a7ed6952f3ed652ef1ee5c9ed8d02663213cae Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Fri, 18 Jul 2025 07:36:22 +0000 Subject: [PATCH 3/3] add stack judge condition Signed-off-by: dengxiaoyu --- .../ets/continueswitchability/ContinueSwitchAbility.ets | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets index 0c4ba305..1d4c2e54 100644 --- a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets +++ b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets @@ -51,18 +51,19 @@ 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 { - logger.info(`${TAG} NavigationMode is not Split. navigationMode: ${navigationMode}`); + } else if (navigationMode === NavigationMode.Stack) { + logger.info(`${TAG} NavigationMode is Stack. navigationMode: ${navigationMode}`); isShowBack = true; } -- Gitee