From 87feaba1d0a710a2d266a5716cafaae373171ddd Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 6 Nov 2023 10:29:39 +0800 Subject: [PATCH] =?UTF-8?q?1.WiFi=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/include/sf_wifi_svr.h | 4 + .../sf_app/code/source/wifi/sf_wifi_svr.c | 136 ++++++++++-------- 2 files changed, 84 insertions(+), 56 deletions(-) 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 3b9815487..d2f971833 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 @@ -466,6 +466,10 @@ typedef struct UINT8 sendFirstTimeM; /* 0~59 (12小时和 24小时共用) */ UINT8 sendSecondTimeH; /* 0~23 */ UINT8 sendSecondTimeM; /* 0~59 */ + UINT8 sendThirdTimeH; /* 0~23 */ + UINT8 sendThirdTimeM; /* 0~59 */ + UINT8 sendFourthTimeH; /* 0~23 */ + UINT8 sendFourthTimeM; /* 0~59 */ UINT16 suffix; /* 0xFFEE */ } __attribute__((packed)) MSG_DEV_SendType_Set_T; 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 35fe6cdf0..af4348c4e 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 @@ -823,7 +823,7 @@ void sf_app_Get_Camera_Info(MSG_DEV_INFO_Get_Rsp_T *camInfo) //camInfo->GpsLongitude = htonl(0); //camInfo->GpsLatitude = htonl(0); #endif - strcpy((char *)camInfo->hwType, "reveal-x"); + strcpy((char *)camInfo->hwType, "reveal-x-pro3.0"); //S8 strTemp[16]= {0}; //sf_get_sys_version(strTemp); @@ -895,14 +895,18 @@ void sf_app_Get_Camera_Para(MSG_DEV_Param_Get_Rsp_T *CamPara) { CamPara->imageSize = 2; } - /*else if(PHOTO_SIZE_16M == puiPara->ImgSize) + else if(PHOTO_SIZE_24M == puiPara->ImgSize) { CamPara->imageSize = 3; } else if(PHOTO_SIZE_32M == puiPara->ImgSize) { - CamPara->imageSize = 2; - }*/ + CamPara->imageSize = 4; + } + else if(PHOTO_SIZE_40M == puiPara->ImgSize) + { + CamPara->imageSize = 5; + } else { CamPara->imageSize = 2; @@ -1399,31 +1403,34 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) MLOGI("[WIFI_SET_CAMERA_ImageSize],ImgSize:%d\n",puiPara->ImgSize); tmpValue = pMsgStruct->msgBuf.setImageSize.imageSize; - if(tmpValue == 0) - { - puiPara->ImgSize = PHOTO_SIZE_16M; - } - else if(tmpValue == 1) - { - puiPara->ImgSize = PHOTO_SIZE_12M; - } - else if(tmpValue == 2) - { - puiPara->ImgSize = PHOTO_SIZE_8M; - } - /* - else if(tmpValue == 3) - { - puiPara->ImgSize = PHOTO_SIZE_16M; - } - else if(tmpValue == 2) - { - puiPara->ImgSize = PHOTO_SIZE_32M; - }*/ - else - { - puiPara->ImgSize = PHOTO_SIZE_8M; - } + if(tmpValue == 0) + { + puiPara->ImgSize = PHOTO_SIZE_16M; + } + else if(tmpValue == 1) + { + puiPara->ImgSize = PHOTO_SIZE_12M; + } + else if(tmpValue == 2) + { + puiPara->ImgSize = PHOTO_SIZE_8M; + } + else if(tmpValue == 3) + { + puiPara->ImgSize = PHOTO_SIZE_24M; + } + else if(tmpValue == 4) + { + puiPara->ImgSize = PHOTO_SIZE_32M; + } + else if(tmpValue == 5) + { + puiPara->ImgSize = PHOTO_SIZE_40M; + } + else + { + puiPara->ImgSize = PHOTO_SIZE_8M; + } SysSetFlag(FL_PHOTO_SIZE, puiPara->ImgSize); Photo_SetUserIndex(PHOTO_USR_SIZE, puiPara->ImgSize); //sf_set_img_size(puiPara->ImgSize); @@ -1554,32 +1561,49 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) MLOGI("[WIFI_SET_CAMERA_SendType],sendType:%d\n",pMsgStruct->msgBuf.setSendType.sendType); if(puiPara->GprsMode == 0) { - puiPara->SendType = pMsgStruct->msgBuf.setSendType.sendType % 3; - puiPara->TimeSend1.Hour = pMsgStruct->msgBuf.setSendType.sendFirstTimeH % 24; - puiPara->TimeSend1.Min = pMsgStruct->msgBuf.setSendType.sendFirstTimeM % 60; - puiPara->TimeSend2.Hour = pMsgStruct->msgBuf.setSendType.sendSecondTimeH % 24; - puiPara->TimeSend2.Min = pMsgStruct->msgBuf.setSendType.sendSecondTimeM % 60; - - if(puiPara->SendType == 0) - { - puiPara->TimeSend1Switch = 0; - puiPara->TimeSend2Switch = 0; - //puiPara->TimeSend3 = 0; - //puiPara->TimeSend4 = 0; - } - else if(puiPara->SendType == 1) - { - puiPara->TimeSend1Switch = 1; - puiPara->TimeSend2Switch = 0; - //puiPara->TimeSend3 = 0; - //puiPara->TimeSend4 = 0; - } - else // if(puiPara->SendType == 2) - { - puiPara->TimeSend1Switch = 1; - puiPara->TimeSend2Switch = 1; - } - MLOGI("SendType:%d TimeSend1Switch:%d %02d:%02d TimeSend2Switch:%d %02d:%02d\n",puiPara->SendType,puiPara->TimeSend1Switch,puiPara->TimeSend1.Hour,puiPara->TimeSend1.Min,puiPara->TimeSend2Switch, puiPara->TimeSend2.Hour,puiPara->TimeSend2.Min); + puiPara->SendType = pMsgStruct->msgBuf.setSendType.sendType % 3; + puiPara->TimeSend1.Hour = pMsgStruct->msgBuf.setSendType.sendFirstTimeH % 24; + puiPara->TimeSend1.Min = pMsgStruct->msgBuf.setSendType.sendFirstTimeM % 60; + puiPara->TimeSend2.Hour = pMsgStruct->msgBuf.setSendType.sendSecondTimeH % 24; + puiPara->TimeSend2.Min = pMsgStruct->msgBuf.setSendType.sendSecondTimeM % 60; + puiPara->TimeSend3.Hour = pMsgStruct->msgBuf.setSendType.sendThirdTimeH % 24; + puiPara->TimeSend3.Min = pMsgStruct->msgBuf.setSendType.sendThirdTimeM % 60; + puiPara->TimeSend4.Hour = pMsgStruct->msgBuf.setSendType.sendFourthTimeH % 24; + puiPara->TimeSend4.Min = pMsgStruct->msgBuf.setSendType.sendFourthTimeM % 60; + if(puiPara->SendType == 0) + { + puiPara->TimeSend1Switch = 0; + puiPara->TimeSend2Switch = 0; + puiPara->TimeSend3Switch = 0; + puiPara->TimeSend4Switch = 0; + } + else if(puiPara->SendType == 1) + { + puiPara->TimeSend1Switch = 1; + puiPara->TimeSend2Switch = 0; + puiPara->TimeSend3Switch = 0; + puiPara->TimeSend4Switch = 0; + } + else if(puiPara->SendType == 2) + { + puiPara->TimeSend1Switch = 1; + puiPara->TimeSend2Switch = 1; + puiPara->TimeSend3Switch = 0; + puiPara->TimeSend4Switch = 0; + } + else if(puiPara->SendType == 4) + { + puiPara->TimeSend1Switch = 1; + puiPara->TimeSend2Switch = 1; + puiPara->TimeSend3Switch = 1; + puiPara->TimeSend4Switch = 1; + } + MLOGI("SendType:%d TimeSend1Switch:%d %02d:%02d TimeSend2Switch:%d %02d:%02d TimeSend3Switch:%d %02d:%02d TimeSend4Switch:%d %02d:%02d\n", + puiPara->SendType, + puiPara->TimeSend1Switch, puiPara->TimeSend1.Hour,puiPara->TimeSend1.Min, + puiPara->TimeSend2Switch, puiPara->TimeSend2.Hour,puiPara->TimeSend2.Min, + puiPara->TimeSend3Switch, puiPara->TimeSend3.Hour,puiPara->TimeSend3.Min, + puiPara->TimeSend4Switch, puiPara->TimeSend4.Hour,puiPara->TimeSend4.Min); } respFlag = 2; @@ -1930,7 +1954,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) case WIFI_CONTROL_CAMERA_SHOOT: MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot); - if((TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3)) + if((System_GetState(SYS_STATE_CARD) == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3)) { if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3)) {