gengxin
author@CHENG <2393524978@qq.com>
Tue, 30 Jan 2024 07:33:58 +0000 (15:33 +0800)
committer@CHENG <2393524978@qq.com>
Tue, 30 Jan 2024 07:33:58 +0000 (15:33 +0800)
21 files changed:
2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c
2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c
2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c
2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_switch.c
2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_testreport.c
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c
2.sdk/sdk/gui/lv_watch/lv_apps/lowbattery/lowbattery.c
2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c

index 3614fab..2bd2dfe 100644 (file)
@@ -60,11 +60,19 @@ void mmi_health_info_get(nv_watch_health_info_t * health_info)
                s_health_info_init = 1;
        }
        
+#ifdef __DEBUG_DIAL__
+       health_info->heart_value = 56; //s_health_info.heart_value;
+       health_info->blood_high_value = 120; //s_health_info.blood_high_value;
+       health_info->blood_low_value = 80; //s_health_info.blood_low_value;
+       health_info->spo2_value = 98; //s_health_info.spo2_value;
+       health_info->body_value = 37.2; //s_health_info.body_value;
+#else
        health_info->heart_value = s_health_info.heart_value;
        health_info->blood_high_value = s_health_info.blood_high_value;
        health_info->blood_low_value = s_health_info.blood_low_value;
        health_info->spo2_value = s_health_info.spo2_value;
        health_info->body_value = s_health_info.body_value;
+#endif
 }
 
 void mmi_health_info_set(nv_watch_health_info_t * health_info)
index 7511823..34afdce 100644 (file)
@@ -77,6 +77,9 @@ void asl_pedometer_poweron_on_init(void)
 
 uint32_t asl_pedometer_steps_get(void)
 {
+#ifdef __DEBUG_DIAL__
+       return 23456;
+#endif
        return s_pedometer_data.step;
 }
 
index 23867e2..fe6eabf 100644 (file)
@@ -193,7 +193,7 @@ enum
        ACT_ID_HEALTH_MEASURE_TEMPERATURE,
 #endif
        ACT_ID_WATCH_SEARCHING,
-#ifdef __MMI_APP_QRCODE_MENU_SUPPORT__
+#if defined(__MMI_APP_QRCODE_MENU_SUPPORT__) || defined(__MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__)
     ACT_ID_APP_QRCODE, 
 #endif
 #ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
index a142286..e755b90 100644 (file)
@@ -142,32 +142,34 @@ lv_obj_t * alarm_create(lv_obj_t * activity_obj)
 #ifdef __MMI_ZHSX_SUPPORT__
        lv_obj_t * cont = lv_cont_create(obj, NULL);
        lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES);
-    lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
-    //lv_obj_set_style_local_bg_color(cont, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+       lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+       //lv_obj_set_style_local_bg_color(cont, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
        lv_obj_set_click(cont, true);
        lv_obj_set_event_cb(cont, mmi_alarm_ring_click_stop);
 
