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-19 10:45:38 +08:00
parent b0325af260
commit 8a68dab79b
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c
View File

@ -6818,22 +6818,22 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data)
FileSys_CloseFile(fp);
#if HUNTING_CAMERA_MCU == ENABLE
char tmp2[64] = {'\0'};
UIMenuStoreInfo *puiPara = sf_ui_para_get();
//UIMenuStoreInfo *puiPara = sf_ui_para_get();
memset(tmp, '\0', sizeof(tmp));
SF_FILE_TYPE_E enFileType = 0;
if(SF_CAM_MODE_PHOTO == puiPara->CamMode){
if(SF_CAM_MODE_PHOTO == sf_get_cammode_statu()){
enFileType = SF_FILE_TYPE_PIC_SMALL;
}else if(SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode){
}else if(SF_CAM_MODE_PHOTO_VIDEO == sf_get_cammode_statu()){
enFileType = SF_FILE_TYPE_PIC_VIDEO;
}
else if(SF_CAM_MODE_VIDEO2 == puiPara->CamMode){
else if(SF_CAM_MODE_VIDEO2 == sf_get_cammode_statu()){
enFileType = SF_FILE_TYPE_PIC_VIDEO;
}
snprintf(tmp, sizeof(tmp), "%sW%s%s.JPG", SF_SEND_LIST_DIR, folder, number); /* DCF 8.3 naming rule */
snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */
DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2);
sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType);
if((!sf_get_mode_flag()) || ((FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()) && (SF_CAM_MODE_PHOTO == puiPara->CamMode)))
if((!sf_get_mode_flag()) || ((FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()) && (SF_CAM_MODE_PHOTO == sf_get_cammode_statu())))
{
if(SUCCESS == sf_share_mem_file_down(0, 0)){
sf_set_send_statu(TRUE);

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

@ -707,9 +707,9 @@ static void UIFlowMovie_ScrOpen(lv_obj_t* obj)
{
DBG_DUMP("%s\r\n", __func__);
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
#endif
// #if HUNTING_CAMERA_MCU == ENABLE
// UIMenuStoreInfo *puiPara = sf_ui_para_get();
// #endif
set_indev_keypad_group(obj);
@ -765,7 +765,7 @@ static void UIFlowMovie_ScrOpen(lv_obj_t* obj)
}
//#NT#2018/08/10#KCHong -end
#if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)
if(sf_get_cammode_statu() == SF_CAM_MODE_PHOTO_VIDEO || sf_get_cammode_statu() == SF_CAM_MODE_VIDEO2)
#else
if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO)
#endif
@ -1391,9 +1391,9 @@ void UIFlowMovie_KeyRelease(lv_obj_t* obj, uint32_t key)
static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
{
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
#endif
// #if HUNTING_CAMERA_MCU == ENABLE
// UIMenuStoreInfo *puiPara = sf_ui_para_get();
// #endif
switch(msg->event)
{
@ -1414,7 +1414,7 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
UIFlowMovie_REC_FINISH(obj,msg);
#if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
if(sf_get_cammode_statu() == SF_CAM_MODE_PHOTO_VIDEO || sf_get_cammode_statu() == SF_CAM_MODE_VIDEO2){
sf_set_phone_shot_status(PHONE_SHOT_STOP);
if(sf_get_mode_flag())
{

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

@ -1401,27 +1401,27 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
puiPara->CamMode = SF_CAM_MODE_PHOTO;
}
int iCurrMode = System_GetState(SYS_STATE_CURRMODE);
int iNextMode = PRIMARY_MODE_PHOTO;
// int iCurrMode = System_GetState(SYS_STATE_CURRMODE);
// int iNextMode = PRIMARY_MODE_PHOTO;
if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
{
iNextMode = PRIMARY_MODE_PHOTO;
}
else if(puiPara->CamMode == SF_CAM_MODE_VIDEO)
{
iNextMode = PRIMARY_MODE_MOVIE;
}
else
{
iNextMode = PRIMARY_MODE_PHOTO;
}
if(iNextMode != iCurrMode)
{
UI_SetData(FL_PreMode, iCurrMode);
UI_SetData(FL_NextMode, iNextMode);
Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode);
}
// if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
// {
// iNextMode = PRIMARY_MODE_PHOTO;
// }
// else if(puiPara->CamMode == SF_CAM_MODE_VIDEO)
// {
// iNextMode = PRIMARY_MODE_MOVIE;
// }
// else
// {
// iNextMode = PRIMARY_MODE_PHOTO;
// }
// if((iNextMode != iCurrMode) && ((TRUE != sf_is_preview())))
// {
// UI_SetData(FL_PreMode, iCurrMode);
// UI_SetData(FL_NextMode, iNextMode);
// Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode);
// }
Save_MenuInfo();
//sf_set_cam_mode(puiPara->CamMode);