Merge branch 'master' of gitee.com:openharmony/xts_acts into master

Signed-off-by: Nchensi10 <chensi52@huawei.com>

ability/ability_runtime/actscalldataabilitytest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsCallDataAbilityTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsCallDataAbilityTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("actscalldataabilitytest_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/actsrequestdialogtest/actsrequestdialog/entry/src/main/ets/test/Ability.test.ets

@@ -32,7 +32,7 @@ export default function abilityTest() {
 
     /*
     * @tc.number: ACTS_requestDialog_0100
-    * @tc.name: Start Recent Ability with no permission.
+    * @tc.name: Start Recent Ability with no callback.
     * @tc.desc: reguest dialog service
     */
     it('ACTS_requestDialog_0100', 0, async function (done) {
@@ -66,11 +66,11 @@ export default function abilityTest() {
         subscriber = data;
         commonEvent.subscribe(subscriber, subscribeCallBack);
         try {
-            await globalThis.abilityContext.requestDialogService(
+            globalThis.abilityContext.requestDialogService(
             {
                 bundleName: 'com.acts.example.requestdialog',
                 abilityName: 'com.acts.example.requestdialog.MainAbility2',
-            }).then((data) => {
+            }, (data) => {
                 console.info("====>ACTS_requestDialog_0100 request end + data:" + JSON.stringify(data));
                 resultCode = data.result;
             })
@@ -91,5 +91,67 @@ export default function abilityTest() {
       id = setTimeout(timeout, CASE_TIMEOUT);
       console.log('Start  ACTS_requestDialog_0100 timer id : ' + id);
     })
+
+    /*
+    * @tc.number: ACTS_requestDialog_0200
+    * @tc.name: Start Recent Ability with no permission.
+    * @tc.desc: reguest dialog service
+    */
+    it('ACTS_requestDialog_0200', 0, async function (done) {
+      console.log('ACTS_requestDialog_0200====<begin');
+      var subscriber;
+      let id;
+      let resultCode;
+
+      async function subscribeCallBack(err, data) {
+        console.info("====>ACTS_requestDialog_0200 Subscribe CallBack data:====>" + JSON.stringify(data));
+
+        async function processInfoCheck(data) {
+          console.info('====> ACTS_requestDialog_0200 processInfoCheck=====>');
+          expect(globalThis.requestDialogSuccess).assertTrue();
+          expect(globalThis.validRequestInfo).assertTrue();
+          expect(globalThis.validRequestCallback).assertTrue();
+          commonEvent.unsubscribe(subscriber, unSubscribeCallback);
+          done();
+        }
+
+        if (data.event == "ACTS_REQUEST_DIALOG_EVENT1") {
+          console.info('====> ACTS_requestDialog_0200 ACTS_StartAbility_CommonEvent1 success=====>');
+
+          await sleep(500);
+          processInfoCheck(data);
+        }
+      }
+
+      commonEvent.createSubscriber(subscriberInfo).then(async (data) => {
+        console.info("====>ACTS_requestDialog_0200 Create Subscriber====>");
+        subscriber = data;
+        commonEvent.subscribe(subscriber, subscribeCallBack);
+        try {
+            await globalThis.abilityContext.requestDialogService(
+            {
+                bundleName: 'com.acts.example.requestdialog',
+                abilityName: 'com.acts.example.requestdialog.MainAbility2',
+            }).then((data) => {
+                console.info("====>ACTS_requestDialog_0200 request end + data:" + JSON.stringify(data));
+                resultCode = data.result;
+            })
+        } catch (paramError) {
+            console.info("====>ACTS_requestDialog_0200 requestDialogSerivce paramError====>");
+        }
+      })
+
+      function unSubscribeCallback() {
+        console.info("====>UnSubscribe0200 CallBack====>");
+      }
+
+      function timeout() {
+        console.log('ACTS_requestDialog_0200 timeout.');
+        done();
+      }
+
+      id = setTimeout(timeout, CASE_TIMEOUT);
+      console.log('Start  ACTS_requestDialog_0200 timer id : ' + id);
+    })
   })
 }
\ No newline at end of file

ability/ability_runtime/apprecovery/AppRecoveryRely/entry/src/main/ets/entryability/EntryAbility.ts

@@ -69,11 +69,9 @@ export default class EntryAbility extends Ability {
         hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
         hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
 
-        // 第一次启动设置项目
         if (strAction == "Acts_AppRecovery_0100_once" || strAction == "Acts_AppRecovery_0300_once" ||
             strAction == "Acts_AppRecovery_0700_once" || strAction == "Acts_AppRecovery_0900_once" ||
             strAction == "Acts_AppRecovery_1100_once") {
-            // 是否包存状态
             if (strAction == "Acts_AppRecovery_0100_once" || strAction == "Acts_AppRecovery_0300_once" ||
                 strAction == "Acts_AppRecovery_1100_once") {
                 appRecovery.saveAppState(this.context);
@@ -81,11 +79,9 @@ export default class EntryAbility extends Ability {
             } else {
                 console.log(strAction + "Rely====> not saveAppState");
             }
-            // 回复ACTS_AppRecovery_First消息
             setTimeout(() => {
                 commonEvent.publish("ACTS_AppRecovery_First",commonEventData,(err)=>{
                     console.log(strAction + "Rely====> publish err:" + JSON.stringify(err));
-                    // 是否退出
                     if (strAction == "Acts_AppRecovery_0100_once" ||
                         strAction == "Acts_AppRecovery_0700_once") {
                         setTimeout(()=>{
@@ -100,7 +96,6 @@ export default class EntryAbility extends Ability {
             }, 200);
         }
 
-        // 第二次启动设置项目
         if (strAction == "Acts_AppRecovery_0100_twice" || strAction == "Acts_AppRecovery_0300_twice" ||
             strAction == "Acts_AppRecovery_0700_twice" || strAction == "Acts_AppRecovery_0900_twice" ||
             strAction == "Acts_AppRecovery_1100_twice") {

ability/ability_runtime/apprecovery/AppRecoverysRely/entry/src/main/ets/entryability/EntryAbility.ts

@@ -67,11 +67,9 @@ export default class EntryAbility extends Ability {
         // Ability has brought to foreground
         hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
         hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
-        // 第一次启动
         if (strAction == "Acts_AppRecovery_0200_once" || strAction == "Acts_AppRecovery_0400_once" ||
             strAction == "Acts_AppRecovery_0800_once" ||
             strAction == "Acts_AppRecovery_1000_once" || strAction == "Acts_AppRecovery_1200_once") {
-            // 需要包存状态的用例
             if (strAction == "Acts_AppRecovery_0200_once" ||
                 strAction == "Acts_AppRecovery_0400_once" ||
                 strAction == "Acts_AppRecovery_1200_once") {
@@ -86,7 +84,6 @@ export default class EntryAbility extends Ability {
                 })
             }, 200);
         }
-        // 第二次启动
         if (strAction == "Acts_AppRecovery_0200_twice" || strAction == "Acts_AppRecovery_0400_twice" ||
             strAction == "Acts_AppRecovery_0800_twice" ||
             strAction == "Acts_AppRecovery_1000_twice" || strAction == "Acts_AppRecovery_1200_twice") {
@@ -96,14 +93,12 @@ export default class EntryAbility extends Ability {
                 })
             }, 200);
         }
-        // 拉起第二个Ability
         this.context.startAbility({
             bundleName: "com.example.apprecoverysrely",
             abilityName: "EntryAbilitySec",
             action: strAction
         },(err) => {
             console.debug(strAction + "Rely1====> startAbility err:"+JSON.stringify(err));
-            // 需要自己正常退出的用例
             if (strAction == "Acts_AppRecovery_0200_once" || strAction == "Acts_AppRecovery_0200_twice" ||
                 strAction == "Acts_AppRecovery_0400_twice" ||
                 strAction == "Acts_AppRecovery_0800_once" || strAction == "Acts_AppRecovery_0800_twice" ||

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/pages/index/index.css

+#wrapper {
+    flex-direction: column;
+}
+
+#div1 {
+    width: 100%;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    background-color: white;
+}
+
+#text1 {
+    height: 45px;
+    width: 150px;
+    font-size: 16px;
+    text-align: center;
+}
+

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/pages/index/index.hml

+<div>
+    <div id="wrapper">
+        <div id="div1">
+            <text id="text1">{{title}}</text>
+        </div>
+    </div>
+</div>
\ No newline at end of file