-       lv_obj_t * cont_gif = lv_cont_create(cont, NULL);
-       lv_obj_set_size(cont_gif, 170, 170); // gif size
-    lv_obj_set_style_local_bg_color(cont_gif, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+       ext->gif_info = gif_open(cont, ANIM_ALARM, 0);
+       lv_obj_t * cont_gif = ext->gif_info->container;
+       lv_obj_set_style_local_bg_color(cont_gif, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+       //lv_obj_add_style(ext->gif_info->container, LV_OBJ_PART_MAIN, &lv_style_transp_tight);
        lv_obj_align(cont_gif, cont, LV_ALIGN_CENTER, 0, -30);
+       lv_obj_set_click(cont_gif, true);
+       lv_obj_set_event_cb(cont_gif, mmi_alarm_ring_click_stop);
 
-    hal_rtc_t cur_time;
+       hal_rtc_t cur_time;
        char time_str[8] = {0};
-       
-    Hal_Rtc_Gettime(&cur_time);
+
+       Hal_Rtc_Gettime(&cur_time);
        sprintf(time_str, "%02d:%02d", cur_time.tm_hour, cur_time.tm_min);
        lv_obj_t * label = lv_label_create(cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
-    lv_label_set_text(label, time_str);
-    lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-    lv_obj_align(label, cont_gif, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
-
-    ext->gif_info = gif_open(cont_gif, ANIM_ALARM, 0);
-    //lv_obj_set_style_local_bg_color(ext->gif_info->container, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
-    //lv_obj_add_style(ext->gif_info->container, LV_OBJ_PART_MAIN, &lv_style_transp_tight);
-       lv_obj_set_click(ext->gif_info->container, true);
-       lv_obj_set_event_cb(ext->gif_info->container, mmi_alarm_ring_click_stop);
+#endif
+       lv_label_set_text(label, time_str);
+       lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+       lv_obj_align(label, cont_gif, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+
 #else
     /* gif open */
     ext->gif_info = gif_open(obj, ANIM_ALARM, 0);
index 2f8485e..53e001d 100644 (file)
@@ -92,14 +92,14 @@ void mmi_hengai_bp_back_measure_finish(void)
 {
        mmi_hengai_bp_raw_data_fill();
        mmi_hengai_bp_measure_action_time_string_set(0);
-       mmi_hengai_bp_measuring_flag_set(false);
+       //mmi_hengai_bp_measuring_flag_set(false);
        mmi_hengai_bp_measure_raw_data_send();  
 }
 
 void mmi_hengai_bp_back_measure_action(void)
 {
        mmi_hengai_bp_measure_action_time_string_set(1);
-       mmi_hengai_bp_measuring_flag_set(true);
+       //mmi_hengai_bp_measuring_flag_set(true);
 }
 
 
index ff5d711..e470a33 100644 (file)
@@ -344,6 +344,8 @@ static lv_obj_t * dial_image_add(lv_obj_t * page)
         lv_label_set_text(label, dial_conf->name);
 #if LV_WATCH_SIMULATOR_360 != 0
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+#elif defined(USE_LV_WATCH_UI_466_466)
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
 #else
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
 #endif
index 3856acf..c5c9005 100644 (file)
@@ -32,6 +32,22 @@ extern "C" {
 #define AGINGTEST_ITEM_NUM NV_FACTORYMODE_AGINGTEST_NUM
 #define HWTEST_LIST_CNT    9
 
+#ifdef __MMI_ZHSX_SUPPORT__
+#ifdef USE_LV_WATCH_UI_466_466
+#define FACTORY_MODE_TEST_ITEM_TITLE_FONT      (lv_watch_font26_gray)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT       (lv_watch_font26)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT_BLACK (lv_watch_font26_black)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT_SMALL (lv_watch_font20)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG   (lv_watch_font40)
+#else
+#define FACTORY_MODE_TEST_ITEM_TITLE_FONT      (lv_watch_font20_gray)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT       (lv_watch_font20)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT_BLACK (lv_watch_font20_black)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT_SMALL (lv_watch_font14)
+#define FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG   (lv_watch_font30)
+#endif
+#endif
+
 /**********************
  *      TYPEDEFS
  **********************/
index b13d3a6..7bb792e 100644 (file)
@@ -282,7 +282,8 @@ void autotest_presskey_create(lv_obj_t * par)
 
        lv_obj_t * label_key_power = lv_label_create(cont_key_power, NULL);
     lv_label_set_text_id(label_key_power, WATCH_TEXT_ID_KEY_POWER);
-    lv_obj_add_style(label_key_power, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
+    //lv_obj_add_style(label_key_power, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
+    lv_obj_add_style(label_key_power, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BLACK);
        lv_label_set_align(label_key_power, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_key_power, NULL, LV_ALIGN_CENTER, 0, 0);
 
@@ -293,7 +294,8 @@ void autotest_presskey_create(lv_obj_t * par)
 
        lv_obj_t * label_key_back = lv_label_create(cont_key_back, NULL);
     lv_label_set_text_id(label_key_back, WATCH_TEXT_ID_KEY_BACK);
-    lv_obj_add_style(label_key_back, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
+    //lv_obj_add_style(label_key_back, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
+    lv_obj_add_style(label_key_back, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BLACK);
        lv_label_set_align(label_key_back, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_key_back, NULL, LV_ALIGN_CENTER, 0, 0);
        
@@ -512,12 +514,15 @@ void autotest_lcdtest_result_create(lv_obj_t * par)
     lv_obj_t * title = autotest_title_create(par, WATCH_TEXT_ID_LCDTEST_RESULT);
 
     lv_obj_t * label_tip = lv_label_create(par, NULL);
-    lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font20);
+    //lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
     lv_label_set_long_mode(label_tip, LV_LABEL_LONG_BREAK);
-    lv_obj_set_size(label_tip, LV_HOR_RES, LV_VER_RES / 4);
+    //lv_obj_set_size(label_tip, LV_HOR_RES, LV_VER_RES / 4);
+    lv_obj_set_size(label_tip, LV_HOR_RES * 5 / 6, LV_VER_RES / 4);
     lv_label_set_text_id(label_tip, WATCH_TEXT_ID_LCDTEST_TIP);
     lv_label_set_align(label_tip, LV_LABEL_ALIGN_CENTER);
-    lv_obj_align(label_tip, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+    //lv_obj_align(label_tip, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+    lv_obj_align(label_tip, NULL, LV_ALIGN_CENTER, 0, -10);
 
     autotest_resultbtn_create(par, AUTOTEST_LCD_COLOR);
 }
@@ -680,7 +685,8 @@ void autotest_wifi_create(lv_obj_t * par)
 
     lv_obj_t * label = lv_label_create(par, NULL);
     lv_label_set_text_id(label, WATCH_TEXT_ID_WIFI_SCAN_TESTING);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+    //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
     lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10);
 
     lv_factory_obj_ext_t * ext_fac = factorymode_get_ext();
@@ -714,6 +720,130 @@ void autotest_wifi_create(lv_obj_t * par)
 }
 #endif
 
+
+#ifdef __MMI_ZHSX_SUPPORT__
+#if USE_GPS
+#include "../../../../product/craneg_modem/hal/gps_device/inc/gpsnmeaapi.h"
+
+extern char * gcvt(double value, int32_t ndigit, char * buf);
+
+static void autotest_gps_location_info_update(lv_anim_t * anim)
+{
+    double gpsLat, gpsLon;
+    gpsNmeaDataT pBuf = {0};
+    char Lat[20] = {0};
+    char Lon[20] = {0};
+    uint8_t SatUsed = 0;
+    uint8_t SatInView = 0;
+    //char Locate[2] = {0};
+    char Snr[GPS_SATELLIES_CHANNEL_COUNT*12] = {0};
+       memset((void *)&pBuf, 0x00, sizeof(gpsNmeaDataT));
+    ReadNmeaData(&pBuf);
+
+    SatUsed = pBuf.NmeaGgaData.SatellitesUsed;
+    SatInView = pBuf.NmeaGsvData.SatellitesInView;
+    int count = 0;
+    strcat(Snr, "\n");
+    for(int j = 1; j<200 ;j++)
+    {
+        for(int i = 0;i<GPS_SATELLIES_CHANNEL_COUNT;i++){
+            if(pBuf.NmeaGsvData.Satellite[i].PRN != j)
+                continue;
+            char snr_str[24] = {0};
+            if(pBuf.NmeaGsvData.Satellite[i].SNR)
+            {
+                snprintf(snr_str, 24, "%03d:[%02d]  ", pBuf.NmeaGsvData.Satellite[i].PRN,pBuf.NmeaGsvData.Satellite[i].SNR);
+                count++;
+                strcat(Snr, snr_str);
+                if (count%2==0)
+                    strcat(Snr, "\n");
+            }
+        }
+    }
+    
+    //sprintf(Locate, "%c", pBuf.NmeaRmcData.Status);
+
+    char str[512]= {0};
+
+    if(/*!strcmp(Locate, "A")*/pBuf.NmeaRmcData.Status == 'A') {
+        //suggest this function is called in the callback function of locating success
+        hal_gps_aidpos_save(pBuf.NmeaRmcData.Latitude, pBuf.NmeaRmcData.NSIndicator,
+                            pBuf.NmeaRmcData.Longitude, pBuf.NmeaRmcData.WEIndicator,
+                            pBuf.NmeaGgaData.Altitude);
+
+        gps2wgs84(pBuf.NmeaRmcData.Latitude, pBuf.NmeaRmcData.Longitude, &gpsLat, &gpsLon);
+        gcvt(gpsLat,11,Lat);
+        gcvt(gpsLon,12,Lon);
+        snprintf(str, 512, "        Lat: %s\n        Lon:%s\n          Satellites:%d(R)  Used:%d\n             Snr:  %s\n        Success",
+                 (const char *)Lat, (const char *)Lon, SatInView, SatUsed, (const char *)Snr);
+    } else if(pBuf.NmeaGgaData.status == 1) {
+        hal_gps_aidpos_save(pBuf.NmeaGgaData.latitude, pBuf.NmeaGgaData.NSIndicator,
+                            pBuf.NmeaGgaData.longitude, pBuf.NmeaGgaData.WEIndicator,
+                            pBuf.NmeaGgaData.Altitude);
+        gps2wgs84(pBuf.NmeaGgaData.latitude, pBuf.NmeaGgaData.longitude, &gpsLat, &gpsLon);
+        gcvt(gpsLat,11,Lat);
+        gcvt(gpsLon,12,Lon);
+        snprintf(str, 512, "        Lat: %s\n        Lon:%s\n          Satellites:%d(G)  Used:%d\n             Snr:  %s\n        Success",
+                 (const char *)Lat, (const char *)Lon, SatInView, SatUsed, (const char *)Snr);
+#if 0
+    } else if(!strcmp(Locate, "V")) {
+        snprintf(str, 256, "Lat: %s\nLon:%s\nSatellites:%s\nSnr:%s\n       Locating...",
+                 (const char *)Lat, (const char *)Lon, (const char *)SatInView, (const char *)Snr);
+#endif
+    } else {
+        snprintf(str, 512, "        Lat: %s\n        Lon:%s\n          Satellites:%d  Used:%d\n                Snr:  %s\n              Locating...",
+                 (const char *)Lat, (const char *)Lon, SatInView, SatUsed, (const char *)Snr);
+    }
+
+    lv_label_set_text(anim->var,str);
+}
+#endif
+
+void autotest_gps_create(lv_obj_t * par)
+{
+       autotest_title_create(par, WATCH_TEXT_ID_GPS_TEST);
+
+#if USE_GPS
+    char str[128]= {0};
+    lv_obj_t * label = lv_label_create(par, NULL);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_SMALL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
+#else
+    lv_obj_set_width(label,LV_HOR_RES-40);
+    lv_obj_set_pos(label, 30, 40);
+#endif
+
+    snprintf(str, 128, "        Lat:\n        Lon:\n           Satellites:  Used:\n            Snr:\n       Turn on GPS...");
+    lv_label_set_text(label,str);
+
+    fac_gps_mode_set(1);
+    gps_core.force_on=0;
+    gps_send_msg(GPS_MSG_STOP);
+    gps_core.force_on=1;
+    gps_send_msg(GPS_MSG_START);
+
+    lv_anim_path_t path;
+    lv_anim_path_init(&path);
+    lv_anim_path_set_cb(&path, lv_anim_path_step);
+
+    lv_anim_t a;
+    lv_anim_init(&a);
+    lv_anim_set_var(&a, label);
+    lv_anim_set_start_cb(&a, (lv_anim_ready_cb_t)autotest_gps_location_info_update);
+    lv_anim_set_time(&a, 1);
+    lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE);
+    lv_anim_set_delay(&a,1000);
+    lv_anim_set_repeat_delay(&a, 1000);
+    lv_anim_start(&a);
+#endif
+
+       autotest_resultbtn_create(par, AUTOTEST_GPS);
+}
+
+#else
+
 void autotest_gps_create(lv_obj_t * par)
 {
     autotest_title_create(par, WATCH_TEXT_ID_GPS_TEST);
@@ -725,6 +855,7 @@ void autotest_gps_create(lv_obj_t * par)
 
     autotest_resultbtn_create(par, AUTOTEST_GPS);
 }
+#endif
 
 void autotest_speaker_create(lv_obj_t * par)
 {
@@ -811,9 +942,14 @@ void autotest_simcard_create(lv_obj_t * par)
     uint8_t sim = watch_modem_sim_present_check_req();
     autotest_title_create(par, WATCH_TEXT_ID_SIMCARD_TEST);
     lv_obj_t * label_sim = lv_label_create(par, NULL);
-    lv_obj_add_style(label_sim, LV_LABEL_PART_MAIN, &lv_watch_font20);
+    //lv_obj_add_style(label_sim, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_sim, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
     lv_label_set_text_id(label_sim, WATCH_TEXT_ID_SIMCARD);
+#ifdef USE_LV_WATCH_UI_CIRCLE
+       lv_obj_align(label_sim, NULL, LV_ALIGN_IN_TOP_LEFT, LV_HOR_RES / 6, 50);
+#else
     lv_obj_align(label_sim, NULL, LV_ALIGN_IN_TOP_LEFT, 10, 50);
+#endif
 
     lv_obj_t * label_rec = lv_label_create(par, label_sim);
     lv_obj_align(label_rec, label_sim, LV_ALIGN_OUT_RIGHT_MID, 20, 0);
@@ -945,10 +1081,16 @@ void autotest_gravity_create(lv_obj_t * par)
 
     lv_obj_t * label = lv_label_create(par, NULL);
     //lv_label_set_text_id(label, WATCH_TEXT_ID_WIFI_SCAN_TESTING);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+    //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
     //lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10);
+#ifdef USE_LV_WATCH_UI_CIRCLE
+       lv_obj_set_width(label, LV_HOR_RES - LV_HOR_RES * 2 / 6);
+       lv_obj_set_pos(label, LV_HOR_RES / 6, 70);
+#else
        lv_obj_set_width(label, LV_HOR_RES - 40);
        lv_obj_set_pos(label, 20, 70);
+#endif
        
        char label_str[128] = {0};
        uint8_t id = mmi_gsensor_sensor_id_get();
@@ -1174,6 +1316,14 @@ static void autotest_fail_btn_event_cb(lv_obj_t * btn, lv_event_t e)
         } else if(num == AUTOTEST_VIBRATION) {
             Hal_Vibrator_Play_End();
         }
+               else if(AUTOTEST_GPS == num)
+               {
+               #if USE_GPS
+                       gps_core.force_on=0;
+                       gps_send_msg(GPS_MSG_STOP);
+                       fac_gps_mode_set(0);
+               #endif
+               }
 
         if(ext->testmode == TEST_AUTO) {
             ext->test_res[num] = TEST_FAILED;
@@ -1218,6 +1368,14 @@ static void autotest_success_btn_event_cb(lv_obj_t * btn, lv_event_t e)
         } else if(num == AUTOTEST_VIBRATION) {
             Hal_Vibrator_Play_End();
         }
+               else if(AUTOTEST_GPS == num)
+               {
+               #if USE_GPS
+                       gps_core.force_on=0;
+                       gps_send_msg(GPS_MSG_STOP);
+                       fac_gps_mode_set(0);
+               #endif
+               }
 
         if(ext->testmode == TEST_AUTO) {
             ext->test_res[num] = TEST_SUCCESS;
@@ -1293,10 +1451,12 @@ static void autotest_starttest_btn_event_cb(lv_obj_t * btn, lv_event_t e)
             lv_obj_t * label = lv_label_create(par, NULL);
             lv_label_set_text_id(label, WATCH_TEXT_ID_MUSIC_PLAYING);
             lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
-            lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-            lv_obj_add_style(label,LV_LABEL_PART_MAIN, &lv_watch_font20);
             lv_obj_set_width(label, LV_HOR_RES);
-            lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 35);
+            lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+            //lv_obj_add_style(label,LV_LABEL_PART_MAIN, &lv_watch_font20);
+            //lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 35);
+            lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+            lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
         } else if(num == AUTOTEST_MICPHONE) {
             lv_btn_set_state(btn, LV_BTN_STATE_DISABLED);
             lv_obj_t * label = lv_label_create(par, NULL);
@@ -1314,8 +1474,10 @@ static void autotest_starttest_btn_event_cb(lv_obj_t * btn, lv_event_t e)
             lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
             lv_obj_set_width(label, LV_HOR_RES);
             lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-            lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
-            lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 35);
+            //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+            //lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 35);
+            lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+            lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
 
             ext_fac->label_key_state = label;
             ext_fac->buffer_size = 0;
@@ -1339,8 +1501,10 @@ static void autotest_starttest_btn_event_cb(lv_obj_t * btn, lv_event_t e)
             lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
             lv_obj_set_width(label, LV_HOR_RES);
             lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-            lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
-            lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 35);
+            //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+            //lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 35);
+            lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+            lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
 
             lv_label_set_text_id(lv_obj_get_child(btn, NULL), WATCH_TEXT_ID_STOP_TEST);
             lv_obj_set_event_cb(btn, autotest_stoptest_btn_event_cb);
@@ -1463,7 +1627,8 @@ static void autotest_testresult_create(lv_obj_t * par, factorymode_test_res_t re
     lv_cont_set_layout(bg, LV_LAYOUT_CENTER);
 
     lv_obj_t * label = lv_label_create(bg, NULL);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+    //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG);
     if(res == TEST_SUCCESS) {
         lv_obj_add_style(bg, LV_CONT_PART_MAIN, &ext->green_st);
         lv_label_set_text_id(label, WATCH_TEXT_ID_SUCCESS);
@@ -1477,12 +1642,15 @@ static void autotest_testresult_create(lv_obj_t * par, factorymode_test_res_t re
 static lv_obj_t * autotest_startbtn_create(lv_obj_t * par, uint8_t num)
 {
     lv_obj_t * start_btn = lv_btn_create(par, NULL);
-    lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, 40);
+    //lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, 40);
+    lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, LV_HOR_RES / 6);
     lv_watch_set_free_num(start_btn, num);
     lv_obj_t * label = lv_label_create(start_btn, NULL);
     lv_label_set_text_id(label, WATCH_TEXT_ID_START_TEST);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
-    lv_obj_align(start_btn, NULL, LV_ALIGN_IN_TOP_MID, 0, 80);
+    //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG);
+    //lv_obj_align(start_btn, NULL, LV_ALIGN_IN_TOP_MID, 0, 80);
+    lv_obj_align(start_btn, NULL, LV_ALIGN_CENTER, 0, -10);
     lv_obj_set_event_cb(start_btn, autotest_starttest_btn_event_cb);
     return start_btn;
 }
@@ -1492,7 +1660,8 @@ static lv_obj_t * autotest_title_create(lv_obj_t * par, watchLangTxtId_t txtId)
     lv_obj_t * label = lv_label_create(par, NULL);
     lv_obj_set_size(label, LV_HOR_RES, LV_VER_RES / 6);
     lv_label_set_text_id(label, txtId);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+    //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
     lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 5);
     return label;
 }
index c353fd3..367c060 100644 (file)
@@ -160,17 +160,30 @@ lv_obj_t * factorymode_main_create(lv_obj_t * activity_obj)
     factorymode_init_style();
     factorymode_init_testmodule();
 
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_t * title = lv_label_create(obj, NULL);
+       lv_obj_set_size(title, LV_HOR_RES, 40);
+       lv_label_set_text_id(title, WATCH_TEXT_ID_FACTORY_MODE);
+       lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+#else
     lv_obj_t * title = lv_label_create(obj, NULL);
     lv_obj_set_size(title, LV_HOR_RES, 30); // LV_VER_RES / 4);
     lv_label_set_text_id(title, WATCH_TEXT_ID_FACTORY_MODE);
     lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font30);
     lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 5);
