gengxin

diff --git a/2.sdk/new_gui.sh b/2.sdk/new_gui.sh
index 6edd654..7360f53 100644 (file)
--- a/2.sdk/new_gui.sh
+++ b/2.sdk/new_gui.sh
@@ -8,15 +8,15 @@ elif [ ! -e "project/$project_name" ] ; then
 else
     echo $project_name
     
-build_time=$(date "+%Y%m%d_%H%M%S")
-echo $build_time
+    build_time=$(date "+%Y%m%d_%H%M%S")
+    echo $build_time
 
-echo "#define MMI_BUILD_PROJECT \"$project_name\"" > sdk/build_info.h
-echo >> sdk/build_info.h
-echo "#define MMI_BUILD_TIME \"$build_time\"" >> sdk/build_info.h
+    echo "#define MMI_BUILD_PROJECT \"$project_name\"" > sdk/build_info.h
+    echo >> sdk/build_info.h
+    echo "#define MMI_BUILD_TIME \"$build_time\"" >> sdk/build_info.h
 
-cd sdk
-make craneg_modem_watch p=$project_name -j8
-cd ..
+    cd sdk
+    make craneg_modem_watch p=$project_name -j8
+    cd ..
 fi
 

diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
index 2b4b065..3d5c65b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
@@ -66,6 +66,7 @@ const void * lang_text_ch[] = {
     "暂无数据, 请稍侯",
     "晴",
     "多云",
+    "阴天",
     "小雨",
     "大雨",
     "小雪",
@@ -873,7 +874,7 @@ const void * lang_text_ch[] = {
     "删除选中", // WATCH_TEXT_ID_DELETE_CURRENT_ITEM,
     "删除全部", // WATCH_TEXT_ID_DELETE_ALL_ITEM,
     "无网络", // WATCH_TEXT_ID_NO_NETWORK,
-    "主题切换", // WATCH_TEXT_ID_MAIN_MENU_SWITCH,
+    "主题更换", // WATCH_TEXT_ID_MAIN_MENU_SWITCH,
     "大图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE,
     "小图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST,
     "工具箱", // WATCH_TEXT_ID_TOOL,

diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
index 0592a36..75f1a78 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
@@ -67,6 +67,7 @@ const void * lang_text_en[] = {
     "No network, please wait",
     "Sunny",
     "Cloudy",
+    "Overcast",
     "Light rain",
     "Heavy rain",
     "Light snow",

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
index 3377f27..98098ad 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -67,6 +67,7 @@ enum
     WATCH_TEXT_ID_WEATHER_NO_NETWORK,                /* "暂无数据，请稍候"         "No network, please wait"         */
     WATCH_TEXT_ID_SUNNY,                             /* "晴"                          "Sunny"                           */
     WATCH_TEXT_ID_CLOUDY,                            /* "多云"                        "Cloudy"                          */
+    WATCH_TEXT_ID_OVERCAST,                          /* "阴天"                        "Overcast"                          */
     WATCH_TEXT_ID_LIGHT_RAIN,                        /* "小雨"                        "Light rain"                      */
     WATCH_TEXT_ID_HEAVY_RAIN,                        /* "大雨"                        "Heavy rain"                      */
     WATCH_TEXT_ID_LIGHT_SNOW,                        /* "小雪"                        "Light snow"                      */
@@ -880,7 +881,7 @@ enum
     WATCH_TEXT_ID_DELETE_CURRENT_ITEM,                  /* "删除选中"                    "Delete current" */
     WATCH_TEXT_ID_DELETE_ALL_ITEM,                      /* "删除全部"                    "Delete all" */
     WATCH_TEXT_ID_NO_NETWORK,                           /* "无网络"                "No SIM or no network" */
-    WATCH_TEXT_ID_MAIN_MENU_SWITCH,                     /* "主题切换"                    "Theme switch" */
+    WATCH_TEXT_ID_MAIN_MENU_SWITCH,                     /* "主题更换"                    "Theme switch" */
     WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE,            /* "大图标"                    "Big icon" */
     WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST,                /* "小图标"                    "Small icon" */
     WATCH_TEXT_ID_TOOL,                                 /* "工具箱"                    "Tool" */

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
index a42040a..22c10b9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
@@ -52,7 +52,7 @@ const struct {
 } factorymodelist[] = {
     { WATCH_TEXT_ID_AUTO_TEST, factorymode_autotest_create_btn_event_cb },
     { WATCH_TEXT_ID_TEST_REPORT, factorymode_testreport_create_btn_event_cb },
-    { WATCH_TEXT_ID_AGING_MODE, factorymode_agingmode_create_btn_event_cb },
+//    { WATCH_TEXT_ID_AGING_MODE, factorymode_agingmode_create_btn_event_cb },
     { WATCH_TEXT_ID_FACTORY_RESET, factorymode_factoryreset_create_btn_event_cb },
 #if USE_LV_WATCH_ENGINEER_MODE!= 0
     { WATCH_TEXT_ID_ENGINEER_MODE, factorymode_engineermode_create_btn_event_cb },

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
index b7464f5..2e4b920 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
@@ -1668,7 +1668,7 @@ static void mmi_vc_call_action_no_permission(void)
        lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
        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_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
+       lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
        lv_obj_align(label, cont, LV_ALIGN_CENTER, 0, 0);
 
        fail_timer_id = Hal_Timer_Start(2*1000, mmi_vc_call_fail_timeout_cb, NULL, FALSE);
@@ -1911,7 +1911,7 @@ static lv_obj_t * mmi_vc_main_create(lv_obj_t * activity_obj)
                lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
                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_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
+               lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
                lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10);
     } 
     else if(true != mmi_watch_tcp_connect_state_get()

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c
index b40f2ac..054de83 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c
@@ -1692,7 +1692,7 @@ static void mmi_vc_call_action_no_permission(void)
        lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
        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_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
+       lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
        lv_obj_align(label, cont, LV_ALIGN_CENTER, 0, 0);
 
        fail_timer_id = Hal_Timer_Start(2*1000, mmi_vc_call_fail_timeout_cb, NULL, FALSE);
@@ -1935,7 +1935,7 @@ static lv_obj_t * mmi_vc_main_create(lv_obj_t * activity_obj)
                lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
                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_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
+               lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
                lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10);
     } 
     else if(true != mmi_watch_tcp_connect_state_get()

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c
index 1b697b1..2f25af9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c
@@ -1716,7 +1716,7 @@ static void mmi_vc_call_action_no_permission(void)
        lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
        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_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
+       lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
        lv_obj_align(label, cont, LV_ALIGN_CENTER, 0, 0);
 
        fail_timer_id = Hal_Timer_Start(2*1000, mmi_vc_call_fail_timeout_cb, NULL, FALSE);
@@ -1959,7 +1959,7 @@ static lv_obj_t * mmi_vc_main_create(lv_obj_t * activity_obj)
                lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
                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_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
+               lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_OR_NETWORK); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK);
                lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10);
     } 
     else if(true != mmi_watch_tcp_connect_state_get()

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
index db3562a..99e9fce 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
@@ -185,7 +185,7 @@ void wechat_prepare_destory(lv_obj_t * activity_obj)
        }
        else if(WECHAT_CREATED_FROM_IMGVIEWER == ext->from)
        {
-        imgviewer_photo_share_flag_reset();
+        //imgviewer_photo_share_flag_reset();
        }
 
        if(NULL != ext->delete_timer_id)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
