diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets index 9e6e844df4669869e040e644ab7450e1a2f0c062..5dd86d6ebb8fad9a9578ea6713243d760c5f86fb 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets @@ -131,8 +131,8 @@ export default function ConnectAbilityTest() { var deviceid = "0"; abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.ability.deviceId)); - deviceid = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); + deviceid = data.deviceId; }) await sleep(500); var request1 = { @@ -167,8 +167,8 @@ export default function ConnectAbilityTest() { var deviceid = "0"; abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.ability.deviceId)); - deviceid = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); + deviceid = data.deviceId; }) await sleep(500); var request2 = { diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets index 0f7d45a2d6f0afff8f9e2c15569281c1a224424a..8770453e8b42bb31f4ee9f16cfd4c7e56cead323 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets @@ -126,8 +126,8 @@ export default function ConnectAbilityTest(abilityContext) { var deviceid = "0"; abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.ability.deviceId)); - deviceid = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); + deviceid = data.deviceId; }) await sleep(500); var request1 = { @@ -157,8 +157,8 @@ export default function ConnectAbilityTest(abilityContext) { var deviceid = "0"; abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.ability.deviceId)); - deviceid = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceid:' + JSON.stringify(data.deviceId)); + deviceid = data.deviceId; }) await sleep(500); var request2 = { diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/ets/MainAbility/pages/third.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/ets/MainAbility/pages/third.ets index 23790bb70f82ad346ccbe87078e6f27614b232ae..cb8960a646692f2d8f5a452c37ea82f2e99dfb72 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/ets/MainAbility/pages/third.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/ets/MainAbility/pages/third.ets @@ -37,7 +37,6 @@ struct Third { private content: string = "Third Page" private contextText: string= ''; private localDeviceId: string= ''; - private backgroundColor = Color.Grey; private tipsMsg = '请输入对端的deviceId'; private isOn = false; @@ -100,7 +99,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { this.updateModuleUpgradeFlag('StartAbilityPromise006','entry'); }); @@ -112,7 +111,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -136,7 +135,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -156,7 +155,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { if ('' === remoteDeviceId && '' === this.contextText) { this.tips(this.tipsMsg); @@ -185,7 +184,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { this.updateModuleUpgradeFlag('StartAbilityPromiseKSB006','entry'); }); @@ -197,7 +196,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -218,7 +217,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { if ('' === remoteDeviceId && '' === this.contextText) { this.tips(this.tipsMsg); @@ -248,7 +247,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -360,7 +359,7 @@ struct Third { console.log('[startAbility] get device onBackPress out'); } - private aboutToAppear(): void { + aboutToAppear(): void { console.info('[startAbility] aboutToAppear in'); remoteDeviceModel = new RemoteDeviceModel; remoteDeviceModel.registerDeviceListCallback(); @@ -378,7 +377,7 @@ struct Third { console.info('[startAbility] onPageShow deviceId is ' + remoteDeviceId); } - private aboutToDisappear() { + aboutToDisappear() { console.info('[startAbility] aboutToDisappear in'); remoteDeviceModel.unregisterDeviceListCallback(); console.info('[startAbility] aboutToDisappear out'); diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/ets/MainAbility/pages/index.ets index 855b203accb89d6ec76ab95d647bc012b7820139..21763db69446fc57fad0b2a3c78f51227fd59bfa 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/ets/MainAbility/pages/index.ets @@ -35,8 +35,6 @@ async function routePage() { @Component struct Index { - private backgroundColor = Color.Grey; - build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text('hm2') @@ -62,7 +60,7 @@ struct Index { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets index d38e9f56d791fc4c98cfc938c4c723f89f8d8397..f21da957daa2d35375368ecb7c306c7ca589b90e 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets @@ -301,8 +301,8 @@ export default function startAbilityTest() { var deviceId = ""; await abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.ability.deviceId)); - deviceId = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.deviceId)); + deviceId = data.deviceId; }) await sleep(1000); let details; @@ -340,8 +340,8 @@ export default function startAbilityTest() { var deviceId = ""; await abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.ability.deviceId)); - deviceId = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.deviceId)); + deviceId = data.deviceId; }) await sleep(1000); let details; @@ -559,7 +559,7 @@ export default function startAbilityTest() { "bundleName": "com.example.qianyiyingyong.hmservice", "abilityName": "com.example.qianyiyingyong.MainAbility", "moduleName": "entry", - "flags": '94.31' + "flags": 94.31 } } await featureAbility.startAbility(str).then((data) => { @@ -594,7 +594,7 @@ export default function startAbilityTest() { "bundleName": "com.example.qianyiyingyong.hmservice", "abilityName": "com.example.qianyiyingyong.MainAbility", "moduleName": "entry", - "flags": '94.31' + "flags": 94.31 } } await featureAbility.startAbility(str).then((data) => { @@ -625,7 +625,6 @@ export default function startAbilityTest() { "bundleName": "com.example.qianyiyingyong.hmservice", "abilityName": "com.example.qianyiyingyong.MainAbility", "moduleName": "entry", - "flags": '' } } await featureAbility.startAbility(str).then((data) => { @@ -660,7 +659,6 @@ export default function startAbilityTest() { "bundleName": "com.example.qianyiyingyong.hmservice", "abilityName": "com.example.qianyiyingyong.MainAbility", "moduleName": "entry", - "flags": '' } } await featureAbility.startAbility(str).then((data) => { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/ets/MainAbility/pages/third.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/ets/MainAbility/pages/third.ets index 5cfba1b1abc9b4b0e61c8e87f423ff6c86cbb66d..8557c45cc034a8dba254251d2fb17fc4dd1a9364 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/ets/MainAbility/pages/third.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/ets/MainAbility/pages/third.ets @@ -34,7 +34,6 @@ struct Third { private content: string = "Third Page" private contextText: string= ''; private localDeviceId: string= ''; - private backgroundColor = Color.Grey; private tipsMsg = '请输入对端的deviceId'; private isOn = false; @@ -97,7 +96,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -120,7 +119,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -139,7 +138,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { this.updateModuleUpgradeFlag('fAStartAbilityPromiseSameBundleName006','entry'); }); @@ -151,7 +150,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { if ('' === remoteDeviceId && '' === this.contextText) { this.tips(this.tipsMsg); @@ -179,7 +178,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { if ('' === remoteDeviceId && '' === this.contextText) { this.tips(this.tipsMsg); @@ -207,7 +206,7 @@ struct Third { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { @@ -317,7 +316,7 @@ struct Third { console.log('[startAbility] get device onBackPress out'); } - private aboutToAppear(): void { + aboutToAppear(): void { console.info('[startAbility] aboutToAppear in'); remoteDeviceModel = new RemoteDeviceModel; remoteDeviceModel.registerDeviceListCallback(); @@ -335,7 +334,7 @@ struct Third { console.info('[startAbility] onPageShow deviceId is ' + remoteDeviceId); } - private aboutToDisappear() { + aboutToDisappear() { console.info('[startAbility] aboutToDisappear in'); remoteDeviceModel.unregisterDeviceListCallback(); console.info('[startAbility] aboutToDisappear out'); diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/ets/MainAbility/pages/index.ets index a5fc0ea8f5d00a1b74788cce8eb03ec7b88e9a74..65e3f950d5d99620b8a332ce73f138b92d81d720 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/ets/MainAbility/pages/index.ets @@ -35,8 +35,6 @@ async function routePage() { @Component struct Index { - private backgroundColor = Color.Grey; - build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text('Hello World') @@ -62,7 +60,7 @@ struct Index { .fontColor(Color.White) .fontWeight(FontWeight.Bold) .margin({ top: 20 }) - .backgroundColor(this.backgroundColor) + .backgroundColor(Color.Grey) .onClick(() => { var str = { 'want': { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets index 28a7693c593a3a2ff354af01293030264925803b..5a73d79a4b5eb516a87da7cbb33ea051dc9ba688 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets @@ -19,7 +19,6 @@ import router from '@system.router'; @Component struct Index { @State message: string = 'Hello World' - private height: number = 25 build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets index 2265da4fb343f2cacc3feccadfe61c19a0141dd3..8414560d76ec652b3caaba66ebd5a895acb34966 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets @@ -24,7 +24,6 @@ const ABILITY_NAME1 = 'hnm2MainAbility'; @Entry @Component struct Index { - private backgroundColor = Color.Grey; build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets index 2265da4fb343f2cacc3feccadfe61c19a0141dd3..8414560d76ec652b3caaba66ebd5a895acb34966 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets @@ -24,7 +24,6 @@ const ABILITY_NAME1 = 'hnm2MainAbility'; @Entry @Component struct Index { - private backgroundColor = Color.Grey; build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets index 711e077392865265941b465f9ce1a7858372b59f..84fcd95027484f4e0a930aecdbbbd602c51270ad 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets @@ -316,8 +316,8 @@ export default function startAbilityTest(abilityContext) { await sleep(1000); abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.ability.deviceId)); - deviceId = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.deviceId)); + deviceId = data.deviceId; }) await sleep(2000); var str = { @@ -355,8 +355,8 @@ export default function startAbilityTest(abilityContext) { await sleep(1000); abilityManager.getTopAbility((err, data) => { console.log(TAG + 'getTopAbility result: ' + JSON.stringify(data) + " , err: " + JSON.stringify(err)); - console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.ability.deviceId)); - deviceId = data.ability.deviceId; + console.log(TAG + 'getTopAbility result deviceId:' + JSON.stringify(data.deviceId)); + deviceId = data.deviceId; }) await sleep(2000); var str = {