+#endif
 
     lv_obj_t * list = lv_list_create(obj, NULL);
     lv_watch_obj_add_element(list);
     lv_watch_obj_add_element(lv_page_get_scrl(list));
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_coord_t interval = 20;
+       lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES - lv_obj_get_height(title) - interval - 30);
+#else
     lv_coord_t interval = 15; // 20;
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES - lv_obj_get_height(title) - interval - 10);
+#endif
     lv_page_set_edge_flash(list, true);
     lv_obj_add_style(list, LV_PAGE_PART_EDGE_FLASH, &lv_watch_cont_opa1);
     lv_obj_align(list, title, LV_ALIGN_OUT_BOTTOM_MID, 0, interval);
@@ -191,7 +204,11 @@ lv_obj_t * factorymode_main_create(lv_obj_t * activity_obj)
         lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
         lv_obj_set_width(label, LV_HOR_RES - 10);
        #ifdef __MMI_ZHSX_SUPPORT__
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
+       #else
                lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+       #endif
        #else
 #if USE_LV_WATCH_UI_360_360 != 0
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
index 4ebc9ac..1112e19 100644 (file)
@@ -158,6 +158,9 @@ static void factorymode_test_prepare_destory(lv_obj_t * activity_obj)
                #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
                case FAC_TEMPERATURE:
                        mmi_tsensor_close();
+                       #ifdef __MMI_CUSTOM_HENGAI_TCMS__
+                       mmi_hengai_tcms_action();
+                       #endif
                        break;
                #endif
                        
@@ -354,7 +357,7 @@ static lv_obj_t * factorymode_loop_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font30_gray);
 #else
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
 #endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
@@ -365,7 +368,7 @@ static lv_obj_t * factorymode_loop_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
 #endif
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
@@ -420,7 +423,7 @@ static lv_obj_t * factorymode_speaker_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font30_gray);
 #else
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
 #endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
@@ -431,7 +434,7 @@ static lv_obj_t * factorymode_speaker_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
 #endif
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
@@ -602,7 +605,7 @@ static lv_obj_t * factorymode_lcd_color_display_create(lv_obj_t * activity_obj)
     lv_obj_set_click(content, false);
 
     lv_obj_t * title_label = lv_label_create(content, NULL);
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
     lv_label_set_text_id(title_label, WATCH_TEXT_ID_LCDTEST);
@@ -610,15 +613,16 @@ static lv_obj_t * factorymode_lcd_color_display_create(lv_obj_t * activity_obj)
 
 
     lv_obj_t * start_btn = lv_btn_create(content, NULL);
-    lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, 40);
+    //lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, 40);
+    lv_obj_set_size(start_btn, LV_HOR_RES / 2, LV_HOR_RES / 6);
     lv_obj_t * label = lv_label_create(start_btn, NULL);
     lv_label_set_text_id(label, WATCH_TEXT_ID_START_TEST);
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
     lv_obj_align(start_btn, content, LV_ALIGN_CENTER, 0, 0);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
-    lv_obj_align(start_btn, NULL, LV_ALIGN_IN_TOP_MID, 0, 100);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+    lv_obj_align(start_btn, NULL, LV_ALIGN_CENTER, 0, -10);
 #endif
     lv_obj_add_protect(start_btn, LV_PROTECT_PRESS_LOST);
     lv_obj_set_event_cb(start_btn, display_start_btn_cb);
@@ -673,10 +677,11 @@ static void backlight_start_btn_cb(lv_obj_t * btn,lv_event_t e)
         lv_obj_del(btn);
 
         lv_obj_t * back_btn = lv_btn_create(par, NULL);
-        lv_obj_set_size(back_btn, LV_HOR_RES * 2 / 4, 40);
+        //lv_obj_set_size(back_btn, LV_HOR_RES * 2 / 4, 40);
+               lv_obj_set_size(back_btn, LV_HOR_RES / 2, LV_HOR_RES / 6);
         lv_obj_t * suc_label = lv_label_create(back_btn, NULL);
         lv_label_set_text_id(suc_label, WATCH_TEXT_ID_OFF);
-        lv_obj_add_style(suc_label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+        lv_obj_add_style(suc_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
         lv_obj_set_event_cb(back_btn, backlight_close_btn_cb);
         lv_obj_align(back_btn, par, LV_ALIGN_IN_BOTTOM_MID, 0, -20);
     }
@@ -712,7 +717,7 @@ static lv_obj_t * factorymode_backlight_display_create(lv_obj_t * activity_obj)
     lv_obj_set_click(content, false);
 
     lv_obj_t * title_label = lv_label_create(content, NULL);
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
     lv_label_set_text_id(title_label, WATCH_TEXT_ID_BACKLIGHT);
@@ -720,11 +725,13 @@ static lv_obj_t * factorymode_backlight_display_create(lv_obj_t * activity_obj)
 
 
     lv_obj_t * start_btn = lv_btn_create(content, NULL);
-    lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, 40);
+    //lv_obj_set_size(start_btn, LV_HOR_RES * 2 / 3, 40);
+    lv_obj_set_size(start_btn, LV_HOR_RES / 2, LV_HOR_RES / 6);
     lv_obj_t * label = lv_label_create(start_btn, NULL);
     lv_label_set_text_id(label, WATCH_TEXT_ID_START_TEST);
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
-    lv_obj_align(start_btn, NULL, LV_ALIGN_IN_TOP_MID, 0, 100);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+    //lv_obj_align(start_btn, NULL, LV_ALIGN_IN_TOP_MID, 0, 100);
+    lv_obj_align(start_btn, NULL, LV_ALIGN_CENTER, 0, -10);
     lv_obj_add_protect(start_btn, LV_PROTECT_PRESS_LOST);
     lv_obj_set_event_cb(start_btn, backlight_start_btn_cb);
     lv_watch_obj_add_element(start_btn);
