From 712c1f5b417b8c81cd56df1d3a14ac1f3e2f968e Mon Sep 17 00:00:00 2001 From: wjw Date: Thu, 17 Jul 2025 13:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=99=AF=E7=82=B9=E6=92=AD?= =?UTF-8?q?=E6=8A=A5=E3=80=81=E4=BA=91=E7=AB=AF=E6=8E=A5=E6=94=B6=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E7=AD=89=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E6=9C=80?= =?UTF-8?q?=E8=BF=91=E6=99=AF=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/attr_broadcast/src/attr_broadcast.c | 14 ++++++++------ custom/jt808/inc/jt808_config.h | 2 +- custom/jt808/src/jt808_msg_parse.c | 1 + custom/jt808/src/jt808_set_TermParam.c | 5 +++-- custom/radar/src/radar.c | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/custom/attr_broadcast/src/attr_broadcast.c b/custom/attr_broadcast/src/attr_broadcast.c index f13abaf..53dd557 100644 --- a/custom/attr_broadcast/src/attr_broadcast.c +++ b/custom/attr_broadcast/src/attr_broadcast.c @@ -13,11 +13,13 @@ #include "app_common.h" #include "app_uart.h" + +#include "control_out.h" #include "attr_broadcast.h" #include "gps_config.h" #include "local_tts.h" -#if 1 +#if 0 #include "app_uart.h" #define DEBUG(fmt, args...) app_printf("[Broadcast]" fmt, ##args) #else @@ -682,12 +684,12 @@ static AttractionNode* find_nearest_attraction(Location current_pos) { current_pos ); - if(distance <= current->radius) { - if (distance < min_distance) { + + if (distance < min_distance) { min_distance = distance; nearest = current; - } - } + } + current = current->next; } @@ -774,7 +776,7 @@ static void attr_broadcast_task(void* arg) { } DEBUG("stat ok:%d\r\n",should_play); // 触发播报 - if (should_play && !broadcast_state.is_playing) { + if ((should_play && !broadcast_state.is_playing) && (1 == sys_sta.MAG_MODE )) { DEBUG("ready to play\r\n"); play_attraction_info(nearest, distance); broadcast_state.is_playing=0; diff --git a/custom/jt808/inc/jt808_config.h b/custom/jt808/inc/jt808_config.h index f3f2eb8..ab1a578 100644 --- a/custom/jt808/inc/jt808_config.h +++ b/custom/jt808/inc/jt808_config.h @@ -6,7 +6,7 @@ #include #include "jt808_util.h" -#define JT808_DEBUG_ENABLE 1 +#define JT808_DEBUG_ENABLE 0 #if JT808_DEBUG_ENABLE #include "app_uart.h" diff --git a/custom/jt808/src/jt808_msg_parse.c b/custom/jt808/src/jt808_msg_parse.c index 204adc2..de35e3f 100644 --- a/custom/jt808/src/jt808_msg_parse.c +++ b/custom/jt808/src/jt808_msg_parse.c @@ -159,6 +159,7 @@ static int jt808_BodyParse(void *Prsmsg_body, PrsResult_t *Result){ // 转换为实际经纬度（除以10^6） double actual_lat = (double)center_lat / 1000000.0; double actual_lon = (double)center_lon / 1000000.0; + JT808_DEBUG("actual_lat=%f,actual_lon=%f\r\n",actual_lat,actual_lon); diff --git a/custom/jt808/src/jt808_set_TermParam.c b/custom/jt808/src/jt808_set_TermParam.c index c3511d2..aedc1af 100644 --- a/custom/jt808/src/jt808_set_TermParam.c +++ b/custom/jt808/src/jt808_set_TermParam.c @@ -667,7 +667,7 @@ void jt808_set_term_param_init(void){ memcpy(jt808_term_param_item.big_term_attr_resp.manufacturer_id, "LAT01", 5); // 制造商ID memcpy(jt808_term_param_item.big_term_attr_resp.term_model, jt808_term_param_item.big_reg_info.term_model, 20); // 终端型号 memcpy(jt808_term_param_item.big_term_attr_resp.term_id, jt808_term_param_item.big_reg_info.term_id, 7); // 终端ID - // memcpy(jt808_term_param_item.big_term_attr_resp.term_ICCID+4, jt808_term_param_item.phone_BCDnum, 6); // 终端手机号码 + // memcpy(jt808_term_param_item.big_term_attr_resp.term_ICCID+4, jt808_term_param_item.phone_BCDnum, 6); // 终端手机号码 但是你照这个来云端收到的iccid全是，因为BCDnum参数本身没有初始化 char str_hw_ver[] = "1.0.0"; // 硬件版本 char str_fw_ver[] = "1.0.1"; // 固件版本 原本为1.0.0 @@ -771,7 +771,8 @@ void jt808_set_term_param_init(void){ JT808_DEBUG_DATA("%02X ",jt808_term_param_item.phone_BCDnum[i]); } JT808_DEBUG_DATA("\n"); - + + //正确的读取云端所需要的iccid size_t iccid_len = strlen(cm_iccid); if(iccid_len > 0) { // 确保不超过term_ICCID容量(10字节=20位BCD) diff --git a/custom/radar/src/radar.c b/custom/radar/src/radar.c index 9c857f4..66371a4 100644 --- a/custom/radar/src/radar.c +++ b/custom/radar/src/radar.c @@ -152,7 +152,7 @@ static void RADAR_TaskHandle(void *param){ } // 进入游客模式开启雷达 //管理员模式优先于游客模式 - if(((0 != sys_sta.O_door_lock) && ((1 == sys_sta.MAG_MODE)&&(1 == sys_sta.PLT_MODE ))) && sys_sta.P_Radar_EN){ + if(((0 != sys_sta.O_door_lock) && ((1 == sys_sta.MAG_MODE)&&(1 == sys_sta.PLT_MODE ))) && (1 == sys_sta.P_Radar_EN)){ // 根据倒车状态确定雷达ID // DEBUG("SendCMD:ID=%#02x", (0 == sys_sta.IO_RX_back)?RADAR_ID_Back:RADAR_ID_Front); radar_Sendcmd((0 == sys_sta.IO_RX_back)?RADAR_ID_Back:RADAR_ID_Front, RADAR_MODE_Real);