Z5_HA_K18

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 cc69c9d..0def210 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
@@ -885,6 +885,9 @@ const void * lang_text_ch[] = {
     "主题更换", // WATCH_TEXT_ID_MAIN_MENU_SWITCH,
     "大图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE,
     "小图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST,
+    "界面更换", // WATCH_TEXT_ID_MAIN_MENU_UI_SWITCH,
+    "快捷风格", // WATCH_TEXT_ID_MAIN_MENU_UI_ONE_PAGE,
+    "列表风格", // WATCH_TEXT_ID_MAIN_MENU_UI_LIST,
     "工具箱", // WATCH_TEXT_ID_TOOL,
     "情景模式", // WATCH_TEXT_ID_USER_PROFILE_MODE,
     "仅响铃", // WATCH_TEXT_ID_USER_PROFILE_RING_ONLY,

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 1ce6b6f..c7bf43c 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
@@ -886,6 +886,9 @@ const void * lang_text_en[] = {
     "Theme switch", // WATCH_TEXT_ID_MAIN_MENU_SWITCH,
     "Big icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE,
     "Small icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST,
+    "Theme switch", // WATCH_TEXT_ID_MAIN_MENU_UI_SWITCH,
+    "Page style", // WATCH_TEXT_ID_MAIN_MENU_UI_ONE_PAGE,
+    "List style", // WATCH_TEXT_ID_MAIN_MENU_UI_LIST,
     "Tool", // WATCH_TEXT_ID_TOOL,
     "User profile", // WATCH_TEXT_ID_USER_PROFILE_MODE,
     "Ring only", // WATCH_TEXT_ID_USER_PROFILE_RING_ONLY,

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 f006019..534bc4e 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -892,6 +892,9 @@ enum
     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_MAIN_MENU_UI_SWITCH,                  /* "界面更换"                    "Theme switch" */
+    WATCH_TEXT_ID_MAIN_MENU_UI_ONE_PAGE,                /* "快捷风格"                    "Page style" */
+    WATCH_TEXT_ID_MAIN_MENU_UI_LIST,                    /* "列表风格"                    "List style" */
     WATCH_TEXT_ID_TOOL,                                 /* "工具箱"                    "Tool" */
     WATCH_TEXT_ID_USER_PROFILE_MODE,                    /* "情景模式"                    "User profile" */
     WATCH_TEXT_ID_USER_PROFILE_RING_ONLY,               /* "仅响铃"                    "Ring only" */

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
index 87c0686..9cd88f8 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
@@ -2861,7 +2861,7 @@ void mmi_heng_ai_bp_tileview_led(lv_obj_t * tileview)
        lv_led_on(ext->led[x]);
        lv_obj_set_size(ext->led[x], 12, 12);
 
-    PHONEBOOK_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: x=%d\n", __FUNCTION__, __LINE__, x);
+    //HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: x=%d\n", __FUNCTION__, __LINE__, x);
        
     lv_obj_set_pos(ext->led_cont, LV_HOR_RES * x + (LV_HOR_RES - lv_obj_get_width(ext->led_cont)) / 2,
                                        LV_VER_RES - lv_obj_get_width(ext->led_cont) - 10);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
index 8b1fe72..4471d36 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c
@@ -520,6 +520,12 @@ static void mmi_hengai_k18_sleep_get_hr_cb(uint8_t * hr, sleep_time_t * hr_time)
 
 static void mmi_hengai_k18_sleep_get_wear_cb(int8_t * worn)
 {
+       if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
+       {
+               *worn = 0;
+               return;
+       }
+       
        if(mmi_hsensor_measure_get_wear_status())
        {
                *worn = 1;

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 0bda987..91b9e79 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
@@ -271,6 +271,34 @@ static lv_obj_t * mmi_main_menu_style_one_page_display(lv_obj_t * tab, void * bt
 
        return btn;
 }
+#elif defined(MMI_PROJECT_Z5_HA_K18)
+static lv_obj_t * mmi_main_menu_style_one_page_display(lv_obj_t * tab, void * btn_src, watchLangTxtId_t txtId, lv_event_cb_t event_cb)
+{
+    lv_obj_t * cont = lv_obj_get_child(tab, NULL);
+    LV_ASSERT_MEM(cont);
+    if(cont == NULL)
+               return NULL;
+       
+       lv_obj_t * btn = lv_imgbtn_create(cont, NULL);
+    lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, btn_src);
+    lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, btn_src);
+    lv_btn_set_checkable(btn, false);
+    lv_obj_set_event_cb(btn, event_cb);
+    lv_tileview_add_element(lv_obj_get_parent(tab), btn);
+       lv_obj_align(btn, cont, LV_ALIGN_CENTER, 0, -15); // -10);
+
+    lv_obj_t * label = lv_label_create(cont, NULL);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &MMI_MAIN_MENU_ONE_PAGE_STYLE_TEXT_FONT);
+    lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL_CIRC);
+    lv_obj_set_size(label, LV_HOR_RES / 2, 80);
+    lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+    lv_label_set_text_id(label, txtId);
+    lv_obj_set_click(label, false);
+       lv_obj_align(label, cont, LV_ALIGN_IN_BOTTOM_MID, 0, -20);
+
+       return btn;
+}
+
 #else
 static lv_obj_t * mmi_main_menu_style_one_page_display(lv_obj_t * tab, void * btn_src, watchLangTxtId_t txtId, lv_event_cb_t event_cb)
 {

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
index f03332b..6c5337d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
@@ -94,6 +94,36 @@ static mmi_page_main_menu_info_t s_main_menu_one_page[] =
 #endif
 
        //{{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, mmi_k18_nfc_experience_create_event_cb}, NULL},
+       //{{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb}, NULL},
+};
+
+#elif defined(MMI_PROJECT_Z5_HA_K18)
+static mmi_page_main_menu_info_t s_main_menu_one_page[] = 
+{
+#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+       {{ ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, NULL},
+#endif
+#ifdef __MMI_CUSTOM_HENGAI_HEALTH__
+       {{ ICON_BLOOD_PRESSURE_ONE_PAGE, WATCH_TEXT_ID_BLOODPRESSURE, mmi_heng_ai_blood_pressure_create_event_cb}, NULL},
+#endif
+#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
+       {{ ICON_SPO2_ONE_PAGE, WATCH_TEXT_ID_SPO2, health_spo2_create_event_cb}, NULL},
+#endif
+#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
+       {{ ICON_TEMPERATURE_ONE_PAGE, WATCH_TEXT_ID_TEMPERATURE, health_temperature_create_event_cb}, NULL},
+#endif
+#ifdef __MMI_CUSTOM_HENGAI_SLEEP_K18__
+       {{ ICON_SLEEP_ONE_PAGE, WATCH_TEXT_ID_SLEEP, mmi_sleep_create_event_cb}, NULL},
+#endif
+#ifdef __MMI_WECHAT_SUPPORT__
+       {{ ICON_WECHAT_ONE_PAGE, WATCH_TEXT_ID_WECHAT, wechat_create_event_cb}, NULL},
+#endif
+       {{ ICON_PHONEBOOK_ONE_PAGE, WATCH_TEXT_ID_PHONEBOOK, phonebook_create_btn_event_cb}, NULL},
+       {{ ICON_DIALPAD_ONE_PAGE, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb}, NULL},
+#ifdef __MMI_TOOL_MENU_SUPPORT__
+       {{ ICON_TOOL_ONE_PAGE, WATCH_TEXT_ID_TOOL, mmi_tool_menu_create_event_cb}, NULL},
+#endif 
+       //{{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb}, NULL},
 };
 
 #else

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
index 8d58285..e417ff2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
@@ -25,6 +25,40 @@ extern lv_watch_Activity_Id_t g_watch_list_actId;
 //    watchLangTxtId_t txtId;
 //    lv_event_cb_t event_cb;
 //} settingList[] = {
