From 4189fabf5dfaea982d9aa8298c8ad64ade6a4d31 Mon Sep 17 00:00:00 2001 From: hu0475 Date: Thu, 13 Jul 2023 17:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=80=E6=9C=89=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hu0475 --- .../ActsLifeCycleEtsFeatureTest/BUILD.gn | 10 ---------- .../src/main/ets/mainability/MainAbility.ts | 2 -- .../ability_runtime/ActsLifeCycleEtsTest/BUILD.gn | 10 ---------- .../src/main/ets/Application/AbilityStage.ts | 1 - .../src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts | 2 -- .../src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts | 2 -- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 -- .../src/main/ets/MainAbility10/MainAbility10.ts | 2 -- .../src/main/ets/MainAbility11/MainAbility11.ts | 3 --- .../src/main/ets/MainAbility12/MainAbility12.ts | 2 -- .../src/main/ets/MainAbility13/MainAbility13.ts | 1 - .../src/main/ets/MainAbility14/MainAbility14.ts | 1 - .../src/main/ets/MainAbility2/MainAbility2.ts | 1 - .../src/main/ets/MainAbility3/MainAbility3.ts | 2 -- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 -- .../src/main/ets/MainAbility5/MainAbility5.ts | 1 - .../src/main/ets/MainAbility6/MainAbility6.ts | 2 -- .../src/main/ets/MainAbility7/MainAbility7.ts | 2 -- .../src/main/ets/MainAbility8/MainAbility8.ts | 2 -- .../src/main/ets/MainAbility9/MainAbility9.ts | 4 ---- .../main/ets/MultiMainability1/MultiMainability1.ts | 2 -- .../ability_runtime/ActsUiAbilityEtsTest/BUILD.gn | 10 ---------- .../src/main/ets/MainAbility3/MainAbility3.ts | 9 --------- .../ability_runtime/commonTestAbilityApp/BUILD.gn | 10 ---------- 24 files changed, 85 deletions(-) diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/BUILD.gn b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/BUILD.gn index f15217a46..38754c9cb 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/BUILD.gn +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/BUILD.gn @@ -22,29 +22,19 @@ ohos_hap_assist_suite("ActsLifeCycleEtsFeatureTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - # hap_name: HAP的名字，可选，默认为目标名 hap_name = "ActsLifeCycleEtsFeatureTest" subsystem_name = "ability" part_name = "ability_runtime" } ohos_app_scope("windowStage_app_profile") { - # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用 app_profile = "AppScope/app.json" - - # sources: 资源文件路径 sources = [ "AppScope/resources" ] } ohos_js_assets("windowStage_js_assets") { - # source_dir: js或ets代码路径，兼容FA模型的单ability配置到ability目录 source_dir = "src/main/ets" } ohos_resources("windowStage_resources") { - # sources: 资源文件路径 sources = [ "src/main/resources" ] - - # deps: 当前目标的依赖 deps = [ ":windowStage_app_profile" ] - - # hap_profile: HAP的config.json，Stage模型对应module.json hap_profile = "src/main/module.json" } diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/src/main/ets/mainability/MainAbility.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/src/main/ets/mainability/MainAbility.ts index 48ed78ede..3270d9cdf 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/src/main/ets/mainability/MainAbility.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsFeatureTest/src/main/ets/mainability/MainAbility.ts @@ -91,7 +91,6 @@ export default class MainAbility extends Ability { } } globalThis.applicationContext1 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext1.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext1.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback1 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { @@ -109,7 +108,6 @@ export default class MainAbility extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility onWindowStageCreate") globalThis.featureAbilityContext = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index1", null) windowStage.loadContent('pages/Index', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/BUILD.gn b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/BUILD.gn index fd7f83d5d..319b8f92a 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/BUILD.gn +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/BUILD.gn @@ -22,29 +22,19 @@ ohos_js_hap_suite("ActsLifeCycleEtsTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - # hap_name: HAP的名字，可选，默认为目标名 hap_name = "ActsLifeCycleEtsTest" subsystem_name = "ability" part_name = "ability_runtime" } ohos_app_scope("windowStage_app_profile") { - # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用 app_profile = "AppScope/app.json" - - # sources: 资源文件路径 sources = [ "AppScope/resources" ] } ohos_js_assets("windowStage_js_assets") { - # source_dir: js或ets代码路径，兼容FA模型的单ability配置到ability目录 source_dir = "src/main/ets" } ohos_resources("windowStage_resources") { - # sources: 资源文件路径 sources = [ "src/main/resources" ] - - # deps: 当前目标的依赖 deps = [ ":windowStage_app_profile" ] - - # hap_profile: HAP的config.json，Stage模型对应module.json hap_profile = "src/main/module.json" } diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Application/AbilityStage.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Application/AbilityStage.ts index 4fda95d87..674dbf6cd 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Application/AbilityStage.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Application/AbilityStage.ts @@ -101,7 +101,6 @@ export default class MyAbilityStage extends AbilityStage { } globalThis.applicationContext = this.context.getApplicationContext(); console.log("[Demo] stage applicationContext: " + JSON.stringify(globalThis.applicationContext)); - // let lifecycleid = globalThis.applicationContext.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback number: " + JSON.stringify(lifecycleid)); setTimeout(function () { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts index 0d641e5d6..9c82b95eb 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts @@ -35,8 +35,6 @@ export default class Hap1MainAbility1 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] Hap1MainAbility1 onWindowStageCreate") - // windowStage.setUIContent(this.context, "testability/pages/indexh1a1", null) - windowStage.loadContent('testability/pages/indexh1a1', (err, data) => { if (err.code) { console.log('Hap1MainAbility1 loadContent error'); diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts index 4a83e15fc..49c1c33a4 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts @@ -35,8 +35,6 @@ export default class Hap1MainAbility2 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] Hap1MainAbility2 onWindowStageCreate") - // windowStage.setUIContent(this.context, "testability/pages/indexh1a2", null) - windowStage.loadContent('testability/pages/indexh1a2', (err, data) => { if (err.code) { console.log('Hap1MainAbility2 loadContent error'); diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility1/MainAbility1.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility1/MainAbility1.ts index 5c11f638b..a05411d74 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility1/MainAbility1.ts @@ -98,7 +98,6 @@ export default class MainAbility1 extends Ability { } } globalThis.applicationContext1 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext1.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext1.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback1 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { @@ -116,7 +115,6 @@ export default class MainAbility1 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility1 onWindowStageCreate") globalThis.ability1context = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index1", null) windowStage.loadContent('testability/pages/index1', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility10/MainAbility10.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility10/MainAbility10.ts index c7ce46326..b82dff3f4 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility10/MainAbility10.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility10/MainAbility10.ts @@ -86,7 +86,6 @@ export default class MainAbility10 extends Ability { } } globalThis.applicationContext10 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext10.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext10.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback10 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { @@ -104,7 +103,6 @@ export default class MainAbility10 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility10 onWindowStageCreate") globalThis.ability10 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index10", null) windowStage.loadContent('testability/pages/index10', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility11/MainAbility11.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility11/MainAbility11.ts index 3a2fb077e..a6810a24c 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility11/MainAbility11.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility11/MainAbility11.ts @@ -80,7 +80,6 @@ export default class MainAbility11 extends Ability { } } globalThis.applicationContext11 = globalThis.ability11.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext11.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext11.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback11 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { @@ -98,8 +97,6 @@ export default class MainAbility11 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility11 onWindowStageCreate") - // windowStage.setUIContent(this.context, "testability/pages/index11", null) - windowStage.loadContent('testability/pages/index11', (err, data) => { if (err.code) { console.log('MainAbility11 loadContent error'); diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility12/MainAbility12.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility12/MainAbility12.ts index 34464745a..83200a2f3 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility12/MainAbility12.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility12/MainAbility12.ts @@ -79,7 +79,6 @@ export default class MainAbility12 extends Ability { } } globalThis.applicationContext12 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext12.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext12.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback12 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { @@ -97,7 +96,6 @@ export default class MainAbility12 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility12 onWindowStageCreate") globalThis.ability12 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index12", null) windowStage.loadContent('testability/pages/index12', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility13/MainAbility13.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility13/MainAbility13.ts index 3f12f8bef..73fc3b6f8 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility13/MainAbility13.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility13/MainAbility13.ts @@ -201,7 +201,6 @@ export default class MainAbility13 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility13 onWindowStageCreate") globalThis.ability1context = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index1", null) windowStage.loadContent('testability/pages/index1', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility14/MainAbility14.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility14/MainAbility14.ts index 271074c5c..1e93e990e 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility14/MainAbility14.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility14/MainAbility14.ts @@ -28,7 +28,6 @@ export default class MainAbility14 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility14 onWindowStageCreate") globalThis.ability14 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index2", null) windowStage.loadContent('testability/pages/index2', (err, data) => { if (err.code) { console.log('MainAbility14 loadContent error'); diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility2/MainAbility2.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility2/MainAbility2.ts index 55c429ca9..b295e5eac 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility2/MainAbility2.ts @@ -28,7 +28,6 @@ export default class MainAbility2 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility2 onWindowStageCreate") globalThis.ability2 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index2", null) windowStage.loadContent('testability/pages/index2', (err, data) => { if (err.code) { console.log('MainAbility2 loadContent error'); diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility3/MainAbility3.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility3/MainAbility3.ts index a50f9754b..20902279d 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility3/MainAbility3.ts @@ -102,7 +102,6 @@ export default class MainAbility3 extends Ability { } } globalThis.applicationContext3 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext3.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext3.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback3 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { @@ -120,7 +119,6 @@ export default class MainAbility3 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility3 onWindowStageCreate") globalThis.ability3 = this.context - // windowStage.setUIContent(this.context, "testability/pages/index3", null) windowStage.loadContent('testability/pages/index3', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility4/MainAbility4.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility4/MainAbility4.ts index 8fa1e1992..124636a7f 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility4/MainAbility4.ts @@ -102,7 +102,6 @@ export default class MainAbility4 extends Ability { } } globalThis.applicationContext4 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext4.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext4.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback4 number: " + JSON.stringify(lifecycleid)); globalThis.callbackid4 = lifecycleid; @@ -120,7 +119,6 @@ export default class MainAbility4 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility4 onWindowStageCreate") globalThis.ability4 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index4", null) windowStage.loadContent('testability/pages/index4', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility5/MainAbility5.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility5/MainAbility5.ts index b597a2456..d541f633a 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility5/MainAbility5.ts @@ -28,7 +28,6 @@ export default class MainAbility5 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility5 onWindowStageCreate") globalThis.ability5 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index5", null) windowStage.loadContent('testability/pages/index5', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility6/MainAbility6.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility6/MainAbility6.ts index 2346dd430..8cc601d59 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility6/MainAbility6.ts @@ -28,7 +28,6 @@ export default class MainAbility6 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility6 onWindowStageCreate") globalThis.ability6 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index6", null) windowStage.loadContent('testability/pages/index6', (err, data) => { if (err.code) { @@ -130,7 +129,6 @@ export default class MainAbility6 extends Ability { } } globalThis.applicationContext6 = globalThis.ability6.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext6.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext6.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] registerAbilityLifecycleCallback6 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility7/MainAbility7.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility7/MainAbility7.ts index 66d8e94eb..b52f5df41 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility7/MainAbility7.ts @@ -28,7 +28,6 @@ export default class MainAbility7 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility7 onWindowStageCreate") globalThis.ability7 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index7", null) windowStage.loadContent('testability/pages/index7', (err, data) => { if (err.code) { @@ -130,7 +129,6 @@ export default class MainAbility7 extends Ability { } } globalThis.applicationContext7 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext7.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext7.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] AbilityLifecycleCallback7 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility8/MainAbility8.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility8/MainAbility8.ts index d3c722322..99ca094ad 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility8/MainAbility8.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility8/MainAbility8.ts @@ -28,7 +28,6 @@ export default class MainAbility8 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility8 onWindowStageCreate") globalThis.ability8 = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index8", null) windowStage.loadContent('testability/pages/index8', (err, data) => { if (err.code) { @@ -129,7 +128,6 @@ export default class MainAbility8 extends Ability { } } globalThis.applicationContext8 = this.context.getApplicationContext(); - // let lifecycleid = globalThis.applicationContext8.registerAbilityLifecycleCallback(AbilityLifecycleCallback); let lifecycleid = globalThis.applicationContext8.on('abilityLifecycle', AbilityLifecycleCallback); console.log("[Demo] AbilityLifecycleCallback8 number: " + JSON.stringify(lifecycleid)); setTimeout(function () { diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility9/MainAbility9.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility9/MainAbility9.ts index a6b69b9d2..ad26e7c88 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility9/MainAbility9.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MainAbility9/MainAbility9.ts @@ -28,8 +28,6 @@ export default class MainAbility9 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MainAbility9 onWindowStageCreate") - // windowStage.setUIContent(this.context, "testability/pages/index9", null) - windowStage.loadContent('testability/pages/index9', (err, data) => { if (err.code) { console.log('MainAbility9 loadContent error'); @@ -96,8 +94,6 @@ export default class MainAbility9 extends Ability { } } globalThis.applicationContext9 = this.context.getApplicationContext(); - // var callBackId = globalThis.applicationContext9 - // .registerAbilityLifecycleCallback(AbilityLifecycleCallback); var callBackId = globalThis.applicationContext9.on('abilityLifecycle', AbilityLifecycleCallback); console.log("callBackId is aaa :" + callBackId); diff --git a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MultiMainability1/MultiMainability1.ts b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MultiMainability1/MultiMainability1.ts index 69231793f..e0f32aca3 100644 --- a/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MultiMainability1/MultiMainability1.ts +++ b/ability/crossplatform/ability_runtime/ActsLifeCycleEtsTest/src/main/ets/MultiMainability1/MultiMainability1.ts @@ -21,7 +21,6 @@ export default class MultiMainability1 extends Ability { console.log("[Demo] MultiMainability1 onCreate") globalThis.abilityWant1 = want; console.log("[Demo] MultiMainability1 context: " + JSON.stringify(this.context)); - // var listKey1 = []; let AbilityLifecycleCallback = { onAbilityCreate(ability) { console.log("[Demo] AbilityLifecycleCallback1 onAbilityCreate ability:" @@ -117,7 +116,6 @@ export default class MultiMainability1 extends Ability { // Main window is created, set main page for this ability console.log("[Demo] MultiMainability1 onWindowStageCreate") globalThis.ability1context = this.context; - // windowStage.setUIContent(this.context, "testability/pages/index1", null) windowStage.loadContent('testability/pages/index1', (err, data) => { if (err.code) { diff --git a/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/BUILD.gn b/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/BUILD.gn index 30ce8a759..dbf21402d 100644 --- a/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/BUILD.gn +++ b/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/BUILD.gn @@ -22,29 +22,19 @@ ohos_js_hap_suite("ActsUiAbilityEtsTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - # hap_name: HAP的名字，可选，默认为目标名 hap_name = "ActsUiAbilityEtsTest" subsystem_name = "ability" part_name = "ability_runtime" } ohos_app_scope("windowStage_app_profile") { - # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用 app_profile = "AppScope/app.json" - - # sources: 资源文件路径 sources = [ "AppScope/resources" ] } ohos_js_assets("windowStage_js_assets") { - # source_dir: js或ets代码路径，兼容FA模型的单ability配置到ability目录 source_dir = "src/main/ets" } ohos_resources("windowStage_resources") { - # sources: 资源文件路径 sources = [ "src/main/resources" ] - - # deps: 当前目标的依赖 deps = [ ":windowStage_app_profile" ] - - # hap_profile: HAP的config.json，Stage模型对应module.json hap_profile = "src/main/module.json" } diff --git a/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/src/main/ets/MainAbility3/MainAbility3.ts b/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/src/main/ets/MainAbility3/MainAbility3.ts index 8cebd446a..1268d0db1 100644 --- a/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/crossplatform/ability_runtime/ActsUiAbilityEtsTest/src/main/ets/MainAbility3/MainAbility3.ts @@ -56,15 +56,6 @@ export default class MainAbility3 extends Ability { onForeground() { console.log("[Demo] MainAbility3 onForeground") recordLife(globalThis.list3, abilityName, 'onForeground'); - // setTimeout(function () { - // console.log("[Demo] MainAbility3 onForeground after 1500ms") - // globalThis.ability3context.terminateSelf() - // .then((data) => { - // console.info('[Demo] MainAbility3 terminateself succeeded: ' + data); - // }).catch((error) => { - // console.error('[Demo] MainAbility3 terminateself failed. Cause: ' + error); - // }) - // }, 1500); } onBackground() { diff --git a/ability/crossplatform/ability_runtime/commonTestAbilityApp/BUILD.gn b/ability/crossplatform/ability_runtime/commonTestAbilityApp/BUILD.gn index ea005f55d..1c54e6efa 100644 --- a/ability/crossplatform/ability_runtime/commonTestAbilityApp/BUILD.gn +++ b/ability/crossplatform/ability_runtime/commonTestAbilityApp/BUILD.gn @@ -22,29 +22,19 @@ ohos_hap_assist_suite("commonTestAbilityApp") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - # hap_name: HAP的名字，可选，默认为目标名 hap_name = "commonTestAbilityApp" subsystem_name = "ability" part_name = "ability_runtime" } ohos_app_scope("windowStage_app_profile") { - # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用 app_profile = "AppScope/app.json" - - # sources: 资源文件路径 sources = [ "AppScope/resources" ] } ohos_js_assets("windowStage_js_assets") { - # source_dir: js或ets代码路径，兼容FA模型的单ability配置到ability目录 source_dir = "src/main/ets" } ohos_resources("windowStage_resources") { - # sources: 资源文件路径 sources = [ "src/main/resources" ] - - # deps: 当前目标的依赖 deps = [ ":windowStage_app_profile" ] - - # hap_profile: HAP的config.json，Stage模型对应module.json hap_profile = "src/main/module.json" } -- GitLab