index 714bf1b..fddf99c 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
@@ -185,7 +185,7 @@ void wechat_prepare_destory(lv_obj_t * activity_obj)
        }
        else if(WECHAT_CREATED_FROM_IMGVIEWER == ext->from)
        {
-        imgviewer_photo_share_flag_reset();
+        //imgviewer_photo_share_flag_reset();
        }
 
        if(NULL != ext->delete_timer_id)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
index e539006..0afe65b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
@@ -336,7 +336,7 @@ static lv_obj_t * mmi_main_menu_style_list_display(lv_obj_t * tab)
                lv_obj_align(img, btn, LV_ALIGN_IN_LEFT_MID, 0, 0);
                
                label = lv_label_create(btn, NULL);
-               lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font30);
+               lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font30);
                lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL);
                lv_obj_set_width(label, lv_obj_get_width(btn) - 70);
                lv_label_set_text_id(label, s_main_menu_list[i].txtId);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
index fbe230b..161e8ff 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
@@ -106,6 +106,7 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
        lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 80);
     lv_obj_set_click(info_label, false);
 
+#if 0
 #if USE_LV_WATCH_ALIPAY != 0
     lv_obj_t * labelId2 = lv_label_create(content, NULL);
     lv_obj_add_style(labelId2,LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
@@ -120,6 +121,7 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
     } else {
         lv_label_set_text(labelId2, "ID2:Yes");
     }