+
+#ifdef MMI_PROJECT_Z5_HA_K18
+static mmi_watch_list_item_t settingList[] =
+{
+#ifdef __MMI_MAIN_MENU_SWITCH_MENU__
+       { ICON_SETTING_MAIN_MENU_SWITCH, WATCH_TEXT_ID_MAIN_MENU_UI_SWITCH, setting_main_menu_switch_create_event_cb },
+#endif
+#if USE_LV_WATCH_DIAL_SWITCH != 0
+    { ICON_SETTING_DAIL_FORMAT_SWITCH, WATCH_TEXT_ID_DAIL_REPLACE, dial_switch_create_btn_action },
+#endif
+#if USE_LV_WATCH_SETTING_VOLUME != 0
+    { ICON_SETTING_VOLUME, WATCH_TEXT_ID_VOLUME_ADJUST, setting_volume_create_btn_action },
+#endif
+#if USE_LV_WATCH_SETTING_BRIGHTNESS != 0
+    { ICON_SETTING_BRIGHTNESS, WATCH_TEXT_ID_BRIGHTNESS_ADJUST, setting_brightness_create_btn_action },
+#endif
+#if USE_LV_WATCH_QRCODE != 0
+#ifdef __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+       { ICON_SETTING_QRCODE, WATCH_TEXT_ID_APP_DL_BIND_QRCODE, mmi_app_and_device_qrcode_create_event_cb },
+#endif
+#endif
+#if USE_LV_WATCH_RESTART_AND_RESET != 0
+    { ICON_SETTING_RESET, WATCH_TEXT_ID_RESTART_AND_RESET, restart_and_reset_create_btn_action },
+#endif
+#if USE_LV_WATCH_SHUTDOWN != 0
+    { ICON_SETTING_SHUTDOWN, WATCH_TEXT_ID_SHUTDOWN, shutdown_create_btn_action },
+#endif
+#if USE_LV_WATCH_SETTING_ABOUT != 0
+       { ICON_SETTING_ABOUT, WATCH_TEXT_ID_ABOUT_WATCH, setting_about_create_btn_action },
+#endif
+};
+
+#else
+
 static mmi_watch_list_item_t settingList[] =
 {
 #ifdef __MMI_ZHSX_SUPPORT__
@@ -155,6 +189,7 @@ static mmi_watch_list_item_t settingList[] =
 
 #endif // __MMI_ZHSX_SUPPORT__
 };
