gengxin

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 c387734..a362d99 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
@@ -40,7 +40,7 @@
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          true
 
-#define MMI_CUSTOMER_HEART_TIMED_INTERVAL              (10 * 60) // unit:s
+#define MMI_CUSTOMER_HEART_TIMED_INTERVAL              (60 * 60) // unit:s
 
 #define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG            true
 

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
index ff14a80..4c69ed7 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
@@ -230,7 +230,7 @@ static void mmi_gui_timing_task_1_minute_mission(void * time_param)
 
        // check tcms
 #ifdef __MMI_CUSTOM_HENGAI_TCMS__
-       mmi_hengai_tcms_mission_check();
+       //mmi_hengai_tcms_mission_check();
 #endif
 
 

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 a5e9e3c..d890fa0 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
@@ -972,6 +972,8 @@ const void * lang_text_ch[] = {
     "目标步数", // WATCH_TEXT_ID_GOAL_STEP,
     "我需要你的帮助!", // WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,
     "确保设备联网\n点击获取APP二维码", // WATCH_TEXT_ID_APP_QRCODE_REFRESH,
+    "BT ota模式", // WATCH_TEXT_ID_BT_OTA_MODE,
+    "已进入BT ota模式", // WATCH_TEXT_ID_BT_OTA_MODE_OPEN,
     //CHENG_MODIFY
     "确认是否跌倒?", // WATCH_TEXT_ID_falldown,
     "确认是否删除",

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 0c15e80..60aa366 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
@@ -973,6 +973,8 @@ const void * lang_text_en[] = {
     "Goal steps", // WATCH_TEXT_ID_GOAL_STEP,
     "I NEED YOUR HELP!", // WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,
     "Click to get qrcode", // WATCH_TEXT_ID_APP_QRCODE_REFRESH,
+    "BT ota mode", // WATCH_TEXT_ID_BT_OTA_MODE,
+    "enter BT ota mode", //WATCH_TEXT_ID_BT_OTA_MODE_OPEN,
     //CHENG_MODIFY
     "Confirm a fall",
     "Confirm deletion",

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 1cc034d..af84244 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -980,6 +980,8 @@ enum
     WATCH_TEXT_ID_GOAL_STEP,                            /* "目标步数"                      "Goal steps" */
     WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,                 /* "我需要你的帮助!"                      "I NEED YOUR HELP!" */
     WATCH_TEXT_ID_APP_QRCODE_REFRESH,                   /* "确保设备联网\n点击获取APP二维码"        "Click to get qrcode" */
+    WATCH_TEXT_ID_BT_OTA_MODE,                          /* "BT ota模式"                     "BT ota mode" */
+    WATCH_TEXT_ID_BT_OTA_MODE_OPEN,                     /* "已进入BT ota模式"                     "enter BT ota mode" */
     //CHENG_MODIFY
     WATCH_TEXT_ID_FALLDWON,                            /*确认是否跌倒*/
     WATCH_TEXT_ID_CONFIRM_DELETE,                        /*确认是否删除*/

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 a5b4f9a..f53b2af 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
@@ -10,6 +10,22 @@
 static uint8_t s_hengai_tcms_counter = 0;
 static uint8_t s_hengai_tcms_check_flag = 0;
 
+void mmi_hengai_tcms_data_send(void)
+{
+       char * data_ptr = NULL;
+       uint32_t data_len = 0;
+
+       data_ptr = fr8012haq_YYL_data_get(&data_len);
+       HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: data_len=%d\n", __FUNCTION__, __LINE__, data_len);
+       if((NULL != data_ptr) && (0 != data_len))
+       {
+               mmi_protocol_fzd_action_hengai_tcms_data(data_ptr, data_len);
+       }
+       fr8012haq_YYL_data_clean();
+
+       s_hengai_tcms_counter = 0;
+}
+
 void mmi_hengai_tcms_mission_check(void)
 {
        if(0 == s_hengai_tcms_check_flag)
@@ -19,18 +35,8 @@ void mmi_hengai_tcms_mission_check(void)
        HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: counter=%d\n", __FUNCTION__, __LINE__, s_hengai_tcms_counter);
        if(HENGAI_TCMS_COUNTER_MAX <= s_hengai_tcms_counter)
        {
-               char * data_ptr = NULL;
-               uint32_t data_len = 0;
-
-               data_ptr = fr8012haq_YYL_data_get(&data_len);
-               HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: data_len=%d\n", __FUNCTION__, __LINE__, data_len);
-               if((NULL != data_ptr) && (0 != data_len))
-               {
-                       mmi_protocol_fzd_action_hengai_tcms_data(data_ptr, data_len);
-               }
-               fr8012haq_YYL_data_clean();
-
-               s_hengai_tcms_counter = 0;
+               HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               mmi_hengai_tcms_data_send();
        }
 }
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.h
index 9681a64..526851a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.h
@@ -30,6 +30,7 @@ extern "C" {
 #define HENGAI_TCMS_COUNTER_MAX        (5) // minutes
 
 
+void mmi_hengai_tcms_data_send(void);
 void mmi_hengai_tcms_mission_check(void);
 
 void mmi_hengai_tcms_action(void);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
index 5dee672..bfa0596 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
@@ -209,6 +209,7 @@ void mmi_factorymode_light_leak_test_create_btn_cb(lv_obj_t * btn,lv_event_t e);
 #endif
 #if USE_FR8012HAQ
 void mmi_factorymode_light_leak_test_create_btn_cb(lv_obj_t * btn,lv_event_t e);
+void mmi_factorymode_bt_ota_mode_create_btn_cb(lv_obj_t * btn,lv_event_t e);
 #endif
 void mmi_factorymode_heart_test_create_btn_cb(lv_obj_t * btn,lv_event_t e);
 #ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
index f648f65..94c9948 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
@@ -99,6 +99,9 @@ const struct {
        #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
        { WATCH_TEXT_ID_TEMPERATURE_TEST, mmi_factorymode_temperature_test_create_btn_cb },
        #endif
+       #if USE_FR8012HAQ
+       { WATCH_TEXT_ID_BT_OTA_MODE, mmi_factorymode_bt_ota_mode_create_btn_cb },
+       #endif
        #endif
 #else
     { WATCH_TEXT_ID_SH_TEMP_MEASURE_START, factorymode_temperature_test_create_btn_cb },

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 c205285..acc4f70 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
@@ -2282,6 +2282,57 @@ void mmi_factorymode_light_leak_test_create_btn_cb(lv_obj_t * btn,lv_event_t e)
         mmi_factorymode_light_leak_test_create(NULL);
     }
 }
+
+static lv_obj_t * mmi_factorymode_bt_ota_mode_create(lv_obj_t * activity_obj)
+{
+       if(activity_obj == NULL) {
+               lv_watch_activity_ext_t activity_ext;
+               memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t));
+               activity_ext.actId = ACT_ID_FACTORY_MODE_TEST;
+               activity_ext.create = mmi_factorymode_bt_ota_mode_create;
+               activity_ext.prepare_destory = factorymode_test_prepare_destory;
+               activity_obj = lv_watch_creat_activity_obj(&activity_ext);
+               LV_ASSERT_MEM(activity_obj);
+               if(NULL == activity_obj) {
+                       return NULL;
+               }
+       }
+
+       lv_obj_t * obj = lv_watch_obj_create(activity_obj);
+       LV_ASSERT_MEM(obj);
+       if(NULL == obj)
+               return NULL;
+
+       lv_obj_t * content = lv_cont_create(obj, NULL);
+       lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj));
+       lv_obj_add_style(content,LV_OBJ_PART_MAIN, &lv_watch_style_transp);
+       lv_obj_align(content, NULL, LV_ALIGN_CENTER, 0, 0);
+       lv_obj_set_click(content, false);
+
+       lv_obj_t * label_prompt = lv_label_create(content, NULL);
+       lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG);
+    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_BT_OTA_MODE_OPEN);
+       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_CENTER, 0, -10);
+
+       //
+       fr8012haq_measure_OTA_start();
+
+       return obj;
+}
+
+void mmi_factorymode_bt_ota_mode_create_btn_cb(lv_obj_t * btn,lv_event_t e)
+{
+    if(e == LV_EVENT_CLICKED)
+       {
+        mmi_factorymode_bt_ota_mode_create(NULL);
+    }
+}
+
 #endif
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
index 04da9c8..a514aa5 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
@@ -598,6 +598,11 @@ bool mmi_protocol_fzd_action_HEARTBEAT(void)
        result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
        lv_mem_free(content_buff);
 
+       // tcms 
+#ifdef __MMI_CUSTOM_HENGAI_TCMS__
+       mmi_hengai_tcms_data_send();
+#endif
+
        return result;
 }