From ce97de7b88d91c97ee874b8dc80e0831ce0ae4f0 Mon Sep 17 00:00:00 2001 From: Caisking Date: Sat, 5 Jul 2025 16:59:23 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9650=E8=A1=A8=E7=9B=98=E6=97=B6?= =?utf8?q?=E9=97=B4=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/main/src/dial/DialModelTime.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp index 26a7b6fe6..a08366bdd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp @@ -11,6 +11,7 @@ #include "DialModelTime.h" #include "components/root_view.h" #include "custom_runtime.h" + #define REGIST_DIAL_MODULE_ANGLE_H(type, func) static OHOS::RegisterDialModel(REGIST_ANGLE_H)(type, func) #define REGIST_DIAL_MODULE_ANGLE_M(type, func) static OHOS::RegisterDialModel(REGIST_ANGLE_M)(type, func) #define REGIST_DIAL_MODULE_ANGLE_S(type, func) static OHOS::RegisterDialModel(REGIST_ANGLE_S)(type, func) @@ -86,6 +87,12 @@ void DialModelTime::UpdateTime() localtime_s(tblock_, &time); #else tblock_ = localtime(&tv.tv_sec); + //需要判断显示的格式 + if (uapi_dev_runtime_get_time_hour_show_model() == 12) + { + if (tblock_->tm_hour > 12) + tblock_->tm_hour = tblock_->tm_hour - 12 ; + } #endif int realMS = tblock_->tm_sec * S_MS_US_TRANS + tv.tv_usec / S_MS_US_TRANS; @@ -154,10 +161,10 @@ bool DialModelTime::GetDialFloatData(DialDataType& type, float& out) out = static_cast(angleMS_); break; case OHOS::DialDataType::SOLAR_YEAR: - out = static_cast(tblock_->tm_year); + out = static_cast(tblock_->tm_year + 1900); break; case OHOS::DialDataType::MONTH: - out = static_cast(tblock_->tm_mon); + out = static_cast(tblock_->tm_mon + 1); break; case OHOS::DialDataType::WEEKDAY_DATA: out = static_cast(tblock_->tm_wday); -- 2.17.1