From 5f7f0621d7cdb4fb5214aa0bb6e419ba885c6769 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Tue, 24 Sep 2024 14:19:30 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E7=9B=98=E8=B7=9D?= =?utf8?q?=E7=A6=BB=E6=95=B0=E6=8D=AE=E4=B8=BAuint32=5Ft?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/activity/src/ActivityModel.cpp | 3 ++- .../main/include/dial/DialModelDistance.h | 2 +- .../main/src/dial/DialModelDistance.cpp | 17 ++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp index f053aac11..4b7ea8439 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp @@ -124,7 +124,8 @@ static void Notify(void *args, const Topic topic, Request* request) return; } // 计步数据累加 - uint32 counter =0;// OHOS::ActivityModel::GetInstance()->GetStepCounter(); + uint32_t counter = + 0; // OHOS::ActivityModel::GetInstance()->GetStepCounter(); counter = *(uint32_t *)request->data; set_step_data(counter); counter = get_step_data();//*(uint32_t *)request->data; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDistance.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDistance.h index 4a7500a52..1498d820f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDistance.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDistance.h @@ -29,7 +29,7 @@ namespace OHOS return &instance; } bool GetDialFloatData(DialDataType &type, float &out) override; - void UpdateDistance(int16_t Distance); + void UpdateDistance(uint32_t Distance); int GetDistanceData(void); private: diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDistance.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDistance.cpp index 38f246631..07a12ed5b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDistance.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDistance.cpp @@ -17,15 +17,14 @@ namespace OHOS return true; } - void DialModelDistance::UpdateDistance(int16_t distance) - { - // 将距离从米(m)转换为公里(km)并保留一位小数 - distance_ = static_cast(distance) / 1000.0f; // distance 米 + void DialModelDistance::UpdateDistance(uint32_t distance) { + // 将距离从米(m)转换为公里(km)并保留一位小数 + distance_ = static_cast(distance) / 1000.0f; // distance 米 - if (onChangeListener_ != nullptr) - { - // 通知改变监听器更新距离数据 - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_DISTANCE, distance_); - } + if (onChangeListener_ != nullptr) { + // 通知改变监听器更新距离数据 + onChangeListener_->OnDialFloatDataUpdate( + DialDataType::DATA_TYPE_DISTANCE, distance_); + } } } -- 2.17.1