From 8dede726753da429ff92b0a4ca86a5f42c17175a Mon Sep 17 00:00:00 2001 From: xinking129 Date: Mon, 17 Jul 2023 09:54:30 +0800 Subject: [PATCH] code format Signed-off-by: xinking129 --- .../ets/TestRunner/OpenHarmonyTestRunner.ts | 11 +- .../src/main/ets/entryability/EntryAbility.ts | 100 +++++++++--------- 2 files changed, 55 insertions(+), 56 deletions(-) diff --git a/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index 7710d5e8c..42eadc9e4 100644 --- a/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -40,19 +40,18 @@ export default class OpenHarmonyTestRunner implements TestRunner { hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - let testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'; + let testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'; let lMonitor = { abilityName: testAbilityName, onAbilityCreate: onAbilityCreateCallback, }; abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - let cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName; - let debug = abilityDelegatorArguments.parameters['-D']; - if (debug == 'true') - { + let cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName; + let debug = abilityDelegatorArguments.parameters['-D']; + if (debug == 'true') { cmd += ' -D' } - hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd); + hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd); abilityDelegator.executeShellCommand(cmd, (err: any, d: any) => { hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? ''); diff --git a/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTestRelyFifth/entry/src/main/ets/entryability/EntryAbility.ts b/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTestRelyFifth/entry/src/main/ets/entryability/EntryAbility.ts index 39e64d65b..d892cd36d 100644 --- a/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTestRelyFifth/entry/src/main/ets/entryability/EntryAbility.ts +++ b/ability/ability_runtime/actsnfcselecttypes/ActsNFCSelectTypesTestRelyFifth/entry/src/main/ets/entryability/EntryAbility.ts @@ -20,65 +20,65 @@ import commonEvent from '@ohos.commonEventManager'; let message; let commonEventData = { - parameters:{ - message:message, - } + parameters: { + message: message, + } }; let timeout = 50; export default class EntryAbility extends UIAbility { - onCreate(want, launchParam) { - hilog.info(0x0000, 'testTag', '%{public}s', 'Abilitytest4 onCreate'); - globalThis.terminate = () => { - setTimeout(() => { - this.context.terminateSelf().then(() => { - console.info('====>EntryAbility terminateSelf end'); - }).catch((err) => { - console.info('====>EntryAbility terminateSelf err:' + JSON.stringify(err)); - }); - }, timeout); - }; - console.info('Ability4 onCreate' + JSON.stringify(want)); - let actionStr = want.action; - if (actionStr === 'ohos.nfc.tag.action.TAG_FOUND') { - hilog.info(0x0000, 'testTag', '%{public}s', 'a4Ability ok'); - commonEventData.parameters.message = 'select'; - commonEvent.publish('ACTS_CROSS_CALL_EVENT', commonEventData, (err) => { - console.info('====>' + actionStr + ' apublish err:' + JSON.stringify(err)); - globalThis.terminate(); - }); + onCreate(want, launchParam) { + hilog.info(0x0000, 'testTag', '%{public}s', 'Abilitytest4 onCreate'); + globalThis.terminate = () => { + setTimeout(() => { + this.context.terminateSelf().then(() => { + console.info('====>EntryAbility terminateSelf end'); + }).catch((err) => { + console.info('====>EntryAbility terminateSelf err:' + JSON.stringify(err)); + }); + }, timeout); + }; + console.info('Ability4 onCreate' + JSON.stringify(want)); + let actionStr = want.action; + if (actionStr === 'ohos.nfc.tag.action.TAG_FOUND') { + hilog.info(0x0000, 'testTag', '%{public}s', 'a4Ability ok'); + commonEventData.parameters.message = 'select'; + commonEvent.publish('ACTS_CROSS_CALL_EVENT', commonEventData, (err) => { + console.info('====>' + actionStr + ' apublish err:' + JSON.stringify(err)); + globalThis.terminate(); + }); + } } - } - onDestroy() { - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onDestroy'); - } + onDestroy() { + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onDestroy'); + } - onWindowStageCreate(windowStage: window.WindowStage) { - // Main window is created, set main page for this ability - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onWindowStageCreate'); + onWindowStageCreate(windowStage: window.WindowStage) { + // Main window is created, set main page for this ability + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onWindowStageCreate'); - windowStage.loadContent('pages/Index', (err, data) => { - if (err.code) { - hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); - return; - } - hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); - }); - } + windowStage.loadContent('pages/Index', (err, data) => { + if (err.code) { + hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); + return; + } + hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); + }); + } - onWindowStageDestroy() { - // Main window is destroyed, release UI related resources - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onWindowStageDestroy'); - } + onWindowStageDestroy() { + // Main window is destroyed, release UI related resources + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onWindowStageDestroy'); + } - onForeground() { - // Ability has brought to foreground - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onForeground'); - } + onForeground() { + // Ability has brought to foreground + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onForeground'); + } - onBackground() { - // Ability has back to background - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onBackground'); - } + onBackground() { + // Ability has back to background + hilog.info(0x0000, 'testTag', '%{public}s', 'Ability4 onBackground'); + } } -- GitLab