和Beta3同步

Change-Id: Ic1b2e6aeaa95672fa5fbd9d4dad92f02135dab0e
Signed-off-by: NHuangXW <huangxinwei4@huawei.com>

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts

@@ -117,6 +117,7 @@ export default {
         try {
             console.debug('ACTS_SerivceAbilityServer ====>onConnect='
             + want + " , JSON." + JSON.stringify(want));
+            commonEvent.publish("ACTS_SerivceAbilityServer_onConnect" + "_" + want.action, (err) => { });
             function onConnectCallback(element, remote) {
                 console.debug('ACTS_SerivceAbilityServer_onConnectCallback ====> mConnIdJs='
                 + JSON.stringify(mConnIdJs) + " , " + mConnIdJs);
@@ -147,8 +148,6 @@ export default {
                         onFailed: onFailedCallback,
                     },
                 )
-            } else {
-                commonEvent.publish("ACTS_SerivceAbilityServer_onConnect" + "_" + want.action, (err) => { });
             }
         } catch (err) {
             console.log("ACTS_SerivceAbilityServer ====< error:" + err)
@@ -159,12 +158,9 @@ export default {
     onDisconnect(want) {
         console.debug('ACTS_SerivceAbilityServer ====>onDisConnect='
         + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServer_onDisConnect" + want.action, (err) => {
-            if (err.code) {
-                console.debug('ACTS_SerivceAbilityServer_onDisConnect publish err=====>' + err);
-            } else {
-                console.debug('ACTS_SerivceAbilityServer_onDisConnect =====<'
-                    + want.action);
+        commonEvent.publish("ACTS_SerivceAbilityServer_onDisConnect_" + want.action, (err) => {
+            console.debug('ACTS_SerivceAbilityServer_onDisConnect ===' + want.action);
+        });
         if (want.action == 'ServiceConnectService_1300' || want.action == 'ServiceConnectService_1400'
         || want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1501'
         || want.action == 'ServiceConnectService_1600' || want.action == 'ServiceConnectService_1601'
@@ -174,8 +170,6 @@ export default {
                 + ("json err=") + JSON.stringify(err) + " , " + want.action);
             })
         }
-            }
-        });
     },
     onReady() {
         console.debug('ACTS_SerivceAbilityServer ====<onReady');

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts

@@ -49,15 +49,9 @@ class StubTest extends rpc.RemoteObject {
     }
 }
 
-function sleep(delay) {
-    let start = new Date().getTime();
-    while (true) {
-        if (new Date().getTime() - start > delay) {
-            break;
-        }
-    }
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
 }
-
 export default {
     onStart(want) {
         console.debug('ACTS_SerivceAbilityServerSecond ====>onStart='
@@ -157,7 +151,7 @@ export default {
     onDisconnect(want) {
         console.debug('ACTS_SerivceAbilityServerSecond ====>onDisConnect='
         + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect", (err) => {
+        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect_" + want.action, (err) => {
             if (err.code) {
                 console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect publish err=====>' + err);
             } else {