From d27da08b5ac228a14a96f3bccf6bf554f680e3a5 Mon Sep 17 00:00:00 2001 From: chensihan Date: Sat, 28 Sep 2024 10:43:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Signed-off-by:=20chensihan?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../native/backup_kit_inner/impl/svc_death_recipient.h | 2 +- interfaces/kits/js/backup/general_callbacks.h | 2 +- .../kits/js/backup/session_backup_n_exporter.cpp | 10 ++++++---- .../backup/session_incremental_backup_n_exporter.cpp | 10 ++++++---- .../kits/js/backup/session_restore_n_exporter.cpp | 10 ++++++---- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h b/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h index d7d9d294d..4f318b474 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h @@ -25,8 +25,8 @@ class SvcDeathRecipient : public IRemoteObject::DeathRecipient { public: void OnRemoteDied(const wptr &object) override { - object->RemoveDeathRecipient(this); functor_(object); + object->RemoveDeathRecipient(this); }; public: diff --git a/interfaces/kits/js/backup/general_callbacks.h b/interfaces/kits/js/backup/general_callbacks.h index 4fc20530f..fdcd560ae 100644 --- a/interfaces/kits/js/backup/general_callbacks.h +++ b/interfaces/kits/js/backup/general_callbacks.h @@ -59,7 +59,7 @@ public: LibN::NAsyncWorkCallback onBundleBegin; LibN::NAsyncWorkCallback onBundleEnd; LibN::NAsyncWorkCallback onAllBundlesEnd; - LibN::NAsyncWorkCallback onBackupServiceDied; + BackupRestoreCallback onBackupServiceDied; BackupRestoreCallback onResultReport; BackupRestoreCallback onProcess; }; diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index 7976c8fdb..7f8e99ccd 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -266,11 +266,13 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) return; } - auto cbCompl = [](napi_env env, NError err) -> NVal { - return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); + auto cbCompl = [](napi_env env, vector &argv) -> bool { + napi_value napi_res = nullptr; + napi_get_undefined(env, &napi_res); + argv.push_back(napi_res); + return true; }; - - callbacks->onBackupServiceDied.ThreadSafeSchedule(cbCompl); + callbacks->onBackupServiceDied.CallJsMethod(cbCompl); } static void OnProcess(weak_ptr pCallbacks, const BundleName name, const std::string processInfo) diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index 1a3d9bd95..2596a6e6c 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -272,11 +272,13 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) return; } - auto cbCompl = [](napi_env env, NError err) -> NVal { - return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); + auto cbCompl = [](napi_env env, vector &argv) -> bool { + napi_value napi_res = nullptr; + napi_get_undefined(env, &napi_res); + argv.push_back(napi_res); + return true; }; - - callbacks->onBackupServiceDied.ThreadSafeSchedule(cbCompl); + callbacks->onBackupServiceDied.CallJsMethod(cbCompl); } static void OnProcess(weak_ptr pCallbacks, const BundleName name, const std::string processInfo) diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index 81347476a..cf26751c8 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -245,11 +245,13 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) return; } - auto cbCompl = [](napi_env env, NError err) -> NVal { - return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); + auto cbCompl = [](napi_env env, vector &argv) -> bool { + napi_value napi_res = nullptr; + napi_get_undefined(env, &napi_res); + argv.push_back(napi_res); + return true; }; - - callbacks->onBackupServiceDied.ThreadSafeSchedule(cbCompl); + callbacks->onBackupServiceDied.CallJsMethod(cbCompl); } static void OnResultReport(weak_ptr pCallbacks, const std::string bundleName, -- Gitee