!4887 元能力-编译报错修改

Merge pull request !4887 from chengxingzhen/master

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 = {

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 = {

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');

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': {

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) => {

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');

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': {

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 }) {

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 }) {

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 }) {

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 = {