gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
index 3c048b2..3996d57 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
@@ -120,7 +120,11 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
     lv_obj_set_event_cb(btn_add, alarm_list_add_btn_action);
 
     lv_obj_t * list = lv_list_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+    lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES*4/5 - 30);
+#else
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES*4/5);
+#endif
     lv_obj_align(list, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
     lv_page_set_edge_flash(list, false);
     lv_page_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_OFF);
@@ -296,6 +300,8 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
     uint8_t pad_w = w - lv_obj_get_style_pad_left(list, LV_LIST_PART_SCROLLABLE);
 #if USE_LV_WATCH_UI_240_320
        lv_obj_set_size(btn, pad_w, LV_VER_RES / 8 + LV_VER_RES / 8);
+#elif defined(USE_LV_WATCH_UI_240_240_CIRCLE)
+       lv_obj_set_size(btn, pad_w, 56 + 4);
 #else
     lv_obj_set_size(btn, pad_w, 56);
 #endif
@@ -324,6 +330,10 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
     lv_label_set_text(label_repeat, str);
 
     /*switch*/
+#ifdef __MMI_ZHSX_SUPPORT__
+    lv_obj_t * img = lv_img_create(cont, NULL);
+       lv_img_set_src(img, (1 == alarm[index].on_off) ? ICON_ALARM_ON : ICON_ALARM_OFF);
+#else
     lv_obj_t * sw = lv_switch_create(cont, NULL);
     lv_obj_set_size(sw, LV_HOR_RES/4, LV_VER_RES/8);
     lv_obj_set_event_cb(sw, alarm_list_switch_action);
@@ -336,8 +346,14 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
     if(1 == alarm[index].on_off) {
         lv_switch_on(sw, LV_ANIM_OFF);
     }
+#endif
 
     /*bidi dir*/
+#ifdef __MMI_ZHSX_SUPPORT__
+       lv_obj_align(label_time, NULL, LV_ALIGN_IN_TOP_LEFT, 10, 5);
+       lv_obj_align(label_repeat, label_time, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0);
+       lv_obj_align(img, NULL, LV_ALIGN_IN_RIGHT_MID, -10, 0);
+#else
     if(LV_BIDI_DIR_RTL == lv_obj_get_base_dir(cont)) {
         lv_obj_set_base_dir(label_time, LV_BIDI_DIR_LTR);
         lv_label_set_align(label_time, LV_LABEL_ALIGN_RIGHT);
@@ -349,6 +365,7 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
         lv_obj_align(label_repeat, label_time, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0);
         lv_obj_align(sw, NULL, LV_ALIGN_IN_RIGHT_MID, -10, 0);
     }
+#endif
 
     return btn;
 }
@@ -849,7 +866,7 @@ static lv_obj_t * alarm_edit_create(lv_obj_t * activity_obj)
     lv_obj_t * btn_del = lv_btn_create(obj, NULL);
     lv_obj_set_size(btn_del, LV_HOR_RES/5, LV_VER_RES/5);
     lv_obj_t * img_del = lv_img_create(btn_del, NULL);
