From f4c011fb66ea166745ca7066aa02c62b80adfa94 Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Thu, 28 Jul 2022 09:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=83=E8=83=BD=E5=8A=9B=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../src/main/ets/ServiceAbility/service.ts | 31 +++++++++++++++---- .../src/main/ets/ServiceAbility/service.ts | 19 +++++++++--- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts index e59a8552d..03c3f992a 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts @@ -14,7 +14,6 @@ */ import rpc from "@ohos.rpc"; import particleAbility from '@ohos.ability.particleAbility' -import featureAbility from '@ohos.ability.featureAbility' import commonEvent from '@ohos.commonEvent' var serversecond_bundleName = "com.amsst.stserviceabilityserversecond"; var serversecond_abilityName = "com.amsst.stserviceabilityserversecond.ServiceAbility"; @@ -59,7 +58,11 @@ export default { onStop() { console.debug('ACTS_SerivceAbilityServer ==== { }); - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); }, onCommand(want, restart, startId) { console.debug('ACTS_SerivceAbilityServer ====>onCommand=' @@ -76,7 +79,11 @@ export default { }, } ); - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); } else if (want.action == 'ServiceStartService_1000') { particleAbility.startAbility( { @@ -89,7 +96,11 @@ export default { }, (err, data) => { console.debug('ACTS_SerivceAbilityServer start Ability 1000 callback=====' + err + ', data= ' + data + " , JSON." + JSON.stringify(data)); - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); } ); } else { @@ -99,7 +110,11 @@ export default { || want.action == 'PageStartService_0301' || want.action == 'PageStartService_0401') { console.debug('ACTS_SerivceAbilityServer_onCommand 100 200 301 401.terminateSelf()=====>' + want.action); - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); } } else { console.debug('ACTS_SerivceAbilityServer_onCommand publish err=====>' + err); @@ -169,7 +184,11 @@ export default { + ("json err=") + JSON.stringify(err) + " , " + want.action); }) } - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); } }); }, diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts index fde7bee83..e6b0b52a1 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts @@ -14,7 +14,6 @@ */ import rpc from "@ohos.rpc"; import particleAbility from '@ohos.ability.particleAbility' -import featureAbility from '@ohos.ability.featureAbility' import commonEvent from '@ohos.commonEvent' var server_bundleName = "com.amsst.stserviceabilityserver"; var server_abilityName = "com.amsst.stserviceabilityserver.ServiceAbility"; @@ -59,14 +58,22 @@ export default { onStop() { console.debug('ACTS_SerivceAbilityServerSecond ==== { }); - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); }, onCommand(want, restart, startId) { console.debug('ACTS_SerivceAbilityServerSecond ====>onCommand=' + "JSON(want)=" + JSON.stringify(want) + " ,restart=" + restart + " ,startId=" + startId); commonEvent.publish("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action, (err) => { }); - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); }, onConnect(want) { console.info('ACTS_SerivceAbilityServerSecond ====< onConnect'); @@ -161,7 +168,11 @@ export default { + ("json err=") + JSON.stringify(err) + " , " + want.action); }) } - featureAbility.terminateSelf(); + particleAbility.terminateSelf().then((data) => { + console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); + }).catch((error) => { + console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); + }); } }); }, -- GitLab