From 17ff8ec534aae5962e0a5f448c5a5a79be4ee51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= <zouyousong1@h-partners.com>
Date: Wed, 11 Jun 2025 17:12:18 +0800
Subject: [PATCH] =?UTF-8?q?codex=20=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=20Signed-off-by:=20=E9=82=B9=E5=8F=8B?=
 =?UTF-8?q?=E6=9D=BE=20<zouyousong1@h-partners.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/utils/include/updateservice_json_utils.h | 12 +++++-------
 services/core/ability/model/include/device_info.h    |  3 +--
 services/firmware/check/include/firmware_icheck.h    |  2 +-
 .../utils/src/firmware_check_analyze_utils.cpp       |  8 +++-----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/foundations/ability/utils/include/updateservice_json_utils.h b/foundations/ability/utils/include/updateservice_json_utils.h
index d9bb0eb0..6fa77aef 100644
--- a/foundations/ability/utils/include/updateservice_json_utils.h
+++ b/foundations/ability/utils/include/updateservice_json_utils.h
@@ -61,8 +61,7 @@ public:
             return nullptr;
         }
 
-        if (!cJSON_IsObject(object))
-        {
+        if (!cJSON_IsObject(object)) {
             cJSON_Delete(object);
             return nullptr;
         }
@@ -134,10 +133,9 @@ private:
             return;
         }
 
-        if constexpr (std::is_integral_v<T> && !std::is_same_v<T, bool>)
-        {
+        if constexpr (std::is_integral_v<T> && !std::is_same_v<T, bool>) {
             if (cJSON_IsNumber(item)) {
-               (sizeof(T) <= sizeof(int)) ? value = static_cast<T>(item->valueint) :
+                (sizeof(T) <= sizeof(int)) ? value = static_cast<T>(item->valueint) :
                     value = static_cast<T>(item->valuedouble);
             }
         } else if constexpr (std::is_floating_point_v<T>) {
@@ -151,9 +149,9 @@ private:
                 value = item->valuestring;
             }
         } else if constexpr (std::is_same_v<T, std::vector<int>>) {
-             GetValueVecInt(item, value);
+            GetValueVecInt(item, value);
         } else if constexpr (std::is_same_v<T, std::vector<std::string>>) {
-             GetValueVecString(item, value);
+            GetValueVecString(item, value);
         } else {
             return;
         }
diff --git a/services/core/ability/model/include/device_info.h b/services/core/ability/model/include/device_info.h
index eabf71ef..5ba0908f 100644
--- a/services/core/ability/model/include/device_info.h
+++ b/services/core/ability/model/include/device_info.h
@@ -29,8 +29,7 @@ public:
 
     friend void ToJson(cJSON *jsonObject, const DeviceInfo &deviceInfo, bool isPrint)
     {
-        if (jsonObject == nullptr)
-        {
+        if (jsonObject == nullptr) {
             return;
         }
 
diff --git a/services/firmware/check/include/firmware_icheck.h b/services/firmware/check/include/firmware_icheck.h
index 0cadca3c..93d0c267 100644
--- a/services/firmware/check/include/firmware_icheck.h
+++ b/services/firmware/check/include/firmware_icheck.h
@@ -106,7 +106,7 @@ public:
         if (response.status != static_cast<int64_t>(HttpConstant::SUCCESS) || response.content.empty()) {
             checkStatus = CheckStatus::CHECK_FAIL;
         } else {
-             cJSON *root = cJSON_Parse(response.content.c_str());
+            cJSON *root = cJSON_Parse(response.content.c_str());
             if (!root) {
                 FIRMWARE_LONG_LOGI("FirmwareCheck response: %{public}s", response.content.c_str());
             }
diff --git a/services/firmware/utils/src/firmware_check_analyze_utils.cpp b/services/firmware/utils/src/firmware_check_analyze_utils.cpp
index 7f0fc845..fe4ac5e0 100644
--- a/services/firmware/utils/src/firmware_check_analyze_utils.cpp
+++ b/services/firmware/utils/src/firmware_check_analyze_utils.cpp
@@ -78,10 +78,8 @@ int32_t FirmwareCheckAnalyzeUtils::AnalyzeBlVersionCheckResults(cJSON *root, BlC
     int32_t ret = CAST_INT(JsonParseError::ERR_OK);
     int32_t status = CAST_INT(CheckResultStatus::STATUS_SYSTEM_ERROR);
     UpdateServiceJsonUtils::GetValueAndSetTo(root, "searchStatus", status);
-    if (status == CAST_INT(CheckResultStatus::STATUS_NEW_VERSION_AVAILABLE))
-    {
-        for (int i = 0; i < cJSON_GetArraySize(itemCheckResults); i++)
-        {
+    if (status == CAST_INT(CheckResultStatus::STATUS_NEW_VERSION_AVAILABLE)) {
+        for (int i = 0; i < cJSON_GetArraySize(itemCheckResults); i++) {
             auto item = cJSON_GetArrayItem(itemCheckResults, i);
             BlVersionCheckResult checkResult;
             ret += UpdateServiceJsonUtils::GetValueAndSetTo(item, "descriptPackageId", checkResult.descriptPackageId);
@@ -131,7 +129,7 @@ int32_t FirmwareCheckAnalyzeUtils::AnalyzeComponents(cJSON *root)
     // 检查 "descriptInfo" 是否存在
     cJSON *itemDescriptInfo = cJSON_GetObjectItemCaseSensitive(root, "descriptInfo");
     if (!itemDescriptInfo) {
-       FIRMWARE_LOGE("FirmwareCheckAnalyzeUtils::AnalyzeComponents no key descriptInfo");
+        FIRMWARE_LOGE("FirmwareCheckAnalyzeUtils::AnalyzeComponents no key descriptInfo");
         return CAST_INT(JsonParseError::MISSING_PROP);
     }
 
-- 
Gitee