@@ -761,7 +768,7 @@ static lv_obj_t * factorymode_simcard_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font30_gray);
 #else
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
 #endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
@@ -773,14 +780,14 @@ static lv_obj_t * factorymode_simcard_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
 #endif
     if(sim == 1) {
         lv_label_set_text_id(label, WATCH_TEXT_ID_RECOGNIZED);
     } else {
         lv_label_set_text_id(label, WATCH_TEXT_ID_NOSIM);
     }
-    lv_obj_align(label, content, LV_ALIGN_CENTER, 0, 0);
+    lv_obj_align(label, content, LV_ALIGN_CENTER, 0, -10);
 
     return obj;
 }
@@ -827,7 +834,7 @@ static lv_obj_t * factorymode_battery_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font30_gray);
 #else
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
 #endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
@@ -842,13 +849,17 @@ static lv_obj_t * factorymode_battery_create(lv_obj_t * activity_obj)
     Hal_Battery_Get_Values(&bat_val);
 
     lv_obj_t * label_chg = lv_label_create(content, NULL);
-#if USE_LV_WATCH_UI_360_360
-    lv_obj_add_style(label_chg,LV_OBJ_PART_MAIN, &lv_watch_font30);
-    lv_obj_align(label_chg, NULL, LV_ALIGN_IN_TOP_LEFT, 60, 45);
+//#if USE_LV_WATCH_UI_360_360
+//    lv_obj_add_style(label_chg,LV_OBJ_PART_MAIN, &lv_watch_font30);
+//    lv_obj_align(label_chg, NULL, LV_ALIGN_IN_TOP_LEFT, 60, 45);
+//#else
+    lv_obj_add_style(label_chg,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(label_chg, NULL, LV_ALIGN_IN_TOP_LEFT, 60, 80);
 #else
-    lv_obj_add_style(label_chg,LV_OBJ_PART_MAIN, &lv_watch_font20);
     lv_obj_align(label_chg, NULL, LV_ALIGN_IN_TOP_LEFT, 30, 30);
 #endif
+//#endif
 
     lv_anim_path_t path;
     lv_anim_path_init(&path);
@@ -964,11 +975,11 @@ static lv_obj_t * factorymode_wifi_create(lv_obj_t * activity_obj)
     lv_factory_obj_ext_t * ext = factorymode_get_ext();
 
     ext->label_rslt = lv_label_create(content, NULL);
-    lv_obj_add_style(ext->label_rslt,LV_OBJ_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(ext->label_rslt,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
     lv_label_set_align(ext->label_rslt, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(ext->label_rslt, false);
     lv_label_set_text_id(ext->label_rslt, WATCH_TEXT_ID_WIFI_SCAN_TESTING);
-    lv_obj_align(ext->label_rslt, content, LV_ALIGN_CENTER, 0, 0);
+    lv_obj_align(ext->label_rslt, content, LV_ALIGN_CENTER, 0, -10);
 
     factory_wifi_t.mWifiScanCount = 1;
     factory_wifi_t.mWifiOverTimeVal = 4;
@@ -1089,15 +1100,20 @@ static lv_obj_t * factorymode_gps_test_create(lv_obj_t * activity_obj)
 
     char str[128]= {0};
     lv_obj_t * label = lv_label_create(content, NULL);
-#if USE_LV_WATCH_UI_360_360
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
-    lv_obj_set_width(label,LV_HOR_RES-40);
-    lv_obj_set_pos(label, 40, 30);
+//#if USE_LV_WATCH_UI_360_360
+//    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+//    lv_obj_set_width(label,LV_HOR_RES-40);
+//    lv_obj_set_pos(label, 40, 30);
+//#else
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_SMALL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font14);
     lv_obj_set_width(label,LV_HOR_RES-40);
     lv_obj_set_pos(label, 28, 16);
 #endif
+//#endif
 
     snprintf(str, 128, "        Lat:\n        Lon:\nSatellites:  Used:\nSnr:\n       Turn on GPS...");
     lv_label_set_text(label,str);
@@ -1209,7 +1225,7 @@ static lv_obj_t * mmi_factorymode_gsensor_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font30_gray);
 #else
-    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+    lv_obj_add_style(title_label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
 #endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
@@ -1220,11 +1236,16 @@ static lv_obj_t * mmi_factorymode_gsensor_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
 #endif
     //lv_obj_set_size(label,LV_HOR_RES,LV_VER_RES/2);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
+#else
     lv_obj_set_width(label, LV_HOR_RES - 40);
     lv_obj_set_pos(label, 20, 70);
+#endif
 
        char str[128] = {0};
     uint8_t id = mmi_gsensor_sensor_id_get();
@@ -1387,13 +1408,18 @@ static lv_obj_t * factory_mode_calibration_create(lv_obj_t * activity_obj)
 #if USE_LV_WATCH_UI_360_360
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
 #else
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font20);
+    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
 #endif
-    lv_obj_set_width(label,LV_HOR_RES-40);
-#if USE_LV_WATCH_UI_360_360
-    lv_obj_set_pos(label, 40, 100);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
 #else
+    lv_obj_set_width(label,LV_HOR_RES-40);
+//#if USE_LV_WATCH_UI_360_360
+//    lv_obj_set_pos(label, 40, 100);
+//#else
     lv_obj_set_pos(label, 20, 70);
+//#endif
 #endif
 
     FILE_ID lte_fd = 0;
@@ -1725,15 +1751,20 @@ static lv_obj_t * mmi_factorymode_temperature_test_create(lv_obj_t * activity_ob
     mmi_tsensor_open();
 
     lv_obj_t * label = lv_label_create(content, NULL);
-#if USE_LV_WATCH_UI_360_360
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
-    lv_obj_set_width(label,LV_HOR_RES-60);
-    lv_obj_set_pos(label, 30, 105);
-#else
+//#if USE_LV_WATCH_UI_360_360
+//    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
+//    lv_obj_set_width(label,LV_HOR_RES-60);
+//    lv_obj_set_pos(label, 30, 105);
+//#else
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font26);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
+#else
     lv_obj_set_width(label,LV_HOR_RES-40);
     lv_obj_set_pos(label, 20, 70);
 #endif
+//#endif
 
     char str[32]= {0};
     sprintf(str, "%s:", (char *)lv_lang_get_text(WATCH_TEXT_ID_TEMPERATURE));
@@ -2158,15 +2189,20 @@ static lv_obj_t * mmi_factorymode_heart_test_create(lv_obj_t * activity_obj)
        mmi_hsensor_heart_open();
 
     lv_obj_t * label = lv_label_create(content, NULL);
-#if USE_LV_WATCH_UI_360_360
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
-    lv_obj_set_width(label,LV_HOR_RES-60);
-    lv_obj_set_pos(label, 30, 105);
-#else
+//#if USE_LV_WATCH_UI_360_360
+//    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
+//    lv_obj_set_width(label,LV_HOR_RES-60);
+//    lv_obj_set_pos(label, 30, 105);
+//#else
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font26);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
+#else
     lv_obj_set_width(label,LV_HOR_RES-40);
     lv_obj_set_pos(label, 20, 70);
 #endif
+//#endif
 
     char str[32]= {0};
 
@@ -2240,15 +2276,20 @@ static lv_obj_t * mmi_factorymode_spo2_test_create(lv_obj_t * activity_obj)
        mmi_hsensor_spo2_open();
 
     lv_obj_t * label = lv_label_create(content, NULL);
-#if USE_LV_WATCH_UI_360_360
-    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
-    lv_obj_set_width(label,LV_HOR_RES-60);
-    lv_obj_set_pos(label, 30, 105);
-#else
+//#if USE_LV_WATCH_UI_360_360
+//    lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font30);
+//    lv_obj_set_width(label,LV_HOR_RES-60);
+//    lv_obj_set_pos(label, 30, 105);
+//#else
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &lv_watch_font26);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_width(label, LV_HOR_RES - 120);
+       lv_obj_set_pos(label, 60, 80);
+#else
     lv_obj_set_width(label,LV_HOR_RES - 40);
     lv_obj_set_pos(label, 20, 70);
 #endif
+//#endif
 
     char str[32]= {0};
 
@@ -2643,7 +2684,7 @@ static lv_obj_t * mmi_factorymode_agetest_select_create(lv_obj_t * activity_obj)
 
        //
     lv_obj_t * btn_120 = lv_btn_create(cont, NULL);
