diff --git a/custom/jt808/src/jt808_set_TermParam.c b/custom/jt808/src/jt808_set_TermParam.c index 32350cb..88cf993 100644 --- a/custom/jt808/src/jt808_set_TermParam.c +++ b/custom/jt808/src/jt808_set_TermParam.c @@ -931,7 +931,7 @@ void jt808_set_term_param_init(void){ // 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.2.1"; // 固件版本 原本为1.0.0 + char str_fw_ver[] = "1.2.2"; // 固件版本 原本为1.0.0 jt808_term_param_item.big_term_attr_resp.hw_ver_len = strlen(str_hw_ver); // 硬件版本长度 jt808_term_param_item.big_term_attr_resp.fw_ver_len = strlen(str_fw_ver); // 固件版本长度 memcpy(jt808_term_param_item.big_term_attr_resp.str_hw_ver, str_hw_ver, strlen(str_hw_ver)); // 硬件版本 diff --git a/custom/tcp_client/src/tcp_client.c b/custom/tcp_client/src/tcp_client.c index ecc62ae..1edb3af 100644 --- a/custom/tcp_client/src/tcp_client.c +++ b/custom/tcp_client/src/tcp_client.c @@ -327,108 +327,6 @@ void tcp_client_close(void){ } -// 网络管理线程 -/*static void net_manage_task(void *arg){ - // osThreadState_t state; - - DEBUG("net_manage_task!\r\n"); - int ret = 0; - cm_cereg_state_t cereg_state = {0}; - uint8_t error_time_out = 0; - while(1){ - while(1){ // 等待插入SIM卡并建立网络连接 - osDelay(1000/5); - error_time_out++; - if(error_time_out > 15){ // 超时退出 - DEBUG("network connect timeout!\n"); - local_tts_text_play("网络异常,5秒后重启!",0,0); - osDelay(5000/5); - cm_pm_reboot(); - } - if(0 == cm_modem_get_cpin()){ // 插入SIM卡 - DEBUG("sim card ready!\r\n"); - }else{ - DEBUG("waiting for sim card...\r\n"); - } - if(0 ==cm_modem_get_cereg_state(&cereg_state)){ // 获取PS网络注册状态 - DEBUG("cereg_state:%d\n",cereg_state.state); // 注册状态 - if(cereg_state.state == 1){ // 已注册 - DEBUG("network ready\n"); - local_tts_text_play("网络正常!",0,0); - break; - }else{ - DEBUG("waiting for network...\n"); - // local_tts_text_play("等待网络连接!",0,0); - } - }else{ - DEBUG("cereg_get_state fail!\n\n"); - } - // if(cm_modem_get_pdp_state(1) == 1){ // 网络就绪 - // app_printf("network ready\n"); - // }else{ - // app_printf("waiting for network...\n"); - // } - } -TCP_DISABLE: - error_time_out = 0; - do{// 连接服务器 - osDelay(1000/5); - error_time_out++; - if(error_time_out > 15){ // 超时退出 - DEBUG("network connect timeout!\n"); - local_tts_text_play("服务器连接失败,重连中...",0,0); - } - }while(0 != tcp_client_connect((char *)(PrsResult.term_param_item->set_term_param.MainServerAddr) , PrsResult.term_param_item->set_term_param.ServerPort)); // 连接到TCP服务器 - DEBUG("tcp_client_connect success!\r\n"); - for(uint8_t i = 0; i < 3; i++){ // 发送3次注册、鉴权、参数设置、上报参数 - ret =jt808_pkg_send(ID_Term_Reg,5000/5);//注册终端 超时:8S - if(0 == ret){ // 0:成功;1:车辆已被注册;2:数据库中无该车辆;3:终端已被注册;4:数据库中无该终端 - DEBUG("send ID_Term_Reg success!\n"); - for(uint8_t i = 0; i < 5; i++){ - osDelay(1000/5); - ret =jt808_pkg_send(ID_Term_Auth,5000/5);//终端鉴权 超时:10S - if(0 == ret){ - DEBUG("send ID_Term_Auth success!\n"); - break; - }else{ - DEBUG("send ID_Term_Auth fail:%d!\n",ret); - if((ret == -1)||(i == 3)){ - goto TCP_DISABLE; - } - } - } - break; - }else{ - local_tts_text_play("设备未绑定,注册异常",0,0); - osDelay(10000/5); - DEBUG("send ID_Term_Reg fail:%d!\n",ret); - if(ret == -1){ // 发送失败 - goto TCP_DISABLE; - } - } - if(i == 2 && ret != 0){ // 3次尝试都失败 - goto TCP_DISABLE; // 跳转重连 - } - } - - jt808_pkg_send(ID_GetTermAttrResp, 0); // 发送终端属性查询应答包 - jt808_Autoreport_param_start();//开启自动上报参数设置 - led_set_event(EVENT_NETWORK_READY); // 网络连接成功 - DEBUG("NetwarK connected!\r\n"); - // local_tts_set(5, 15, CM_LOCAL_TTS_DIGIT_AUTO); - local_tts_text_play("服务器已连接",0,0); - // local_tts_text_play("欢迎使用莱昂特智能终端设备...。",0,0); // 0:表示自动计算字符串长度,10000表示最大等待时间 - osSemaphoreAcquire(netconn_disconnect_sem, osWaitForever); // 等待断开连接信号 - jt808_Autoreport_param_stop();//停止自动上报参数设置 - led_set_event(EVENT_NETWORK_DISCONNECT); // 网络断开连接 - DEBUG("NetwarK disconnected!\r\n"); - // local_tts_set(5, 15, CM_LOCAL_TTS_DIGIT_AUTO); - local_tts_text_play("服务器已断开",0,0); - } -} - -*/ - void tcp_client_init(void){ osThreadAttr_t net_manage_task_attr={ .name = "net_manage_task",