+#endif
 #endif
 
     lv_obj_set_event_cb(content, setting_about_click_event_cb);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
index 025644d..3b060e2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
@@ -29,8 +29,11 @@ static lv_res_t lv_list_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, voi
 static lv_obj_t * sms_msg_create_in_menu(lv_obj_t * activity_obj);\r
 \r
 static void sms_msg_prepare_destory(lv_obj_t * activity_obj);\r
-\r
+#ifdef __MMI_ZHSX_SUPPORT__\r
+static void sms_msg_no_sim_create(lv_obj_t * obj);\r
+#else\r
 static void sms_msg_no_network_or_sim_create(lv_obj_t * obj);\r
+#endif\r
 static lv_sms_msg_ext_t * sms_msg_get_ext(void);\r
 static nv_watch_sms_msg_t * sms_msg_read_nvm(void);\r
 static void sms_msg_write_nvm(nv_watch_sms_msg_t * nvm);\r
@@ -93,12 +96,22 @@ static lv_obj_t * sms_msg_create_in_menu(lv_obj_t * activity_obj)
     sms_msg_write_nvm_for_test();\r
 #endif\r
 \r
+#ifdef __MMI_ZHSX_SUPPORT__\r
+    if(false == watch_modem_sim_present_check_req())\r
+       {\r
+        sms_msg_no_sim_create(obj);\r
+        lv_watch_set_free_num(activity_obj, 0);\r
+        return obj;\r
+    }\r
+#else\r
     if((false == watch_modem_sim_present_check_req())\r
             || (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req())) {\r
         sms_msg_no_network_or_sim_create(obj);\r
         lv_watch_set_free_num(activity_obj, 0);\r
         return obj;\r
     }\r
+#endif\r
+\r
     nv_watch_sms_msg_t * nvm_sms_list = sms_msg_read_nvm();\r
     printf("nvm_sms_list = %p\n",nvm_sms_list);\r
 \r
@@ -519,19 +532,19 @@ static void smsmsg_copy_info(nv_watch_sms_msg_info_t * dest, app_adp_new_sms_inf
        \r
 }\r
 \r
-\r
-static void sms_msg_no_network_or_sim_create(lv_obj_t * obj)\r
-{\r
 #ifdef __MMI_ZHSX_SUPPORT__\r
+static void sms_msg_no_sim_create(lv_obj_t * obj)\r
+{\r
        lv_obj_t * label = lv_label_create(obj, NULL);\r
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);\r
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);\r
     lv_obj_set_click(label, false);\r
-    lv_label_set_text_id(label, WATCH_TEXT_ID_NO_NETWORK); // WATCH_TEXT_ID_NO_SIM_CARD);\r
+    lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD);\r
     lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10);\r
-\r
+}\r
 #else\r
-\r
+static void sms_msg_no_network_or_sim_create(lv_obj_t * obj)\r
+{\r
        lv_obj_t * label = lv_label_create(obj, NULL);\r
     if(1 == lv_lang_act()) {\r
         lv_obj_add_style(label, LV_LABEL_PART_MAIN,&lv_watch_font20);\r
@@ -543,8 +556,8 @@ static void sms_msg_no_network_or_sim_create(lv_obj_t * obj)
     lv_obj_set_click(label, false);\r
     lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_OR_NETWORK);\r
     lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0);\r
-#endif\r
 }\r
