From df63a0759db5e951fdb029394ac2f92f03236a68 Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 27 Jan 2025 17:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=96=87=E4=BB=B6id?= =?UTF-8?q?l=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL Change-Id: I316b5546d269a0005435d68a270df5e8a0de68b3 --- .../service/object/object_asset_loader.cpp | 8 +++++--- .../service/object/object_asset_loader.h | 4 ++-- .../service/object/object_data_listener.cpp | 12 +++++++----- .../service/object/object_data_listener.h | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/services/distributeddataservice/service/object/object_asset_loader.cpp b/services/distributeddataservice/service/object/object_asset_loader.cpp index c3d582e6a..6a49aec40 100644 --- a/services/distributeddataservice/service/object/object_asset_loader.cpp +++ b/services/distributeddataservice/service/object/object_asset_loader.cpp @@ -182,15 +182,17 @@ int32_t ObjectAssetLoader::PushAsset(int32_t userId, const sptr &asset return status; } -int32_t ObjectAssetsSendListener::OnSendResult(const sptr &assetObj, int32_t result) +int32_t ObjectAssetsSendListener::OnSendResult(const AssetObj &assetObj, int32_t result) { - if (assetObj == nullptr) { + AssetObj assetObjTemp = assetObj; + const sptr assetObjPtr = sptr(&assetObjTemp); + if (assetObjPtr == nullptr) { ZLOGE("OnSendResult error! status:%{public}d", result); ObjectStore::RadarReporter::ReportStateError(std::string(__FUNCTION__), ObjectStore::SAVE, ObjectStore::PUSH_ASSETS, ObjectStore::RADAR_FAILED, result, ObjectStore::FINISHED); return result; } - ZLOGI("OnSendResult, status:%{public}d, asset size:%{public}zu", result, assetObj->uris_.size()); + ZLOGI("OnSendResult, status:%{public}d, asset size:%{public}zu", result, assetObjPtr->uris_.size()); if (result == OBJECT_SUCCESS) { ObjectStore::RadarReporter::ReportStage(std::string(__FUNCTION__), ObjectStore::SAVE, ObjectStore::PUSH_ASSETS, ObjectStore::RADAR_SUCCESS); diff --git a/services/distributeddataservice/service/object/object_asset_loader.h b/services/distributeddataservice/service/object/object_asset_loader.h index 44d3f8ab0..5f90d574b 100644 --- a/services/distributeddataservice/service/object/object_asset_loader.h +++ b/services/distributeddataservice/service/object/object_asset_loader.h @@ -21,7 +21,7 @@ #include "store/general_value.h" #include "concurrent_map.h" #include -#include "asset/asset_send_callback_stub.h" +#include "asset_send_callback_stub.h" namespace OHOS { namespace DistributedObject { using AssetObj = Storage::DistributedFile::AssetObj; @@ -36,7 +36,7 @@ class ObjectAssetsSendListener : public Storage::DistributedFile::AssetSendCallb public: ObjectAssetsSendListener() =default; ~ObjectAssetsSendListener() = default; - int32_t OnSendResult(const sptr &assetObj, int32_t result) override; + int32_t OnSendResult(const AssetObj &assetObj, int32_t result) override; }; class ObjectAssetLoader { diff --git a/services/distributeddataservice/service/object/object_data_listener.cpp b/services/distributeddataservice/service/object/object_data_listener.cpp index 1c58fb493..e29cf565e 100644 --- a/services/distributeddataservice/service/object/object_data_listener.cpp +++ b/services/distributeddataservice/service/object/object_data_listener.cpp @@ -55,20 +55,22 @@ int32_t ObjectAssetsRecvListener::OnStart(const std::string &srcNetworkId, const return OBJECT_SUCCESS; } -int32_t ObjectAssetsRecvListener::OnFinished(const std::string &srcNetworkId, const sptr &assetObj, +int32_t ObjectAssetsRecvListener::OnFinished(const std::string &srcNetworkId, const AssetObj &assetObj, int32_t result) { - if (assetObj == nullptr) { + AssetObj assetObjTemp = assetObj; + const sptr assetObjPtr = sptr(&assetObjTemp); + if (assetObjPtr == nullptr) { ZLOGE("OnFinished error! status:%{public}d, srcNetworkId:%{public}s", result, DistributedData::Anonymous::Change(srcNetworkId).c_str()); ObjectStore::RadarReporter::ReportStageError(std::string(__FUNCTION__), ObjectStore::DATA_RESTORE, ObjectStore::ASSETS_RECV, ObjectStore::RADAR_FAILED, result); return result; } - auto objectKey = assetObj->dstBundleName_+assetObj->sessionId_; + auto objectKey = assetObjPtr->dstBundleName_+assetObjPtr->sessionId_; ZLOGI("OnFinished, status:%{public}d objectKey:%{public}s, asset size:%{public}zu", result, objectKey.c_str(), - assetObj->uris_.size()); - ObjectStoreManager::GetInstance()->NotifyAssetsReady(objectKey, assetObj->dstBundleName_, srcNetworkId); + assetObjPtr->uris_.size()); + ObjectStoreManager::GetInstance()->NotifyAssetsReady(objectKey, assetObjPtr->dstBundleName_, srcNetworkId); return OBJECT_SUCCESS; } } // namespace DistributedObject diff --git a/services/distributeddataservice/service/object/object_data_listener.h b/services/distributeddataservice/service/object/object_data_listener.h index 0ee568c60..a96ff0219 100644 --- a/services/distributeddataservice/service/object/object_data_listener.h +++ b/services/distributeddataservice/service/object/object_data_listener.h @@ -17,7 +17,7 @@ #define DISTRIBUTEDDATAMGR_OBJECT_DATA_LISTENER_H #include "kv_store_observer.h" -#include "asset/asset_recv_callback_stub.h" +#include "asset_recv_callback_stub.h" namespace OHOS { namespace DistributedObject { using AssetObj = Storage::DistributedFile::AssetObj; @@ -37,7 +37,7 @@ public: const std::string &dstNetworkId, const std::string &sessionId, const std::string &dstBundleName) override; int32_t OnFinished(const std::string &srcNetworkId, - const sptr &assetObj, int32_t result) override; + const AssetObj &assetObj, int32_t result) override; }; } // namespace DistributedObject } // namespace OHOS -- Gitee