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

1.wifi状态和菜单切换更改

Browse Source
This commit is contained in:
payton 2023-12-01 14:27:52 +08:00
parent 38743429cd
commit 84b7b973dc
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -1414,6 +1414,10 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
#if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
if(sf_get_mode_flag())
{
sf_wifi_server_stop_shoot_respond(0);
}
#else
if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){
#endif

12
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -1637,6 +1637,12 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
UI_SetData(FL_NextMode, iNextMode);
Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode);
}
else {
if(sf_get_mode_flag())
{
sf_wifi_server_stop_shoot_respond(0);
}
}
#if HUNTING_CAMERA_MCU == ENABLE
sf_set_cap_statu(FALSE);
#endif
@ -1835,7 +1841,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_PREV:
case LV_USER_KEY_ZOOMOUT:
{
if (SF_WIFI_CON != sf_get_wifi_status())
if (0 > appSvrResponseSocketGet())
{
// UIFlowPhoto_OnExeZoomOutStart(obj);
UIFlowPhoto_OnExeOpenPlayScreen(obj);
@ -1846,9 +1852,9 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_MENU:
case LV_USER_KEY_RIGHT:
{
SF_WIFI_STATUS_E status = sf_get_wifi_status();
//SF_WIFI_STATUS_E status = sf_get_wifi_status();
ShutDownTime = MENU_GO_TO_WORK_MODE_TIME_S;
if (SF_WIFI_CON != status)
if (0 > appSvrResponseSocketGet())
{
UIFlowPhoto_OnKeyMenu(obj);
}

2
code/application/source/sf_app/code/include/sf_wifi_svr.h
View File

@ -945,4 +945,6 @@ UINT8 sf_wifi_server_stop_shoot_respond(UINT8 errCode);
void sf_apinfo_thread_init(void);
void sf_wifi_set_cam_mode(void);
void appSvrResponseSocketSet(SINT32 socket);
SINT32 appSvrResponseSocketGet(void);
#endif /*__SF_WIFI_SERVER__*/

2
code/application/source/sf_app/code/source/wifi/sf_getapinfo.c
View File

@ -310,7 +310,6 @@ static int print_event(struct nl_msg *msg, void *arg)
sf_sys_status_led_set(SF_LED_SYS_STATE_WIFI_CONNECTED);
//sf_app_msg_data_snd(SY_MSG_WIFI_CONNECT,(unsigned char*)NULL);
}
sf_wifi_set_cam_mode();
break;
case NL80211_CMD_DEL_STATION:
@ -323,6 +322,7 @@ static int print_event(struct nl_msg *msg, void *arg)
if(connectNum == 0)
{
sf_set_wifi_status(SF_WIFI_OK);
appSvrResponseSocketSet(-2);
sf_sys_status_led_set(SF_LED_SYS_STATE_WIFI_DISCONNECT);
//sf_app_msg_data_snd(SY_MSG_WIFI_DISCONNECT,(unsigned char*)NULL);
//sf_rtsp_msg_data_snd(1,(unsigned char*)NULL);

11
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -2414,6 +2414,8 @@ void *sf_server_accept_thread(void *pData)
maxSD = pClient->socket;
memcpy(&pClient->ClientAddr, &cliAddr, sizeof(struct sockaddr_in));
cmdClientListPrint(pClientContextHead);
sf_wifi_set_cam_mode();
appSvrResponseSocketSet(pClient->socket); //bad method it will error at socket over one---oliver
}
}
@ -2425,7 +2427,6 @@ void *sf_server_accept_thread(void *pData)
}
pClient = pClientContextHead ;
appSvrResponseSocketSet(pClient->socket); //bad method it will error at socket over one---oliver
while(pClient != NULL)
{
@ -2450,6 +2451,10 @@ void *sf_server_accept_thread(void *pData)
sf_delete_ip_from_list();
cmdClientListPrint(pClientContextHead);
if(pClient == NULL)
{
appSvrResponseSocketSet(-2);
}
}
else
{
@ -2465,6 +2470,10 @@ void *sf_server_accept_thread(void *pData)
pClient = pClientContextHead;
cmdClientListPrint(pClientContextHead);
if(pClient == NULL)
{
appSvrResponseSocketSet(-2);
}
}
}
continue;

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

@ -1831,10 +1831,6 @@ static SINT32 sf_cardv_proccess_cmd_file(SF_MESSAGE_BUF_S *pMessageBuf)
#define SEND_SUCCEED 0
#define SEND_FAILED -1
sf_ui_sending_show(SEND_SUCCEED == pMessageBuf->arg2 ? FILE_SENDING_GUI_SEND_SUCCEED : FILE_SENDING_GUI_SEND_FAILED);
if(sf_get_mode_flag())
{
sf_wifi_server_stop_shoot_respond((UINT8)pMessageBuf->arg2);
}
break;
default: