From: luozheng <1732036298@qq.com> Date: Mon, 5 Jan 2026 06:31:27 +0000 (+0800) Subject: 动态小鹰表盘提交,还有问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3014%2Ftarget%2F1;p=mirrors%2FFD230.git 动态小鹰表盘提交,还有问题 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialDataType.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialDataType.h index 69784392b..958426710 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialDataType.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialDataType.h @@ -137,6 +137,7 @@ enum class DialDataType : int16_t { BLOOD_OXYGEN = 220, SYSTOLIC_BLOOD_PRESSURE = 221, DIASTOLIC_BLOOD_PRESSURE = 222, + TIME_PERIOD_BG = 223, // 时间段背景索引(0-3: 0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3) DUAL_LANGUAGE_SYSTEM = 230, UNREAD_SMS_MSG = 250, UNREAD_WECHAT_MSG = 251, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialModelBg.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialModelBg.h new file mode 100644 index 000000000..d6f55eaa5 --- /dev/null +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/include/main/dial/DialModelBg.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialModelBg - 时间段背景切换模型 + * Author: + * Create: 2025-01 + */ + +#ifndef DIAL_MODEL_BG_H +#define DIAL_MODEL_BG_H + +#include "DialBaseModel.h" + +namespace OHOS +{ + class DialModelBg : public DialBaseModel + { + public: + DialModelBg() {} + ~DialModelBg() override {} + static DialModelBg *GetInstance() + { + static DialModelBg instance; + return &instance; + } + bool GetDialFloatData(DialDataType &type, float &out) override; + + private: + struct tm tblock_; + /** + * @brief 根据小时计算时间段索引 + * @param hour 当前小时(0-23) + * @return 时间段索引: 0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3 + */ + int CalculateTimePeriodIndex(int hour); + }; +} + +#endif // DIAL_MODEL_BG_H + 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 69784392b..958426710 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 @@ -137,6 +137,7 @@ enum class DialDataType : int16_t { BLOOD_OXYGEN = 220, SYSTOLIC_BLOOD_PRESSURE = 221, DIASTOLIC_BLOOD_PRESSURE = 222, + TIME_PERIOD_BG = 223, // 时间段背景索引(0-3: 0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3) DUAL_LANGUAGE_SYSTEM = 230, UNREAD_SMS_MSG = 250, UNREAD_WECHAT_MSG = 251, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialModelBg.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialModelBg.h new file mode 100644 index 000000000..d6f55eaa5 --- /dev/null +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/dial/DialModelBg.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialModelBg - 时间段背景切换模型 + * Author: + * Create: 2025-01 + */ + +#ifndef DIAL_MODEL_BG_H +#define DIAL_MODEL_BG_H + +#include "DialBaseModel.h" + +namespace OHOS +{ + class DialModelBg : public DialBaseModel + { + public: + DialModelBg() {} + ~DialModelBg() override {} + static DialModelBg *GetInstance() + { + static DialModelBg instance; + return &instance; + } + bool GetDialFloatData(DialDataType &type, float &out) override; + + private: + struct tm tblock_; + /** + * @brief 根据小时计算时间段索引 + * @param hour 当前小时(0-23) + * @return 时间段索引: 0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3 + */ + int CalculateTimePeriodIndex(int hour); + }; +} + +#endif // DIAL_MODEL_BG_H + diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialModelBg.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialModelBg.cpp new file mode 100644 index 000000000..d5523626a --- /dev/null +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/dial/DialModelBg.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialModelBg - 时间段背景切换模型实现 + * Author: + * Create: 2025-01 + */ + +#include "main/include/dial/DialModelBg.h" +#include "main/include/dial/RegisterDialModel.h" +#include "custom_runtime.h" +#include + +// 注册模块 +REGIST_DIAL_MODULE(OHOS::DialDataType::TIME_PERIOD_BG, OHOS::DialModelBg::GetInstance()); + +namespace OHOS +{ + +int DialModelBg::CalculateTimePeriodIndex(int hour) +{ + // 时间段映射:0-5点->0, 6-11点->1, 12-17点->2, 18-23点->3 + if (hour >= 0 && hour < 6) { + return 0; // 0-5点 + } else if (hour >= 6 && hour < 12) { + return 1; // 6-11点 + } else if (hour >= 12 && hour < 18) { + return 2; // 12-17点 + } else { + return 3; // 18-23点 + } +} + +bool DialModelBg::GetDialFloatData(DialDataType &type, float &out) +{ + (void)type; + + // 获取当前时间 + struct timeval tv; + gettimeofday(&tv, NULL); + localtime_r(&tv.tv_sec, &tblock_); + + // 获取当前小时(0-23) + int hour = tblock_.tm_hour; + + // 计算时间段索引 + int periodIndex = CalculateTimePeriodIndex(hour); + + // 返回时间段索引作为浮点数 + out = static_cast(periodIndex); + + return true; +} + +} // namespace OHOS + diff --git a/tools/dial_converter_tool/instance/207/BACKGROUND_0_6.png b/tools/dial_converter_tool/instance/207/BACKGROUND_0_6.png new file mode 100644 index 000000000..eca5bea1b Binary files /dev/null and b/tools/dial_converter_tool/instance/207/BACKGROUND_0_6.png differ diff --git a/tools/dial_converter_tool/instance/207/BACKGROUND_12_18.png b/tools/dial_converter_tool/instance/207/BACKGROUND_12_18.png new file mode 100644 index 000000000..fda00cdeb Binary files /dev/null and b/tools/dial_converter_tool/instance/207/BACKGROUND_12_18.png differ diff --git a/tools/dial_converter_tool/instance/207/BACKGROUND_18_24.png b/tools/dial_converter_tool/instance/207/BACKGROUND_18_24.png new file mode 100644 index 000000000..8bfa69a29 Binary files /dev/null and b/tools/dial_converter_tool/instance/207/BACKGROUND_18_24.png differ diff --git a/tools/dial_converter_tool/instance/207/BACKGROUND_6_12.png b/tools/dial_converter_tool/instance/207/BACKGROUND_6_12.png new file mode 100644 index 000000000..e1d8a2c3e Binary files /dev/null and b/tools/dial_converter_tool/instance/207/BACKGROUND_6_12.png differ diff --git a/tools/dial_converter_tool/instance/207/Battery/Battery.png b/tools/dial_converter_tool/instance/207/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/207/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/207/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/207/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/207/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/207/Battery/Battery_Nomoal.png b/tools/dial_converter_tool/instance/207/Battery/Battery_Nomoal.png new file mode 100644 index 000000000..4cd353d2e Binary files /dev/null and b/tools/dial_converter_tool/instance/207/Battery/Battery_Nomoal.png differ diff --git a/tools/dial_converter_tool/instance/207/owl_clock.png b/tools/dial_converter_tool/instance/207/owl_clock.png new file mode 100644 index 000000000..6e8149cc2 Binary files /dev/null and b/tools/dial_converter_tool/instance/207/owl_clock.png differ diff --git a/tools/dial_converter_tool/instance/207/owl_clock.xml b/tools/dial_converter_tool/instance/207/owl_clock.xml new file mode 100644 index 000000000..d198dee2a --- /dev/null +++ b/tools/dial_converter_tool/instance/207/owl_clock.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tools/dial_converter_tool/out/owl_clock.bin b/tools/dial_converter_tool/out/owl_clock.bin new file mode 100644 index 000000000..72ff88b06 Binary files /dev/null and b/tools/dial_converter_tool/out/owl_clock.bin differ