From 84b7b973dc819a7c0e859f5fd251aed27637379d Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 1 Dec 2023 14:27:52 +0800 Subject: [PATCH] =?UTF-8?q?1.wifi=E7=8A=B6=E6=80=81=E5=92=8C=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=88=87=E6=8D=A2=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMovie/UIFlowMovieEventCallback.c | 4 ++++ .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 12 +++++++++--- .../source/sf_app/code/include/sf_wifi_svr.h | 2 ++ .../source/sf_app/code/source/wifi/sf_getapinfo.c | 2 +- .../source/sf_app/code/source/wifi/sf_wifi_svr.c | 11 ++++++++++- code/lib/source/sifar/code/source/common/sf_common.c | 4 ---- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c index 582e142bf..eb1636bd5 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -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 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index f8fb8c096..8ea7725b1 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -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); } diff --git a/code/application/source/sf_app/code/include/sf_wifi_svr.h b/code/application/source/sf_app/code/include/sf_wifi_svr.h index 065ff1ce0..f705dec59 100755 --- a/code/application/source/sf_app/code/include/sf_wifi_svr.h +++ b/code/application/source/sf_app/code/include/sf_wifi_svr.h @@ -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__*/ diff --git a/code/application/source/sf_app/code/source/wifi/sf_getapinfo.c b/code/application/source/sf_app/code/source/wifi/sf_getapinfo.c index 352e859cc..e3869d924 100644 --- a/code/application/source/sf_app/code/source/wifi/sf_getapinfo.c +++ b/code/application/source/sf_app/code/source/wifi/sf_getapinfo.c @@ -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); diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index 14fa24654..a62c26c74 100755 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -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; diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 6084c54db..6b5ea124b 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -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: