From: luozheng <1732036298@qq.com> Date: Tue, 6 Jan 2026 03:24:23 +0000 (+0800) Subject: 精简运动表盘优化,但时间和日期显示不了 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3020%2F1;p=mirrors%2FFD230.git 精简运动表盘优化,但时间和日期显示不了 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataBase.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataBase.h index 44af2bd5d..0586094f6 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataBase.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataBase.h @@ -43,6 +43,7 @@ enum class DialOldDataType { DATA_TYPE_STEPS_GOAL_INT, // 运动步数百分比 DATA_TYPE_CALORIE_GOAL_INT, // 运动卡路里目标百分比 DATA_TYPE_TIME_PERIOD_BG, // 时间段背景索引(0-3: 0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3) + DATA_TYPE_TIME_STR, DATA_TYPE_MULTI_FLOAT_BASE = 0x2fff, // 多个浮点数据类型基值 diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataType.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataType.h index 28ced919a..e91ee4d1b 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataType.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialDataType.h @@ -151,6 +151,7 @@ enum class DialDataType : int16_t { STEPS_GOAL_BOXPROGRESS,//步数目标进度条映射? CALORIE_GOAL_BOXPROGRESS,//卡路里目标进度条映射? TIME_PERIOD_BG, // 时间段背景索引(0-3: 0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3) + TIMESTR_STR1, SWIVEL_GEAR_POSITIVE = 8190, // private data, clockwise SWIVEL_GEAR_NEGATIVE = 8191, // counterclockwise diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialModelTimeStr1.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialModelTimeStr1.h new file mode 100644 index 000000000..0b61a7a82 --- /dev/null +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialModelTimeStr1.h @@ -0,0 +1,28 @@ + + +#ifndef DIAL_MODEL_TimeStr1_H +#define DIAL_MODEL_TimeStr1_H + +#include "DialBaseModel.h" +#include +#include + +namespace OHOS { +class DialModelTimeStr1 : public DialBaseModel { +public: + DialModelTimeStr1() {} + virtual ~DialModelTimeStr1() {} + static DialModelTimeStr1 *GetInstance() { + static DialModelTimeStr1 instance; + return &instance; + } + bool GetDialTextData(DialDataType &type, std::string *&out, + int16_t &strNum) override; + void UpdateTimeStr(const std::string dialTimeStr); + +private: + struct tm tblock_; + std::string dialTimeStr_ = "00/00"; +}; +} // namespace OHOS +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialDataBase.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialDataBase.cpp index 796de1783..58c8647d3 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialDataBase.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialDataBase.cpp @@ -54,6 +54,7 @@ static std::unordered_map g_d {DialOldDataType::DATA_TYPE_STEPS_GOAL_INT, OHOS::DialDataType::STEP_GOAL_PROGRESS}, {DialOldDataType::DATA_TYPE_CALORIE_GOAL_INT, OHOS::DialDataType::CALORIE_RATIO}, {DialOldDataType::DATA_TYPE_TIME_PERIOD_BG, OHOS::DialDataType::TIME_PERIOD_BG}, + {DialOldDataType::DATA_TYPE_TIME_STR, OHOS::DialDataType::TIMESTR_STR1}, {DialOldDataType::DATA_TYPE_WEEK_STR, OHOS::DialDataType::WEEK_STR}, {DialOldDataType::DATA_TYPE_DATE_STR, OHOS::DialDataType::DATE_STR}, {DialOldDataType::DATA_TYPE_WEATHER_STR, OHOS::DialDataType::WEATHER_STR}, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialModelTimeStr1.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialModelTimeStr1.cpp new file mode 100644 index 000000000..ae75c4bec --- /dev/null +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialModelTimeStr1.cpp @@ -0,0 +1,52 @@ +#include "main/include/dial/DialModelTimeStr1.h" +#include "main/include/dial/RegisterDialModel.h" +#include "custom_runtime.h" +#include "sys/time.h" +#include "wearable_log.h" +#include +#include +#include +#include +#include +#include + +REGIST_DIAL_MODULE(OHOS::DialDataType::TIMESTR_STR1, + OHOS::DialModelTimeStr1::GetInstance()); + +namespace OHOS { + +bool DialModelTimeStr1::GetDialTextData(DialDataType &type, std::string *&out, + int16_t &strNum) { + (void)type; + /*获取时间*/ + struct timeval tv; + gettimeofday(&tv, NULL); // 获取当前时间 + localtime_r(&tv.tv_sec, &tblock_); + + // Use ostringstream to format the date as MM/DD (月/日) with leading zeros + std::ostringstream oss; + + // 格式化月份(补零到2位) + / + 格式化日期(补零到2位) + oss << std::setw(2) << std::setfill('0') << (tblock_.tm_mon + 1) << "/" // tm_mon从0开始,需+1 + << std::setw(2) << std::setfill('0') << tblock_.tm_mday; + + std::string dateStr = oss.str(); // 获取格式化后的日期字符串 + + if (!dateStr.empty()) { + dialTimeStr_ = dateStr; + out = &dialTimeStr_; + } + + strNum = 1; + return true; +} + +void DialModelTimeStr1::UpdateTimeStr(const std::string dialTimeStr) { + dialTimeStr_.clear(); + dialTimeStr_ = dialTimeStr; // 更新字符串 + if (onChangeListener_ != nullptr) { + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::TIMESTR_STR1, + &dialTimeStr_, 1); + } +} +} // namespace OHOS \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/208/essential_sport.xml b/tools/dial_converter_tool/instance/208/essential_sport.xml index 49a1302ff..226a56902 100644 --- a/tools/dial_converter_tool/instance/208/essential_sport.xml +++ b/tools/dial_converter_tool/instance/208/essential_sport.xml @@ -5,7 +5,7 @@ - + @@ -21,5 +21,17 @@ + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/out/essential_sport.bin b/tools/dial_converter_tool/out/essential_sport.bin index 56963da1b..8978184f9 100644 Binary files a/tools/dial_converter_tool/out/essential_sport.bin and b/tools/dial_converter_tool/out/essential_sport.bin differ