gengxin

diff --git a/2.sdk/new_clean.sh b/2.sdk/new_clean.sh
index 4ea13c0..0ccf625 100644 (file)
--- a/2.sdk/new_clean.sh
+++ b/2.sdk/new_clean.sh
@@ -33,7 +33,22 @@ else
     cd sdk
     make craneg_modem_sdk p=$project_name -j8
     make craneg_modem_watch p=$project_name -j8
+
+    cd out/$project_name/product/craneg_modem_watch/
+    cp "craneg_modem_watch"*.zip ../
+
     cd ..
+    rm *"_dump".zip
+    mv *"_debug".zip $project_name"_debug_"$build_time.zip
+    mv "craneg_modem_watch"*.zip $project_name"_release_"$build_time.zip
+    mv *.zip craneg_modem_watch/
+
+    cd craneg_modem_watch/
+    tar -czvf $project_name"_debug_"$build_time.tar.gz $project_name"_debug_"$build_time.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
+    rm $project_name"_debug_"$build_time.zip
+    shell $(pwd) #shell $PWD
+    cd ../../../../../
+
 fi
 
 

diff --git a/2.sdk/new_gui.sh b/2.sdk/new_gui.sh
index 7360f53..9278fcd 100644 (file)
--- a/2.sdk/new_gui.sh
+++ b/2.sdk/new_gui.sh
@@ -17,6 +17,22 @@ else
 
     cd sdk
     make craneg_modem_watch p=$project_name -j8
+    
+    cd out/$project_name/product/craneg_modem_watch/
+    rm $project_name"_"*.*
+    cp "craneg_modem_watch"*.zip ../
+
     cd ..
+    rm *"_dump".zip
+    mv *"_debug".zip $project_name"_debug_"$build_time.zip
+    mv "craneg_modem_watch"*.zip $project_name"_release_"$build_time.zip
+    mv *.zip craneg_modem_watch/
+
+    cd craneg_modem_watch/
+    tar -czvf $project_name"_debug_"$build_time.tar.gz $project_name"_debug_"$build_time.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
+    rm $project_name"_debug_"$build_time.zip
+    shell $(pwd) #shell $PWD
+    cd ../../../../../
+
 fi
 

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
index 0cf5fdb..3dd91c1 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
@@ -38,19 +38,19 @@
 
 
 //health measure timed
-#define MMI_CUSTOMER_HEART_TIMED_FLAG          false
+#define MMI_CUSTOMER_HEART_TIMED_FLAG          true
 
 #define MMI_CUSTOMER_HEART_TIMED_INTERVAL              (10 * 60) // unit:s
 
-#define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG            false
+#define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG            true
 
 #define MMI_CUSTOMER_TEMPERATURE_TIMED_INTERVAL                (60 * 60) // unit:s
 
-#define MMI_CUSTOMER_BLOOD_TIMED_FLAG          false
+#define MMI_CUSTOMER_BLOOD_TIMED_FLAG          true
 
 #define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL              (60 * 60) // unit:s
 
-#define MMI_CUSTOMER_SPO2_TIMED_FLAG           false
+#define MMI_CUSTOMER_SPO2_TIMED_FLAG           true
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 

diff --git a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 4336b42..d670a19 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -203,8 +203,8 @@
 
 #define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
 
-#define __MMI_SLEEP_FUNCTION_SUPPORT__
-#define __MMI_CUSTOM_HENGAI_SLEEP__
+//#define __MMI_SLEEP_FUNCTION_SUPPORT__
+//#define __MMI_CUSTOM_HENGAI_SLEEP__
 
 #define __MMI_CUSTOM_HENGAI_HEALTH__
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c
index aba0195..032606d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c
@@ -38,6 +38,9 @@ void mmi_hengai_tcms_action(void)
 {
        HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 
+       if(false == watch_modem_sim_present_check_req())
+               return;
+       
        if(true == mmi_watch_is_in_factory_mode())
                return ;
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
index 6841d40..644d37e 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
@@ -2249,6 +2249,7 @@ static lv_obj_t * mmi_factorymode_light_leak_test_create(lv_obj_t * activity_obj
     lv_label_set_long_mode(label_prompt, LV_LABEL_LONG_SROLL);
     lv_obj_set_width(label_prompt, LV_HOR_RES * 5 / 6);
        lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT);
+       lv_label_set_align(label_prompt, LV_LABEL_ALIGN_CENTER);
        //lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
        //lv_obj_align(label_prompt, btn_start, LV_ALIGN_OUT_BOTTOM_MID, 0, -10);
        lv_obj_align(label_prompt, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 8);