projects / mirrors / ASR3603_Z5_DS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dac7be4)
gengxin
author@CHENG <2393524978@qq.com>
Tue, 7 May 2024 02:58:11 +0000 (10:58 +0800)
committer@CHENG <2393524978@qq.com>
Tue, 7 May 2024 02:58:11 +0000 (10:58 +0800)
2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h patch | blob | history
2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h patch | blob | history
2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h patch | blob | history
2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h patch | blob | history
2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h patch | blob | history
2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c patch | blob | history

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 4d1e2aa..33cb415 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -238,6 +238,7 @@
 
 #define __MMI_FZD_PROTOCOL_WITHOUT_PING_COMMAND_SUPPORT__
 
+#define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
 
 #define __HEALTH_MEASURE_FAKE_temperature_DATA__
 //#define __MMI_CUSTOM_HENG_AI__
diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 7fedf41..ef3ae8a 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -238,6 +238,7 @@
 
 #define __MMI_FZD_PROTOCOL_WITHOUT_PING_COMMAND_SUPPORT__
 
+#define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
 
 #define __HEALTH_MEASURE_FAKE_temperature_DATA__
 //#define __MMI_CUSTOM_HENG_AI__
diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index bd1277a..62c5db7 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -238,6 +238,7 @@
 
 #define __MMI_FZD_PROTOCOL_WITHOUT_PING_COMMAND_SUPPORT__
 
+#define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
 
 #define __HEALTH_MEASURE_FAKE_temperature_DATA__
 //#define __MMI_CUSTOM_HENG_AI__
diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 44fc620..df25d12 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -238,6 +238,7 @@
 
 #define __MMI_FZD_PROTOCOL_WITHOUT_PING_COMMAND_SUPPORT__
 
+#define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
 
 #define __HEALTH_MEASURE_FAKE_temperature_DATA__
 //#define __MMI_CUSTOM_HENG_AI__
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
index 633414c..3a1632e 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
@@ -175,8 +175,12 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
     lv_imgbtn_set_src(btn_decrease, LV_BTN_STATE_RELEASED, ICON_DECREASE);
     lv_imgbtn_set_src(btn_decrease, LV_BTN_STATE_PRESSED, ICON_DECREASE);
     lv_obj_set_event_cb(btn_decrease, mmi_step_goal_set_btn_event_cb);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_decrease, NULL, LV_ALIGN_IN_LEFT_MID, LV_HOR_RES / 8, -LV_VER_RES / 8);
+#else
+       lv_obj_align(btn_decrease, NULL, LV_ALIGN_IN_LEFT_MID, LV_HOR_RES / 12, -LV_VER_RES / 8);
+#endif
 #else
        lv_obj_align(btn_decrease, NULL, LV_ALIGN_IN_LEFT_MID, LV_HOR_RES / 12, -LV_VER_RES / 8);
 #endif
@@ -186,16 +190,24 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
     lv_imgbtn_set_src(btn_increase, LV_BTN_STATE_RELEASED, ICON_INCREASE);
     lv_imgbtn_set_src(btn_increase, LV_BTN_STATE_PRESSED, ICON_INCREASE);
     lv_obj_set_event_cb(btn_increase, mmi_step_goal_set_btn_event_cb);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_increase, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_HOR_RES / 8, -LV_VER_RES / 8);
+#else
+       lv_obj_align(btn_increase, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_HOR_RES / 12, -LV_VER_RES / 8);
+#endif
 #else
        lv_obj_align(btn_increase, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_HOR_RES / 12, -LV_VER_RES / 8);
 #endif
        lv_watch_set_free_num(btn_increase, 2);
 
        lv_obj_t * label_goal = lv_label_create(cont, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label_goal, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label_goal, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
 #else
        lv_obj_add_style(label_goal, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #endif
@@ -209,8 +221,12 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
        s_step_label_goal_set = label_goal;
 
        lv_obj_t * btn_cancel = lv_btn_create(cont, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_set_size(btn_cancel, 140, 70);
+#else
+       lv_obj_set_size(btn_cancel, 100, 56);
+#endif
 #else
        lv_obj_set_size(btn_cancel, 100, 56);
 #endif
@@ -218,8 +234,12 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
        lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
        lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 70, -60);
+#else
+       lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 10, -25);
+#endif
 #else
        lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 10, -20);
 #endif
@@ -227,8 +247,12 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
        lv_watch_set_free_num(btn_cancel, 3);
        lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL);
        lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
+#else
+       lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+#endif
 #else
        lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
 #endif
@@ -238,8 +262,12 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
        lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
        lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -60);
+#else
+       lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -10, -25);
+#endif
 #else
        lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -10, -20);
 #endif
@@ -285,8 +313,12 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     lv_obj_set_click(cont_today, false);
 
     lv_obj_t * label = lv_label_create(cont_today, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
 #else
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #endif
@@ -302,7 +334,15 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
 
     lv_obj_t * digital_content = digital_content_create(cont_today, pedometer_get_steps(), 1);
 
+#if USE_LV_WATCH_UI_CIRCLE
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(cont_today, NULL, LV_ALIGN_IN_TOP_MID, 0, LV_VER_RES / 6);
+#else
+    lv_obj_align(cont_today, NULL, LV_ALIGN_IN_TOP_MID, 0, LV_VER_RES / 10);
+#endif
+#else
     lv_obj_align(cont_today, NULL, LV_ALIGN_IN_TOP_MID, 0, LV_VER_RES / 6);
+#endif
        
        //
     lv_obj_t * cont_goal = lv_watch_cont_create(cont, LV_LAYOUT_COLUMN_MID, &lv_style_transp_fit, lv_obj_get_width(cont));
@@ -310,8 +350,12 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     lv_obj_set_click(cont_goal, false);
        
     label = lv_label_create(cont_goal, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
 #else
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #endif
@@ -319,8 +363,12 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     lv_obj_set_click(label, false);
 
        lv_obj_t * btn_goal = lv_btn_create(cont_goal, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_set_size(btn_goal, 200, 70);
+#else
+       lv_obj_set_size(btn_goal, 150, 56);
+#endif
 #else
        lv_obj_set_size(btn_goal, 150, 56);
 #endif
@@ -331,8 +379,12 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
        lv_obj_set_event_cb(btn_goal, mmi_step_goal_btn_event_cb);
        
     label = lv_label_create(btn_goal, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
 #ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
 #else
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #endif
@@ -341,7 +393,15 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     lv_label_set_text(label, str);
     lv_obj_set_click(label, false);
 
+#if USE_LV_WATCH_UI_CIRCLE
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(cont_goal, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 8);
+#else
+       lv_obj_align(cont_goal, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 9);
+#endif
+#else
+       lv_obj_align(cont_goal, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 8);
+#endif
        
 #if USE_LV_WATCH_LAUNCHER != 0
     lv_drop_pull_obj_ext_t * ext = launcher_get_pull_ext();
Unnamed repository; edit this file 'description' to name the repository.