payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.rtsp标识更改

Browse Source
This commit is contained in:
payton 2023-11-22 18:05:45 +08:00
parent 13de078eaa
commit 6a303efec9
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/lib/source/sifar/code/include/sf_common.h
View File

@ -170,4 +170,6 @@ void sf_set_ble_status(SF_BLE_STATUS_E enStatus);
BOOL cmd_wifi_switch(unsigned char argc, char **argv); BOOL cmd_wifi_switch(unsigned char argc, char **argv);
void sf_set_msdc_clk(void); void sf_set_msdc_clk(void);
void sf_send_message_to_create_qrcode(void); void sf_send_message_to_create_qrcode(void);
UINT8 sf_get_rtsp_flag(void);
void sf_set_rtsp_flag(UINT8 flag);
#endif #endif

50
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -74,7 +74,7 @@ static UINT8 NetWorkFlag = 0; //SF_4G_STATUS_E
static UINT8 simCardInsert = 0; static UINT8 simCardInsert = 0;
static int g_esim_flag = 0; static int g_esim_flag = 0;
static UINT8 operationSelectResp = 0; //WIFICameraErrCode_t static UINT8 operationSelectResp = 0; //WIFICameraErrCode_t
UINT8 RespFlag = 0; UINT8 RtspFlag = 0;
static BOOL IsMenu = FALSE; static BOOL IsMenu = FALSE;
static BOOL IsCap = FALSE; static BOOL IsCap = FALSE;
static BOOL IsSend = FALSE; static BOOL IsSend = FALSE;
@ -1428,23 +1428,23 @@ BOOL sf_cmd_usb_mux_s(unsigned char argc, char **argv)
*************************************************/ *************************************************/
void sf_rtsp_stop(void) void sf_rtsp_stop(void)
{ {
if(0 == RespFlag) if(0 == RtspFlag)
{ {
/*SF_MESSAGE_BUF_S stMessageBuf = {0}; /*SF_MESSAGE_BUF_S stMessageBuf = {0};
stMessageBuf.arg1 = SF_WIFI_CMD_STOP; stMessageBuf.arg1 = SF_WIFI_CMD_STOP;
stMessageBuf.cmdId = CMD_WIFI; stMessageBuf.cmdId = CMD_WIFI;
sf_com_message_send_to_cardv(&stMessageBuf);*/ sf_com_message_send_to_cardv(&stMessageBuf);*/
UINT32 tmp = ImageApp_Common_IsRtspStart(0); UINT32 tmp = ImageApp_Common_IsRtspStart(0);
printf("[%s:%d] RespFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RespFlag, tmp); printf("[%s:%d] RtspFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RtspFlag, tmp);
if(1 == tmp) if(1 == tmp)
{ {
//ImageApp_Common_RtspStop(0); //ImageApp_Common_RtspStop(0);
RespFlag = 1; RtspFlag = 1;
} }
} }
else else
{ {
printf("[%s:%d] RespFlag = %d\n", __FUNCTION__, __LINE__,RespFlag); printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag);
} }
} }
@ -1458,26 +1458,54 @@ void sf_rtsp_stop(void)
*************************************************/ *************************************************/
void sf_rtsp_restart(void) void sf_rtsp_restart(void)
{ {
if(1 == RespFlag) if(1 == RtspFlag)
{ {
/*SF_MESSAGE_BUF_S stMessageBuf = {0}; /*SF_MESSAGE_BUF_S stMessageBuf = {0};
stMessageBuf.arg1 = SF_WIFI_CMD_RESTART; stMessageBuf.arg1 = SF_WIFI_CMD_RESTART;
stMessageBuf.cmdId = CMD_WIFI; stMessageBuf.cmdId = CMD_WIFI;
sf_com_message_send_to_cardv(&stMessageBuf);*/ sf_com_message_send_to_cardv(&stMessageBuf);*/
UINT32 tmp = ImageApp_Common_IsRtspStart(0); UINT32 tmp = ImageApp_Common_IsRtspStart(0);
printf("[%s:%d] RespFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RespFlag, tmp); printf("[%s:%d] RtspFlag = %d tmp:%d\n", __FUNCTION__, __LINE__,RtspFlag, tmp);
if(tmp == 0) if(tmp == 0)
{ {
//ImageApp_Common_RtspStart(0); //ImageApp_Common_RtspStart(0);
RespFlag = 0; RtspFlag = 0;
} }
} }
else else
{ {
printf("[%s:%d] RespFlag = %d\n", __FUNCTION__, __LINE__,RespFlag); printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag);
} }
} }
/*************************************************
Function: sf_set_rtsp_flag
Description:
Input:
Output: N/A
Return: N/A
Others: N/A
*************************************************/
void sf_set_rtsp_flag(UINT8 flag)
{
RtspFlag = flag;
printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag);
}
/*************************************************
Function: sf_get_rtsp_flag
Description:
Input:
Output: N/A
Return: N/A
Others: N/A
*************************************************/
UINT8 sf_get_rtsp_flag(void)
{
printf("[%s:%d] RtspFlag = %d\n", __FUNCTION__, __LINE__,RtspFlag);
return RtspFlag;
}
short sf_cardv_get_cq_signal(void) short sf_cardv_get_cq_signal(void)
{ {
return cq_Signal; return cq_Signal;
@ -2512,6 +2540,10 @@ BOOL sf_check_net_work_flag(void)
void sf_cardv_4G_status_set(UINT8 status) void sf_cardv_4G_status_set(UINT8 status)
{ {
NetWorkFlag = status; NetWorkFlag = status;
// if((SF_4G_SENDING == NetWorkFlag) && (TRUE == sf_get_send_statu()))
// {
// sf_ui_sending_show(FILE_SENDING_GUI_START_SENDING);
// }
printf("cardv NetWorkFlag:%d\n",NetWorkFlag); printf("cardv NetWorkFlag:%d\n",NetWorkFlag);
} }