From e59b06485eda02951de5dbd8d47c5496e752bfb1 Mon Sep 17 00:00:00 2001 From: mujie1970 Date: Tue, 2 Sep 2025 11:50:50 +0800 Subject: [PATCH] StopDownload fails Signed-off-by: mujie1970 --- .../js/ani/file_cloud_sync/include/download_progress_ani.h | 5 ++++- .../ani/file_cloud_sync/src/download_callback_impl_ani.cpp | 4 ++-- .../js/ani/file_cloud_sync/src/download_progress_ani.cpp | 2 +- interfaces/kits/js/cloudfilesync/cloud_file_cache_napi.cpp | 2 +- interfaces/kits/js/cloudfilesync/cloud_file_napi.cpp | 2 +- interfaces/kits/js/cloudfilesync/download_progress_napi.cpp | 2 +- interfaces/kits/js/cloudfilesync/download_progress_napi.h | 5 ++++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/interfaces/kits/js/ani/file_cloud_sync/include/download_progress_ani.h b/interfaces/kits/js/ani/file_cloud_sync/include/download_progress_ani.h index 4f36ff4c4..c57eab7ca 100644 --- a/interfaces/kits/js/ani/file_cloud_sync/include/download_progress_ani.h +++ b/interfaces/kits/js/ani/file_cloud_sync/include/download_progress_ani.h @@ -75,7 +75,10 @@ protected: class SingleProgressAni : public DlProgressAni { public: - explicit SingleProgressAni(int64_t downloadId) : DlProgressAni(downloadId) {} + SingleProgressAni(int64_t downloadId, const std::string &uri) : DlProgressAni(downloadId) + { + uri_ = uri; + } void Update(const DownloadProgressObj &progress) override; ani_object ConvertToObject(ani_env *env) override; std::shared_ptr CreateNewObject() override; diff --git a/interfaces/kits/js/ani/file_cloud_sync/src/download_callback_impl_ani.cpp b/interfaces/kits/js/ani/file_cloud_sync/src/download_callback_impl_ani.cpp index cdc17f693..aacdad5f5 100644 --- a/interfaces/kits/js/ani/file_cloud_sync/src/download_callback_impl_ani.cpp +++ b/interfaces/kits/js/ani/file_cloud_sync/src/download_callback_impl_ani.cpp @@ -29,7 +29,7 @@ int32_t CloudDownloadCallbackImplAni::StartDownloadInner(const std::string &uri) return ret; } - downloadInfos_[downloadId] = std::make_shared(downloadId); + downloadInfos_[downloadId] = std::make_shared(downloadId, uri); return ret; } @@ -61,7 +61,7 @@ int32_t CloudFileCacheCallbackImplAni::StartDownloadInner(const std::string &uri LOGE("Start single download failed! ret = %{public}d", ret); return ret; } - downloadInfos_[downloadId] = std::make_shared(downloadId); + downloadInfos_[downloadId] = std::make_shared(downloadId, uri); return ret; } diff --git a/interfaces/kits/js/ani/file_cloud_sync/src/download_progress_ani.cpp b/interfaces/kits/js/ani/file_cloud_sync/src/download_progress_ani.cpp index c62d2a70d..bd3ec75db 100644 --- a/interfaces/kits/js/ani/file_cloud_sync/src/download_progress_ani.cpp +++ b/interfaces/kits/js/ani/file_cloud_sync/src/download_progress_ani.cpp @@ -87,7 +87,7 @@ ani_object SingleProgressAni::ConvertToObject(ani_env *env) std::shared_ptr SingleProgressAni::CreateNewObject() { - return std::make_shared(taskId_); + return std::make_shared(taskId_, uri_); } void BatchProgressAni::Update(const DownloadProgressObj &progress) diff --git a/interfaces/kits/js/cloudfilesync/cloud_file_cache_napi.cpp b/interfaces/kits/js/cloudfilesync/cloud_file_cache_napi.cpp index 4dcdafeaa..b3f80f7fd 100644 --- a/interfaces/kits/js/cloudfilesync/cloud_file_cache_napi.cpp +++ b/interfaces/kits/js/cloudfilesync/cloud_file_cache_napi.cpp @@ -44,7 +44,7 @@ int32_t CloudFileCacheCallbackImplNapi::StartDownloadInner(const std::string &ur LOGE("Start single download failed! ret = %{public}d", ret); return ret; } - downloadInfos_[downloadId] = std::make_shared(downloadId); + downloadInfos_[downloadId] = std::make_shared(downloadId, uri); return ret; } diff --git a/interfaces/kits/js/cloudfilesync/cloud_file_napi.cpp b/interfaces/kits/js/cloudfilesync/cloud_file_napi.cpp index 31d7d4e83..cd5c1a3ed 100644 --- a/interfaces/kits/js/cloudfilesync/cloud_file_napi.cpp +++ b/interfaces/kits/js/cloudfilesync/cloud_file_napi.cpp @@ -40,7 +40,7 @@ int32_t CloudDownloadCallbackImplNapi::StartDownloadInner(const std::string &uri return ret; } - downloadInfos_[downloadId] = std::make_shared(downloadId); + downloadInfos_[downloadId] = std::make_shared(downloadId, uri); return ret; } diff --git a/interfaces/kits/js/cloudfilesync/download_progress_napi.cpp b/interfaces/kits/js/cloudfilesync/download_progress_napi.cpp index 309b093d0..c730861aa 100644 --- a/interfaces/kits/js/cloudfilesync/download_progress_napi.cpp +++ b/interfaces/kits/js/cloudfilesync/download_progress_napi.cpp @@ -50,7 +50,7 @@ napi_value SingleProgressNapi::ConvertToValue(napi_env env) std::shared_ptr SingleProgressNapi::CreateNewObject() { - return std::make_shared(taskId_); + return std::make_shared(taskId_, uri_); } void BatchProgressNapi::Update(const DownloadProgressObj &progress) diff --git a/interfaces/kits/js/cloudfilesync/download_progress_napi.h b/interfaces/kits/js/cloudfilesync/download_progress_napi.h index 3d54400ec..c8fd7735e 100644 --- a/interfaces/kits/js/cloudfilesync/download_progress_napi.h +++ b/interfaces/kits/js/cloudfilesync/download_progress_napi.h @@ -76,7 +76,10 @@ protected: class SingleProgressNapi : public DlProgressNapi { public: - explicit SingleProgressNapi(int64_t downloadId) : DlProgressNapi(downloadId) {} + SingleProgressNapi(int64_t downloadId, const std::string &uri) : DlProgressNapi(downloadId) + { + uri_ = uri; + } void Update(const DownloadProgressObj &progress) override; napi_value ConvertToValue(napi_env env) override; std::shared_ptr CreateNewObject() override; -- Gitee