From: @CHENG <2393524978@qq.com> Date: Tue, 18 Feb 2025 03:10:37 +0000 (+0800) Subject: hengai 接口更新 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=54bd0726f54d6cd11d264c3ea06be1765bcbe28e;p=mirrors%2FASR3603_Z5.git hengai 接口更新 --- diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c index a75541f9..0e4b680a 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c @@ -48,7 +48,7 @@ void __hengai_tcp_bp_measure_raw_data_send(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); char * begin_time_str = __hengai_data_send_begin_time(); temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -131,11 +131,7 @@ void __hengai_tcp_bp_measure_raw_data_send(void) } _lv_memset_00(data_ptr, data_len); - #if 1 sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); - #else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); - #endif data_len = strlen(data_ptr); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, data_len); @@ -199,7 +195,7 @@ void mmi_hengai_tcp_bp_back_measure_raw_data_send(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); char * begin_time_str = mmi_hengai_bp_measure_action_time_string_get(1); temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -232,7 +228,12 @@ void mmi_hengai_tcp_bp_back_measure_raw_data_send(void) temp_len += sprintf(json_data + temp_len, "\"sample_rate\":%d,", MMI_HENGAI_BP_RAW_DATA_SAMPLE_RATE); - temp_len += sprintf(json_data + temp_len, "\"measure_method\":0}"); + temp_len += sprintf(json_data + temp_len, "\"measure_mode\":0,"); /* ²âÁ¿Ä£Ê½(0:±»¶¯²âÁ¿/1:Ö÷¶¯²âÁ¿/2:Á¬Ðø²âÁ¿/3:ÆäËû²âÁ¿) */ + + temp_len += sprintf(json_data + temp_len, "\"measure_type\":7}"); /* ²âÁ¿ÀàÐÍ(2:ѪÑõÏà¹Ø²âÁ¿/6:ÇéÐ÷Ïà¹Ø²âÁ¿/7:ѪѹÏà + ¹Ø²âÁ¿/8:ѪÌÇÏà¹Ø²âÁ¿/9:HRVÏà¹Ø²âÁ¿/10:Ѫѹ±ê¶¨ + ²âÁ¿/11:ѪÌDZ궨²âÁ¿/) + */ HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len); @@ -291,11 +292,8 @@ void mmi_hengai_tcp_bp_back_measure_raw_data_send(void) } _lv_memset_00(data_ptr, data_len); - #if 1 - sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); - #else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); - #endif + //sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); + sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/synthesis/create", encode_header_str, encode_str); data_len = strlen(data_ptr); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, data_len); @@ -357,7 +355,7 @@ void mmi_hengai_tcp_bp_measure_raw_data_send(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", "2024-03-27 10:57:16"); @@ -450,11 +448,7 @@ void mmi_hengai_tcp_bp_measure_raw_data_send(void) } _lv_memset_00(data_ptr, data_len); -#if 1 sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); -#else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); -#endif data_len = strlen(data_ptr); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, data_len); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%d]: %s\n", __LINE__, data_ptr); @@ -495,7 +489,7 @@ void mmi_hengai_tcp_bp_measure_raw_data_send(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); char * begin_time_str = mmi_hengai_bp_measure_action_time_string_get(1); temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -528,7 +522,12 @@ void mmi_hengai_tcp_bp_measure_raw_data_send(void) temp_len += sprintf(json_data + temp_len, "\"sample_rate\":%d,", MMI_HENGAI_BP_RAW_DATA_SAMPLE_RATE); - temp_len += sprintf(json_data + temp_len, "\"measure_method\":1}"); + temp_len += sprintf(json_data + temp_len, "\"measure_mode\":1,"); /* ²âÁ¿Ä£Ê½(0:±»¶¯²âÁ¿/1:Ö÷¶¯²âÁ¿/2:Á¬Ðø²âÁ¿/3:ÆäËû²âÁ¿) */ + + temp_len += sprintf(json_data + temp_len, "\"measure_type\":7}"); /* ²âÁ¿ÀàÐÍ(2:ѪÑõÏà¹Ø²âÁ¿/6:ÇéÐ÷Ïà¹Ø²âÁ¿/7:ѪѹÏà + ¹Ø²âÁ¿/8:ѪÌÇÏà¹Ø²âÁ¿/9:HRVÏà¹Ø²âÁ¿/10:Ѫѹ±ê¶¨ + ²âÁ¿/11:ѪÌDZ궨²âÁ¿/) + */ HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len); @@ -587,11 +586,8 @@ void mmi_hengai_tcp_bp_measure_raw_data_send(void) } _lv_memset_00(data_ptr, data_len); - #if 1 - sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); - #else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); - #endif + //sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/measurement", encode_header_str, encode_str); + sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/synthesis/create", encode_header_str, encode_str); data_len = strlen(data_ptr); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, data_len); @@ -623,6 +619,7 @@ FREE_AND_EXIT: } // calibrate mode +#if 0 void mmi_hengai_tcp_bp_calibrate_model_send(void) { char * data_ptr = NULL; @@ -651,7 +648,7 @@ void mmi_hengai_tcp_bp_calibrate_model_send(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\"}", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\"}", imei); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len); @@ -710,11 +707,7 @@ void mmi_hengai_tcp_bp_calibrate_model_send(void) } _lv_memset_00(data_ptr, data_len); -#if 1 sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/model", encode_header_str, encode_str); -#else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/model", encode_header_str, encode_str); -#endif data_len = strlen(data_ptr); s_hengai_bp_send_code = HENGAI_HEALTH_SEND_CALIBRATE_MODEL; @@ -742,7 +735,9 @@ FREE_AND_EXIT: data_ptr = NULL; } } +#endif +static uint8_t s_hengai_bp_cal_times = 0; void mmi_hengai_tcp_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t bp_value_high, uint16_t bp_value_low) { char * data_ptr = NULL; @@ -770,7 +765,7 @@ void mmi_hengai_tcp_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); char * begin_time_str = mmi_hengai_bp_measure_action_time_string_get(1); temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -803,11 +798,14 @@ void mmi_hengai_tcp_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t temp_len += sprintf(json_data + temp_len, "\"sample_rate\":%d,", MMI_HENGAI_BP_RAW_DATA_SAMPLE_RATE); - temp_len += sprintf(json_data + temp_len, "\"sbp\":%d,", bp_value_high); + temp_len += sprintf(json_data + temp_len, "\"measure_mode\":1,"); /* ²âÁ¿Ä£Ê½(0:±»¶¯²âÁ¿/1:Ö÷¶¯²âÁ¿/2:Á¬Ðø²âÁ¿/3:ÆäËû²âÁ¿) */ - temp_len += sprintf(json_data + temp_len, "\"dbp\":%d,", bp_value_low); + temp_len += sprintf(json_data + temp_len, "\"measure_type\":10,"); /* ²âÁ¿ÀàÐÍ(2:ѪÑõÏà¹Ø²âÁ¿/6:ÇéÐ÷Ïà¹Ø²âÁ¿/7:ѪѹÏà + ¹Ø²âÁ¿/8:ѪÌÇÏà¹Ø²âÁ¿/9:HRVÏà¹Ø²âÁ¿/10:Ѫѹ±ê¶¨ + ²âÁ¿/11:ѪÌDZ궨²âÁ¿/) + */ - temp_len += sprintf(json_data + temp_len, "\"category\":%d}", calibrate_times); + temp_len += sprintf(json_data + temp_len, "\"cal_value\":[%d,%d]}", bp_value_high, bp_value_low); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len); @@ -866,13 +864,11 @@ void mmi_hengai_tcp_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t } _lv_memset_00(data_ptr, data_len); -#if 1 - sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/calibration", encode_header_str, encode_str); -#else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/calibration", encode_header_str, encode_str); -#endif + //sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/calibration", encode_header_str, encode_str); + sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/synthesis/create", encode_header_str, encode_str); data_len = strlen(data_ptr); + s_hengai_bp_cal_times = calibrate_times; s_hengai_bp_send_code = HENGAI_HEALTH_SEND_CALIBRATE_DATA; mmi_protocol_fzd_action_tcp_http(data_ptr, data_len); @@ -928,7 +924,14 @@ void mmi_hengai_tcp_bp_calibrate_model_clean(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\"}", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); + + temp_len += sprintf(json_data + temp_len, "\"measure_mode\":1,"); /* ²âÁ¿Ä£Ê½(0:±»¶¯²âÁ¿/1:Ö÷¶¯²âÁ¿/2:Á¬Ðø²âÁ¿/3:ÆäËû²âÁ¿) */ + + temp_len += sprintf(json_data + temp_len, "\"measure_type\":10}"); /* ²âÁ¿ÀàÐÍ(6:ÇéÐ÷Ïà¹Ø²âÁ¿/7:ѪѹÏà¹Ø²âÁ¿/8:ѪÌÇÏà + ¹Ø²âÁ¿/9:HRVÏà¹Ø²âÁ¿/10:Ѫѹ±ê¶¨²âÁ¿/11:ѪÌDZê + ¶¨²âÁ¿/) + */ HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len); @@ -987,11 +990,8 @@ void mmi_hengai_tcp_bp_calibrate_model_clean(void) } _lv_memset_00(data_ptr, data_len); -#if 1 - sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/model/delete", encode_header_str, encode_str); -#else - sprintf(data_ptr, "POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/model/delete", encode_header_str, encode_str); -#endif + //sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/bp/model/delete", encode_header_str, encode_str); + sprintf(data_ptr, ",POST,%s%s,%s,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/health/synthesis/delete", encode_header_str, encode_str); data_len = strlen(data_ptr); s_hengai_bp_send_code = HENGAI_HEALTH_SEND_CLEAN_MODEL; @@ -1047,7 +1047,7 @@ void mmi_hengai_tcp_health_lib_activation_feedback(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\"}", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\"}", imei); HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len); @@ -1076,11 +1076,7 @@ void mmi_hengai_tcp_health_lib_activation_feedback(void) } _lv_memset_00(data_ptr, data_len); -#if 1 sprintf(data_ptr, ",POST,%s%s,,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/sinklib/activation/feedback", encode_str); -#else - sprintf(data_ptr, "POST,%s%s,,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/sinklib/activation/feedback", encode_str); -#endif data_len = strlen(data_ptr); s_hengai_bp_send_code = HENGAI_HEALTH_SEND_ACTIVE_FEEDBACK; @@ -1137,7 +1133,7 @@ void mmi_hengai_tcp_health_lib_activation_check_action(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(json_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei); temp_len += sprintf(json_data + temp_len, "\"model\":\"%s\",", "Z5_HA_K18"); @@ -1175,11 +1171,7 @@ void mmi_hengai_tcp_health_lib_activation_check_action(void) } _lv_memset_00(data_ptr, data_len); - #if 1 sprintf(data_ptr, ",POST,%s%s,,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/sinklib/activation", encode_str); - #else - sprintf(data_ptr, "POST,%s%s,,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/sinklib/activation", encode_str); - #endif data_len = strlen(data_ptr); s_hengai_bp_send_code = HENGAI_HEALTH_SEND_ACTIVE; @@ -1284,11 +1276,7 @@ void mmi_hengai_tcp_algorithm_interface_login_action(void) } _lv_memset_00(data_ptr, data_len); - #if 1 sprintf(data_ptr, ",POST,%s%s,,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/entrance/user/login", encode_str); - #else - sprintf(data_ptr, "POST,%s%s,,%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, "/entrance/user/login", encode_str); - #endif data_len = strlen(data_ptr); s_hengai_bp_send_code = HENGAI_HEALTH_SEND_LOGIN; @@ -1435,6 +1423,17 @@ bool mmi_hengai_health_data_parse(unsigned char * next_buff, unsigned int next_b case HENGAI_HEALTH_SEND_ACTIVE_FEEDBACK: break; + #if 1 + case HENGAI_HEALTH_SEND_CALIBRATE_DATA: + bool status_value = cJSON_IsTrue(cJSON_GetObjectItem(json_recv, "status")); + + HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, status_value); + if(2 == s_hengai_bp_cal_times) + { + mmi_ui_msg_action_hengai_bp_calibrate_result(status_value); + } + break; + #else case HENGAI_HEALTH_SEND_CALIBRATE_DATA: if(cJSON_IsTrue(cJSON_GetObjectItem(json_recv, "status"))) { @@ -1459,6 +1458,7 @@ bool mmi_hengai_health_data_parse(unsigned char * next_buff, unsigned int next_b HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, status_value); mmi_ui_msg_action_hengai_bp_calibrate_result(status_value); break; + #endif case HENGAI_HEALTH_SEND_MEASURE_DATA: // ui measure if(cJSON_IsTrue(cJSON_GetObjectItem(json_recv, "status"))) @@ -1739,7 +1739,7 @@ void mmi_hengai_emotion_raw_data_send(void) temp_len += sprintf(post_data + temp_len, "{\"app_key\":\"%s\",", HENGAI_HTTP_POST_APP_KEY); - temp_len += sprintf(post_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(post_data + temp_len, "\"device_code\":\"%s\",", imei); temp_len += sprintf(post_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -1869,7 +1869,7 @@ void mmi_hengai_bp_measure_raw_data_send(void) temp_len += sprintf(post_data + temp_len, "{\"app_key\":\"%s\",", HENGAI_HTTP_POST_APP_KEY); - temp_len += sprintf(post_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(post_data + temp_len, "\"device_code\":\"%s\",", imei); temp_len += sprintf(post_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -2056,7 +2056,7 @@ void mmi_hengai_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t bp_ temp_len += sprintf(post_data + temp_len, "{\"app_key\":\"%s\",", HENGAI_HTTP_POST_APP_KEY); - temp_len += sprintf(post_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(post_data + temp_len, "\"device_code\":\"%s\",", imei); temp_len += sprintf(post_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str); @@ -2261,7 +2261,7 @@ void mmi_hengai_health_lib_activation_check_action(void) char imei[16 + 1] = {0}; app_adp_get_imei_req(imei); - temp_len += sprintf(post_data + temp_len, "\"mac\":\"%s\",", imei); + temp_len += sprintf(post_data + temp_len, "\"device_code\":\"%s\",", imei); temp_len += sprintf(post_data + temp_len, "\"model\":\"%s\",", "Z5_HA_K18");