diff --git a/application/AppScope/app.json b/application/AppScope/app.json index 32322367d6e2e7b3a4075a3c6c992f9f9f804421..73903a844dc8b8a4e590f07c36b23142b99ae8ad 100644 --- a/application/AppScope/app.json +++ b/application/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000039, - "versionName": "1.0.39", + "versionCode": 10000041, + "versionName": "1.0.41", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/AppScope/app.json5 b/application/AppScope/app.json5 index 7653f906d6b9c1f482a5da1384e156881243b34e..6ff633fb2022cf0a3a547adacf6443c8b529b54f 100644 --- a/application/AppScope/app.json5 +++ b/application/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000040, - "versionName": "1.0.40", + "versionCode": 10000041, + "versionName": "1.0.41", "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 31e0b81eb60693375d35da8e8227612956247bfa..d23a0413c1bc7a8cd5eb003d57516bc6cb5d0e2e 100644 --- a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets +++ b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets @@ -16,12 +16,13 @@ import UIExtensionAbility from '@ohos.app.ability.UIExtensionAbility'; import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession'; import Want from '@ohos.app.ability.Want'; import { Configuration } from '@ohos.app.ability.Configuration'; +import { logger } from '../utils/Logger'; -const TAG: string = '[ContinueSwitchAbility]' +const TAG: string = '[ContinueSwitchAbility]'; export default class ContinueSwitchAbility extends UIExtensionAbility { onCreate() { - console.log(TAG, `UIExtAbility onCreate`); + logger.info(`${TAG} UIExtAbility onCreate`); AppStorage.setOrCreate('currentColorMode', this.context.config.colorMode); AppStorage.setOrCreate('currentFontSizeScale', this.context.config.fontSizeScale); } @@ -32,27 +33,36 @@ export default class ContinueSwitchAbility extends UIExtensionAbility { } onForeground() { - console.log(TAG, `UIExtAbility onForeground`); + logger.info(`${TAG} UIExtAbility onForeground`); } onBackground() { - console.log(TAG, `UIExtAbility onBackground`); + logger.info(`${TAG} UIExtAbility onBackground`); } onDestroy() { - console.log(TAG, `UIExtAbility onDestroy`); + logger.info(`${TAG} UIExtAbility onDestroy`); } onSessionCreate(want: Want, session: UIExtensionContentSession) { - console.log(TAG, `UIExtAbility onSessionCreate.`); + logger.info(`${TAG} UIExtAbility onSessionCreate.`); let parameters = want.parameters; let pushParams = want.parameters?.pushParams as string | undefined; let startReason = ''; let isShowBack = pushParams?.includes('isShowBack') ? (pushParams.includes('isShowBack:false') ? false : true) : true; + let navigationMode = NavigationMode.Auto; + if (parameters) { - startReason = parameters['startReason'] as string; + startReason = parameters.startReason as string; + navigationMode = parameters.navigationMode as NavigationMode; + } + + if (startReason === 'from_search' && navigationMode === NavigationMode.Split) { + logger.info(`${TAG} navigationMode: ${navigationMode}`); + isShowBack = false; } + AppStorage.setOrCreate('continueSession', session); AppStorage.setOrCreate('startReason', startReason); AppStorage.setOrCreate('isShowBack', isShowBack); @@ -61,10 +71,10 @@ export default class ContinueSwitchAbility extends UIExtensionAbility { }; let storage: LocalStorage = new LocalStorage(param); session.loadContent('pages/ContinueSwitch', storage); - console.log(TAG, `onSessionCreate end. startReason: ${startReason},isShowBack: ${isShowBack}`); + logger.info(`${TAG} onSessionCreate end. startReason: ${startReason}, isShowBack: ${isShowBack}`); } onSessionDestroy(session: UIExtensionContentSession) { - console.log(TAG, `UIExtAbility onSessionDestroy`); + logger.info(`${TAG} UIExtAbility onSessionDestroy`); } } \ No newline at end of file