From: Caisking <3449750381@qq.com> Date: Fri, 9 Aug 2024 10:07:01 +0000 (+0800) Subject: 增加Dial星期数据类型 X-Git-Tag: release_V1.2.70_20241020_135402~679^2~23 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3018603c98712433e07a040001907aa5f63a1f6a;p=mirrors%2FFD230.git 增加Dial星期数据类型 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h index 2a52f5b38..fbaa2175e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h @@ -32,12 +32,18 @@ enum class DialDataType DATA_TYPE_DISTANCE, // 运动距离 DATA_TYPE_WEATHER, // 天气 DATA_TYPE_POWER_STANDBY, // 备用电量数据类型 - + DATA_TYPE_HOUR_TENS, // 小时(十位) + DATA_TYPE_HOUR_UNITS, // 小时(单位) + DATA_TYPE_MINUTE_TENS, // 分钟(十位) + DATA_TYPE_MINUTE_UNITS, // 分钟(单位) + DATA_TYPE_MULTI_FLOAT_BASE = 0x2fff, // 多个浮点数据类型基值 + DATA_TYPE_HOUR_MIN, // 时分 - DATA_TYPE_TEXT_BASE = 0x4fff, // 文本数据类型基值 - DATA_TYPE_WEEK_STR, // 星期(string) + DATA_TYPE_TEXT_BASE = 0x4fff, // 文本数据类型基值 + DATA_TYPE_WEEK_STR, // 星期(string) + DATA_TYPE_DATE_STR, // 日期(string) - DATA_TYPE_MAX = 0x7fff, // 数据类型的最大值 + DATA_TYPE_MAX = 0x7fff, // 数据类型的最大值 }; #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h index 7b7cffee4..d36d0a8e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h @@ -1,6 +1,12 @@ +/*** + * @Date: 2024-08-03 17:35:36 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-08-07 11:50:10 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h + */ -#ifndef DIAL_MODEL_PATH_H -#define DIAL_MODEL_PATH_H +#ifndef DIAL_MODEL_WeekStr_H +#define DIAL_MODEL_WeekStr_H #include "DialBaseModel.h" #include