+#endif
 
 /**********************
  *      MACROS

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c
index 422089d..7473ad5 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c
@@ -88,11 +88,23 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj)
         return NULL;
 
     lv_obj_t * title_label = lv_label_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(title_label, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+#else
     lv_obj_add_style(title_label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
+#endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
+       #ifdef MMI_PROJECT_Z5_HA_K18
+    lv_label_set_text_id(title_label, WATCH_TEXT_ID_MAIN_MENU_UI_SWITCH);
+       #else
     lv_label_set_text_id(title_label, WATCH_TEXT_ID_MAIN_MENU_SWITCH);
+       #endif
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(title_label, obj, LV_ALIGN_IN_TOP_MID, 0, 20);
+#else
     lv_obj_align(title_label, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
 
        //
     lv_obj_t * style_btn_0 = lv_btn_create(obj, NULL);
@@ -107,8 +119,16 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj)
     lv_img_set_src(style_img_0, ICON_ITEM_NOT_SELECTED);
 
     lv_obj_t* style_label_0 = lv_label_create(style_btn_0, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(style_label_0, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else  
     lv_obj_add_style(style_label_0, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
+#endif
+       #ifdef MMI_PROJECT_Z5_HA_K18
+    lv_label_set_text_id(style_label_0, WATCH_TEXT_ID_MAIN_MENU_UI_ONE_PAGE);
+       #else
     lv_label_set_text_id(style_label_0, WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE);
+       #endif
 
        //
     lv_obj_t * style_btn_1 = lv_btn_create(obj, style_btn_0);
@@ -120,8 +140,16 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj)
        lv_img_set_src(style_img_1, ICON_ITEM_NOT_SELECTED);
 
     lv_obj_t* style_label_1 = lv_label_create(style_btn_1, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(style_label_1, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else  
     lv_obj_add_style(style_label_1, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
+#endif
+       #ifdef MMI_PROJECT_Z5_HA_K18
+    lv_label_set_text_id(style_label_1, WATCH_TEXT_ID_MAIN_MENU_UI_LIST);
+       #else
     lv_label_set_text_id(style_label_1, WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST);
+       #endif
     //lv_label_set_long_mode(label_reset, LV_LABEL_LONG_BREAK);
     //lv_obj_set_width(label_reset, LV_HOR_RES * 2 / 3);
 
@@ -131,8 +159,13 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj)
        else if(MMI_MAIN_MENU_STYLE_LIST == style_value)
            lv_img_set_src(style_img_1, ICON_ITEM_SELECTED);
        
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(style_btn_0, obj, LV_ALIGN_CENTER, -20, -60);
+       lv_obj_align(style_btn_1, style_btn_0, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 60);
+#else
        lv_obj_align(style_btn_0, obj, LV_ALIGN_CENTER, -20, -40);
        lv_obj_align(style_btn_1, style_btn_0, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 40);
+#endif
 
     return obj;
 }

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
index 15b8c99..73db60a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
@@ -7,6 +7,32 @@
 
 extern lv_watch_Activity_Id_t g_watch_list_actId;
 
+#ifdef MMI_PROJECT_Z5_HA_K18
+static const mmi_watch_list_item_t s_tool_menu_list[] = 
+{
+#if USE_LV_WATCH_SMS_MSG != 0
+       { ICON_TOOL_SMS_MSG, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb},
+#endif
+#ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__
+       { ICON_TOOL_CALLLOG, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb },
+#endif
+#ifdef __MMI_WEATHER_MENU_SUPPORT__
+       { ICON_TOOL_WEATHER, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb },
+#endif 
+#if USE_LV_WATCH_ALARM_SET
+       { ICON_TOOL_ALARM, WATCH_TEXT_ID_ALARM, alarm_create_event_cb },
+#endif
+#if USE_LV_WATCH_STOPWATCH != 0
+       { ICON_TOOL_STOPWATCH, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb },
+#endif
+#if USE_LV_WATCH_TIMER
+       { ICON_TOOL_TIMER, WATCH_TEXT_ID_TIMER, timer_create_event_cb },
+#endif
+       { ICON_TOOL_SETTING, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb},
+};
+
+#else
+
 static const mmi_watch_list_item_t s_tool_menu_list[] = 
 {
 #if USE_LV_WATCH_ALARM_SET
@@ -22,6 +48,7 @@ static const mmi_watch_list_item_t s_tool_menu_list[] =
        { ICON_TOOL_WEATHER, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb },
 #endif
 };
+#endif
 
 lv_obj_t * mmi_tool_menu_create(lv_obj_t * activity_obj)
 {

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 6c615f6..cec4781 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -267,6 +267,16 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_VIDEOCALL_ONE_PAGE          "R:/png/primary_function/one_page/icon_videocall.png"
 #endif
 
+#ifdef __MMI_CUSTOM_HENGAI_HEALTH__
+#define ICON_BLOOD_PRESSURE_ONE_PAGE             "R:/png/primary_function/one_page/ICON_BLOOD_PRESSURE.png"
+#endif
+#ifdef __MMI_CUSTOM_HENGAI_SLEEP_K18__
+#define ICON_SLEEP_ONE_PAGE             "R:/png/primary_function/one_page/ICON_SLEEP.png"
+#endif
+#ifdef __MMI_WEATHER_MENU_SUPPORT__
+#define ICON_WEATHER_ONE_PAGE             "R:/png/primary_function/one_page/icon_weather.png"
+#endif
+
 #ifdef __MMI_TOOL_MENU_SUPPORT__
 #define ICON_TOOL_ONE_PAGE             "R:/png/primary_function/one_page/ICON_TOOL.png"
 #endif
@@ -1003,6 +1013,19 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_ALARM_OFF                    "R:/png/alarm/ICON_ALARM_OFF.png"
 
 #ifdef __MMI_TOOL_MENU_SUPPORT__
+#ifdef MMI_PROJECT_Z5_HA_K18
+//#define ICON_TOOL_PHONEBOOK             "R:/png/tool/ICON_PHONEBOOK.png"
+#define ICON_TOOL_SMS_MSG                      "R:/png/tool/ICON_SMS.png"
+//#define ICON_TOOL_DIALPAD               "R:/png/tool/ICON_DIALPAD.png"
+#define ICON_TOOL_CALLLOG             "R:/png/tool/ICON_CALLLOG.png"
+//#define ICON_TOOL_WECHAT                     "R:/png/tool/ICON_WECHAT.png"
+#define ICON_TOOL_ALARM                        "R:/png/tool/ICON_ALARM.png"
+#define ICON_TOOL_STOPWATCH             "R:/png/tool/ICON_STOPWATCH.png"
+#define ICON_TOOL_TIMER                "R:/png/tool/ICON_TIMER.png"
+#define ICON_TOOL_WEATHER              "R:/png/tool/icon_weather.png"
+#define ICON_TOOL_SETTING              "R:/png/tool/icon_settings.png"
+#else
+
 #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"
@@ -1010,6 +1033,7 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_TOOL_WEATHER              "R:/png/tool/ICON_TOOL_WEATHER.png"
 #endif
 #endif
+#endif
 
 #ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
 #define ICON_KEY_POWER_POWER_OFF               "R:/png/setting/ICON_KEY_POWER_POWER_OFF.png"

diff --git a/2.sdk/sdk/product/craneg_modem/framework/cus/charger_cus.c b/2.sdk/sdk/product/craneg_modem/framework/cus/charger_cus.c
index 114c3d4..4449c76 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/framework/cus/charger_cus.c
+++ b/2.sdk/sdk/product/craneg_modem/framework/cus/charger_cus.c
@@ -9,7 +9,7 @@ PMIC_CONFIG_T g_tgtPmdCfg[] =
        /*************************************************************************************
                        Battery inital parameters
        **************************************************************************************/
-#ifdef DRV_PROJECT_Z5_HA_K18_DRIVER
+#ifdef DRV_PROJECT_Z5_HA_K18 // DRV_PROJECT_Z5_HA_K18_DRIVER
        {
                4200,
                3400,