-    lv_img_set_src(img_del, ICON_IMGVIEWER_DELETE_BLUE);
+    lv_img_set_src(img_del, ICON_ALBUM_DELETE_BLUE); // ICON_IMGVIEWER_DELETE_BLUE);
     lv_obj_add_style(btn_del, LV_BTN_PART_MAIN, &lv_style_transp_tight);
     if(LV_BIDI_DIR_RTL == lv_obj_get_base_dir(btn_del)) {
         lv_obj_align(btn_del, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
index 56f59eb..eb16ed8 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
@@ -766,7 +766,11 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par)
     lv_obj_set_style_local_bg_opa(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
     lv_obj_set_style_local_pad_left(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
     lv_obj_set_style_local_pad_right(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+    lv_cont_set_layout(cont, LV_LAYOUT_OFF);
+#else
     lv_cont_set_layout(cont, LV_LAYOUT_ROW_MID);
+#endif
     lv_obj_set_click(cont, false);
 
 
@@ -798,18 +802,33 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par)
        printf("[@CHENG_DEBUG][%s][%d]: w=%d, h=%d, x=%d, y=%d\n", __FUNCTION__, __LINE__,
                lv_obj_get_width(cont), lv_obj_get_height(cont), lv_obj_get_x(cont), lv_obj_get_y(cont));
        
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+       lv_obj_set_hidden(img_back, true);
+       lv_obj_set_hidden(img_setting, true);
+       lv_obj_align(label_ph, NULL, LV_ALIGN_CENTER, 0, 0);
+#endif
+
     return bg;
 }
 
 static void album_photo_item_create(lv_obj_t * par)
 {
     lv_album_obj_ext_t * ext = album_get_ext();
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+    uint8_t line = ext->photo_cnt % 2 == 0 ? ext->photo_cnt / 2 : ext->photo_cnt / 2 + 1;
+#else
     uint8_t line = ext->photo_cnt % 3 == 0 ? ext->photo_cnt / 3 : ext->photo_cnt / 3 + 1;
+#endif
 
     ext->img_page  = lv_page_create(par, NULL);
     //lv_obj_set_size(ext->img_page, LV_HOR_RES, 200);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+       lv_obj_set_size(ext->img_page, 165, 155);
+       lv_obj_align(ext->img_page, NULL, LV_ALIGN_IN_TOP_MID, 0, 45);
+#else
     lv_obj_set_size(ext->img_page, LV_HOR_RES, LV_VER_RES - 55); //image back height
-    lv_obj_align(ext->img_page, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+    lv_obj_align(ext->img_page, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+#endif
     lv_obj_add_style(ext->img_page, LV_PAGE_PART_BG, &lv_watch_style_transp);
     lv_obj_add_style(ext->img_page, LV_PAGE_PART_SCROLLABLE, &lv_watch_style_transp);
     lv_obj_add_style(ext->img_page, LV_PAGE_PART_EDGE_FLASH, &lv_watch_cont_opa1);
@@ -819,7 +838,8 @@ static void album_photo_item_create(lv_obj_t * par)
     lv_obj_set_signal_cb(page_scrl, album_item_page_scrl_signal);
 
     lv_obj_t * cont = lv_cont_create(ext->img_page, NULL);
-    lv_obj_set_size(cont, LV_HOR_RES - 8, (72 + 3) * line);
+    //lv_obj_set_size(cont, LV_HOR_RES - 8, (72 + 3) * line);
+    lv_obj_set_size(cont, lv_obj_get_width(ext->img_page) - 8, (72 + 3) * line);
     lv_obj_set_x(cont, 2);
     lv_cont_set_layout(cont, LV_LAYOUT_GRID);
     lv_obj_set_click(cont, false);
@@ -938,11 +958,19 @@ static void album_view_photo_opt_create(lv_obj_t * img_view)
 {
     lv_obj_t * img_back = lv_img_create(img_view, NULL);
     lv_img_set_src(img_back, ICON_ALBUM_BACK);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+    if(lv_obj_get_base_dir(img_view) == LV_BIDI_DIR_RTL) {
+        lv_obj_align(img_back, NULL, LV_ALIGN_IN_TOP_MID, 0, 0);
+        lv_img_set_angle(img_back, 1800);
+    } else
+        lv_obj_align(img_back, NULL, LV_ALIGN_IN_TOP_MID, 0, 0);
+#else
     if(lv_obj_get_base_dir(img_view) == LV_BIDI_DIR_RTL) {
         lv_obj_align(img_back, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
         lv_img_set_angle(img_back, 1800);
     } else
         lv_obj_align(img_back, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0);
+#endif
     lv_obj_set_click(img_back, true);
     lv_obj_set_adv_hittest(img_back, false);
     lv_watch_set_free_num(img_back, 4);
@@ -961,10 +989,14 @@ static void album_view_photo_opt_create(lv_obj_t * img_view)
 
     lv_obj_t * img_del = lv_img_create(img_view, NULL);
     lv_img_set_src(img_del, ICON_ALBUM_DELETE_GRAY);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+       lv_obj_align(img_del, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+#else
      if(lv_obj_get_base_dir(img_view) == LV_BIDI_DIR_RTL)
         lv_obj_align(img_del, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
     else
-    lv_obj_align(img_del, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+           lv_obj_align(img_del, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+#endif
     lv_obj_set_click(img_del, true);
     lv_obj_set_adv_hittest(img_del, false);
     lv_obj_set_event_cb(img_del, album_opt_delete_event_cb);
@@ -1210,7 +1242,12 @@ static void album_setting_delete_create(lv_obj_t * par, uint8_t del_one)
     else
         lv_obj_add_style(label_q, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
     //lv_obj_align(label_q, img_to_del, LV_ALIGN_OUT_BOTTOM_MID, 0, 15);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+       lv_obj_set_hidden(img_to_del, true);
+    lv_obj_align(label_q, NULL, LV_ALIGN_CENTER, 0, -25);
+#else
     lv_obj_align(label_q, img_to_del, LV_ALIGN_OUT_BOTTOM_MID, 0, 25);
+#endif
 
     lv_obj_t * btn_cancel = lv_btn_create(bg, NULL);
     lv_obj_set_size(btn_cancel, 100, 56);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
index 6270ccf..6124ee3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
@@ -64,6 +64,7 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj);
 #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__
 
 #if USE_LV_WATCH_UI_240_320
+#define MMI_ALIPAY_QRCODE_BG_WIDTH (180)
 #define QRCODE_WIDTH 150
 #define PARENT_CTRL_QRCODE_WIDTH 150
 #define BIND_QRCODE_WIDTH 150
@@ -76,6 +77,7 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj);
 #define MMI_ALIPAY_COLLECT_QRCODE_Y    (-10)
 
 #elif USE_LV_WATCH_UI_240_280
+#define MMI_ALIPAY_QRCODE_BG_WIDTH (180)
 #define QRCODE_WIDTH 150
 #define PARENT_CTRL_QRCODE_WIDTH 150
 #define BIND_QRCODE_WIDTH 150
@@ -87,7 +89,21 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj);
 
 #define MMI_ALIPAY_COLLECT_QRCODE_Y    (0)
 
+#elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define MMI_ALIPAY_QRCODE_BG_WIDTH (126+12)
+#define QRCODE_WIDTH (126)
+#define PARENT_CTRL_QRCODE_WIDTH (126)
+#define BIND_QRCODE_WIDTH (126)
+#define COLLECT_QRCODE_WIDTH (126)
+
+
+#define MMI_ALIPAY_BIND_PROMPT_Y       (15 + 18)
+#define MMI_ALIPAY_BIND_QRCODE_BG_Y    (15)
+
+#define MMI_ALIPAY_COLLECT_QRCODE_Y    (0)
+
 #else
+#define MMI_ALIPAY_QRCODE_BG_WIDTH (180)
 #define QRCODE_WIDTH 150
 #define PARENT_CTRL_QRCODE_WIDTH 150
 #define BIND_QRCODE_WIDTH 150
@@ -717,11 +733,12 @@ static void upay_init_task(lv_task_t * task)
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
 #endif
         lv_label_set_text(label, "#ff0000 网络异常，无法使用 ");
-#ifdef CUSTORMER_NEWINGS
-        lv_obj_align(label, (lv_obj_t *)task->user_data, LV_ALIGN_IN_TOP_MID, 0, 25);
-#else
-        lv_obj_align(label, (lv_obj_t *)task->user_data, LV_ALIGN_IN_TOP_MID, 0, 8);
-#endif
+//#ifdef CUSTORMER_NEWINGS
+//        lv_obj_align(label, (lv_obj_t *)task->user_data, LV_ALIGN_IN_TOP_MID, 0, 25);
+//#else
+//        lv_obj_align(label, (lv_obj_t *)task->user_data, LV_ALIGN_IN_TOP_MID, 0, 8);
+//#endif
+               lv_obj_align(label, (lv_obj_t *)task->user_data, LV_ALIGN_CENTER, 0, -10);
     }
     else
     {
@@ -884,7 +901,8 @@ void upay_show_bind_qrcode(lv_obj_t * obj, char *bind_code)
 
        lv_obj_t * cont = lv_cont_create(content, NULL);
        lv_cont_set_fit(cont, LV_FIT_NONE);
-       lv_obj_set_size(cont, 180, 180);
+       //lv_obj_set_size(cont, 180, 180);
+       lv_obj_set_size(cont, MMI_ALIPAY_QRCODE_BG_WIDTH, MMI_ALIPAY_QRCODE_BG_WIDTH);
        lv_obj_set_style_local_bg_color(cont, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
        lv_cont_set_layout(cont, LV_LAYOUT_OFF);
        lv_obj_set_click(cont, false);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c b/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c
index 37f251e..458eeb1 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c
@@ -132,8 +132,13 @@ static lv_obj_t * call_log_list_create(lv_obj_t * obj)
     lv_page_set_edge_flash(list, true);
     lv_obj_add_style(list, LV_LIST_PART_EDGE_FLASH, &lv_watch_cont_opa1);
     lv_obj_add_style(list, LV_LIST_PART_BG, &lv_watch_style_transp);
+       lv_list_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_OFF);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+       lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES - lv_obj_get_height(title) - 20);
+#else
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES - lv_obj_get_height(title)); // - LV_VER_RES / 10);
-    lv_obj_align(list, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+#endif
+    lv_obj_align(list, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); // 0);
     lv_watch_obj_add_element(list);
 
     return list;

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c b/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c
index 0e14c1b..4326686 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c
@@ -199,6 +199,10 @@ static lv_camera_obj_ext_t * camera_get_ext(void)
 
 static void camera_create_option(lv_obj_t * obj)
 {
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+       return;
+#endif
+
     lv_obj_t * back_btn = lv_img_create(obj, NULL);
     lv_img_set_src(back_btn, ICON_ALBUM_BACK);
     lv_obj_set_event_cb(back_btn, camera_back_btn_event_cb);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h
index d4ae90d..8e37db0 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h
@@ -40,6 +40,7 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj);
 void dialpad_create_event_cb(lv_obj_t * btn, lv_event_t e);
 #ifdef __MMI_ZHSX_SUPPORT__
 void mmi_dial_pad_switch_set(uint8_t value);
+void mmi_dial_pad_switch_nv_read(void);
 void mmi_dial_pad_switch_nv_default(nv_watch_switch_t * data);
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
index ad5f24b..b458687 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
@@ -16,7 +16,7 @@
  *      DEFINES
  *********************/
 #define PHONEBOOK_TEST   0
-#define PHONEBOOK_DEBUG  1
+#define PHONEBOOK_DEBUG  0 // 1
 
 /* 1: use LV_WATCH_LEFT_OR_RIGHT_SLIDE_CALLBACK. If current user is the first one, right slide, phonebook will be closed.
  * 0: use LV_WATCH_ANIM_VER_UP_HIDE. If ver up slide, phonebook will be closed.
@@ -1287,14 +1287,14 @@ static void mmi_phonebook_no_contacts_create(lv_obj_t * obj)
     return;
 }
 
-static void mmi_phonebook_no_network_create(lv_obj_t * obj)
+static void mmi_phonebook_no_sim_create(lv_obj_t * obj)
 {
     lv_obj_t * label = lv_label_create(obj, NULL);
     lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
 
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
-    lv_label_set_text_id(label, WATCH_TEXT_ID_NO_NETWORK);
+    lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD);
     lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10);
 
     return;
@@ -1321,8 +1321,6 @@ static lv_obj_t * mmi_phonebook_create(lv_obj_t * activity_obj)
 {
     PHONEBOOK_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 
-    nv_watch_phonebook_t * nvm_contact_list = phonebook_read_nvm();
-
     if(activity_obj == NULL)
        {
         lv_watch_activity_ext_t activity_ext = {0};
@@ -1340,20 +1338,19 @@ static lv_obj_t * mmi_phonebook_create(lv_obj_t * activity_obj)
     if(NULL == obj)
                return NULL;
 
+       if(false == watch_modem_sim_present_check_req())
+       {
+               mmi_phonebook_no_sim_create(obj);
+               lv_watch_set_free_num(activity_obj, 0);
+               return obj;
+       }
+       
+    nv_watch_phonebook_t * nvm_contact_list = phonebook_read_nvm();
     if('\0' == nvm_contact_list->info[0].number[0])
     {
         mmi_phonebook_no_contacts_create(obj);
         lv_watch_set_free_num(activity_obj, 0);
     }
-       /*
-       else if((false == watch_modem_sim_present_check_req())
-                       || (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req())
-                       )
-       {
-               mmi_phonebook_no_network_create(obj);
-               lv_watch_set_free_num(activity_obj, 0);
-       }
-       */
        else 
        {
         mmi_phonebook_contacts_list_create(obj, nvm_contact_list);