表盘“增加”蓝花“表盘
authorluozheng <1732036298@qq.com>
Sun, 3 Nov 2024 09:43:15 +0000 (17:43 +0800)
committerluozheng <1732036298@qq.com>
Sun, 3 Nov 2024 09:43:15 +0000 (17:43 +0800)
21 files changed:
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp
tools/dial_converter_tool/dial_lzma/116/blueflower.lzma [new file with mode: 0644]
tools/dial_converter_tool/instance/116/Battery/Battery.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/Battery/BatteryCharge.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/blueflower.png [moved from tools/dial_converter_tool/instance/116/weather.png with 100% similarity]
tools/dial_converter_tool/instance/116/blueflower.xml [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/1.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/2.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/3.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/4.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/5.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/6.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/7.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/FIRDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/MONDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/SATURDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/SUNDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/THURSDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/TUESDAY_IMAGE_PATH.png [new file with mode: 0644]
tools/dial_converter_tool/instance/116/week/WEDNESDAY_IMAGE_PATH.png [new file with mode: 0644]

index 8f83d94..e9e42c3 100644 (file)
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-11-03 16:47:34
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-11-03 17:01:37
+ * @LastEditTime: 2024-11-03 17:29:15
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp
  */
 #include "main/include/dial/DialModelDateWeekMDStr.h"
@@ -21,8 +21,7 @@ namespace OHOS
     REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DATE_WEEK_MD_STR, OHOS::DialModelDateWeekMDStr::GetInstance());
 
     // Cnweekdays 是一个包含周字符串的数组
-    constexpr const char *Cnweekdays[] = {"周天", "周一", "周二", "周三",
-                                          "周四", "周五", "周六"};
+    constexpr const char *Cnweekdays[] = {"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
 
     /*获取当前日期和星期信息 */
 
@@ -45,7 +44,7 @@ namespace OHOS
         oss << std::setw(2)
             << std::setfill('0') << (local_time.tm_mon + 1) << "月"
             << std::setw(2)
-            << std::setfill('0') << local_time.tm_mday << "日";
+            << std::setfill('0') << local_time.tm_mday << "号";
 
         // 获取星期
         dateweekmdstr = oss.str() + " " + Cnweekdays[local_time.tm_wday];
diff --git a/tools/dial_converter_tool/dial_lzma/116/blueflower.lzma b/tools/dial_converter_tool/dial_lzma/116/blueflower.lzma
new file mode 100644 (file)
index 0000000..60b4eb9
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/116/blueflower.lzma differ
diff --git a/tools/dial_converter_tool/instance/116/Battery/Battery.png b/tools/dial_converter_tool/instance/116/Battery/Battery.png
new file mode 100644 (file)
index 0000000..916febe
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/Battery/Battery.png differ
diff --git a/tools/dial_converter_tool/instance/116/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/116/Battery/BatteryCharge.png
new file mode 100644 (file)
index 0000000..4c26888
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/Battery/BatteryCharge.png differ
diff --git a/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png
new file mode 100644 (file)
index 0000000..6e75b23
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/116/blueflower.xml b/tools/dial_converter_tool/instance/116/blueflower.xml
new file mode 100644 (file)
index 0000000..f829422
--- /dev/null
@@ -0,0 +1,30 @@
+<dial title="blueflower" description="蓝花" size="466 466" version="1.0" preview_img="./instance/116/blueflower.png">\r
+    <static_img id="back_ground" position="0 0" img_name="./instance/116/MAIN_FACE_IMAGE.png"></static_img>\r
+\r
+    <!-- 月份标签 -->\r
+    <!-- <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 196 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label> -->\r
+    <!-- 日期标签 -->\r
+    <!-- <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 196 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label> -->\r
+    <!-- 星期显示 -->\r
+    <!-- <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 196 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label> -->\r
+    \r
+    <!-- 日期和星期显示 -->\r
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="83 216 300 100" text="%s" font_size="26" align="center" bind_data="20486" period="10"></label>\r
+    \r
+    <!-- 电池进度条 -->\r
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>\r
+    <!-- 电池图像 -->\r
+    <option_img position="173 52" img_names="./instance/116/Battery/Battery.png,./instance/116/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
+    <!-- 电池百分比标签 -->\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 66 33" text="%s" font_size="28" align="center" bind_data="20485" period="10"></label>\r
+\r
+    <!-- 小时标签 -->\r
+    <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r
+    <!-- 分钟标签 -->\r
+    <!-- <label id="minute_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="260 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="14" period="10"></label> -->\r
+    <!-- 分隔符 -->\r
+    <!-- <label id="point_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="220 308 50 120" text=":" font_size="75" align="center"></label> -->\r
+\r
+    <label id="hour_ten_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="83 95 300 100" text="%s" font_size="100" align="center" bind_data="20483" period="10"></label>\r
+\r
+</dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/116/week/1.png b/tools/dial_converter_tool/instance/116/week/1.png
new file mode 100644 (file)
index 0000000..6304005
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/1.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/2.png b/tools/dial_converter_tool/instance/116/week/2.png
new file mode 100644 (file)
index 0000000..5454b11
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/2.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/3.png b/tools/dial_converter_tool/instance/116/week/3.png
new file mode 100644 (file)
index 0000000..110a033
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/3.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/4.png b/tools/dial_converter_tool/instance/116/week/4.png
new file mode 100644 (file)
index 0000000..a8fbf54
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/4.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/5.png b/tools/dial_converter_tool/instance/116/week/5.png
new file mode 100644 (file)
index 0000000..8d7a3ee
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/5.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/6.png b/tools/dial_converter_tool/instance/116/week/6.png
new file mode 100644 (file)
index 0000000..f49f8ef
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/6.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/7.png b/tools/dial_converter_tool/instance/116/week/7.png
new file mode 100644 (file)
index 0000000..45dff34
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/7.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/FIRDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/FIRDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..9c39932
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/FIRDAY_IMAGE_PATH.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/MONDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/MONDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..58d2cdd
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/MONDAY_IMAGE_PATH.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/SATURDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/SATURDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..861ad16
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/SATURDAY_IMAGE_PATH.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/SUNDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/SUNDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..1a09471
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/SUNDAY_IMAGE_PATH.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/THURSDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/THURSDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..a2e27c6
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/THURSDAY_IMAGE_PATH.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/TUESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/TUESDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..c5b292d
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/TUESDAY_IMAGE_PATH.png differ
diff --git a/tools/dial_converter_tool/instance/116/week/WEDNESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/116/week/WEDNESDAY_IMAGE_PATH.png
new file mode 100644 (file)
index 0000000..e099b56
Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/WEDNESDAY_IMAGE_PATH.png differ