From: @CHENG <2393524978@qq.com>
Date: Thu, 20 Jun 2024 11:33:56 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e880bde7d03422223a55b4b4ba757b9b9c67e05c;p=mirrors%2FASR3603_Z5.git

gengxin
---

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 4b8927c5..8b432da8 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
@@ -976,7 +976,9 @@ static void dial_update_canvas_img(watch_element_base_t * base)
                     dial_update_canvas(sub_img, 0, pos.x + img_dsc->img_pos.x, pos.y + img_dsc->img_pos.y);
                 break;
             case IMG_TYPE_CALORIE_PROGRESS:
-                sub_img = dial_get_sub_img(img_dsc, ((record.kcal * 100 / 1000) / (100 / img_dsc->subimg->sub_img_cnt)));
+                //sub_img = dial_get_sub_img(img_dsc, ((record.kcal * 100 / 1000) / (100 / img_dsc->subimg->sub_img_cnt)));
+				//if(NULL == sub_img)
+					sub_img = dial_get_sub_img(img_dsc, 10);
                 if(sub_img)
                     dial_update_canvas(sub_img, 0, pos.x + img_dsc->img_pos.x, pos.y + img_dsc->img_pos.y);
                 break;
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 b0122444..bf78ee63 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
@@ -30,7 +30,7 @@ uint16_t pedometer_get_goalsteps(void)
     return pedometer_goalsteps;
 }
 
-static lv_obj_t * digital_content_create(lv_obj_t * par, int16_t level, uint8_t first_time)
+static lv_obj_t * digital_content_create(lv_obj_t * par, uint32_t level, uint8_t first_time)
 {
     lv_obj_t * par_obj = NULL;