From: @CHENG <2393524978@qq.com> Date: Mon, 29 Apr 2024 01:35:27 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=69089da3b05d8f28d5dceb62cd14de1b6865d2e9;p=mirrors%2FASR3603_Z5_DS.git gengxin --- diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h index c622f8aa..dd08c5ba 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h @@ -98,6 +98,16 @@ // low battery #define MMI_CUSTOMER_LOW_BATTERY_SWITCH (MMI_WATCH_SWITCH_ON) +// schedule power on/off +#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH (MMI_WATCH_SWITCH_ON) +#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR (6) // 0-23 +#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE (0) // 0-59 + +#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH (MMI_WATCH_SWITCH_ON) +#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR (23) // 0-23 +#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE (59) // 0-59 + + #endif diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/album/icon_del_all_bg.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/album/icon_del_all_bg.png index 68671960..62024325 100644 Binary files a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/album/icon_del_all_bg.png and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/album/icon_del_all_bg.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png new file mode 100644 index 00000000..ab80e321 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png index 3329c796..9bba95cd 100644 Binary files a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png index 81bc88ef..e34642cf 100644 Binary files a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial/buildin_dial_list.db index 1c2db896..cf64e206 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial/buildin_dial_list.db +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial/buildin_dial_list.db @@ -1,3 +1,5 @@ +dial_style4 +R:/png/dial_style4/dial_style4.json dolphin R:/png/dial_dolphin/dolphin_watch.json default_digit @@ -10,5 +12,7 @@ style1 R:/png/dial_style1/dial_style1.json dial_style3 R:/png/dial_style3/dial_style3.json -dial_style4 -R:/png/dial_style4/dial_style4.json +dial_style6 +R:/png/dial_style6/style6.json +dial_style5 +R:/png/dial_style5/style5.json diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style1/dial_style1.json index 5ea86ef8..13f7f616 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style1/dial_style1.json +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style1/dial_style1.json @@ -245,7 +245,7 @@ "img_cnt": 0, "img_ll": [ ], - "label_cnt": 4, + "label_cnt": 5, "label_ll": [ { @@ -303,6 +303,20 @@ "y": 0 }, "font_size": 20 + }, + { + "label_type": 27, + "text": "农历", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 120, + "y": 0 + }, + "font_size": 20 } ], "bar": { @@ -373,8 +387,8 @@ }, { "element_pos": { - "x": 130, - "y": 125 + "x": 144, + "y": 143 }, "element_cnt": 1, "act_type": 8, @@ -472,7 +486,7 @@ "b": 255 }, "text_pos": { - "x": -7, + "x": -5, "y": 37 }, "font_size": 25 diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style4/dial_style4.json index 0a62aab9..25d0b17c 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style4/dial_style4.json +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style4/dial_style4.json @@ -333,8 +333,8 @@ }, { "element_pos": { - "x": 50, - "y": 197 + "x": 35, + "y": 154 }, "element_cnt": 1, "act_type": 4, @@ -346,7 +346,7 @@ "img_cnt": 0, "img_ll": [ ], - "label_cnt": 1, + "label_cnt": 2, "label_ll": [ { "label_type": 5, @@ -360,7 +360,21 @@ "x": 0, "y": 0 }, - "font_size": 24 + "font_size": 22 + }, + { + "label_type": 27, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 0, + "y": -30 + }, + "font_size": 22 } ], "bar": { @@ -382,8 +396,8 @@ }, { "element_pos": { - "x": 50, - "y": 132 + "x": 35, + "y": 190 }, "element_cnt": 1, "act_type": 8, @@ -419,8 +433,8 @@ "b": 255 }, "text_pos": { - "x": -5, - "y": 30 + "x": 33, + "y": 0 }, "font_size": 20 } @@ -444,7 +458,7 @@ }, { "element_pos": { - "x": 120, + "x": 125, "y": 130 }, "element_cnt": 1, diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/bg.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/bg.png new file mode 100644 index 00000000..ae9146ff Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/bg.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/icon_dial_rocket.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/icon_dial_rocket.png new file mode 100644 index 00000000..e3983dda Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/icon_dial_rocket.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/style5.json b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/style5.json new file mode 100644 index 00000000..bf7673ed --- /dev/null +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style5/style5.json @@ -0,0 +1,210 @@ +{ + "name": "独坐", + "preview_img": "R:/png/dial_style5/icon_dial_rocket.png", + "bg_img": "R:/png/dial_style5/bg.png", + "configurable": 0, + "element_ll": [ + { + "element_pos": { + "x": 0, + "y": 50 + }, + "element_cnt": 1, + "act_type": 1, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 1, + "element_name": "数字时钟", + "img_cnt": 0, + "img_ll": [], + "label_cnt": 2, + "label_ll": [ + { + "label_type": 1, + "text": "分", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 10, + "y": 50 + }, + "font_size": 55 + }, + { + "label_type": 0, + "text": "时", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 20, + "y": 0 + }, + "font_size": 55 + } + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + }, + { + "element_pos": { + "x": 160, + "y": 105 + }, + "element_cnt": 1, + "act_type": 5, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 5, + "element_name": "日期", + "img_cnt": 0, + "img_ll": [ + ], + "label_cnt": 4, + "label_ll": [ + { + "label_type": 8, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 0, + "y": 0 + }, + "font_size": 30 + }, + { + "label_type": 10, + "text": "/", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 33, + "y": 0 + }, + "font_size": 30 + }, + { + "label_type": 9, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 42, + "y": 0 + }, + "font_size": 30 + }, + { + "label_type": 10, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 70, + "y": 0 + }, + "font_size": 30 + } + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + }, + { + "element_pos": { + "x": 170, + "y": 70 + }, + "element_cnt": 1, + "act_type": 4, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 4, + "element_name": "星期", + "img_cnt": 0, + "img_ll": [ + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 5, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 0, + "y": 0 + }, + "font_size": 30 + } + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + } + ] +} diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/OVERCAST.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/OVERCAST.png new file mode 100644 index 00000000..7c09ff86 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/OVERCAST.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/SLEET.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/SLEET.png new file mode 100644 index 00000000..834a5f40 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/SLEET.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/SUNNY_NIGHT.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/SUNNY_NIGHT.png new file mode 100644 index 00000000..3a1e77a0 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/SUNNY_NIGHT.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/bg.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/bg.png new file mode 100644 index 00000000..fa385666 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/bg.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/cloundy.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/cloundy.png new file mode 100644 index 00000000..bc1edac1 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/cloundy.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/degree.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/degree.png new file mode 100644 index 00000000..3488c3e5 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/degree.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/fog.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/fog.png new file mode 100644 index 00000000..687554b7 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/fog.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/pre.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/pre.png new file mode 100644 index 00000000..3f8b20c2 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/pre.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/rain.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/rain.png new file mode 100644 index 00000000..26a5e63a Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/rain.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/snow.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/snow.png new file mode 100644 index 00000000..b1b9abd7 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/snow.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/style6.json b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/style6.json new file mode 100644 index 00000000..ba68fd4d --- /dev/null +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/style6.json @@ -0,0 +1,530 @@ +{ + "name": "红字", + "preview_img": "R:/png/dial_style6/pre.png", + "bg_img": "R:/png/dial_style6/bg.png", + "configurable": 0, + "element_ll": [ + { + "element_pos": { + "x": 5, + "y": 50 + }, + "element_cnt": 1, + "act_type": 1, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 1, + "element_name": "数字时钟", + "img_cnt": 4, + "img_ll": + [ + { + "img_type": 10, + "img_pos": { + "x": 5, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style6/time/0.png" + }, + { + "sub_img": "R:/png/dial_style6/time/1.png" + }, + { + "sub_img": "R:/png/dial_style6/time/2.png" + }, + { + "sub_img": "R:/png/dial_style6/time/3.png" + }, + { + "sub_img": "R:/png/dial_style6/time/4.png" + }, + { + "sub_img": "R:/png/dial_style6/time/5.png" + }, + { + "sub_img": "R:/png/dial_style6/time/6.png" + }, + { + "sub_img": "R:/png/dial_style6/time/7.png" + }, + { + "sub_img": "R:/png/dial_style6/time/8.png" + }, + { + "sub_img": "R:/png/dial_style6/time/9.png" + } + ] + }, + { + "img_type": 11, + "img_pos": { + "x": 60, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style6/time/0.png" + }, + { + "sub_img": "R:/png/dial_style6/time/1.png" + }, + { + "sub_img": "R:/png/dial_style6/time/2.png" + }, + { + "sub_img": "R:/png/dial_style6/time/3.png" + }, + { + "sub_img": "R:/png/dial_style6/time/4.png" + }, + { + "sub_img": "R:/png/dial_style6/time/5.png" + }, + { + "sub_img": "R:/png/dial_style6/time/6.png" + }, + { + "sub_img": "R:/png/dial_style6/time/7.png" + }, + { + "sub_img": "R:/png/dial_style6/time/8.png" + }, + { + "sub_img": "R:/png/dial_style6/time/9.png" + } + ] + }, + { + "img_type": 12, + "img_pos": { + "x": 2, + "y": 68 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style6/time/0.png" + }, + { + "sub_img": "R:/png/dial_style6/time/1.png" + }, + { + "sub_img": "R:/png/dial_style6/time/2.png" + }, + { + "sub_img": "R:/png/dial_style6/time/3.png" + }, + { + "sub_img": "R:/png/dial_style6/time/4.png" + }, + { + "sub_img": "R:/png/dial_style6/time/5.png" + }, + { + "sub_img": "R:/png/dial_style6/time/6.png" + }, + { + "sub_img": "R:/png/dial_style6/time/7.png" + }, + { + "sub_img": "R:/png/dial_style6/time/8.png" + }, + { + "sub_img": "R:/png/dial_style6/time/9.png" + } + ] + }, + { + "img_type": 13, + "img_pos": { + "x": 62, + "y": 68 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style6/time/0.png" + }, + { + "sub_img": "R:/png/dial_style6/time/1.png" + }, + { + "sub_img": "R:/png/dial_style6/time/2.png" + }, + { + "sub_img": "R:/png/dial_style6/time/3.png" + }, + { + "sub_img": "R:/png/dial_style6/time/4.png" + }, + { + "sub_img": "R:/png/dial_style6/time/5.png" + }, + { + "sub_img": "R:/png/dial_style6/time/6.png" + }, + { + "sub_img": "R:/png/dial_style6/time/7.png" + }, + { + "sub_img": "R:/png/dial_style6/time/8.png" + }, + { + "sub_img": "R:/png/dial_style6/time/9.png" + } + ] + } + ], + "label_cnt": 0, + "label_ll":[], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + }, + { + "element_pos": { + "x": 180, + "y": 115 + }, + "element_cnt": 1, + "act_type": 6, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 6, + "element_name": "天气", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 60, + "img_pos": { + "x": -35, + "y": -15 + }, + "sub_img_cnt": 17, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style6/sunny.png" + }, + { + "sub_img": "R:/png/dial_style6/sunny.png" + }, + { + "sub_img": "R:/png/dial_style6/cloudy.png" + }, + { + "sub_img": "R:/png/dial_style6/rain.png" + }, + { + "sub_img": "R:/png/dial_style6/rain.png" + }, + { + "sub_img": "R:/png/dial_style6/snow.png" + }, + { + "sub_img": "R:/png/dial_style6/snow.png" + }, + { + "sub_img": "R:/png/dial_style6/FOG.png" + }, + { + "sub_img": "R:/png/dial_style6/FOG.png" + }, + { + "sub_img": "R:/png/dial_style6/windy.png" + }, + { + "sub_img": "R:/png/dial_style6/OVERCAST.png" + }, + { + "sub_img": "R:/png/dial_style6/rain.png" + }, + { + "sub_img": "R:/png/dial_style6/rain.png" + }, + { + "sub_img": "R:/png/dial_style6/sunny.png" + }, + { + "sub_img": "R:/png/dial_style6/SLEET.png" + }, + { + "sub_img": "R:/png/dial_style6/FOG.png" + }, + { + "sub_img": "R:/png/dial_style6/SUNNY_NIGHT.png" + } + ] + } + ], + "label_cnt": 2, + "label_ll": [ + { + "label_type": 12, + "text": "温度", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": -18, + "y": 35 + }, + "font_size": 25 + }, + { + "label_type": 10, + "text": "。", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 10, + "y": 12 + }, + "font_size": 25 + } + + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + }, + { + "element_pos": { + "x": 25, + "y": 230 + }, + "element_cnt": 1, + "act_type": 5, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 5, + "element_name": "日期", + "img_cnt": 0, + "img_ll": [ + ], + "label_cnt": 7, + "label_ll": [ + { + "label_type": 7, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 30, + "y": 0 + }, + "font_size": 25 + }, + { + "label_type": 10, + "text": "-", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 85, + "y": 0 + }, + "font_size": 25 + }, + { + "label_type": 8, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 95, + "y": 0 + }, + "font_size": 25 + }, + { + "label_type": 10, + "text": "-", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 125, + "y": 0 + }, + "font_size": 25 + }, + { + "label_type": 9, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 135, + "y": 0 + }, + "font_size": 25 + }, + { + "label_type": 27, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 112, + "y": -165 + }, + "font_size": 25 + }, + { + "label_type": 10, + "text": "农历", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 130, + "y": -200 + }, + "font_size": 25 + } + + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + }, + { + "element_pos": { + "x": 75, + "y": 195 + }, + "element_cnt": 1, + "act_type": 4, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 4, + "element_name": "星期", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 40, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 7, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style6/week/sun.png" + }, + { + "sub_img": "R:/png/dial_style6/week/mon.png" + }, + { + "sub_img": "R:/png/dial_style6/week/tue.png" + }, + { + "sub_img": "R:/png/dial_style6/week/wed.png" + }, + { + "sub_img": "R:/png/dial_style6/week/thu.png" + }, + { + "sub_img": "R:/png/dial_style6/week/fri.png" + }, + { + "sub_img": "R:/png/dial_style6/week/sat.png" + } + + ] + } + ], + "label_cnt": 0, + "label_ll": [ + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 8, + "y": 9 + }, + "bar_color": { + "r": 77, + "g": 88, + "b": 99 + }, + "bar_w": 11, + "bar_h": 12 + } + } + ] + } + + ] +} diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/sunny.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/sunny.png new file mode 100644 index 00000000..3663868f Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/sunny.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/0.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/0.png new file mode 100644 index 00000000..b63f4d30 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/0.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/1.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/1.png new file mode 100644 index 00000000..23ce1cb9 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/1.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/2.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/2.png new file mode 100644 index 00000000..75606130 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/2.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/3.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/3.png new file mode 100644 index 00000000..8aa96644 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/3.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/4.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/4.png new file mode 100644 index 00000000..86c53aaa Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/4.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/5.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/5.png new file mode 100644 index 00000000..67ee008e Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/5.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/6.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/6.png new file mode 100644 index 00000000..c028667b Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/6.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/7.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/7.png new file mode 100644 index 00000000..bc794b97 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/7.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/8.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/8.png new file mode 100644 index 00000000..f2580de8 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/8.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/9.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/9.png new file mode 100644 index 00000000..b0737826 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/time/9.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/fri.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/fri.png new file mode 100644 index 00000000..e080f60a Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/fri.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/mon.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/mon.png new file mode 100644 index 00000000..3e9729c8 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/mon.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/sat.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/sat.png new file mode 100644 index 00000000..1dadb7b8 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/sat.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/sun.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/sun.png new file mode 100644 index 00000000..4461b249 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/sun.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/thu.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/thu.png new file mode 100644 index 00000000..06223678 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/thu.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/tue.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/tue.png new file mode 100644 index 00000000..e8becc59 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/tue.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/wed.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/wed.png new file mode 100644 index 00000000..1cbbe77f Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/week/wed.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/windy.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/windy.png new file mode 100644 index 00000000..78053af8 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/windy.png differ diff --git "a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/\346\262\231\345\260\230\346\232\264.png" "b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/\346\262\231\345\260\230\346\232\264.png" new file mode 100644 index 00000000..9bb5dfee Binary files /dev/null and "b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/dial_style6/\346\262\231\345\260\230\346\232\264.png" differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_PHONEBOOK.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_PHONEBOOK.png index 63996d8b..75544025 100644 Binary files a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_PHONEBOOK.png and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_PHONEBOOK.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png index c48b1cea..95fb8b24 100644 Binary files a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png differ diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h index cb053f49..e47cfd67 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_conf_CUSTOM.h @@ -12,6 +12,7 @@ //drv +#define DRV_PROJECT_Z5_DS_Z11_COMMON 1 #define DRV_PROJECT_Z5_DS_Z11XG_DTM_FZD 1 diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 4d1af916..d8f3dcc3 100644 --- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -105,7 +105,7 @@ #define USE_LV_MULTI_LANG 1 /* status show */ -#define USE_LV_WATCH_STATUS_BATT_VALUE 1 +#define USE_LV_WATCH_STATUS_BATT_VALUE 0 #define USE_LV_WATCH_STATUS_WIFI 0 /* vad */ @@ -163,9 +163,7 @@ #endif #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ #define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ -//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ #define __MMI_WECHAT_SUPPORT__ #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__