-    lv_obj_set_size(btn_120, LV_HOR_RES * 2 / 3, 40);
+    lv_obj_set_size(btn_120, LV_HOR_RES / 2, LV_HOR_RES / 6);
     lv_obj_align(btn_120, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
     lv_watch_set_free_num(btn_120, 120); // minutes
     lv_obj_set_event_cb(btn_120, mmi_factorymode_agetest_select_event_cb);
index c3f2056..b8ff6b6 100644 (file)
@@ -87,33 +87,52 @@ lv_obj_t * factorymode_testreport_create(lv_obj_t * activity_obj)
         lv_watch_obj_add_element(bg);
 
         lv_obj_t * label_res = lv_label_create(bg, NULL);
-        lv_obj_add_style(label_res, LV_LABEL_PART_MAIN, &lv_watch_font30);
+        //lv_obj_add_style(label_res, LV_LABEL_PART_MAIN, &lv_watch_font30);
+        lv_obj_add_style(label_res, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG);
         lv_label_set_text_id(label_res, WATCH_TEXT_ID_ALL_PASS);
     } else {
         lv_obj_t * label = lv_label_create(obj, NULL);
         lv_obj_set_size(label, LV_HOR_RES, LV_VER_RES / 6);
         lv_label_set_text_id(label, WATCH_TEXT_ID_TEST_REPORT);
-        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TITLE_FONT);
         lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 5);
 
-        lv_obj_t * label_sign = lv_label_create(obj, label);
+        lv_obj_t * label_sign = lv_label_create(obj, NULL);
+        lv_obj_add_style(label_sign, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
         lv_label_set_text_id(label_sign, WATCH_TEXT_ID_TEST_REPORT_SIGN);
         lv_label_set_long_mode(label_sign, LV_LABEL_LONG_BREAK);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_size(label_sign, LV_HOR_RES - 60, 30);
+               lv_obj_align(label_sign, label, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+       #else
         lv_obj_set_size(label_sign, LV_HOR_RES, 30);
         lv_obj_align(label_sign, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 30);
+       #endif
 
         lv_obj_t * btn_clean = lv_btn_create(obj, NULL);
-        lv_obj_t * label_clean = lv_label_create(btn_clean, label);
+        lv_obj_t * label_clean = lv_label_create(btn_clean, NULL);
+        lv_obj_add_style(label_clean, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
         lv_label_set_text_id(label_clean, WATCH_TEXT_ID_TEST_REPORT_CLEAN);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_size(btn_clean, LV_HOR_RES * 2 / 5, 40);
+               lv_obj_align(btn_clean, label_sign, LV_ALIGN_OUT_BOTTOM_LEFT, 5, 10);
+       #else
         lv_obj_set_size(btn_clean, LV_HOR_RES * 3 / 5, 30);
         lv_obj_align(btn_clean, label_sign, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0);
+       #endif
         lv_obj_set_event_cb(btn_clean, testrepot_clean_btn_event_cb);
 
         lv_obj_t * btn_retest = lv_btn_create(obj, NULL);
-        lv_obj_t * label_retest = lv_label_create(btn_retest, label);
+        lv_obj_t * label_retest = lv_label_create(btn_retest, NULL);
+        lv_obj_add_style(label_retest, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
         lv_label_set_text_id(label_retest, WATCH_TEXT_ID_RETEST);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_size(btn_retest, LV_HOR_RES * 2 / 5, 40);
+               lv_obj_align(btn_retest, label_sign, LV_ALIGN_OUT_BOTTOM_RIGHT, -5, 10);
+       #else
         lv_obj_set_size(btn_retest, LV_HOR_RES * 2 / 5, 30);
         lv_obj_align(btn_retest, label_sign, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 0);
+       #endif
         lv_obj_set_event_cb(btn_retest, testrepot_retest_btn_event_cb);
 
         testreport_item_create(obj);
@@ -205,15 +224,21 @@ static void testreport_item_create(lv_obj_t * par)
         }
     }
     lv_obj_t * page  = lv_page_create(par, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(page, LV_HOR_RES - 80, 260);
+    lv_obj_align(page, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -30);
+#else
     lv_obj_set_size(page, LV_HOR_RES - 10, 130);
     lv_obj_align(page, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 5, 0);
+#endif
     lv_obj_add_style(page, LV_PAGE_PART_BG, &lv_style_transp);
     lv_obj_add_style(page, LV_PAGE_PART_SCROLLABLE, &lv_style_transp);
     lv_obj_add_style(page, LV_PAGE_PART_EDGE_FLASH, &lv_watch_cont_opa1);
     lv_page_set_scrollbar_mode(page, LV_SCROLLBAR_MODE_OFF);
 
     lv_obj_t * cont = lv_cont_create(page, NULL);
-    lv_obj_set_size(cont, LV_HOR_RES - 10, (item_cnt / 3 + 1) * 50 + 10);
+    //lv_obj_set_size(cont, LV_HOR_RES - 10, (item_cnt / 3 + 1) * 50 + 10);
+    lv_obj_set_size(cont, lv_obj_get_width(page), (item_cnt / 3 + 1) * 50 + 10);
     lv_cont_set_layout(cont, LV_LAYOUT_GRID);
     lv_obj_set_click(cont, false);
     lv_obj_set_style_local_bg_opa(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
@@ -231,7 +256,8 @@ static void testreport_item_create(lv_obj_t * par)
         if(ext_fac->istest[i]) {
             ext->btn[i] = lv_btn_create(cont, NULL);
             lv_obj_add_protect(ext->btn[i], LV_PROTECT_PRESS_LOST);
-            lv_obj_set_size(ext->btn[i], (LV_HOR_RES - 10 - 3 * 3) / 3, 50);
+            //lv_obj_set_size(ext->btn[i], (LV_HOR_RES - 10 - 3 * 3) / 3, 50);
+            lv_obj_set_size(ext->btn[i], (lv_obj_get_width(cont) - 3 * 3) / 3, 50);
             // lv_obj_set_event_cb(ext->btn[i], testreport_item_btn_event_cb);
             lv_watch_set_free_num(ext->btn[i], i);
 
index 8d22d58..9ffdb1d 100644 (file)
@@ -115,6 +115,11 @@ bool mmi_health_measure_state_is_ui_measure(void)
        if(MMI_HEALTH_MEASURE_STATE_UI == s_health_measure_run_data.measure_state)
                return true;
 
+#ifdef __MMI_CUSTOM_HENGAI_HEALTH__
+       if(mmi_hengai_bp_measuring_flag_get())
+               return true;
+#endif
+
        return false;
 }
 
index e7063f2..758ff6a 100644 (file)
@@ -270,7 +270,11 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj)
                }
                lv_obj_set_style_local_bg_color(ext->gif_info->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
        #if USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, SPO2_MEASURE_IMAGE_Y);
+               #else
                lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, 5);
+               #endif
        #else
                lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
        #endif
index a743ff6..6059e1a 100644 (file)
@@ -836,8 +836,10 @@ static lv_obj_t * sport_create(lv_obj_t * activity_obj)
 {
     static lv_point_t pu_valid_pos[] = {
 #if USE_LV_WATCH_BODYINFO != 0
+#ifndef __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
         {0, 0},
 #endif
+#endif
 #if USE_LV_WATCH_PEDOMETER != 0
         {1, 0},
 #endif
@@ -879,11 +881,13 @@ static lv_obj_t * sport_create(lv_obj_t * activity_obj)
 
     //lv_obj_t * tab;
 #if USE_LV_WATCH_BODYINFO != 0
+#ifndef __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
        bodyinfo_create(tileview, 0);
     //tab = bodyinfo_create(tileview, 0);
     //LV_ASSERT_MEM(tab);
     //if(tab == NULL) return NULL;
 #endif
+#endif
 
 #if USE_LV_WATCH_PEDOMETER != 0
        pedometer_create(tileview, 1);
index ed1afc1..c8dc97b 100644 (file)
@@ -124,6 +124,71 @@ static lv_obj_t * lowbattery_create(lv_obj_t * activity_obj)
         if(activity_obj == NULL) return NULL;
     }
 
+#ifdef __MMI_ZHSX_SUPPORT__
+
+    lv_obj_t * obj = lv_cont_create(activity_obj, NULL);
+    LV_ASSERT_MEM(obj);
+    if(obj == NULL) return NULL;
+    lv_obj_add_style(obj, LV_OBJ_PART_MAIN, &lv_watch_style_transp);
+    lv_obj_set_style_local_bg_color(obj,LV_OBJ_PART_MAIN,LV_STATE_DEFAULT,LV_COLOR_BLACK);
+    lv_obj_set_style_local_bg_opa(obj,LV_OBJ_PART_MAIN,LV_STATE_DEFAULT,LV_OPA_COVER);
+    lv_obj_set_size(obj,  LV_HOR_RES, LV_VER_RES);
+    lv_obj_set_drag(obj, false);
+
+    lv_obj_t * content = lv_cont_create(obj, NULL);
+    if(content == NULL) return NULL;
+    lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_style_transp);
+    lv_cont_set_fit2(content, LV_FIT_NONE, LV_FIT_TIGHT);
+    lv_obj_set_width(content, LV_HOR_RES);
+    lv_obj_set_drag(content, false);
+    lv_cont_set_layout(content, LV_LAYOUT_COLUMN_MID);
+
+    lv_obj_t * label = lv_label_create(content, NULL);
+    lv_obj_set_base_dir(label, LV_BIDI_DIR_LTR);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26_gray);
+#else
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+#endif
+    hal_rtc_t tm;
+    Hal_Rtc_Gettime(&tm); // get time
+    char * rtctime = lv_mem_alloc(6);
+    memset(rtctime, 0, 6);
+    snprintf(rtctime, 6, "%02d:%02d", tm.tm_hour, tm.tm_min);
+    lv_label_set_text(label, rtctime);
+    lv_mem_free(rtctime);
+    lv_lowbattery_ext_t * ext =
+        lv_obj_allocate_ext_attr(activity_obj, sizeof(lv_lowbattery_ext_t));
+    LV_ASSERT_MEM(ext);
+    if(ext == NULL) return NULL;
+    ext->timelabel = label;// store the label obj
+
+    lv_obj_t * img = lv_img_create(content, NULL);
+    lv_img_set_src(img, ICON_LOWBATTERY_CHARGE);
+    //lv_obj_set_size(img, 52, 83);
+
+    label = lv_label_create(content, NULL);
+    lv_obj_set_base_dir(label, LV_BIDI_DIR_LTR);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26_gray);
+#else
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+#endif
+    lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
+    lv_obj_set_size(label, LV_HOR_RES * 3 / 4/*200*/, 45);
+    lv_label_set_text_id(label, WATCH_TEXT_ID_LOWBATTERY);
+    lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+
+    lv_obj_t * btn;
+    btn = lv_imgbtn_create(content, NULL);
+    lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_LOWBATTERY_DIAL);
+    lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_LOWBATTERY_DIAL);
+    lv_obj_set_event_cb(btn, phonebook_create_btn_event_cb);
+
+       lv_obj_align(content, NULL, LV_ALIGN_CENTER, 0, 0);
+
+#else
+
     lv_obj_t * content = lv_cont_create(activity_obj, NULL);
     LV_ASSERT_MEM(content);
     if(content == NULL) return NULL;