+#endif\r
 \r
 static lv_sms_msg_ext_t * sms_msg_get_ext(void)\r
 {\r

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
index 9711a58..f124f46 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -84,7 +84,9 @@ LV_IMG_DECLARE(img_poweron_logo);
 //#define ICON_SPORT              "R:/png/primary_function/icon_sport.png"
 //#endif
 #define ICON_HEART_RATE         "R:/png/primary_function/icon_heart_rate.png"
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 #define ICON_VIDEOCALL          "R:/png/primary_function/icon_videocall.png"
+#endif
 //#define ICON_AIKNOWLEDGE        "R:/png/primary_function/icon_aiknowledge.png"
 #define ICON_CALENDAR           "R:/png/primary_function/icon_calendar.png"
 //#define ICON_CLEAR_RAM          "R:/png/primary_function/icon_clear_ram.png"
@@ -105,8 +107,10 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_MESSAGE            "R:/png/primary_function/icon_message.png"
 #define ICON_TIMER              "R:/png/primary_function/icon_timer.png"
 #if USE_LV_WATCH_WEATHER != 0
+#ifdef __MMI_WEATHER_MENU_SUPPORT__
 #define ICON_WEATHER            "R:/png/primary_function/icon_weather.png"
 #endif
+#endif
 #if USE_LV_WATCH_SLEEP != 0
 #define ICON_SLEEP              "R:/png/primary_function/icon_sleep.png"
 #endif
@@ -135,10 +139,16 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_TEMPERATURE_ONE_PAGE              "R:/png/primary_function/one_page/ICON_TEMPERATURE.png"
 
 #define ICON_WECHAT_ONE_PAGE             "R:/png/primary_function/one_page/icon_wechat.png"
+#if USE_LV_WATCH_CAMERA != 0
 #define ICON_CAMERA_ONE_PAGE             "R:/png/primary_function/one_page/icon_camera.png"
 #define ICON_ALBUM_ONE_PAGE              "R:/png/primary_function/one_page/icon_album.png"
+#endif
+#if USE_LV_WATCH_ALIPAY != 0
 #define ICON_ALIPAY_ONE_PAGE             "R:/png/primary_function/one_page/icon_alipay.png"
+#endif
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 #define ICON_VIDEOCALL_ONE_PAGE          "R:/png/primary_function/one_page/icon_videocall.png"
+#endif
 
 #ifdef __MMI_TOOL_MENU_SUPPORT__
 #define ICON_TOOL_ONE_PAGE             "R:/png/primary_function/one_page/ICON_TOOL.png"
@@ -160,11 +170,22 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_TEMPERATURE_LIST          "R:/png/primary_function/list/ICON_TEMPERATURE.png"
 
 #define ICON_WECHAT_LIST             "R:/png/primary_function/list/icon_wechat.png"
+#if USE_LV_WATCH_CAMERA != 0
 #define ICON_CAMERA_LIST             "R:/png/primary_function/list/icon_camera.png"
 #define ICON_ALBUM_LIST              "R:/png/primary_function/list/icon_album.png"
+#endif
+#if USE_LV_WATCH_ALIPAY != 0
 #define ICON_ALIPAY_LIST             "R:/png/primary_function/list/icon_alipay.png"
+#endif
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 #define ICON_VIDEOCALL_LIST          "R:/png/primary_function/list/icon_videocall.png"
+#endif
 
+#if USE_LV_WATCH_WEATHER != 0
+#ifdef __MMI_WEATHER_MENU_SUPPORT__
+#define ICON_WEATHER_LIST            "R:/png/primary_function/list/icon_weather.png"
+#endif
+#endif
 #define ICON_ALARM_LIST              "R:/png/primary_function/list/icon_alarm.png"
 #define ICON_TIMER_LIST              "R:/png/primary_function/list/icon_timer.png"
 #define ICON_STOPWATCH_LIST          "R:/png/primary_function/list/icon_stopwatch.png"
@@ -303,6 +324,7 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_NO_NETWORK                     "R:/png/weather/icon_no_network.png"
 #define ICON_SUNNY                          "R:/png/weather/icon_sunny.png"
 #define ICON_CLOUDY                         "R:/png/weather/icon_cloudy.png"
+#define ICON_OVERCAST                                          "R:/png/weather/ICON_OVERCAST.png"
 #define ICON_LIGHT_RAIN                     "R:/png/weather/icon_light_rain.png"
 #define ICON_HEAVY_RAIN                     "R:/png/weather/icon_heavy_rain.png"
 #define ICON_LIGHT_SNOW                     "R:/png/weather/icon_light_snow.png"
@@ -350,7 +372,7 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_ALBUM_DELETE_GRAY        "R:/png/album/icon_delete_gray.png"
 #define ICON_ALBUM_MORE_SETTING       "R:/png/album/icon_more_setting.png"
 #define ICON_ALBUM_DELETE_BLUE        "R:/png/album/icon_delete_blue.png"
-#define ICON_ALBUM_NO_PHOTO           "R:/png/album/icon_no_photo.png"
+//#define ICON_ALBUM_NO_PHOTO           "R:/png/album/icon_no_photo.png"
 #define ICON_ALBUM_CHECK              "R:/png/album/icon_check.png"
 #define ICON_ALBUM_DEL_ALL_BG         "R:/png/album/icon_del_all_bg.png"
 #define ICON_ALBUM_SELECT             "R:/png/album/icon_select.png"
@@ -508,6 +530,7 @@ LV_IMG_DECLARE(img_poweron_logo);
 
 // portrait
 #if USE_LV_WATCH_PHONEBOOK != 0
+#ifndef __MMI_ZHSX_SUPPORT_PHONEBOOK_LIST_STYLE__
 #define ICON_FATHER                                    "R:/png/portrait/icon_father.png"
 #define ICON_FATHER_SMALL                              "R:/png/phone_portrait/icon_father_small.png"
 #define ICON_MOTHER                                    "R:/png/portrait/icon_mother.png"
@@ -532,13 +555,14 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_SISTER_SMALL                              "R:/png/phone_portrait/icon_girl_small.png"
 #define ICON_GIRL                                      "R:/png/portrait/icon_girl.png"
 #define ICON_GIRL_SMALL                                "R:/png/phone_portrait/icon_girl_small.png"
-#define ICON_FAMILY                                    "R:/png/portrait/icon_family.png"
-#define ICON_FAMILY_SMALL                              "R:/png/phone_portrait/icon_family_small.png"
-#define ICON_OTHER                                     "R:/png/portrait/icon_family.png"
-#define ICON_OTHER_SMALL                               "R:/png/phone_portrait/icon_family_small.png"
+//#define ICON_FAMILY                                    "R:/png/portrait/icon_family.png"
+//#define ICON_FAMILY_SMALL                              "R:/png/phone_portrait/icon_family_small.png"
+#define ICON_OTHER                                     ICON_FAMILY
+#define ICON_OTHER_SMALL                               ICON_FAMILY_SMALL
 #define ICON_RELATIVE                                  "R:/png/portrait/icon_relative.png"
 #define ICON_FRIENDS                                   "R:/png/portrait/icon_friends.png"
 #endif
+#endif
 
 //make friends
 #if USE_LV_WATCH_MAKE_FRIENDS != 0
@@ -839,6 +863,9 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_TOOL_ALARM                        "R:/png/tool/ICON_TOOL_ALARM.png"
 #define ICON_TOOL_STOPWATCH             "R:/png/tool/ICON_TOOL_STOPWATCH.png"
 #define ICON_TOOL_TIMER                "R:/png/tool/ICON_TOOL_TIMER.png"
+#ifdef __MMI_WEATHER_MENU_SUPPORT__
+#define ICON_TOOL_WEATHER              "R:/png/tool/ICON_TOOL_WEATHER.png"
+#endif
 #endif
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c
index e139e23..2767299 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c
@@ -211,7 +211,7 @@ static void mmi_protocol_watch_timed_mission_timer_cb(uint32_t para)
        if(mmi_protocol_watch_location_upload_interval_get() <= (cur_time_stamp - s_watch_timed_location_time_stamp))
        {
                uint32_t current_steps = asl_pedometer_steps_get();
-               if(20 <= MMI_ABS(current_steps - s_watch_timed_location_last_steps))
+               if(20 <= LV_MATH_ABS(current_steps - s_watch_timed_location_last_steps))
                {
                        mmi_protocol_action_location();
                }

diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_adaptor_sms.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_adaptor_sms.c
index ed9b21d..daed13f 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_adaptor_sms.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_adaptor_sms.c
@@ -42,7 +42,9 @@ void MMI_Modem_New_Sms_Ind(app_adp_new_sms_info_ind_t * sms_info)
     _lv_memset_00(msg_info->data, sms_info->data_len + 1);
     memcpy(msg_info->data, sms_info->data, sms_info->data_len);
 
+#if USE_LV_WATCH_MESSAGE != 0
     app_adaptor_update_message_info_req(msg_info);
+#endif
 
     if(sms_info->number) {
         lv_mem_free(sms_info->number);