xts--编译报错适配

Signed-off-by: Nchengxingzhen <chengxingzhen@huawei.com>

ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility3/MainAbility3.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility3/MainAbility3.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actscalldataabilitytest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actscalldataabilitytest/entry/src/main/ets/MainAbility/test/callTest.test.ets

-// @ts-nocheck
-
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility/pages/index.ets

@@ -13,7 +13,6 @@
 * limitations under the License.
 */
 
-// @ts-nocheck
 import router from '@ohos.router';
 import file from '@system.file';
 import testsuite from "../../test/List.test"

ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility3/MainAbility3.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +20,7 @@ export default class MainAbility3 extends Ability {
         console.log("MainAbility3 onCreate")
     }
 
-    onDestroy(want) {
+    onDestroy() {
         // Ability is destroying, release resources for this ability
         console.log("MainAbility3 onDestroy")
     }

ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility4/MainAbility4.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +20,7 @@ export default class MainAbility4 extends Ability {
         console.log("MainAbility4 onCreate")
     }
 
-    onDestroy(want) {
+    onDestroy() {
         // Ability is destroying, release resources for this ability
         console.log("MainAbility4 onDestroy")
     }

ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 4000;

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/test/Ability.test.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/test/Ability.test.ets

-// @ts-nocheck
 /*
 * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 2000;
@@ -259,7 +258,6 @@ export default function singleusermodelTest() {
                 let temp
                 let cmd = 'aa dump -a'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand 0800: err : ' + JSON.stringify(err));
                         console.info('executeShellCommand 0800: data : ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("SingleUserModel1800") == -1).assertTrue()
@@ -269,7 +267,6 @@ export default function singleusermodelTest() {
                     })
                 cmd = 'aa dump -a -u 0'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand 0: err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data 0: ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("SingleUserModel1800") == -1).assertTrue()

ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 

ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const ABILITY_TIMEOUT=5000;
@@ -137,7 +136,6 @@ export default function singleusermodelTest() {
                 let temp
                 let cmd ='aa dump -e'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand : err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data : ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility2") == -1).assertTrue()
@@ -147,7 +145,6 @@ export default function singleusermodelTest() {
                     })
                 cmd ='aa dump -e -u 0'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand 0: err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data 0: ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility2") == -1).assertTrue()
@@ -215,7 +212,6 @@ export default function singleusermodelTest() {
                 let temp
                 let cmd ='aa dump -e'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand : err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data : ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility3") == -1).assertTrue()
@@ -225,7 +221,6 @@ export default function singleusermodelTest() {
                     })
                 cmd ='aa dump -e -u 0'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand 0: err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data 0: ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility3") == -1).assertTrue()
@@ -284,7 +279,6 @@ export default function singleusermodelTest() {
                 let temp
                 let cmd ='aa dump -e'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand : err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data : ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility4") == -1).assertTrue()
@@ -294,7 +288,6 @@ export default function singleusermodelTest() {
                     })
                 cmd ='aa dump -e -u 0'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand 0: err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data 0: ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility4") == -1).assertTrue()
@@ -361,7 +354,6 @@ export default function singleusermodelTest() {
                 let temp
                 let cmd ='aa dump -e'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand : err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data : ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility5") == -1).assertTrue()
@@ -371,7 +363,6 @@ export default function singleusermodelTest() {
                     })
                 cmd ='aa dump -e -u 0'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                        console.info('executeShellCommand 0: err : ' + JSON.stringify(err));
                         console.info('executeShellCommand : data 0: ' + JSON.stringify(data));
                         temp = data["stdResult"];
                         expect(temp.indexOf("ServiceAbility5") == -1).assertTrue()

ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/test/Ability.test.ets

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 const START_ABILITY_TIMEOUT = 3000;

ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 const START_ABILITY_TIMEOUT = 3000;
@@ -41,7 +40,6 @@ export default function singleusermodelTest() {
                 let temp
                 let cmd = 'aa dump -a'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                    console.info('executeShellCommand : err : ' + JSON.stringify(err));
                     console.info('executeShellCommand : data : ' + JSON.stringify(data));
                     temp = data["stdResult"];
                     expect(temp.indexOf("SingleUserModel1900") >= 0).assertTrue()
@@ -51,7 +49,6 @@ export default function singleusermodelTest() {
                 })
                 cmd = 'aa dump -a -u 0'
                 await abilityDelegator.executeShellCommand(cmd).then((data) => {
-                    console.info('executeShellCommand 0: err : ' + JSON.stringify(err));
                     console.info('executeShellCommand 0: data : ' + JSON.stringify(data));
                     temp = data["stdResult"];
                     expect(temp.indexOf("SingleUserModel1900") == -1).assertTrue()

ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 

ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 

ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 const START_ABILITY_TIMEOUT = 3000;

ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility2/MainAbility2.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility3/MainAbility3.ts

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"
 import commonEvent from '@ohos.commonEvent';
 

ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/test/Ability.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"
 import commonEvent from '@ohos.commonEvent';
 

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/CreateFormAbility/pages/MainAbility_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +28,7 @@ struct Index {
   @State ability: string = "FormAbility";
   @State moduleName: string = "phone";
   @State name: string = "form1";
+  @State allowUpate: boolean = true;
   private dimension: FormDimension = FormDimension.Dimension_2_2;
   private temporary = false;
 
@@ -49,7 +49,7 @@ struct Index {
             dimension: this.dimension,
             temporary: this.temporary,
           })
-          .allowUpdate(this.allowUpate)
+          .allowUpdate(this.allowUpate )
           .visibility(this.isShowing ? Visibility.Visible : Visibility.Hidden)
           .onAcquired((form) => {
             console.log("[FormComponent.host] get form, form id:" + form.id);

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormHostAbility/pages/MainAbility_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +25,7 @@ struct Index {
   @State ability: string = "FormAbility";
   @State moduleName: string = "phone";
   @State name: string = "widget";
+  @State allowUpate: boolean = true;
   private dimension: FormDimension = FormDimension.Dimension_2_1;
   private temporary = false;
 

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/SecondAbility/pages/MainAbility_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets

@@ -18,7 +18,6 @@ import formHost from '@ohos.application.formHost';
 import commonEvent from '@ohos.commonEvent';
 import systemTime from '@ohos.systemTime';
 
-// @ts-nocheck
 @Entry
 @Component
 struct Index {

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets

@@ -17,7 +17,6 @@ import commonEvent from '@ohos.commonEvent';
 import featureAbility from '@ohos.ability.featureAbility';
 import formHost from '@ohos.application.formHost';
 
-// @ts-nocheck
 @Entry
 @Component
 struct Index {

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-// @ts-nocheck
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/ListTest'

ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/Utils.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +23,7 @@ export default class Utils {
   static sleep(time) {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
-        resolve()
+        resolve(reject)
       }, time)
     }).then(() => {
       console.info(`sleep ${time} over...`)
@@ -76,6 +75,8 @@ export default class Utils {
       x: downX,
       y: downY,
       type: TouchType.Down,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('down touch started: ' + JSON.stringify(downPonit))
     sendTouchEvent(downPonit);
@@ -88,7 +89,9 @@ export default class Utils {
         id: 1,
         x: downX + (xStep * i),
         y: downY + (yStep * i),
-        type: TouchType.Move
+        type: TouchType.Move,
+        screenX: 0,
+        screenY: 1,
       }
       console.info('move touch started: ' + JSON.stringify(movePoint))
       ret = sendTouchEvent(movePoint)
@@ -106,6 +109,8 @@ export default class Utils {
       x: upX,
       y: upY,
       type: TouchType.Up,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('up touch started: ' + JSON.stringify(upPoint))
     sendTouchEvent(upPoint)
@@ -124,7 +129,3 @@ export default class Utils {
     return duration;
   }
 }
\ No newline at end of file
-
-
-
-

ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/Utils.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +23,7 @@ export default class Utils {
   static sleep(time) {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
-        resolve()
+        resolve(reject)
       }, time)
     }).then(() => {
       console.info(`sleep ${time} over...`)
@@ -76,6 +75,8 @@ export default class Utils {
       x: downX,
       y: downY,
       type: TouchType.Down,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('down touch started: ' + JSON.stringify(downPonit))
     sendTouchEvent(downPonit);
@@ -88,7 +89,9 @@ export default class Utils {
         id: 1,
         x: downX + (xStep * i),
         y: downY + (yStep * i),
-        type: TouchType.Move
+        type: TouchType.Move,
+        screenX: 0,
+        screenY: 1,
       }
       console.info('move touch started: ' + JSON.stringify(movePoint))
       ret = sendTouchEvent(movePoint)
@@ -106,6 +109,8 @@ export default class Utils {
       x: upX,
       y: upY,
       type: TouchType.Up,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('up touch started: ' + JSON.stringify(upPoint))
     sendTouchEvent(upPoint)
@@ -124,7 +129,3 @@ export default class Utils {
     return duration;
   }
 }
\ No newline at end of file
-
-
-
-

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets

-// @ts-nocheck
-
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -753,15 +750,15 @@ export default function StartAbilityForResult() {
             console.log("------------start FreeInstall_FA_StartAbilityForResult_1800-------------");
             TAG = "FreeInstall_FA_StartAbilityForResult_1800";
             let wrong;
-            var str = {
-                'want': {
-                    "bundleName": "com.example.qianyiyingyong.hmservice",
-                    "abilityName": "com.example.qianyiyingyong.MainAbility",
-                    "moduleName": "entry",
-                    'flags': '11'
+            let startAbilityParameter =  {
+                want: {
+                    bundleName: "com.example.qianyiyingyong.hmservice",
+                    abilityName: "com.example.qianyiyingyong.MainAbility",
+                    moduleName: "entry",
+                    flags: 11
                 }
             }
-            await featureAbility.startAbilityForResult(str)
+            await featureAbility.startAbilityForResult(startAbilityParameter)
                 .then((data) => {
                     console.info(TAG + ' StartAbilityForResultPromise successful. Data: ' + JSON.stringify(data))
                 }).catch((error) => {
@@ -793,15 +790,15 @@ export default function StartAbilityForResult() {
             })
             await Utils.sleep(500);
             let details;
-            var str = {
-                'want': {
+            let startAbilityParameter = {
+                want: {
                     "bundleName": "com.example.qianyiyingyong.hmservice",
                     "abilityName": "com.example.qianyiyingyong.MainAbility",
                     "moduleName": "entry",
-                    'flags': '11'
+                    'flags': 11
                 }
             }
-            await featureAbility.startAbilityForResult(str)
+            await featureAbility.startAbilityForResult(startAbilityParameter)
                 .then((data) => {
                     details = data;
                     console.info(TAG + ' StartAbilityForResultPromise successful. Data: ' + JSON.stringify(data))
@@ -824,15 +821,15 @@ export default function StartAbilityForResult() {
             console.log("------------start FreeInstall_FA_StartAbilityForResult_2000-------------");
             TAG = "FreeInstall_FA_StartAbilityForResult_2000";
             let wrong;
-            var str = {
-                'want': {
+            let startAbilityParameter = {
+                want: {
                     "bundleName": "com.example.qianyiyingyong.hmservice",
                     "abilityName": "com.example.qianyiyingyong.MainAbility",
                     "moduleName": "entry",
-                    'flags': ''
+                    'flags': 0
                 }
             }
-            await featureAbility.startAbilityForResult(str)
+            await featureAbility.startAbilityForResult(startAbilityParameter)
                 .then((data) => {
                     console.info(TAG + ' StartAbilityForResultPromise successful. Data: ' + JSON.stringify(data))
                 }).catch((error) => {
@@ -859,15 +856,15 @@ export default function StartAbilityForResult() {
             })
             await Utils.sleep(1000);
             let details;
-            var str = {
-                'want': {
+            let startAbilityParameter = {
+                want: {
                     "bundleName": "com.example.qianyiyingyong.hmservice",
                     "abilityName": "com.example.qianyiyingyong.MainAbility",
                     "moduleName": "entry",
-                    'flags': ''
+                    'flags': 2
                 }
             }
-            await featureAbility.startAbilityForResult(str)
+            await featureAbility.startAbilityForResult(startAbilityParameter)
                 .then((data) => {
                     details = data;
                     console.info(TAG + ' StartAbilityForResultPromise successful. Data: ' + JSON.stringify(data))

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets

-// @ts-nocheck
-
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/Utils.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +23,7 @@ export default class Utils {
   static sleep(time) {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
-        resolve()
+        resolve(reject)
       }, time)
     }).then(() => {
       console.info(`sleep ${time} over...`)
@@ -76,6 +75,8 @@ export default class Utils {
       x: downX,
       y: downY,
       type: TouchType.Down,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('down touch started: ' + JSON.stringify(downPonit))
     sendTouchEvent(downPonit);
@@ -88,7 +89,9 @@ export default class Utils {
         id: 1,
         x: downX + (xStep * i),
         y: downY + (yStep * i),
-        type: TouchType.Move
+        type: TouchType.Move,
+        screenX: 0,
+        screenY: 1,
       }
       console.info('move touch started: ' + JSON.stringify(movePoint))
       ret = sendTouchEvent(movePoint)
@@ -106,6 +109,8 @@ export default class Utils {
       x: upX,
       y: upY,
       type: TouchType.Up,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('up touch started: ' + JSON.stringify(upPoint))
     sendTouchEvent(upPoint)
@@ -124,7 +129,3 @@ export default class Utils {
     return duration;
   }
 }
\ No newline at end of file
-
-
-
-

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/Utils.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +23,7 @@ export default class Utils {
   static sleep(time) {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
-        resolve()
+        resolve(reject)
       }, time)
     }).then(() => {
       console.info(`sleep ${time} over...`)
@@ -76,6 +75,8 @@ export default class Utils {
       x: downX,
       y: downY,
       type: TouchType.Down,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('down touch started: ' + JSON.stringify(downPonit))
     sendTouchEvent(downPonit);
@@ -88,7 +89,9 @@ export default class Utils {
         id: 1,
         x: downX + (xStep * i),
         y: downY + (yStep * i),
-        type: TouchType.Move
+        type: TouchType.Move,
+        screenX: 0,
+        screenY: 1,
       }
       console.info('move touch started: ' + JSON.stringify(movePoint))
       ret = sendTouchEvent(movePoint)
@@ -106,6 +109,8 @@ export default class Utils {
       x: upX,
       y: upY,
       type: TouchType.Up,
+      screenX: 0,
+      screenY: 1,
     }
     console.info('up touch started: ' + JSON.stringify(upPoint))
     sendTouchEvent(upPoint)
@@ -124,7 +129,3 @@ export default class Utils {
     return duration;
   }
 }
\ No newline at end of file
-
-
-
-

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/second.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets

-// @ts-nocheck
-
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets

-// @ts-nocheck
-
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/test/AbilityPermission.test.ets

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// @ts-nocheck
 import osaccount from '@ohos.account.osAccount'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"
 import commonEvent from '@ohos.commonEvent'

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility1_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility2_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility4_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility5_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility6_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility7_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/test/LifecycleTest.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/LifeCycleTest.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,7 +61,7 @@ export default function lifecycleTest() {
     });
 
     var TAG = "";
-    var listKeyTemp = ""
+    var listKeyTemp;
     var tempCallbackId;
 
     function sleep(time) {

ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/test/Test.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility1_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility2_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility4_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility5_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility6_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility7_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/pages/MainAbility_pages.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/test/LifecycleTest.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility/pages/index.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");

ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/test/LifeCycleTest.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,7 +61,7 @@ export default function lifecycleTest() {
     });
 
     var TAG = "";
-    var listKeyTemp = ""
+    var listKeyTemp;
     var tempCallbackId;
 
     function sleep(time) {