USE_LV_WATCH_UI_240_280

diff --git a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
index 00b3ac7..0b7d0d9 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
+++ b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
@@ -35,12 +35,12 @@ extern "C" {
 
 #elif USE_LV_WATCH_UI_240_280
 #define HEART_LABEL_INFO_X             (0)
-#define HEART_LABEL_INFO_Y             (180)
+#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            (220)
+#define HEART_LABEL_VALUE_Y            (195)
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 

diff --git a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
index 56c4026..7c20dab 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
+++ b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
@@ -35,12 +35,12 @@ extern "C" {
 
 #elif USE_LV_WATCH_UI_240_280
 #define SPO2_LABEL_INFO_X              (0)
-#define SPO2_LABEL_INFO_Y              (180)
+#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             (220)
+#define SPO2_LABEL_VALUE_Y             (195)
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 

diff --git a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
index 7dbb95e..5fc3bd1 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
+++ b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
@@ -36,12 +36,12 @@ extern "C" {
 
 #elif USE_LV_WATCH_UI_240_280
 #define TEMPERATURE_LABEL_INFO_X               (0)
-#define TEMPERATURE_LABEL_INFO_Y               (180)
+#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              (220)
+#define TEMPERATURE_LABEL_VALUE_Y              (195)
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 

diff --git a/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c b/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c
index 9cd2870..af03d8b 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c
+++ b/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c
@@ -24,7 +24,7 @@ typedef struct
 } video_call_jrtc_t;
 
 
-extern voip_phone_call_params_t voipcall_params;
+extern MMI_VIDEO_CALL_PARAMS_T voipcall_params;
 static video_call_jrtc_t voip_jrtc;
 
 

diff --git a/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c b/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
index a604460..0bdb272 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
+++ b/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
@@ -1,11 +1,6 @@
-/**
- * @file videocall.c
- *
- */
-
-/*********************
-*      INCLUDES
-*********************/
+
+
+
 #include "lv_watch.h"
 
 
@@ -25,7 +20,7 @@ static lv_task_t * rat_check_task = NULL;
 /**********************
 *      Global Variable
 **********************/
-voip_phone_call_params_t voipcall_params;
+MMI_VIDEO_CALL_PARAMS_T voipcall_params;
 lv_color_t g_cbuf[canvas_width * canvas_heigh + 8]  __attribute__((aligned(8)));
 
 /**********************
@@ -1228,7 +1223,7 @@ static void voip_phone_prepare_destory(lv_obj_t * activity_obj)
         voipcall_params.callreq_timer_id = NULL;
     }
 
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
     voipcall_params.state = MMI_VOIP_CALL_STATE_NULL;
 }
 
@@ -1342,7 +1337,7 @@ void watch_voip_call_response_disconnect(int32_t index)
         // remove donw slider handle
         lv_watch_obj_set_down_slide_cb(voip_phone_get_obj(), NULL);
     }
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
     voipcall_params.state = MMI_VOIP_CALL_STATE_NULL;
 }
 
@@ -1379,16 +1374,7 @@ void watch_voip_call_response_no_carrier(int32_t index, uint8_t isNoCarrier)
     if(activity_obj) {
         voip_phone_ring_off_create();
     }
-#if 0
-    // display alarm if it is buffered
-    if(voipcall_params.buffer_alarm) {
-        Hal_NFFS_File_Play_Repeat(AUDIO_ALARM, query_current_volume());
-        alarm_create(NULL);
-    } else {
-        // indicate voice msg
-        voice_msg_call_end();
-    }
-#endif
+
     if(MMI_MODEM_CALL_STATE_NULL != phone_get_call_state()) {
         printf("%s tele call is on going, keep para of audio\n", __FUNCTION__);
         Hal_Set_Voice_Call_Status(VOICE_CALL_END);
@@ -1397,7 +1383,7 @@ void watch_voip_call_response_no_carrier(int32_t index, uint8_t isNoCarrier)
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
     watch_wakeup_time_reset();
 
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
     voipcall_params.state = MMI_VOIP_CALL_STATE_NULL;
 } /* watch_voip_call_response_no_carrier */
 
@@ -1417,7 +1403,7 @@ void watch_voip_call_response_bottom_error(void)
 {
     printf("%s %d\n", __FUNCTION__, __LINE__);
     voip_phone_cleanup();
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
 }
 
 void watch_voip_call_response_bottom_need_redail(void)
@@ -1439,7 +1425,7 @@ void watch_voip_incomingcall_response(char * number, int32_t calltype)
         return;
     }
 
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
     voipcall_params.voip_call_type = (MODEM_VIDEO_CALL_TYPE)calltype;
     voipcall_params.is_mt          = true;
     voipcall_params.state          = MMI_VOIP_CALL_STATE_INCOMING;
@@ -1487,7 +1473,7 @@ void watch_voip_incomingcall_response(char * number, int32_t calltype)
                 voipcall_params.callreq_timer_id = NULL;
             }
 
