From: @CHENG <2393524978@qq.com> Date: Mon, 26 May 2025 09:58:28 +0000 (+0800) Subject: Z5_HA_K18_NFC 需求修改 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=095649ca59192b5e1995c2f6d7b12ce9cafadbde;p=mirrors%2FASR3603_Z5.git Z5_HA_K18_NFC 需求修改 --- diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h index 01f2822f..c5f4c3e4 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h @@ -48,7 +48,7 @@ #define MMI_CUSTOMER_BLOOD_TIMED_FLAG false -#define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL (60 * 60) // unit:s +#define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL (15 * 60) // unit:s #define MMI_CUSTOMER_SPO2_TIMED_FLAG false diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_NFC_EXPERIENCE_HEART_B.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_NFC_EXPERIENCE_HEART_B.png index dc9407fd..ceed8b87 100644 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_NFC_EXPERIENCE_HEART_B.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_NFC_EXPERIENCE_HEART_B.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db index fef722e8..5458a548 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db @@ -1,2 +1,6 @@ style1 R:/png/dial_style1/dial_style1.json +style2 +R:/png/dial_style2/dial_style2.json +style3 +R:/png/dial_style3/dial_style3.json diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json index 6b3716b2..441a8ed4 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/dial_style1.json @@ -1,5 +1,5 @@ { - "name": "那时花开", + "name": "style1", "preview_img": "R:/png/dial_style1/view.png", "bg_img": "R:/png/dial_style1/bg.png", "configurable": 0, diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/view.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/view.png index 55c3ba43..36b0994a 100644 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/view.png and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style1/view.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/bg.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/bg.png new file mode 100644 index 00000000..51bb5df4 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/bg.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/dial_style2.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/dial_style2.json new file mode 100644 index 00000000..18292a89 --- /dev/null +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/dial_style2.json @@ -0,0 +1,637 @@ +{ + "name": "style2", + "preview_img": "R:/png/dial_style2/view.png", + "bg_img": "R:/png/dial_style2/bg.png", + "configurable": 0, + "element_ll": + [ + { + "element_pos": { + "x": 86, + "y": 70 + }, + "element_cnt": 1, + "act_type": 1, + "layer": 0, + "element_dsc_ll": + [ + { + "element_type": 1, + "element_name": "数字时钟", + "img_cnt": 5, + "img_ll": [ + { + "img_type": 10, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/time/0.png" + }, + { + "sub_img": "R:/png/dial_style2/time/1.png" + }, + { + "sub_img": "R:/png/dial_style2/time/2.png" + }, + { + "sub_img": "R:/png/dial_style2/time/3.png" + }, + { + "sub_img": "R:/png/dial_style2/time/4.png" + }, + { + "sub_img": "R:/png/dial_style2/time/5.png" + }, + { + "sub_img": "R:/png/dial_style2/time/6.png" + }, + { + "sub_img": "R:/png/dial_style2/time/7.png" + }, + { + "sub_img": "R:/png/dial_style2/time/8.png" + }, + { + "sub_img": "R:/png/dial_style2/time/9.png" + } + ] + }, + { + "img_type": 11, + "img_pos": { + "x": 65, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/time/0.png" + }, + { + "sub_img": "R:/png/dial_style2/time/1.png" + }, + { + "sub_img": "R:/png/dial_style2/time/2.png" + }, + { + "sub_img": "R:/png/dial_style2/time/3.png" + }, + { + "sub_img": "R:/png/dial_style2/time/4.png" + }, + { + "sub_img": "R:/png/dial_style2/time/5.png" + }, + { + "sub_img": "R:/png/dial_style2/time/6.png" + }, + { + "sub_img": "R:/png/dial_style2/time/7.png" + }, + { + "sub_img": "R:/png/dial_style2/time/8.png" + }, + { + "sub_img": "R:/png/dial_style2/time/9.png" + } + ] + }, + { + "img_type": 16, + "img_pos": { + "x": 140, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/time/colon.png" + } + ] + }, + { + "img_type": 12, + "img_pos": { + "x": 154, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/time/0.png" + }, + { + "sub_img": "R:/png/dial_style2/time/1.png" + }, + { + "sub_img": "R:/png/dial_style2/time/2.png" + }, + { + "sub_img": "R:/png/dial_style2/time/3.png" + }, + { + "sub_img": "R:/png/dial_style2/time/4.png" + }, + { + "sub_img": "R:/png/dial_style2/time/5.png" + }, + { + "sub_img": "R:/png/dial_style2/time/6.png" + }, + { + "sub_img": "R:/png/dial_style2/time/7.png" + }, + { + "sub_img": "R:/png/dial_style2/time/8.png" + }, + { + "sub_img": "R:/png/dial_style2/time/9.png" + } + ] + }, + { + "img_type": 13, + "img_pos": { + "x": 219, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/time/0.png" + }, + { + "sub_img": "R:/png/dial_style2/time/1.png" + }, + { + "sub_img": "R:/png/dial_style2/time/2.png" + }, + { + "sub_img": "R:/png/dial_style2/time/3.png" + }, + { + "sub_img": "R:/png/dial_style2/time/4.png" + }, + { + "sub_img": "R:/png/dial_style2/time/5.png" + }, + { + "sub_img": "R:/png/dial_style2/time/6.png" + }, + { + "sub_img": "R:/png/dial_style2/time/7.png" + }, + { + "sub_img": "R:/png/dial_style2/time/8.png" + }, + { + "sub_img": "R:/png/dial_style2/time/9.png" + } + ] + } + ], + "label_cnt": 0, + "label_ll": [ + { + "label_type": 5, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 25, + "y": 160 + }, + "font_size": 20 + } + ], + "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": 90, + "y": 155 + }, + "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": 40 + }, + { + "label_type": 10, + "text": "月", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 40, + "y": 0 + }, + "font_size": 40 + }, + { + "label_type": 9, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 75, + "y": 0 + }, + "font_size": 40 + }, + { + "label_type": 10, + "text": "日", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 115, + "y": 0 + }, + "font_size": 40 + } + ], + "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": 283, + "y": 155 + }, + "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": 40 + } + ], + "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": 217, + "y": 375 + }, + "element_cnt": 1, + "act_type": 8, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 8, + "element_name": "计步", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 80, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/step.png" + } + ] + } + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 17, + "text": "10249", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 20, + "y": 5 + }, + "font_size": 20 + } + ], + "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": 140, + "y": 205 + }, + "element_cnt": 1, + "act_type": 18, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 18, + "element_name": "幸福值", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 180, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/happiness.png" + } + ] + } + ], + "label_cnt": 2, + "label_ll": [ + { + "label_type": 31, + "text": "123", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 40, + "y": 40 + }, + "font_size": 40 + }, + { + "label_type": 30, + "text": "幸福值", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 61, + "y": 100 + }, + "font_size": 20 + } + ], + "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": 300, + "y": 380 + }, + "element_cnt": 1, + "act_type": 14, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 14, + "element_name": "血氧", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 140, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/spo2.png" + } + ] + } + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 26, + "text": "--", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 21, + "y": 0 + }, + "font_size": 20 + } + ], + "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": 120, + "y": 370 + }, + "element_cnt": 1, + "act_type": 17, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 17, + "element_name": "温度", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 170, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style2/temperature.png" + } + ] + } + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 29, + "text": "--", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 25, + "y": 10 + }, + "font_size": 20 + } + ], + "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_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/happiness.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/happiness.png new file mode 100644 index 00000000..9eb26f5b Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/happiness.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/spo2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/spo2.png new file mode 100644 index 00000000..402619d2 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/spo2.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/step.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/step.png new file mode 100644 index 00000000..af6fa2ea Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/step.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/temperature.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/temperature.png new file mode 100644 index 00000000..e94de930 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/temperature.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/0.png new file mode 100644 index 00000000..158b9261 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/0.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/1.png new file mode 100644 index 00000000..ad3ea4a9 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/1.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/2.png new file mode 100644 index 00000000..bb3154db Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/2.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/3.png new file mode 100644 index 00000000..f71a72d5 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/3.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/4.png new file mode 100644 index 00000000..f4bb5f1c Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/4.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/5.png new file mode 100644 index 00000000..3fc54eba Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/5.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/6.png new file mode 100644 index 00000000..81b099d9 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/6.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/7.png new file mode 100644 index 00000000..6196c648 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/7.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/8.png new file mode 100644 index 00000000..0720ff32 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/8.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/9.png new file mode 100644 index 00000000..04b6b0f2 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/9.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/colon.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/colon.png new file mode 100644 index 00000000..63e151b9 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/time/colon.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/view.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/view.png new file mode 100644 index 00000000..25308f17 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style2/view.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/bg.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/bg.png new file mode 100644 index 00000000..255294a7 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/bg.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/dial_style3.json new file mode 100644 index 00000000..c644ebba --- /dev/null +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/dial_style3.json @@ -0,0 +1,637 @@ +{ + "name": "style3", + "preview_img": "R:/png/dial_style3/view.png", + "bg_img": "R:/png/dial_style3/bg.png", + "configurable": 0, + "element_ll": + [ + { + "element_pos": { + "x": 86, + "y": 70 + }, + "element_cnt": 1, + "act_type": 1, + "layer": 0, + "element_dsc_ll": + [ + { + "element_type": 1, + "element_name": "数字时钟", + "img_cnt": 5, + "img_ll": [ + { + "img_type": 10, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/time/0.png" + }, + { + "sub_img": "R:/png/dial_style3/time/1.png" + }, + { + "sub_img": "R:/png/dial_style3/time/2.png" + }, + { + "sub_img": "R:/png/dial_style3/time/3.png" + }, + { + "sub_img": "R:/png/dial_style3/time/4.png" + }, + { + "sub_img": "R:/png/dial_style3/time/5.png" + }, + { + "sub_img": "R:/png/dial_style3/time/6.png" + }, + { + "sub_img": "R:/png/dial_style3/time/7.png" + }, + { + "sub_img": "R:/png/dial_style3/time/8.png" + }, + { + "sub_img": "R:/png/dial_style3/time/9.png" + } + ] + }, + { + "img_type": 11, + "img_pos": { + "x": 65, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/time/0.png" + }, + { + "sub_img": "R:/png/dial_style3/time/1.png" + }, + { + "sub_img": "R:/png/dial_style3/time/2.png" + }, + { + "sub_img": "R:/png/dial_style3/time/3.png" + }, + { + "sub_img": "R:/png/dial_style3/time/4.png" + }, + { + "sub_img": "R:/png/dial_style3/time/5.png" + }, + { + "sub_img": "R:/png/dial_style3/time/6.png" + }, + { + "sub_img": "R:/png/dial_style3/time/7.png" + }, + { + "sub_img": "R:/png/dial_style3/time/8.png" + }, + { + "sub_img": "R:/png/dial_style3/time/9.png" + } + ] + }, + { + "img_type": 16, + "img_pos": { + "x": 140, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/time/colon.png" + } + ] + }, + { + "img_type": 12, + "img_pos": { + "x": 154, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/time/0.png" + }, + { + "sub_img": "R:/png/dial_style3/time/1.png" + }, + { + "sub_img": "R:/png/dial_style3/time/2.png" + }, + { + "sub_img": "R:/png/dial_style3/time/3.png" + }, + { + "sub_img": "R:/png/dial_style3/time/4.png" + }, + { + "sub_img": "R:/png/dial_style3/time/5.png" + }, + { + "sub_img": "R:/png/dial_style3/time/6.png" + }, + { + "sub_img": "R:/png/dial_style3/time/7.png" + }, + { + "sub_img": "R:/png/dial_style3/time/8.png" + }, + { + "sub_img": "R:/png/dial_style3/time/9.png" + } + ] + }, + { + "img_type": 13, + "img_pos": { + "x": 219, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/time/0.png" + }, + { + "sub_img": "R:/png/dial_style3/time/1.png" + }, + { + "sub_img": "R:/png/dial_style3/time/2.png" + }, + { + "sub_img": "R:/png/dial_style3/time/3.png" + }, + { + "sub_img": "R:/png/dial_style3/time/4.png" + }, + { + "sub_img": "R:/png/dial_style3/time/5.png" + }, + { + "sub_img": "R:/png/dial_style3/time/6.png" + }, + { + "sub_img": "R:/png/dial_style3/time/7.png" + }, + { + "sub_img": "R:/png/dial_style3/time/8.png" + }, + { + "sub_img": "R:/png/dial_style3/time/9.png" + } + ] + } + ], + "label_cnt": 0, + "label_ll": [ + { + "label_type": 5, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 25, + "y": 160 + }, + "font_size": 20 + } + ], + "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": 90, + "y": 155 + }, + "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": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 0, + "y": 0 + }, + "font_size": 40 + }, + { + "label_type": 10, + "text": "月", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 40, + "y": 0 + }, + "font_size": 40 + }, + { + "label_type": 9, + "text": "", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 75, + "y": 0 + }, + "font_size": 40 + }, + { + "label_type": 10, + "text": "日", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 115, + "y": 0 + }, + "font_size": 40 + } + ], + "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": 283, + "y": 155 + }, + "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": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 0, + "y": 0 + }, + "font_size": 40 + } + ], + "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": 217, + "y": 375 + }, + "element_cnt": 1, + "act_type": 8, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 8, + "element_name": "计步", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 80, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/step.png" + } + ] + } + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 17, + "text": "10249", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 20, + "y": 5 + }, + "font_size": 20 + } + ], + "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": 140, + "y": 205 + }, + "element_cnt": 1, + "act_type": 18, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 18, + "element_name": "幸福值", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 180, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/happiness.png" + } + ] + } + ], + "label_cnt": 2, + "label_ll": [ + { + "label_type": 31, + "text": "123", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 40, + "y": 40 + }, + "font_size": 40 + }, + { + "label_type": 30, + "text": "幸福值", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 61, + "y": 100 + }, + "font_size": 20 + } + ], + "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": 300, + "y": 380 + }, + "element_cnt": 1, + "act_type": 14, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 14, + "element_name": "血氧", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 140, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/spo2.png" + } + ] + } + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 26, + "text": "--", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 21, + "y": 0 + }, + "font_size": 20 + } + ], + "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": 120, + "y": 370 + }, + "element_cnt": 1, + "act_type": 17, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 17, + "element_name": "温度", + "img_cnt": 1, + "img_ll": [ + { + "img_type": 170, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_style3/temperature.png" + } + ] + } + ], + "label_cnt": 1, + "label_ll": [ + { + "label_type": 29, + "text": "--", + "text_color": { + "r": 30, + "g": 30, + "b": 30 + }, + "text_pos": { + "x": 25, + "y": 10 + }, + "font_size": 20 + } + ], + "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_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/happiness.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/happiness.png new file mode 100644 index 00000000..9eb26f5b Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/happiness.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/spo2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/spo2.png new file mode 100644 index 00000000..8364b2c0 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/spo2.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/step.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/step.png new file mode 100644 index 00000000..6a661bfd Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/step.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/temperature.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/temperature.png new file mode 100644 index 00000000..d711e8f0 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/temperature.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/0.png new file mode 100644 index 00000000..158b9261 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/0.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/1.png new file mode 100644 index 00000000..ad3ea4a9 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/1.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/2.png new file mode 100644 index 00000000..bb3154db Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/2.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/3.png new file mode 100644 index 00000000..f71a72d5 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/3.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/4.png new file mode 100644 index 00000000..f4bb5f1c Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/4.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/5.png new file mode 100644 index 00000000..3fc54eba Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/5.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/6.png new file mode 100644 index 00000000..81b099d9 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/6.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/7.png new file mode 100644 index 00000000..6196c648 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/7.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/8.png new file mode 100644 index 00000000..0720ff32 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/8.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/9.png new file mode 100644 index 00000000..04b6b0f2 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/9.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/colon.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/colon.png new file mode 100644 index 00000000..63e151b9 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/time/colon.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/view.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/view.png new file mode 100644 index 00000000..e7f26007 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/view.png differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 671bcce2..750bae78 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -25,7 +25,7 @@ #define USE_LV_WATCH_SETTING_ABOUT 1 #define USE_LV_WATCH_SHUTDOWN 1 #define USE_LV_WATCH_LANGUAGE 1 -#define USE_LV_WATCH_DIAL_SWITCH 0 // 1 +#define USE_LV_WATCH_DIAL_SWITCH 1 //#define USE_LV_WATCH_DIAL_DEFAULT_CLOCK 1 //#define USE_LV_WATCH_DIAL_DOLPHIN 1 //#define USE_LV_WATCH_DIAL_ROCKET 1 diff --git a/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c b/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c index c2db9b6d..e0cc6441 100644 --- a/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c +++ b/2.sdk/sdk/gui/lv_drivers/indev/sos_key.c @@ -174,6 +174,16 @@ static void EndKeyCountHandle(void * param) mEndKeyTimer = NULL; } +#ifdef MMI_PROJECT_Z5_HA_K18_NFC +static void mmi_key_back_long_press_action(void) +{ + // only in idle + if(lv_watch_get_activity_obj(ACT_ID_LAUNCHER) == lv_watch_get_top_activity_obj()) + { + setting_about_create_btn_action(NULL, LV_EVENT_CLICKED); + } +} +#endif static void sos_key_task(void *param) { @@ -233,7 +243,11 @@ static void sos_key_task(void *param) #endif //sos_btn_action(NULL); + #ifdef MMI_PROJECT_Z5_HA_K18_NFC + mmi_key_back_long_press_action(); + #else mmi_key_back_sos_btn_action(); + #endif break; } } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c index 2c903547..fc292a58 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c @@ -1505,6 +1505,15 @@ bool mmi_hengai_health_data_parse(unsigned char * next_buff, unsigned int next_b // update mmi_hengai_bp_back_measure_result(bp_value_high, bp_value_low); + + #ifdef MMI_PROJECT_Z5_HA_K18_NFC + if (cJSON_IsNumber(cJSON_GetObjectItem(json_data, "happiness"))) + { + float value_happiness = (cJSON_GetObjectItem(json_data, "happiness"))->valuedouble; + + mmi_hengai_happinss_value_set(value_happiness); + } + #endif } break; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c index 23f4148b..f6fde751 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c @@ -45,6 +45,8 @@ static char s_happiness_begin_time_str[24] = {0}, s_happiness_end_time_str[24] = static int * s_happiness_raw_data_ptr = NULL; static int s_happiness_raw_data_len = 0; +/* happiness value */ +static float s_happiness_total_value = 0; static void mmi_k18_nfc_experience_happiness_value_get(void); static int mmi_k18_nfc_experience_stop(char is_interrupt); @@ -270,15 +272,20 @@ void mmi_k18_nfc_experience_finish_screen(lv_obj_t * par) lv_obj_t * img_value = lv_img_create(img, NULL); lv_img_set_src(img_value, ICON_NFC_EXPERIENCE_HEART_B); lv_obj_set_click(img_value, false); - lv_obj_align(img_value, NULL, LV_ALIGN_IN_TOP_MID, 0, 315); + lv_obj_align(img_value, NULL, LV_ALIGN_IN_TOP_MID, 0, 300); lv_obj_t * label_value = lv_label_create(img_value, NULL); lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &lv_watch_font24); char temp_value[16] = {0}; - uint8_t value1 = 0, value2 = 0, value3 = 0; - value1 = (uint8_t)(s_experience_data.happiness_value); - value2 = (uint8_t)((s_experience_data.happiness_value - value1) * 10); - value3 = (uint8_t)(((s_experience_data.happiness_value - value1) * 10 - value2) * 10); + unsigned int value1 = 0; + unsigned char value2 = 0, value3 = 0; + //value1 = (uint8_t)(s_experience_data.happiness_value); + //value2 = (uint8_t)((s_experience_data.happiness_value - value1) * 10); + //value3 = (uint8_t)(((s_experience_data.happiness_value - value1) * 10 - value2) * 10); + value1 = (unsigned int)(s_happiness_total_value); + value2 = (uint8_t)((s_happiness_total_value - value1) * 10); + value3 = (uint8_t)(((s_happiness_total_value - value1) * 10 - value2) * 10); + if(0 == value3) { if(0 == value2) @@ -302,7 +309,7 @@ void mmi_k18_nfc_experience_finish_screen(lv_obj_t * par) lv_obj_t * label_info = lv_label_create(img, NULL); lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font36); lv_label_set_text_id(label_info, WATCH_TEXT_ID_HAPPINESS_VALUE); - lv_obj_align(label_info, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -45); + lv_obj_align(label_info, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -30); // lv_task_t * task_p = lv_task_create(mmi_k18_nfc_experience_finish_task_cb, 1000 * 5, LV_TASK_PRIO_HIGH, NULL); // lv_task_once(task_p); @@ -497,6 +504,8 @@ void mmi_k18_nfc_experience_create_event_cb(lv_obj_t * btn, lv_event_t e) s_experience_data.total_duration = 60 * 3; s_experience_data.remain_duration = s_experience_data.total_duration; s_experience_data.happiness_value = 76.89; // 168; + + s_happiness_total_value += 76.89; #endif @@ -632,18 +641,33 @@ void mmi_hengai_happinss_value_set(float value_happiness) return; } - uint8_t value1 = 0, value2 = 0, value3 = 0; - value1 = (uint8_t)(value_happiness); + unsigned int value1 = 0; + unsigned char value2 = 0, value3 = 0; + value1 = (unsigned int)(value_happiness); value2 = (uint8_t)((value_happiness - value1) * 10); value3 = (uint8_t)(((value_happiness - value1) * 10 - value2) * 10); K18_NFC_LOG("[@CHENG_DEBUG][%s][%d]: %d-%d-%d\n", __FUNCTION__, __LINE__, value1, value2, value3); + s_happiness_total_value += value_happiness; + +#if 0 s_experience_data.happiness_value = value_happiness; nv_watch_health_info_t health_info = {0}; mmi_health_info_get(&health_info); health_info.happiness_value = value_happiness; mmi_health_info_set(&health_info); +#endif +} + +float mmi_hengai_happiness_value_get(void) +{ + return s_happiness_total_value; +} + +void mmi_hengai_happiness_value_clean(void) +{ + s_happiness_total_value = 0; } void mmi_happiness_raw_data_time_str_set(uint8_t is_begin) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.h index 9fbf82be..66036b13 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.h @@ -51,6 +51,10 @@ int mmi_k18_nfc_experience_trigger(char * data_ptr, int data_len); void mmi_hengai_happinss_value_set(float value_happiness); +float mmi_hengai_happiness_value_get(void); + +void mmi_hengai_happiness_value_clean(void); + #endif #ifdef __cplusplus diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c index a64e7f27..58d8d90d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c @@ -668,13 +668,16 @@ static void dial_update_canvas_label(watch_element_base_t * base) dial_create_canvas_text(infotxt, label_dsc->label_font, label_dsc->text_color, pos.x + label_dsc->text_pos.x, pos.y + label_dsc->text_pos.y); break; case LABEL_TYPE_HAPPINESS: - if(health_info.happiness_value) + //if(health_info.happiness_value) + float happiness_value = mmi_hengai_happiness_value_get(); + if(happiness_value) { - uint8_t value1 = 0, value2 = 0, value3 = 0; + unsigned int value1 = 0; + unsigned char value2 = 0, value3 = 0; - value1 = (uint8_t)health_info.happiness_value; - value2 = (uint8_t)((health_info.happiness_value - value1) * 10); - value3 = (uint8_t)(((health_info.happiness_value - value1) * 10 - value2) * 10); + value1 = (unsigned int)happiness_value; + value2 = (uint8_t)((happiness_value - value1) * 10); + value3 = (uint8_t)(((happiness_value - value1) * 10 - value2) * 10); if(0 == value3) { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c index f321ddc6..73788a42 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c @@ -241,6 +241,10 @@ static lv_res_t launcher_tileview_scrl_signal(lv_obj_t * tile_scrl, lv_signal_t #endif } if(drag_dir & LV_DRAG_DIR_VER) { + #ifdef MMI_PROJECT_Z5_HA_K18_NFC + return LV_RES_OK; + #endif + if(launcher_tileview_act_is_dial() == false) return LV_RES_OK; lv_indev_get_point(indev, &act_pt); lv_obj_t * status_obj = lv_watch_get_activity_obj(ACT_ID_STATUS_AND_SETTING); @@ -280,6 +284,10 @@ static lv_res_t launcher_tileview_scrl_signal(lv_obj_t * tile_scrl, lv_signal_t lv_obj_set_y_animation(pedometer_obj, LV_VER_RES, true, LV_WATCH_OBJ_HIDE_TIME, launcher_drop_pull_destroy_anim_end); } if(drag_dir & LV_DRAG_DIR_VER) { + #ifdef MMI_PROJECT_Z5_HA_K18_NFC + return LV_RES_OK; + #endif + lv_indev_get_point(indev, &act_pt); if(status_obj) { if(act_pt.y < LV_VER_RES / 2) diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index 63f0a86d..9d757e7a 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -926,6 +926,10 @@ static void watch_normal_charging_status_change(VOID * para) //mmi_watch_charging_prompt_screen(NULL, chg_status); mmi_ui_msg_action_charging_prompt(chg_status); #endif +#ifdef MMI_PROJECT_Z5_HA_K18_NFC + mmi_hengai_happiness_value_clean(); + asl_pedometer_steps_clear(); +#endif } void watch_set_pintype(MMI_MODEM_PIN_STATUS_TYPE pinreqtype)