From: luozheng <1732036298@qq.com> Date: Sun, 3 Nov 2024 09:43:15 +0000 (+0800) Subject: 表盘“增加”蓝花“表盘 X-Git-Tag: fd230_release_V1.3.102~29^2~74 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=db8c46696c00900b29df01375084a594c2c795d6;p=mirrors%2FFD230.git 表盘“增加”蓝花“表盘 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp index 8f83d94ac..e9e42c351 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp @@ -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 index 000000000..60b4eb9ec 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 index 000000000..916febe86 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 index 000000000..4c26888f3 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 index 000000000..6e75b237c 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/weather.png b/tools/dial_converter_tool/instance/116/blueflower.png similarity index 100% rename from tools/dial_converter_tool/instance/116/weather.png rename to tools/dial_converter_tool/instance/116/blueflower.png diff --git a/tools/dial_converter_tool/instance/116/blueflower.xml b/tools/dial_converter_tool/instance/116/blueflower.xml new file mode 100644 index 000000000..f82942278 --- /dev/null +++ b/tools/dial_converter_tool/instance/116/blueflower.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 index 000000000..6304005b1 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 index 000000000..5454b1190 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 index 000000000..110a03318 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 index 000000000..a8fbf5442 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 index 000000000..8d7a3ee42 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 index 000000000..f49f8ef98 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 index 000000000..45dff3434 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 index 000000000..9c3993262 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 index 000000000..58d2cdd29 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 index 000000000..861ad16a8 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 index 000000000..1a0947185 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 index 000000000..a2e27c6d8 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 index 000000000..c5b292dcb 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 index 000000000..e099b5661 Binary files /dev/null and b/tools/dial_converter_tool/instance/116/week/WEDNESDAY_IMAGE_PATH.png differ