gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
index 0b7d0d9..70586c3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
@@ -44,7 +44,27 @@ extern "C" {
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define HEART_LABEL_INFO_X             (0)
+#define HEART_LABEL_INFO_Y             (155)
+#define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)
+#define HEART_LABEL_INFO_H             (30)
+
+#define HEART_LABEL_VALUE_X            (0)
+#define HEART_LABEL_VALUE_Y            (195)
+#define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
+#define HEART_LABEL_VALUE_H            (50)
+
 #else
+#define HEART_LABEL_INFO_X             (0)
+#define HEART_LABEL_INFO_Y             (180)
+#define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)
+#define HEART_LABEL_INFO_H             (30)
+
+#define HEART_LABEL_VALUE_X            (0)
+#define HEART_LABEL_VALUE_Y            (220)
+#define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
+#define HEART_LABEL_VALUE_H            (50)
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
index 7c20dab..1a58c79 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
@@ -44,7 +44,27 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define SPO2_LABEL_INFO_X              (0)
+#define SPO2_LABEL_INFO_Y              (155)
+#define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)
+#define SPO2_LABEL_INFO_H              (30)
+
+#define SPO2_LABEL_VALUE_X             (0)
+#define SPO2_LABEL_VALUE_Y             (195)
+#define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
+#define SPO2_LABEL_VALUE_H             (50)
+
 #else
+#define SPO2_LABEL_INFO_X              (0)
+#define SPO2_LABEL_INFO_Y              (180)
+#define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)
+#define SPO2_LABEL_INFO_H              (30)
+
+#define SPO2_LABEL_VALUE_X             (0)
+#define SPO2_LABEL_VALUE_Y             (220)
+#define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
+#define SPO2_LABEL_VALUE_H             (50)
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
index 5fc3bd1..37d1ec3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
@@ -45,7 +45,27 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define TEMPERATURE_LABEL_INFO_X               (0)
+#define TEMPERATURE_LABEL_INFO_Y               (155)
+#define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)
+#define TEMPERATURE_LABEL_INFO_H               (30)
+
+#define TEMPERATURE_LABEL_VALUE_X              (0)
+#define TEMPERATURE_LABEL_VALUE_Y              (195)
+#define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
+#define TEMPERATURE_LABEL_VALUE_H              (50)
+
 #else
+#define TEMPERATURE_LABEL_INFO_X               (0)
+#define TEMPERATURE_LABEL_INFO_Y               (180)
+#define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)
+#define TEMPERATURE_LABEL_INFO_H               (30)
+
+#define TEMPERATURE_LABEL_VALUE_X              (0)
+#define TEMPERATURE_LABEL_VALUE_Y              (220)
+#define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
+#define TEMPERATURE_LABEL_VALUE_H              (50)
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
index b010a28..69ba3ee 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
@@ -86,8 +86,21 @@ void voip_alarm_ind(void);
 #define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
 #define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
+
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
+
 #else
+#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
 
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h
index ae6697b..bf4d953 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h
@@ -86,8 +86,21 @@ void voip_alarm_ind(void);
 #define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
 #define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
+
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
+
 #else
+#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
 
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h
index 6f671f0..0b764ea 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h
@@ -86,8 +86,21 @@ void voip_alarm_ind(void);
 #define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
 #define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
+
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
+
 #else
+#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
 
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
 
 #endif