优化：精简运动日期不显示问题

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 0586094..31985e7 100644 (file)
--- 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,7 +43,6 @@ 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, // 多个浮点数据类型基值
@@ -58,6 +57,7 @@ enum class DialOldDataType {
   DATA_TYPE_POWER_STR,          // 电量（string)
   DATA_TYPE_DATE_WEEK_MD_STR,   // 星期（月日）和日期（string)
   DATA_TYPE_DATE_EN_STR,        // 月份+日期 （英文）
+  DATA_TYPE_TIME_STR,           // 月/日eg:02/08
   DATA_TYPE_WEEK_EN_STR,        // 星期（英文）
   DATA_TYPE_STEPS_GOAL_STR,     // 运动步数目标(string)
   DATA_TYPE_CALORIE_GOAL_STR,   // 卡路里目标(string)

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 e91ee4d..b4e8618 100644 (file)
--- 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,7 +151,6 @@ 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
@@ -190,6 +189,7 @@ enum class DialDataType : int16_t {
     WEEK_EN_STR = 12297, // 星期（英文）
     STEPS_GOAL_STR = 12298, // 运动步数目标(string)
     CALORIE_GOAL_STR = 12299, // 卡路里目标(string)
+    TIMESTR_STR1 = 12300, // 月/日eg:02/08
     // 文本数据，私有可定制部分，到16383结束（包括16383）
 
     // 起始：多个浮点数据，OH标准协议部分，禁止改动，从16384开始（包括16384，二进制格式为：0100,xxxx,xxxx,xxxx）

diff --git a/tools/dial_tools/dial_lzma/208/essential_sport.lzma b/tools/dial_tools/dial_lzma/208/essential_sport.lzma
new file mode 100644 (file)
index 0000000..f0ddc8f
Binary files /dev/null and b/tools/dial_tools/dial_lzma/208/essential_sport.lzma differ

diff --git a/tools/dial_tools/instance/208/essential_sport.xml b/tools/dial_tools/instance/208/essential_sport.xml
index 226a569..d519926 100644 (file)
--- a/tools/dial_tools/instance/208/essential_sport.xml
+++ b/tools/dial_tools/instance/208/essential_sport.xml
@@ -26,7 +26,7 @@
     <arc_label id="date_month_day_arc" center="-30 540" radius="233" start_angle="30" end_angle="359"\r
             color="0xFF889199" font="HarmonyOS_Sans_SC_Regular.ttf"\r
             text="%s" font_size="28" align="left"\r
-            bind_data="38" period="10"></arc_label>\r
+            bind_data="20488" period="10"></arc_label>\r
 \r
     <!-- 电量弧形标签：右下方 \"⚡80%\"，贴近表盘外圈 -->\r
     <arc_label id="battery_arc_label" center="515 515" radius="233" start_angle="310" end_angle="359"\r

diff --git a/tools/dial_converter_tool/instance/209/BACKGROUND_0_6.png b/tools/dial_tools/instance/209/BACKGROUND_0_6.png
similarity index 100%
rename from tools/dial_converter_tool/instance/209/BACKGROUND_0_6.png
rename to tools/dial_tools/instance/209/BACKGROUND_0_6.png

diff --git a/tools/dial_converter_tool/instance/209/BACKGROUND_12_18.png b/tools/dial_tools/instance/209/BACKGROUND_12_18.png
similarity index 100%
rename from tools/dial_converter_tool/instance/209/BACKGROUND_12_18.png
rename to tools/dial_tools/instance/209/BACKGROUND_12_18.png

diff --git a/tools/dial_converter_tool/instance/209/BACKGROUND_18_24.png b/tools/dial_tools/instance/209/BACKGROUND_18_24.png
similarity index 100%
rename from tools/dial_converter_tool/instance/209/BACKGROUND_18_24.png
rename to tools/dial_tools/instance/209/BACKGROUND_18_24.png

diff --git a/tools/dial_converter_tool/instance/209/BACKGROUND_6_12.png b/tools/dial_tools/instance/209/BACKGROUND_6_12.png
similarity index 100%
rename from tools/dial_converter_tool/instance/209/BACKGROUND_6_12.png
rename to tools/dial_tools/instance/209/BACKGROUND_6_12.png

diff --git a/tools/dial_converter_tool/instance/209/abyssal_pulse.png b/tools/dial_tools/instance/209/abyssal_pulse.png
similarity index 100%
rename from tools/dial_converter_tool/instance/209/abyssal_pulse.png
rename to tools/dial_tools/instance/209/abyssal_pulse.png

diff --git a/tools/dial_converter_tool/instance/209/abyssal_pulse.xml b/tools/dial_tools/instance/209/abyssal_pulse.xml
similarity index 100%
rename from tools/dial_converter_tool/instance/209/abyssal_pulse.xml
rename to tools/dial_tools/instance/209/abyssal_pulse.xml

diff --git a/tools/dial_converter_tool/instance/210/BACKGROUND_0_6.png b/tools/dial_tools/instance/210/BACKGROUND_0_6.png
similarity index 100%
rename from tools/dial_converter_tool/instance/210/BACKGROUND_0_6.png
rename to tools/dial_tools/instance/210/BACKGROUND_0_6.png

diff --git a/tools/dial_converter_tool/instance/210/BACKGROUND_12_18.png b/tools/dial_tools/instance/210/BACKGROUND_12_18.png
similarity index 100%
rename from tools/dial_converter_tool/instance/210/BACKGROUND_12_18.png
rename to tools/dial_tools/instance/210/BACKGROUND_12_18.png

diff --git a/tools/dial_converter_tool/instance/210/BACKGROUND_18_24.png b/tools/dial_tools/instance/210/BACKGROUND_18_24.png
similarity index 100%
rename from tools/dial_converter_tool/instance/210/BACKGROUND_18_24.png
rename to tools/dial_tools/instance/210/BACKGROUND_18_24.png

diff --git a/tools/dial_converter_tool/instance/210/BACKGROUND_6_12.png b/tools/dial_tools/instance/210/BACKGROUND_6_12.png
similarity index 100%
rename from tools/dial_converter_tool/instance/210/BACKGROUND_6_12.png
rename to tools/dial_tools/instance/210/BACKGROUND_6_12.png

diff --git a/tools/dial_converter_tool/instance/210/two_tone_art.png b/tools/dial_tools/instance/210/two_tone_art.png
similarity index 100%
rename from tools/dial_converter_tool/instance/210/two_tone_art.png
rename to tools/dial_tools/instance/210/two_tone_art.png

diff --git a/tools/dial_converter_tool/instance/210/two_tone_art.xml b/tools/dial_tools/instance/210/two_tone_art.xml
similarity index 100%
rename from tools/dial_converter_tool/instance/210/two_tone_art.xml
rename to tools/dial_tools/instance/210/two_tone_art.xml

diff --git a/tools/dial_tools/out/essential_sport.bin b/tools/dial_tools/out/essential_sport.bin
new file mode 100644 (file)
index 0000000..f1d9087
Binary files /dev/null and b/tools/dial_tools/out/essential_sport.bin differ