@@ -168,6 +233,8 @@ static lv_obj_t * lowbattery_create(lv_obj_t * activity_obj)
     lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_LOWBATTERY_DIAL);
     lv_obj_set_event_cb(btn, phonebook_create_btn_event_cb);
 
+#endif
+
     return activity_obj;
 }
 
index 8cde3c8..fcec455 100644 (file)
 
 static uint16_t pedometer_goalsteps = 10000;
 
+#ifdef __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
+uint16_t pedometer_get_steps(void)
+{
+    return asl_pedometer_steps_get();
+}
+
+void pedometer_set_goalsteps(uint16_t goal)
+{
+    pedometer_goalsteps = goal;
+}
+
+uint16_t pedometer_get_goalsteps(void)
+{
+    return pedometer_goalsteps;
+}
+
+static lv_obj_t * digital_content_create(lv_obj_t * par, int16_t level, uint8_t first_time)
+{
+    lv_obj_t * par_obj = NULL;
+       
+    if(first_time) 
+       {
+        lv_obj_t * content = lv_watch_cont_create(par, LV_LAYOUT_ROW_MID, &lv_style_transp_fit, lv_obj_get_width(par));
+        lv_cont_set_fit2(content, LV_FIT_TIGHT, LV_FIT_TIGHT);
+        lv_obj_align(content, par, LV_ALIGN_CENTER, 0, 0);
+        par_obj = content;
+    } 
+       else 
+       {
+        par_obj = par;
+    }
+    lv_cont_set_layout(par_obj, LV_LAYOUT_OFF);
+
+    char str[10] = "";
+    snprintf(str, sizeof(str), "%d", level);
+
+    const void * digitalSrcList[] = {
+        ICON_PEDOMETER_DIGITAL_0,
+        ICON_PEDOMETER_DIGITAL_1,
+        ICON_PEDOMETER_DIGITAL_2,
+        ICON_PEDOMETER_DIGITAL_3,
+        ICON_PEDOMETER_DIGITAL_4,
+        ICON_PEDOMETER_DIGITAL_5,
+        ICON_PEDOMETER_DIGITAL_6,
+        ICON_PEDOMETER_DIGITAL_7,
+        ICON_PEDOMETER_DIGITAL_8,
+        ICON_PEDOMETER_DIGITAL_9,
+    };
+
+    for(int8_t i = 0; i < strlen(str); i++) {
+        lv_obj_t * img = lv_img_create(par_obj, NULL);
+        LV_ASSERT_MEM(img);
+        if(img == NULL) return NULL;
+        lv_img_set_src(img, digitalSrcList[str[i] - '0']);
+        lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_LEFT, i * (lv_obj_get_width(img) + 5), 0);
+    }
+       
+    return par_obj;
+}
+
+void pedometer_update_screen(void)
+{
+       lv_drop_pull_obj_ext_t * ext = NULL;
+
+#if USE_LV_WATCH_LAUNCHER != 0
+       ext = launcher_get_pull_ext();
+#endif
+       if(NULL == ext) 
+               return;
+
+       printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+
+    lv_obj_t * label = ext->pedometer_goal;
+    char str[10] = "";
+    snprintf(str, sizeof(str), "%d", pedometer_get_goalsteps());
+    lv_label_set_text(label, str);
+
+       lv_obj_t * pedometer_cont = ext->pedometer_cont;
+       lv_obj_clean(pedometer_cont);
+       digital_content_create(pedometer_cont, pedometer_get_steps(), 0);
+}
+
+void mmi_ui_msg_update_pedometer_screen(void)
+{
+       pedometer_update_screen();
+}
+
+void pedometer_update_goal(uint16_t goal)
+{
+    pedometer_set_goalsteps(goal);
+}
+
+static lv_obj_t * s_step_cont_main = NULL;
+static lv_obj_t * s_step_cont_goal = NULL;
+static lv_obj_t * s_step_label_goal_set = NULL;
+static uint32_t s_step_goal_temp_value = 0;
+
+static void mmi_step_goal_set_btn_event_cb(lv_obj_t * btn, lv_event_t e)
+{
+    if(LV_EVENT_CLICKED != e)
+               return;
+
+       uint32_t index = lv_watch_get_free_num(btn);
+       if(1 == index)
+    {
+               if(500 < s_step_goal_temp_value)
+                       s_step_goal_temp_value -= 500;
+
+               char str[8] = "";
+               sprintf(str, "%d", s_step_goal_temp_value);
+               lv_label_set_text(s_step_label_goal_set, str);
+               lv_label_set_align(s_step_label_goal_set, LV_LABEL_ALIGN_CENTER);
+               lv_obj_align(s_step_label_goal_set, NULL, LV_ALIGN_CENTER, 0, -LV_VER_RES / 8);
+    }
+       else if(2 == index)
+    {
+               if(50000 > s_step_goal_temp_value)
+                       s_step_goal_temp_value += 500;
+
+               char str[8] = "";
+               sprintf(str, "%d", s_step_goal_temp_value);
+               lv_label_set_text(s_step_label_goal_set, str);
+               lv_label_set_align(s_step_label_goal_set, LV_LABEL_ALIGN_CENTER);
+               lv_obj_align(s_step_label_goal_set, NULL, LV_ALIGN_CENTER, 0, -LV_VER_RES / 8);
+    }
+       else if(4 == index)
+    {
+               pedometer_set_goalsteps(s_step_goal_temp_value);
+               pedometer_update_screen();
+       
+               lv_obj_set_hidden(s_step_cont_main, false);
+               lv_obj_set_hidden(s_step_cont_goal, true);
+    }
+       else
+       {
+               lv_obj_set_hidden(s_step_cont_main, false);
+               lv_obj_set_hidden(s_step_cont_goal, true);
+       }
+}
+
+lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
+{
+       lv_obj_t * cont = lv_cont_create(tab, NULL);
+       if(NULL == cont)
+               return NULL;
+       lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES);
+       lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+       lv_tileview_add_element(tileview, cont);
+       lv_obj_set_click(cont, false);
+
+       lv_obj_t * btn_decrease = lv_imgbtn_create(cont, NULL);
+    lv_imgbtn_set_src(btn_decrease, LV_BTN_STATE_RELEASED, ICON_DECREASE);
+    lv_imgbtn_set_src(btn_decrease, LV_BTN_STATE_PRESSED, ICON_DECREASE);
+    lv_obj_set_event_cb(btn_decrease, mmi_step_goal_set_btn_event_cb);
+       lv_obj_align(btn_decrease, NULL, LV_ALIGN_IN_LEFT_MID, LV_HOR_RES / 8, -LV_VER_RES / 8);
+       lv_watch_set_free_num(btn_decrease, 1);
+
+    lv_obj_t * btn_increase = lv_imgbtn_create(cont, NULL);
+    lv_imgbtn_set_src(btn_increase, LV_BTN_STATE_RELEASED, ICON_INCREASE);
+    lv_imgbtn_set_src(btn_increase, LV_BTN_STATE_PRESSED, ICON_INCREASE);
+    lv_obj_set_event_cb(btn_increase, mmi_step_goal_set_btn_event_cb);
+       lv_obj_align(btn_increase, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_HOR_RES / 8, -LV_VER_RES / 8);
+       lv_watch_set_free_num(btn_increase, 2);
+
+       lv_obj_t * label_goal = lv_label_create(cont, NULL);
+       lv_obj_add_style(label_goal, LV_LABEL_PART_MAIN, &lv_watch_font40);
+    char str[8] = "";
+       s_step_goal_temp_value = pedometer_get_goalsteps();
+    sprintf(str, "%d", s_step_goal_temp_value);
+    lv_label_set_text(label_goal, str);
+       lv_label_set_align(label_goal, LV_LABEL_ALIGN_CENTER);
+       lv_obj_align(label_goal, NULL, LV_ALIGN_CENTER, 0, -LV_VER_RES / 8);
+    lv_obj_set_click(label_goal, false);
+       s_step_label_goal_set = label_goal;
+
+       lv_obj_t * btn_cancel = lv_btn_create(cont, NULL);
+       lv_obj_set_size(btn_cancel, 140, 70);
+       lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
+       lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
+       lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
+       lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+       lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 70, -60);
+       lv_obj_set_event_cb(btn_cancel, mmi_step_goal_set_btn_event_cb);
+       lv_watch_set_free_num(btn_cancel, 3);
+       lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL);
+       lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL);
+       lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
+
+       lv_obj_t * btn_ok = lv_btn_create(cont, btn_cancel);
+       lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
+       lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
+       lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
+       lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+       lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -60);
+       lv_obj_set_event_cb(btn_ok, mmi_step_goal_set_btn_event_cb);
+       lv_watch_set_free_num(btn_ok, 4);
+       lv_obj_t * label_ok = lv_label_create(btn_ok, label_cancel);
+       lv_label_set_text_id(label_ok, WATCH_TEXT_ID_OK);
+
+       return cont;
+}
+
+static void mmi_step_goal_btn_event_cb(lv_obj_t * btn, lv_event_t e)
+{
+    if(LV_EVENT_CLICKED == e)
+    {
+               lv_obj_set_hidden(s_step_cont_main, true);
+               lv_obj_set_hidden(s_step_cont_goal, false);
+    }
+}
+
+lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
+{
+    lv_obj_t * tab;
+    if(id == 0xFF) {
+        tab = tileview;
+    } else {
+        tab = launcher_tileview_add_tile(tileview, id);
+        LV_ASSERT_MEM(tab);
+        if(tab == NULL) return NULL;
+    }
+
+    lv_obj_t * cont = lv_cont_create(tab, NULL);
+    if(NULL == cont)
+               return NULL;
+       lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES);
+       lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+    lv_tileview_add_element(tileview, cont);
+    lv_obj_set_click(cont, false);
+
+       //
+    lv_obj_t * cont_today = lv_watch_cont_create(cont, LV_LAYOUT_COLUMN_MID, &lv_style_transp_fit, lv_obj_get_width(cont));
+    lv_tileview_add_element(tileview, cont_today);
+    lv_obj_set_click(cont_today, false);
+
+    lv_obj_t * label = lv_label_create(cont_today, NULL);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+    lv_label_set_text_id(label, WATCH_TEXT_ID_TODAY_STEP);
+    lv_obj_set_click(label, false);
+
+#if USE_LV_WATCH_BODYINFO != 0
+    nv_watch_pedometer_setting_t pedo;
+    memset(&pedo, 0, sizeof(nv_watch_pedometer_setting_t));
+    bodyinfo_init(&pedo);
+    pedometer_set_goalsteps(pedo.goal);
+#endif
+
+    lv_obj_t * digital_content = digital_content_create(cont_today, pedometer_get_steps(), 1);
+
+    lv_obj_align(cont_today, NULL, LV_ALIGN_IN_TOP_MID, 0, LV_VER_RES / 6);
+       
+       //
+    lv_obj_t * cont_goal = lv_watch_cont_create(cont, LV_LAYOUT_COLUMN_MID, &lv_style_transp_fit, lv_obj_get_width(cont));
+    lv_tileview_add_element(tileview, cont_goal);
+    lv_obj_set_click(cont_goal, false);
+       
+    label = lv_label_create(cont_goal, NULL);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+    lv_label_set_text_id(label, WATCH_TEXT_ID_GOAL_STEP);
+    lv_obj_set_click(label, false);
+
+       lv_obj_t * btn_goal = lv_btn_create(cont_goal, NULL);
+       lv_obj_set_size(btn_goal, 200, 70);
+       lv_obj_set_style_local_bg_color(btn_goal, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
+       lv_obj_set_style_local_radius(btn_goal, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
+       lv_obj_set_style_local_bg_color(btn_goal, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
+       lv_obj_set_style_local_radius(btn_goal, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+       lv_obj_set_event_cb(btn_goal, mmi_step_goal_btn_event_cb);
+       
+    label = lv_label_create(btn_goal, NULL);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+    char str[10] = "";
+    snprintf(str, sizeof(str), "%d", pedometer_get_goalsteps());
+    lv_label_set_text(label, str);
+    lv_obj_set_click(label, false);
+
+       lv_obj_align(cont_goal, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 8);
+       
+#if USE_LV_WATCH_LAUNCHER != 0
+    lv_drop_pull_obj_ext_t * ext = launcher_get_pull_ext();
+    if(NULL != ext) 
+       {
+        ext->pedometer_dot = NULL;
+        ext->pedometer_cont = digital_content;
+        ext->pedometer_goal = label;
+    }
+#endif
+
+       s_step_cont_main = cont;
+       lv_obj_set_hidden(s_step_cont_main, false);
+       
+       lv_obj_t * cont_set = mmi_step_goal_set_cont_create(tab, tileview);
+       if(NULL != cont_set)
+       {
+               s_step_cont_goal = cont_set;
+               lv_obj_set_hidden(s_step_cont_goal, true);
+       }
+       
+       printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       
+    return tab;
+}
+
+#else
 
 #define PEDOMETER_DEF_ANGLE              5000
 #define PEDOMETER_CIRCLE_START           340
@@ -246,6 +550,8 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     return tab;
 }
 
+#endif
+
 #else
 
 #include <stdio.h>
index 1e7100d..cb59a33 100644 (file)
@@ -238,7 +238,11 @@ static void sms_msg_list_create(lv_obj_t * obj, lv_ll_t * sms_list)
        lv_obj_set_style_local_outline_width(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);\r
 #else\r
 \r
+#ifdef USE_LV_WATCH_UI_466_466\r
+       lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES - 60);\r
+#else\r
        lv_obj_set_size(list,LV_HOR_RES,LV_VER_RES);//set list size\r
+#endif\r
        lv_obj_add_style(list, LV_LIST_PART_BG,&lv_watch_style_transp);\r
        lv_obj_set_style_local_pad_inner(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);\r
     lv_obj_set_style_local_pad_left(list,  LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6);\r
@@ -358,9 +362,15 @@ void sms_msg_app_new_sms_info_ind(app_adp_new_sms_info_ind_t *sms_info)
                sms_msg_write_nvm(nvm_sms_list);\r
                lv_mem_free(nvm_sms_list);\r
 \r
-       #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__\r
-               if(false == mmi_watch_is_in_do_not_disturb_time())\r
-       #endif\r
+               if(true\r
+                       && (false == mmi_active_screen_is_prohibit_interrupted())\r
+                       #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__\r
+                       && (false == mmi_watch_is_in_do_not_disturb_time())\r
+                       #endif\r
+                       #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__\r
+                       && (false == mmi_health_measure_state_is_ui_measure())\r
+                       #endif\r
+                       )\r
                {\r
                        uint8_t volume = 0;\r
                        \r
@@ -551,7 +561,11 @@ static void smsmsg_copy_info(nv_watch_sms_msg_info_t * dest, app_adp_new_sms_inf
 static void sms_msg_no_sim_create(lv_obj_t * obj)\r
 {\r
        lv_obj_t * label = lv_label_create(obj, NULL);\r
+#ifdef USE_LV_WATCH_UI_466_466\r
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);\r
+#else\r
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);\r
+#endif\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_SIM_CARD);\r
@@ -701,6 +715,51 @@ lv_obj_t * sms_msg_list_add(lv_obj_t * list,sms_msg_t * msg,lv_event_cb_t rel_cb
        lv_obj_align(remind_img, img_bg, LV_ALIGN_IN_TOP_RIGHT, -8, 8);\r
        lv_obj_set_hidden(remind_img, !msg->isnew);\r
 \r
+#ifdef __MMI_ZHSX_SUPPORT__\r
+\r
+       lv_obj_t * label_name = lv_label_create(img_bg, NULL);\r
+    lv_label_set_text(label_name, ('\0' == msg->name[0])? msg->number : msg->name);\r
+    lv_obj_set_click(label_name, false);\r
+    //lv_label_set_long_mode(label_name, LV_LABEL_LONG_SROLL_CIRC);\r
+       lv_obj_set_width(label_name, lv_obj_get_width(img_bg)-10);\r
+#ifdef USE_LV_WATCH_UI_466_466\r
+       lv_obj_add_style(label_name, LV_LABEL_PART_MAIN,&lv_watch_font26);\r
+       lv_obj_align(label_name, NULL, LV_ALIGN_IN_TOP_LEFT, 5, 4);\r
+#else\r
+       lv_obj_add_style(label_name, LV_LABEL_PART_MAIN,&lv_watch_font20);\r
+       lv_obj_align(label_name, NULL, LV_ALIGN_IN_TOP_LEFT, 5, 1);\r
+#endif\r
+       \r
+       lv_obj_t * label_time = lv_label_create(img_bg, NULL);\r
+       lv_label_set_text(label_time, msg->time);\r
+       lv_obj_set_click(label_time, false);\r
+#ifdef USE_LV_WATCH_UI_466_466\r
+       lv_obj_add_style(label_time, LV_LABEL_PART_MAIN,&lv_watch_font20_yellow);\r
+       lv_obj_align(label_time, label_name, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 2);\r
+#else\r
+       lv_obj_add_style(label_time, LV_LABEL_PART_MAIN,&lv_watch_font12_yellow);\r
+       lv_obj_align(label_time, label_name, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 1);\r
+#endif\r
+\r
+       lv_obj_t * label_data = lv_label_create(img_bg, NULL);\r
+    lv_label_set_text(label_data, msg->data);\r
+    lv_obj_set_click(label_data, false);\r
+    lv_label_set_long_mode(label_data, LV_LABEL_LONG_DOT);\r
+       lv_obj_set_width(label_data, lv_obj_get_width(img_bg) - 10);\r
+#ifdef USE_LV_WATCH_UI_466_466\r
+       lv_obj_set_height(label_data, 30);\r
+       lv_label_set_align(label_data, LV_LABEL_ALIGN_LEFT);\r
+       lv_obj_add_style(label_data, LV_LABEL_PART_MAIN,&lv_watch_font26);\r
+       lv_obj_align(label_data, label_time, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 2);\r
+#else\r
+       lv_obj_set_height(label_data, 24);\r
+       lv_label_set_align(label_data, LV_LABEL_ALIGN_LEFT);\r
+       lv_obj_add_style(label_data, LV_LABEL_PART_MAIN,&lv_watch_font20);\r
+       lv_obj_align(label_data, label_time, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 1);\r
+#endif\r
+\r
+#else\r
+\r
        lv_obj_t * label_cont = lv_cont_create(img_bg, NULL);\r
        lv_obj_set_width(label_cont, lv_obj_get_width(img_bg));\r
        lv_obj_align(label_cont, img_bg, LV_ALIGN_IN_TOP_MID, 0, 0);\r
@@ -735,6 +794,7 @@ lv_obj_t * sms_msg_list_add(lv_obj_t * list,sms_msg_t * msg,lv_event_cb_t rel_cb
        lv_obj_add_style(label_data, LV_LABEL_PART_MAIN,&lv_watch_font20);\r
     lv_label_set_long_mode(label_data, LV_LABEL_LONG_DOT);\r
        lv_obj_align(label_data, label_cont, LV_ALIGN_OUT_BOTTOM_LEFT, 5, 4);\r
+#endif\r
 \r
        lv_watch_obj_add_element(liste);\r
 \r
@@ -787,30 +847,50 @@ static void mbox_sms_label(lv_sms_item_ext_t * ext)
                lv_obj_t * msg_ta = lv_textarea_create(mbox_count, NULL);\r
                LV_ASSERT_MEM(msg_ta);\r
        #ifdef USE_LV_WATCH_UI_CIRCLE\r
+       #ifdef USE_LV_WATCH_UI_466_466\r
+               lv_obj_set_size(msg_ta, LV_HOR_RES - 80, LV_VER_RES - 50 - 100);\r
+       #else\r
                lv_obj_set_size(msg_ta, LV_HOR_RES - 20 * 2, LV_VER_RES - 20 - 15 * 2 - 40);\r
+       #endif\r
        #else\r
                lv_obj_set_size(msg_ta, LV_HOR_RES - 15 * 2, LV_VER_RES - 20 - 15 * 2 - 40);\r
        #endif\r
+       #ifdef USE_LV_WATCH_UI_466_466\r
+               lv_obj_add_style(msg_ta, LV_TEXTAREA_PART_BG, &lv_watch_font40);\r
+       #else\r
                lv_obj_add_style(msg_ta, LV_TEXTAREA_PART_BG,&lv_watch_font26);\r
+       #endif\r
                lv_obj_set_style_local_bg_opa(msg_ta, LV_TEXTAREA_PART_BG,LV_STATE_DEFAULT, LV_OPA_0);\r
                lv_textarea_set_text(msg_ta,ext->smsmsg.data);\r
                lv_textarea_set_cursor_pos(msg_ta, 0);\r
                lv_textarea_set_cursor_hidden(msg_ta,true);\r
                lv_textarea_set_scrollbar_mode(msg_ta,LV_SCROLLBAR_MODE_OFF);\r
                lv_textarea_set_edge_flash(msg_ta, true);\r
+       #ifdef USE_LV_WATCH_UI_466_466\r
+               lv_obj_align(msg_ta, mbox_count, LV_ALIGN_IN_TOP_MID, 0, 50);\r
+       #else\r
                lv_obj_align(msg_ta, mbox_count, LV_ALIGN_IN_TOP_MID, 0, 20);\r
+       #endif\r
            lv_obj_set_click(msg_ta, false);\r
                \r
                lv_obj_t * close_btn = lv_btn_create(mbox_count, NULL);\r
                lv_watch_set_free_ptr(close_btn, ext);\r
+       #ifdef USE_LV_WATCH_UI_466_466\r
+               lv_obj_set_size(close_btn, 140, 70);\r
+       #else\r
            lv_obj_set_size(close_btn, 100, 40);\r
+       #endif\r
                lv_obj_set_style_local_bg_color(close_btn, LV_OBJ_PART_MAIN,LV_STATE_DEFAULT,LV_COLOR_MAKE(0x55, 0x55, 0x55));\r
                lv_obj_set_style_local_bg_opa(close_btn, LV_OBJ_PART_MAIN,LV_STATE_DEFAULT, LV_OPA_100);\r
                lv_obj_set_style_local_radius(close_btn, LV_OBJ_PART_MAIN,LV_STATE_DEFAULT, 100);\r
                \r
            lv_obj_t * label = lv_label_create(close_btn, NULL);\r
            lv_label_set_text_id(label, WATCH_TEXT_ID_BACK);\r
+       #ifdef USE_LV_WATCH_UI_466_466\r
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN,&lv_watch_font40);\r
+       #else\r
            lv_obj_add_style(label, LV_LABEL_PART_MAIN,&lv_watch_font26);\r
+       #endif\r
            lv_obj_add_protect(close_btn, LV_PROTECT_PRESS_LOST);\r
            lv_obj_set_event_cb(close_btn, sms_cancel_vbtn_cb);\r
                lv_obj_align(close_btn, mbox_count, LV_ALIGN_IN_BOTTOM_MID, 0, -15);\r
@@ -1022,7 +1102,11 @@ static void sms_no_msg_create(lv_obj_t * obj)
 {\r
     lv_obj_t * label = lv_label_create(obj, NULL);\r
 #ifdef __MMI_ZHSX_SUPPORT__\r
+#ifdef USE_LV_WATCH_UI_466_466\r
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);\r
+#else\r
        lv_obj_add_style(label, LV_LABEL_PART_MAIN,&lv_watch_font26);\r
+#endif\r
 #else\r
     if(1 == lv_lang_act()) {\r
         lv_obj_add_style(label, LV_LABEL_PART_MAIN,&lv_watch_font20);\r
index ba66fa1..fd3cf66 100644 (file)
@@ -246,6 +246,13 @@ lv_obj_t * sos_create(lv_obj_t * activity_obj)
        
        lv_obj_set_style_local_bg_color(activity_obj, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
        
+#if 1
+       ext->gif_info = gif_open(activity_obj, ANIM_SOS, 1);
+       if(!ext->gif_info)
+               return activity_obj;
+
+       lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_CENTER, 0, 0);
+#else
        lv_obj_t * gif_cont = lv_cont_create(activity_obj, NULL);
        lv_obj_set_size(gif_cont, LV_HOR_RES, 240);
        lv_obj_align(gif_cont, NULL, LV_ALIGN_IN_TOP_MID, 0, (LV_VER_RES - 240) / 2);
@@ -253,6 +260,7 @@ lv_obj_t * sos_create(lv_obj_t * activity_obj)
     ext->gif_info = gif_open(gif_cont, ANIM_SOS, 1);
     if(!ext->gif_info)
         return activity_obj;
+#endif
 
        s_sos_dial_index = 0;
     ext->gif_task_p = lv_task_create(sos_task, 100, LV_TASK_PRIO_MID, (void *)ext->gif_info);
index a3c904c..56fbd97 100644 (file)
@@ -208,6 +208,7 @@ lv_style_t lv_style_transp_fit;
 lv_style_t lv_style_transp_tight;
 lv_style_t lv_watch_style_transp;
 lv_style_t lv_watch_font10;
+lv_style_t lv_watch_font12_yellow;
 lv_style_t lv_watch_font14;
 lv_style_t lv_watch_font20;
 lv_style_t lv_watch_font20_black;
@@ -1006,6 +1007,10 @@ static void lv_theme_watch_set_private_style(void)
     lv_style_set_text_color(&lv_watch_font10, LV_STATE_DEFAULT, LV_COLOR_WHITE);
     lv_style_set_text_font(&lv_watch_font10, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_12);
 
+    style_init_reset(&lv_watch_font12_yellow);
+    lv_style_set_text_color(&lv_watch_font12_yellow, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
+    lv_style_set_text_font(&lv_watch_font12_yellow, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_12);
+
     /*font 14*/
     style_init_reset(&lv_watch_font14);
     lv_style_set_text_color(&lv_watch_font14, LV_STATE_DEFAULT, LV_COLOR_WHITE);
index b6c05c9..33960f2 100644 (file)
@@ -118,6 +118,7 @@ extern lv_style_t lv_style_transp_tight;
 
 extern lv_style_t lv_watch_style_transp;
 extern lv_style_t lv_watch_font10;
+extern lv_style_t lv_watch_font12_yellow;
 extern lv_style_t lv_watch_font14;
 extern lv_style_t lv_watch_font20;
 extern lv_style_t lv_watch_font20_black;
index b4924bb..382f5e9 100644 (file)
@@ -642,27 +642,48 @@ static lv_obj_t * mmi_watch_no_sim_power_off_prompt_create(lv_obj_t * activity_o
        sprintf(t_text, "%d%s", s_no_sim_power_off_seconds, lv_lang_get_text(WATCH_TEXT_ID_NO_SIM_POWER_OFF_PROMPT));
        lv_label_set_text(label, t_text);
        lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, LV_VER_RES / 3);
+#else
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font26_black);
        lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 70);
+#endif
 
        lv_obj_t * btn_cancel = lv_btn_create(cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_size(btn_cancel, 140, 70);
+#else
        lv_obj_set_size(btn_cancel, 100, 56);
+#endif
        lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
        lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
        lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 70, -60);
+#else
        lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 10, -20);
+#endif
        lv_obj_set_event_cb(btn_cancel, mmi_watch_no_sim_power_off_cancel_btn_event_cb);
        lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL);
        lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
+#else
        lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+#endif
 
        lv_obj_t * btn_ok = lv_btn_create(cont, btn_cancel);
        lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
        lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
        lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -60);
+#else
        lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -10, -20);
+#endif
        lv_obj_set_event_cb(btn_ok, mmi_watch_no_sim_power_off_ok_btn_event_cb);
        lv_obj_t * label_ok = lv_label_create(btn_ok, label_cancel);
        lv_label_set_text_id(label_ok, WATCH_TEXT_ID_OK);