From: p15692025051 <846603105@qq.com>
Date: Fri, 12 Jan 2024 07:14:59 +0000 (+0800)
Subject: 血压模组代码更新
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e13a4ddb66eb27f001236ce75ee10c9e87684e77;p=mirrors%2FASR3603_Z5.git

血压模组代码更新
---

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 7d6960f1..db92417b 100644
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -67,7 +67,7 @@ char is_open_sar = 1;//是否打开sar检测
 static void DelayInUs(unsigned int us);
 void FR8012HAQ_close(void);
 TASK_HANDLE * Hsensor_task_id;
-int fr8012haq_parse_returned_data(void);
+int fr8012haq_parse_returned_data(int timeout);
 //字符串里查找最近一个c字符，返回偏移位置
 unsigned int find_c(char *data,char c)
 {
@@ -677,6 +677,10 @@ int fr8012haq_parse_returned_data(int timeout)
             {
                 ret = 3;
             }
+            if(strstr(UART4_buf,"\"HA_activate\":\"0\""))
+            {
+                ret = -3;
+            }
         }
         /*********************************************/
         /*执行工作模式成功*/
@@ -735,12 +739,14 @@ void fr8012haq_process_data(uint32_t *process_data)
     fr8012haq_parse_returned_data(60);
    
 }
-//返回0未激活，联网后判断一次是否激活，没激活需要执行激活参数
+//返回是否激活返回0未激活，联网后判断一次是否激活，没激活需要执行激活参数
 char get_is_HA_activate(void)
 {
+    uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"is_HA_activate\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"is_HA_activate\"}"));
+    fr8012haq_parse_returned_data(100);
     return is_HA_activate;
 }
-//获取激活码
+//获取请求码
 char *get_HA_req_code(void )
 {
     if(strlen(HA_req_code)>2 && is_HA_activate == 0)
@@ -761,14 +767,15 @@ int HA_lib_activate(char *key_code)
         {
             send_data_len = snprintf(send_data,sizeof(send_data),"{\"cmd\":\"3\",\"set_HA_key_code\":\"%s\"}\n",HA_key_code);
             uart4_send_data(send_data,send_data_len);
-            if(fr8012haq_parse_returned_data(500)==3)
+            if(fr8012haq_parse_returned_data(100)==3)
             {
-                break;
-                ret = 1;
+                if(get_is_HA_activate() == 1)//查询一次
+                {
+                    break;
+                    ret = 1;
+                }
             }
-                
         }
-        
     }
     return ret;
 }
@@ -779,8 +786,7 @@ void HA_lib_init(void)
     char send_data[100] = {0};
     int send_data_len = 0;
     //获取sensor恒爱库激活状态
-    uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"is_HA_activate\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"is_HA_activate\"}"));
-    fr8012haq_parse_returned_data(500);
+    
     if(get_is_HA_activate() == 0)//没激活，需要激活
     {
         //发送IMEI号