-            Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+            Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
             voipcall_params.state = MMI_VOIP_CALL_STATE_NULL;
             voip_set_volume_when_slider_act();
             voip_phone_cleanup();
@@ -1758,7 +1744,7 @@ void mmi_video_call_req(char * number, MODEM_VIDEO_CALL_TYPE voip_call_type)
     }
 
     // set call parameters
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
     voipcall_params.is_mt          = false;
     voipcall_params.state          = MMI_VOIP_CALL_STATE_DIALING;
     voipcall_params.voip_call_type = voip_call_type;
@@ -2017,7 +2003,7 @@ void voip_activity_destroy_req(void)
         voipcall_params.callreq_timer_id = NULL;
     }
 
-    Hal_Mem_Set(&voipcall_params, 0, sizeof(voip_phone_call_params_t));
+    Hal_Mem_Set(&voipcall_params, 0, sizeof(MMI_VIDEO_CALL_PARAMS_T));
     voipcall_params.state = MMI_VOIP_CALL_STATE_NULL;
     voip_set_volume_when_slider_act();
     voip_phone_cleanup();

diff --git a/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h b/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
index 40b8bf2..aab1107 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
+++ b/2.sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
@@ -166,7 +166,7 @@ typedef struct {
     MODEM_VIDEO_CALL_TYPE    voip_call_type;
     TIMER_ID             callreq_timer_id;         /* callreq timer */
     uint8_t              speaker_volume;           /* speaker volume during call procedure */
-} voip_phone_call_params_t;
+} MMI_VIDEO_CALL_PARAMS_T;
 
 typedef struct {
     lv_watch_obj_ext_t lv_watch_obj;

diff --git a/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c b/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
index 04eb4ff..7b87d48 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
+++ b/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
@@ -487,13 +487,13 @@ static lv_obj_t * menu_add_btn(lv_obj_t * tab, int8_t menu_index, int8_t btn_id,
                lv_obj_align(btn, cont, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -45 - 18);
 #elif USE_LV_WATCH_UI_240_280
        if(0 == i)
-               lv_obj_align(btn, cont, LV_ALIGN_IN_TOP_LEFT, 20, 40 - 15);
+               lv_obj_align(btn, cont, LV_ALIGN_IN_TOP_LEFT, 23, 40 - 6);
        else if(1 == i) 
-               lv_obj_align(btn, cont, LV_ALIGN_IN_TOP_RIGHT, -20, 40 - 15);
+               lv_obj_align(btn, cont, LV_ALIGN_IN_TOP_RIGHT, -23, 40 - 6);
        else if(2 == i) 
-               lv_obj_align(btn, cont, LV_ALIGN_IN_BOTTOM_LEFT, 20, -45 - 18);
+               lv_obj_align(btn, cont, LV_ALIGN_IN_BOTTOM_LEFT, 23, -45 - 8);
        else if(3 == i) 
-               lv_obj_align(btn, cont, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -45 - 18);
+               lv_obj_align(btn, cont, LV_ALIGN_IN_BOTTOM_RIGHT, -23, -45 - 8);
 
 #else
     if(i == 0) {

diff --git a/2.sdk/gui/lv_watch/lv_apps/timer/timer_clock.c b/2.sdk/gui/lv_watch/lv_apps/timer/timer_clock.c
index 8c35272..f13c6f6 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/timer/timer_clock.c
+++ b/2.sdk/gui/lv_watch/lv_apps/timer/timer_clock.c
@@ -342,7 +342,7 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_240_320
        lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 35);
 #elif USE_LV_WATCH_UI_240_280
-       lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360);
+       lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 20);
 #else
     lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360);
 #endif
@@ -361,7 +361,7 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_240_320
     lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 35);
 #elif USE_LV_WATCH_UI_240_280
-       lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
+       lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 20);
 #else
     lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
 #endif
@@ -376,7 +376,7 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_240_320
     lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 35);
 #elif USE_LV_WATCH_UI_240_280
-       lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
+       lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 20);
 #else
     lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
 #endif

diff --git a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_fail.png b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_fail.png
index 50dc054..589bc9b 100644 (file)
Binary files a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_fail.png and b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_fail.png differ

diff --git a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_timeout.png b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_timeout.png
index d287cb1..c227531 100644 (file)
Binary files a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_timeout.png and b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_bind_timeout.png differ

diff --git a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_1.png b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_1.png
index b39ed2c..40c7eee 100644 (file)
Binary files a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_1.png and b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_1.png differ

diff --git a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_2.png b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_2.png
index ff96067..97c3908 100644 (file)
Binary files a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_2.png and b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_2.png differ

diff --git a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_3.png b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_3.png
index b670161..c02a35f 100644 (file)
Binary files a/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_3.png and b/2.sdk/gui/lv_watch/resource/png/upay/240_280/upay_menu_3.png differ