From 3f5ae1735f5349a3cfd1ef628fb5cb2dc6201b10 Mon Sep 17 00:00:00 2001 From: xinking129 Date: Thu, 20 Jul 2023 14:03:51 +0800 Subject: [PATCH] modify format Signed-off-by: xinking129 --- .../src/main/ets/entryability/EntryAbility.ts | 44 ++++++++++--------- .../src/main/ets/entryability/EntryAbility.ts | 24 +++++----- .../main/ets/entryability1/EntryAbility1.ts | 2 +- .../src/main/ets/entryability/EntryAbility.ts | 7 +-- .../src/main/ets/entryability/EntryAbility.ts | 22 +++++----- .../ets/TestRunner/OpenHarmonyTestRunner.ts | 6 +-- 6 files changed, 56 insertions(+), 49 deletions(-) diff --git a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeOneReply/entry/src/main/ets/entryability/EntryAbility.ts b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeOneReply/entry/src/main/ets/entryability/EntryAbility.ts index d77fcf741..404579b71 100644 --- a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeOneReply/entry/src/main/ets/entryability/EntryAbility.ts +++ b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeOneReply/entry/src/main/ets/entryability/EntryAbility.ts @@ -25,22 +25,26 @@ let commonEventData = { }; let onForeGroundTAG = -1; let TAG = 'StateChangeTestTAG'; +let delayTime_500 = 500; +let delayTime_1000 = 1000; +let delayTime_2000 = 2000; +let undefineTag = -1; +let defineTag = 1; let applicationStateChangeCallbackFir = { onApplicationForeground() { console.log(TAG, 'applicationStateChangeCallbackFir onApplicationForeground'); - commonEventData.parameters.commonStateArr[0] = 1; + commonEventData.parameters.commonStateArr[0] = defineTag; setTimeout(() => { - console.info('Enter onApplicationForeground publish!') + console.info('Enter onApplicationForeground publish!'); commonEvent.publish('processState', commonEventData, (err) => { - console.info("====>processState publish err: " + JSON.stringify(err)); - }) - }, 1000); - + console.info('====>processState publish err: ' + JSON.stringify(err)); + }); + }, delayTime_1000); }, onApplicationBackground() { console.log(TAG, 'applicationStateChangeCallbackFir onApplicationBackground'); - commonEventData.parameters.commonStateArr[1] = 1; + commonEventData.parameters.commonStateArr[1] = defineTag; if (globalThis.want.action === 'NeedBackGroundOff' || globalThis.want.action === 'MultiAppRegister') { console.info('entered needbackgroundoff!'); @@ -52,30 +56,30 @@ let applicationStateChangeCallbackFir = { let applicationStateChangeCallbackSec = { onApplicationForeground() { console.log(TAG, 'applicationStateChangeCallbackSec onApplicationForeground'); - commonEventData.parameters.commonStateArr[2] = 1; + commonEventData.parameters.commonStateArr[2] = defineTag; }, onApplicationBackground() { console.log(TAG, 'applicationStateChangeCallbackSec onApplicationBackground'); - commonEventData.parameters.commonStateArr[3] = 1; + commonEventData.parameters.commonStateArr[3] = defineTag; if (globalThis.want.action === 'doubleNeedBackGroundOff') { setTimeout(() => { globalThis.applicationContext.off('applicationStateChange', applicationStateChangeCallbackSec); - }, 500); + }, delayTime_500); } else if (globalThis.want.action === 'DoubleRegisterOff') { setTimeout(() => { console.info('entered DoubleRegisterOff'); globalThis.applicationContext.off('applicationStateChange'); - }, 500); + }, delayTime_500); } } -} +}; export default class EntryAbility extends Ability { onCreate(want, launchParam) { - onForeGroundTAG = -1; + onForeGroundTAG = undefineTag; for (let i = 0; i < 4; i++) { - commonStateArr[i] = -1 + commonStateArr[i] = undefineTag; } hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); @@ -89,9 +93,9 @@ export default class EntryAbility extends Ability { globalThis.applicationContext.off('applicationStateChange', applicationStateChangeCallbackFir); } globalThis.applicationContext.on('applicationStateChange', applicationStateChangeCallbackFir); - if (globalThis.want.action === 'doubleRegister' || globalThis.want.action === 'doubleNeedBackGroundOff'|| + if (globalThis.want.action === 'doubleRegister' || globalThis.want.action === 'doubleNeedBackGroundOff'|| globalThis.want.action === 'DoubleRegisterOff') { - console.info("double in action is logic entered!"); + console.info('double in action is logic entered!'); globalThis.applicationContext.on('applicationStateChange', applicationStateChangeCallbackSec); } @@ -129,13 +133,13 @@ export default class EntryAbility extends Ability { hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'Abilityone onForeground'); onForeGroundTAG += 1; - if (onForeGroundTAG === 1 && (globalThis.want.action === 'NeedBackGroundOff' || globalThis.want.action === 'MultiAppRegister'|| + if (onForeGroundTAG === 1 && (globalThis.want.action === 'NeedBackGroundOff' || globalThis.want.action === 'MultiAppRegister'|| globalThis.want.action === 'DoubleRegisterOff')) { setTimeout(() => { commonEvent.publish('processState', commonEventData, (err) => { - console.info("====>processState publish err: " + JSON.stringify(err)); - }) - }, 2000); + console.info('====>processState publish err: ' + JSON.stringify(err)); + }); + }, delayTime_2000); } } diff --git a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability/EntryAbility.ts b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability/EntryAbility.ts index 5725c66bf..44a5405f0 100644 --- a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability/EntryAbility.ts +++ b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability/EntryAbility.ts @@ -14,12 +14,14 @@ */ import hilog from '@ohos.hilog'; import Ability from '@ohos.app.ability.UIAbility'; -import Window from '@ohos.window'; +import type Window from '@ohos.window'; import commonEvent from '@ohos.commonEvent'; let TAG = 'getRunningProcess'; let commonStateArr; +let delayTime_3000 = 3000; +let delayTime_1000 = 1000; let commonEventData = { parameters: { commonStateArr: commonStateArr @@ -36,15 +38,15 @@ let applicationStateChangeCallbackFir = { commonEventData.parameters.commonStateArr = 1; commonEvent.publish('processState', commonEventData, (err) => { console.info('====>processState publish err: ' + JSON.stringify(err)); - }) - }, 1000); + }); + }, delayTime_1000); } -} -let ForegroundTAG = -1; +}; +let foregroundTAG = -1; export default class EntryAbility extends Ability { onCreate(want, launchParam) { - ForegroundTAG = -1; + foregroundTAG = -1; commonEventData.parameters.commonStateArr = -1; hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); @@ -86,13 +88,13 @@ export default class EntryAbility extends Ability { onForeground() { // Ability has brought to foreground - ForegroundTAG++ - if (ForegroundTAG === 1) { + foregroundTAG++; + if (foregroundTAG === 1) { setTimeout(() => { commonEvent.publish('processState', commonEventData, (err) => { - console.info("====>processState publish err: " + JSON.stringify(err)); - }) - }, 3000); + console.info('====>processState publish err: ' + JSON.stringify(err)); + }); + }, delayTime_3000); } hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); diff --git a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability1/EntryAbility1.ts b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability1/EntryAbility1.ts index 881ded2c0..29c213835 100644 --- a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability1/EntryAbility1.ts +++ b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeThreeReply/entry/src/main/ets/entryability1/EntryAbility1.ts @@ -61,7 +61,7 @@ export default class EntryAbility1 extends Ability { setTimeout(() => { globalThis.abilityContext2.terminateSelf((err) => { console.log('terminateSelf result:' + JSON.stringify(err)); - }) + }); }, 3000); } diff --git a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeTwoReply/entry/src/main/ets/entryability/EntryAbility.ts b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeTwoReply/entry/src/main/ets/entryability/EntryAbility.ts index b6db44d23..b3e136129 100644 --- a/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeTwoReply/entry/src/main/ets/entryability/EntryAbility.ts +++ b/ability/ability_runtime/getrunningprocessinformation/ApplicationStateChangeTwoReply/entry/src/main/ets/entryability/EntryAbility.ts @@ -17,6 +17,7 @@ import Ability from '@ohos.app.ability.UIAbility'; import Window from '@ohos.window'; let TAG = 'StateChangeTestTAG'; +let delayTime_3000 = 3000; let applicationStateChangeCallbackSec = { onApplicationForeground() { console.info('==== ApplicationStateChange Foreground ===='); @@ -37,7 +38,7 @@ export default class EntryAbility extends Ability { globalThis.abilityContext = this.context; globalThis.want = want; - if (want.action == 'MultiAppRegister' || want.action == 'DoubleRegisterOff') { + if (want.action === 'MultiAppRegister' || want.action === 'DoubleRegisterOff') { globalThis.applicationContext = this.context.getApplicationContext(); globalThis.applicationContext.on('applicationStateChange', applicationStateChangeCallbackSec); } @@ -77,8 +78,8 @@ export default class EntryAbility extends Ability { setTimeout(() => { globalThis.abilityContext.terminateSelf((err) => { console.log('terminateSelf result:' + JSON.stringify(err)); - }) - }, 3000) + }); + }, delayTime_3000); } onBackground() { diff --git a/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationOneReply/entry/src/main/ets/entryability/EntryAbility.ts b/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationOneReply/entry/src/main/ets/entryability/EntryAbility.ts index 8a5c565d3..74a4a0fac 100644 --- a/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationOneReply/entry/src/main/ets/entryability/EntryAbility.ts +++ b/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationOneReply/entry/src/main/ets/entryability/EntryAbility.ts @@ -37,8 +37,8 @@ globalThis.StartFloatingAbility = () => { }; globalThis.abilityContext.startAbility(want, options, (error) => { console.log(TAG, 'start floating ability error.code = ' + error.code); - }) -} + }); +}; globalThis.StartNormalAbility = () => { let want = { @@ -48,8 +48,8 @@ globalThis.StartNormalAbility = () => { }; globalThis.abilityContext.startAbility(want, (error) => { console.log(TAG, 'start normal ability error.code = ' + error.code); - }) -} + }); +}; globalThis.GetRunningProcessInfoCallback = () => { globalThis.applicationContext.getRunningProcessInformation((err, data) => { @@ -60,8 +60,8 @@ globalThis.GetRunningProcessInfoCallback = () => { console.log(TAG, 'Oncreate Callback State: ' + JSON.stringify(data[0].state)); commonStateArr[sequence++] = data[0].state; } - }) -} + }); +}; globalThis.GetRunningProcessInfoPromise = () => { globalThis.applicationContext.getRunningProcessInformation().then((data) => { @@ -69,18 +69,18 @@ globalThis.GetRunningProcessInfoPromise = () => { commonStateArr[sequence++] = data[0].state; }).catch((err) => { console.log(TAG, 'getRunningProcessInformation err: ' + JSON.stringify(err)); - }) -} + }); +}; globalThis.PublishStateArray = () => { commonEvent.publish('processState', commonEventData, (err) => { console.info('====>processState publish err: ' + JSON.stringify(err)); - }) -} + }); +}; export default class EntryAbility extends Ability { onCreate(want, launchParam) { - sequence = 0 + sequence = 0; hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); diff --git a/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index 93882e475..c2be75981 100644 --- a/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -58,15 +58,15 @@ export default class OpenHarmonyTestRunner implements TestRunner { hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility' + var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'; let lMonitor = { abilityName: testAbilityName, onAbilityCreate: onAbilityCreateCallback, }; abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName + var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName; cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters['-D'] + var debug = abilityDelegatorArguments.parameters['-D']; if (debug == 'true') { cmd += ' -D' } -- GitLab