k18-活体更新

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
index 1757056..06d1959 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -562,7 +562,7 @@ int fr8012haq_parse_returned_data(int timeout)
                     if(str_tmp)
                     {  
                         str_tmp += strlen("\"factory_data\":\"");
-                        str_tmp += num_buf_len+1;
+                        //str_tmp += num_buf_len+1;
                         num_buf_len = find_c(str_tmp,',');
                         if(num_buf_len>=sizeof(num_buf))
                             num_buf_len = sizeof(num_buf)-1;
@@ -586,6 +586,7 @@ int fr8012haq_parse_returned_data(int timeout)
                         memcpy(num_buf,str_tmp,num_buf_len);
                         factory_calc_bio = atoi(num_buf);
 
+                        str_tmp += num_buf_len+1;
                         num_buf_len = find_c(str_tmp,',');
                         if(num_buf_len>=sizeof(num_buf))
                             num_buf_len = sizeof(num_buf)-1;
@@ -602,7 +603,7 @@ int fr8012haq_parse_returned_data(int timeout)
                         factory_apre_val[1] = atoi(num_buf);
                         
                         str_tmp += num_buf_len+1;
-                        num_buf_len = find_c(str_tmp,'\n');
+                        num_buf_len = find_c(str_tmp,'\"');
                         if(num_buf_len>=sizeof(num_buf))
                             num_buf_len = sizeof(num_buf)-1;
                         memset(num_buf,0,sizeof(num_buf));

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 ad743a4..590fab4 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
@@ -2183,8 +2183,8 @@ static void mmi_factorymode_light_leak_test_status_update(lv_anim_t * anim)
     char str[64]= {0};
        int apre_val0 = 0, apre_val1 = 0, aps_val = 0,bio_val_o=0,calc_bio=0;
        char wear_status = 0;
-       fr8012haq_factory_data_get(&apre_val0, &apre_val1, &aps_val,&wear_status,bio_val_o,calc_bio);
-    sprintf(str, "%s: %d,%d,%d\n wear_status:%d bio_val_o: %d\n calc_bio  : %d", (char *)lv_lang_get_text(WATCH_TEXT_ID_LIGHT_LEAK_DATA),
+       fr8012haq_factory_data_get(&apre_val0, &apre_val1, &aps_val,&wear_status,&bio_val_o,&calc_bio);
+    sprintf(str, "%s: %d,%d,%d\nwear_status:%d\nbio_val_o: %d\n calc_bio  : %d", (char *)lv_lang_get_text(WATCH_TEXT_ID_LIGHT_LEAK_DATA),
                                                                apre_val0,
                                                                apre_val1,
                                                                aps_val,