From b53a6c8bea68963fce48427262068b7c2d1117b0 Mon Sep 17 00:00:00 2001 From: wangqi Date: Fri, 25 Mar 2022 15:41:21 +0800 Subject: [PATCH] =?UTF-8?q?Description:=20Fix=20Problem=20Signed-off-by:?= =?UTF-8?q?=20=E7=8E=8B=E7=90=AA=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/include/progress_thread.h | 5 +++-- engine/include/update_service.h | 8 ++++++-- engine/include/update_service_proxy.h | 4 ++-- engine/include/update_service_stub.h | 4 ++-- engine/src/update_helper.cpp | 15 +++++++++------ engine/src/update_service.cpp | 5 +++-- engine/src/update_service_stub.cpp | 4 ++-- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/engine/include/progress_thread.h b/engine/include/progress_thread.h index f3c6f363..131d1117 100755 --- a/engine/include/progress_thread.h +++ b/engine/include/progress_thread.h @@ -71,7 +71,7 @@ private: class DownloadThread : public ProgressThread { public: using ProgressCallback = std::function; - DownloadThread(ProgressCallback callback) : ProgressThread(), callback_(callback) {} + explicit DownloadThread(ProgressCallback callback) : ProgressThread(), callback_(callback) {} ~DownloadThread() override { ProgressThread::ExitThread(); @@ -89,6 +89,7 @@ public: { return static_cast(packageSize_); }; + protected: bool ProcessThreadExecute() override; void ProcessThreadExit() override; @@ -104,6 +105,6 @@ private: size_t packageSize_ { 1 }; std::string downloadFileName_; }; -} +} // namespace update_engine } // namespace OHOS #endif // UPDATER_THREAD_H diff --git a/engine/include/update_service.h b/engine/include/update_service.h index 630f035a..f292801f 100755 --- a/engine/include/update_service.h +++ b/engine/include/update_service.h @@ -49,7 +49,7 @@ public: int32_t GetNewVersion(VersionInfo &versionInfo) override; - int32_t GetUpgradeStatus (UpgradeInfo &info) override; + int32_t GetUpgradeStatus(UpgradeInfo &info) override; int32_t SetUpdatePolicy(const UpdatePolicy &policy) override; @@ -63,6 +63,7 @@ public: static int32_t ParseJsonFile(const std::vector &buffer, VersionInfo &info, std::string &url); static int32_t ReadCheckVersionResult(const cJSON* results, VersionInfo &info, std::string &url); static int32_t ReadCheckVersiondescriptInfo(const cJSON *descriptInfo, VersionInfo &info); + #ifndef UPDATER_UT protected: #else @@ -70,11 +71,13 @@ public: #endif void OnStart() override; void OnStop() override; + private: void DownloadCallback(const std::string &fileName, const Progress &progress); void UpgradeCallback(const Progress &progress); std::string GetDownloadServerUrl() const; void InitVersionInfo(VersionInfo &versionInfo) const; + #ifndef UPDATER_UT private: #else @@ -83,6 +86,7 @@ public: void SearchCallback(const std::string &msg, SearchStatus status); bool VerifyDownloadPkg(const std::string &pkgName, Progress &progress); void ReadDataFromSSL(int32_t engineSocket); + private: UpdatePolicy policy_ = { 1, 1, INSTALLMODE_AUTO, AUTOUPGRADECONDITION_IDLE, { 10, 20 } @@ -95,6 +99,6 @@ private: UpdateContext updateContext_ {}; std::string downloadUrl_; }; -} +} // namespace update_engine } // namespace OHOS #endif // UPDATER_SERVICE_H \ No newline at end of file diff --git a/engine/include/update_service_proxy.h b/engine/include/update_service_proxy.h index 35d97caf..bd0feb16 100755 --- a/engine/include/update_service_proxy.h +++ b/engine/include/update_service_proxy.h @@ -37,7 +37,7 @@ public: int32_t GetNewVersion(VersionInfo &versionInfo) override; - int32_t GetUpgradeStatus (UpgradeInfo &info) override; + int32_t GetUpgradeStatus(UpgradeInfo &info) override; int32_t SetUpdatePolicy(const UpdatePolicy &policy) override; @@ -51,6 +51,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} +} // namespace update_engine } // namespace OHOS #endif // UPDATER_PROXY_H \ No newline at end of file diff --git a/engine/include/update_service_stub.h b/engine/include/update_service_stub.h index 3647888d..13f0efe4 100755 --- a/engine/include/update_service_stub.h +++ b/engine/include/update_service_stub.h @@ -35,6 +35,6 @@ public: using RequestFuncType = std::function; }; -} -} +} // namespace update_engine +} // namespace OHOS #endif // UPDATE_SERVICE_STUB_H_ \ No newline at end of file diff --git a/engine/src/update_helper.cpp b/engine/src/update_helper.cpp index cda0e8ea..8fb4855d 100755 --- a/engine/src/update_helper.cpp +++ b/engine/src/update_helper.cpp @@ -63,8 +63,9 @@ int32_t UpdateHelper::WriteVersionInfo(MessageParcel &data, const VersionInfo &i { data.WriteInt32(static_cast(info.status)); data.WriteString16(Str8ToStr16(info.errMsg)); + size_t i; data.WriteInt32(static_cast(sizeof(info.result) / sizeof(info.result[0]))); - for (size_t i = 0; i < sizeof(info.result) / sizeof(info.result[0]); i++) { + for (i = 0; i < sizeof(info.result) / sizeof(info.result[0]); i++) { data.WriteUint64(static_cast(info.result[i].size)); data.WriteInt32(static_cast(info.result[i].packageType)); @@ -74,7 +75,7 @@ int32_t UpdateHelper::WriteVersionInfo(MessageParcel &data, const VersionInfo &i data.WriteString16(Str8ToStr16(info.result[i].descriptPackageId)); } data.WriteInt32(static_cast(sizeof(info.descriptInfo) / sizeof(info.descriptInfo[0]))); - for (size_t i = 0; i < sizeof(info.descriptInfo) / sizeof(info.descriptInfo[0]); i++) { + for (i = 0; i < sizeof(info.descriptInfo) / sizeof(info.descriptInfo[0]); i++) { data.WriteString16(Str8ToStr16(info.descriptInfo[i].descriptPackageId)); data.WriteString16(Str8ToStr16(info.descriptInfo[i].content)); } @@ -87,7 +88,8 @@ int32_t UpdateHelper::ReadVersionInfo(MessageParcel &reply, VersionInfo &info) info.errMsg = Str16ToStr8(reply.ReadString16()); int32_t count = reply.ReadInt32(); - for (size_t i = 0; (i < static_cast(count)) && (i < sizeof(info.result) / sizeof(info.result[0])); i++) { + size_t i; + for (i = 0; (i < static_cast(count)) && (i < sizeof(info.result) / sizeof(info.result[0])); i++) { uint64_t uint64 = reply.ReadUint64(); info.result[i].size = static_cast(uint64); info.result[i].packageType = static_cast(reply.ReadInt32()); @@ -98,7 +100,7 @@ int32_t UpdateHelper::ReadVersionInfo(MessageParcel &reply, VersionInfo &info) info.result[i].descriptPackageId = Str16ToStr8(reply.ReadString16()); } count = reply.ReadInt32(); - for (size_t i = 0; (i < static_cast(count)) + for (i = 0; (i < static_cast(count)) && (i < sizeof(info.descriptInfo) / sizeof(info.descriptInfo[0])); i++) { info.descriptInfo[i].descriptPackageId = Str16ToStr8(reply.ReadString16()); info.descriptInfo[i].content = Str16ToStr8(reply.ReadString16()); @@ -165,7 +167,8 @@ int32_t UpdateHelper::CopyVersionInfo(const VersionInfo &srcInfo, VersionInfo &d { dstInfo.status = srcInfo.status; dstInfo.errMsg = srcInfo.errMsg; - for (size_t i = 0; i < sizeof(dstInfo.result) / sizeof(dstInfo.result[0]); i++) { + size_t i; + for (i = 0; i < sizeof(dstInfo.result) / sizeof(dstInfo.result[0]); i++) { dstInfo.result[i].size = srcInfo.result[i].size; dstInfo.result[i].packageType = srcInfo.result[i].packageType; dstInfo.result[i].versionName = srcInfo.result[i].versionName; @@ -173,7 +176,7 @@ int32_t UpdateHelper::CopyVersionInfo(const VersionInfo &srcInfo, VersionInfo &d dstInfo.result[i].verifyInfo = srcInfo.result[i].verifyInfo; dstInfo.result[i].descriptPackageId = srcInfo.result[i].descriptPackageId; } - for (size_t i = 0; i < sizeof(dstInfo.descriptInfo) / sizeof(dstInfo.descriptInfo[0]); i++) { + for (i = 0; i < sizeof(dstInfo.descriptInfo) / sizeof(dstInfo.descriptInfo[0]); i++) { dstInfo.descriptInfo[i].content = srcInfo.descriptInfo[i].content; dstInfo.descriptInfo[i].descriptPackageId = srcInfo.descriptInfo[i].descriptPackageId; } diff --git a/engine/src/update_service.cpp b/engine/src/update_service.cpp index 2c122f49..c4927a0a 100644 --- a/engine/src/update_service.cpp +++ b/engine/src/update_service.cpp @@ -473,7 +473,8 @@ void UpdateService::InitVersionInfo(VersionInfo &versionInfo) const versionInfo.errMsg = "Can not get local version"; } - for (size_t i = 0; i < sizeof(versionInfo.result) / sizeof(versionInfo.result[0]); i++) { + size_t i; + for (i = 0; i < sizeof(versionInfo.result) / sizeof(versionInfo.result[0]); i++) { versionInfo.result[i].size = 0; versionInfo.result[i].packageType = PACKAGE_TYPE_NORMAL; versionInfo.result[i].versionName = versionName; @@ -481,7 +482,7 @@ void UpdateService::InitVersionInfo(VersionInfo &versionInfo) const versionInfo.result[i].verifyInfo = ""; versionInfo.result[i].descriptPackageId = ""; } - for (size_t i = 0; i < sizeof(versionInfo.descriptInfo) / sizeof(versionInfo.descriptInfo[0]); i++) { + for (i = 0; i < sizeof(versionInfo.descriptInfo) / sizeof(versionInfo.descriptInfo[0]); i++) { versionInfo.descriptInfo[i].content = ""; versionInfo.descriptInfo[i].descriptPackageId = ""; } diff --git a/engine/src/update_service_stub.cpp b/engine/src/update_service_stub.cpp index f170a2f9..8bbbb1ae 100755 --- a/engine/src/update_service_stub.cpp +++ b/engine/src/update_service_stub.cpp @@ -177,5 +177,5 @@ int32_t UpdateServiceStub::OnRemoteRequest(uint32_t code, ENGINE_LOGE("UpdateServiceStub OnRemoteRequest code %u not found", code); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } -} -} // namespace OHO \ No newline at end of file +} // namespace update_engine +} // namespace OHOS \ No newline at end of file -- Gitee