From 87d549e9ddd6288b3b6161d564ae63323cc62de8 Mon Sep 17 00:00:00 2001 From: xinking129 Date: Thu, 20 Jul 2023 14:45:38 +0800 Subject: [PATCH] modify format Signed-off-by: xinking129 --- .../src/main/ets/entryability/EntryAbility.ts | 24 ++++++++++--------- .../src/main/ets/entryability/EntryAbility.ts | 16 +++++++------ .../main/ets/entryability1/EntryAbility1.ts | 5 ++-- .../src/main/ets/entryability/EntryAbility.ts | 2 +- .../src/main/ets/entryability/EntryAbility.ts | 2 +- .../ets/TestRunner/OpenHarmonyTestRunner.ts | 10 ++++---- .../src/main/ets/entryability/EntryAbility.ts | 2 +- 7 files changed, 33 insertions(+), 28 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 404579b71..d6889a6d3 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 @@ -14,7 +14,7 @@ */ 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 commonStateArr: number[] = [-1, -1, -1, -1]; @@ -23,16 +23,18 @@ let commonEventData = { commonStateArr: commonStateArr } }; -let onForeGroundTAG = -1; -let TAG = 'StateChangeTestTAG'; + +let tag = 'StateChangeTesttag'; let delayTime_500 = 500; let delayTime_1000 = 1000; let delayTime_2000 = 2000; let undefineTag = -1; let defineTag = 1; +let arrLength = 4; +let onForeGroundTAG = undefineTag; let applicationStateChangeCallbackFir = { onApplicationForeground() { - console.log(TAG, 'applicationStateChangeCallbackFir onApplicationForeground'); + console.log(tag, 'applicationStateChangeCallbackFir onApplicationForeground'); commonEventData.parameters.commonStateArr[0] = defineTag; setTimeout(() => { @@ -43,7 +45,7 @@ let applicationStateChangeCallbackFir = { }, delayTime_1000); }, onApplicationBackground() { - console.log(TAG, 'applicationStateChangeCallbackFir onApplicationBackground'); + console.log(tag, 'applicationStateChangeCallbackFir onApplicationBackground'); commonEventData.parameters.commonStateArr[1] = defineTag; if (globalThis.want.action === 'NeedBackGroundOff' || globalThis.want.action === 'MultiAppRegister') { @@ -55,11 +57,11 @@ let applicationStateChangeCallbackFir = { let applicationStateChangeCallbackSec = { onApplicationForeground() { - console.log(TAG, 'applicationStateChangeCallbackSec onApplicationForeground'); + console.log(tag, 'applicationStateChangeCallbackSec onApplicationForeground'); commonEventData.parameters.commonStateArr[2] = defineTag; }, onApplicationBackground() { - console.log(TAG, 'applicationStateChangeCallbackSec onApplicationBackground'); + console.log(tag, 'applicationStateChangeCallbackSec onApplicationBackground'); commonEventData.parameters.commonStateArr[3] = defineTag; if (globalThis.want.action === 'doubleNeedBackGroundOff') { setTimeout(() => { @@ -78,7 +80,7 @@ let applicationStateChangeCallbackSec = { export default class EntryAbility extends Ability { onCreate(want, launchParam) { onForeGroundTAG = undefineTag; - for (let i = 0; i < 4; i++) { + for (let i = 0; i < arrLength; i++) { commonStateArr[i] = undefineTag; } hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); @@ -93,7 +95,7 @@ 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!'); globalThis.applicationContext.on('applicationStateChange', applicationStateChangeCallbackSec); @@ -132,8 +134,8 @@ export default class EntryAbility extends Ability { // Ability has brought to foreground 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'|| + onForeGroundTAG += defineTag; + if (onForeGroundTAG === defineTag && (globalThis.want.action === 'NeedBackGroundOff' || globalThis.want.action === 'MultiAppRegister' || globalThis.want.action === 'DoubleRegisterOff')) { setTimeout(() => { commonEvent.publish('processState', commonEventData, (err) => { 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 44a5405f0..6ea26fc34 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 @@ -18,10 +18,12 @@ import type Window from '@ohos.window'; import commonEvent from '@ohos.commonEvent'; -let TAG = 'getRunningProcess'; +let tag = 'getRunningProcess'; let commonStateArr; let delayTime_3000 = 3000; let delayTime_1000 = 1000; +let undefinedTag = -1; +let definedTag = 1; let commonEventData = { parameters: { commonStateArr: commonStateArr @@ -29,10 +31,10 @@ let commonEventData = { }; let applicationStateChangeCallbackFir = { onApplicationForeground() { - console.log(TAG, 'applicationStateChangeCallbackFir onApplicationForeground'); + console.log(tag, 'applicationStateChangeCallbackFir onApplicationForeground'); }, onApplicationBackground() { - console.log(TAG, 'applicationStateChangeCallbackFir onApplicationBackground'); + console.log(tag, 'applicationStateChangeCallbackFir onApplicationBackground'); setTimeout(() => { console.info('Enter onApplicationForeground publish!'); commonEventData.parameters.commonStateArr = 1; @@ -42,12 +44,12 @@ let applicationStateChangeCallbackFir = { }, delayTime_1000); } }; -let foregroundTAG = -1; +let foregroundTAG = undefinedTag; export default class EntryAbility extends Ability { onCreate(want, launchParam) { - foregroundTAG = -1; - commonEventData.parameters.commonStateArr = -1; + foregroundTAG = undefinedTag; + commonEventData.parameters.commonStateArr = undefinedTag; 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) ?? ''); @@ -89,7 +91,7 @@ export default class EntryAbility extends Ability { onForeground() { // Ability has brought to foreground foregroundTAG++; - if (foregroundTAG === 1) { + if (foregroundTAG === definedTag) { setTimeout(() => { commonEvent.publish('processState', commonEventData, (err) => { console.info('====>processState publish err: ' + JSON.stringify(err)); 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 29c213835..6d6f86d12 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 @@ -14,8 +14,9 @@ */ import hilog from '@ohos.hilog'; import Ability from '@ohos.app.ability.UIAbility'; -import Window from '@ohos.window'; +import type Window from '@ohos.window'; +let delayTime_3000 = 3000; export default class EntryAbility1 extends Ability { onCreate(want, launchParam) { hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); @@ -62,7 +63,7 @@ export default class EntryAbility1 extends Ability { globalThis.abilityContext2.terminateSelf((err) => { console.log('terminateSelf result:' + JSON.stringify(err)); }); - }, 3000); + }, delayTime_3000); } onBackground() { 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 b3e136129..6ca5d5aac 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 @@ -14,7 +14,7 @@ */ import hilog from '@ohos.hilog'; import Ability from '@ohos.app.ability.UIAbility'; -import Window from '@ohos.window'; +import type Window from '@ohos.window'; let TAG = 'StateChangeTestTAG'; let delayTime_3000 = 3000; 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 74a4a0fac..802451686 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 @@ -14,7 +14,7 @@ */ 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'; import AbilityConstant from '@ohos.app.ability.AbilityConstant'; 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 c2be75981..4da8488a0 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 @@ -16,8 +16,8 @@ import hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined +let abilityDelegator = undefined +let abilityDelegatorArguments = undefined function translateParamsToString(parameters) { const keySet = new Set([ @@ -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'; + let 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; + let cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName; cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters['-D']; + let debug = abilityDelegatorArguments.parameters['-D']; if (debug == 'true') { cmd += ' -D' } diff --git a/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTwoReply/entry/src/main/ets/entryability/EntryAbility.ts b/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTwoReply/entry/src/main/ets/entryability/EntryAbility.ts index a731118cb..e14536962 100644 --- a/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTwoReply/entry/src/main/ets/entryability/EntryAbility.ts +++ b/ability/ability_runtime/getrunningprocessinformation/GetRunningProcessInformationTwoReply/entry/src/main/ets/entryability/EntryAbility.ts @@ -14,7 +14,7 @@ */ import hilog from '@ohos.hilog'; import Ability from '@ohos.app.ability.UIAbility'; -import Window from '@ohos.window'; +import type Window from '@ohos.window'; export default class EntryAbility extends Ability { onCreate(want, launchParam) { -- GitLab