From 80a26e8088ce7259e18e32770380bf047665e2a0 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 15 Dec 2023 15:46:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=83=8C=E5=85=89cmd?= =?UTF-8?q?=EF=BC=9B2.=E5=A6=82=E8=A6=81=E5=88=87=E6=8D=A2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=8B=8D=E6=91=84=E7=BB=93=E6=9D=9F=E5=86=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 3 +- .../lib/source/sifar/code/include/sf_common.h | 3 ++ .../sifar/code/source/common/sf_common.c | 29 +++++++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) 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 1d6a0655c..9cfc4a93d 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 @@ -1653,6 +1653,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg) case UIAPPPHOTO_CB_CAPSTART: #if HUNTING_CAMERA_MCU == ENABLE sf_set_cap_statu(TRUE); + sf_set_cammode_statu(puiPara->CamMode); #endif if(obj == UIFlowPhoto) @@ -1679,7 +1680,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg) UIFlowPhoto_BackPreviewHandle(); #if HUNTING_CAMERA_MCU == ENABLE - if((sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)){ + if((sf_get_mode_flag()) && (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 diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index 4e52744da..62830bdeb 100755 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -189,4 +189,7 @@ void sf_set_msdc_clk(void); void sf_send_message_to_create_qrcode(void); UINT8 sf_get_rtsp_flag(void); void sf_set_rtsp_flag(UINT8 flag); +char sf_get_cammode_statu(void); +void sf_set_cammode_statu(char is); +BOOL sf_set_backlight_status(unsigned char argc, char **argv); #endif 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 2466f2e3c..40e51004b 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -100,7 +100,7 @@ static UINT8 UiparaFlag = 0; static SF_BLE_STATUS_E BleStatus = SF_BLE_OK; static UINT8 McuUpdateFlag = 0; static SF_GPS_STATUS_E gGpsSearching = SF_GPS_SEARCHING_UNKNOW; - +static char CamMode = 0; static SF_THREAD_S UpgradeTskParam = { .IsRun = 0, @@ -3368,4 +3368,29 @@ void sf_send_message_to_create_qrcode(void) stMessageBuf.arg1 = SF_EVENT_KEY_MOCK_CREATE_QR_CODE; stMessageBuf.cmdId = CMD_KEY; sf_com_message_send_to_app(&stMessageBuf); -} \ No newline at end of file +} + +void sf_set_cammode_statu(char is) +{ + CamMode = is; + //printf("[%s]:%d IsCap:%d\n", __FUNCTION__, __LINE__,IsCap); +} + +char sf_get_cammode_statu(void) +{ + //printf("[%s]:%d IsCap:%d\n", __FUNCTION__, __LINE__,IsCap); + return CamMode; + +} + +BOOL sf_set_backlight_status(unsigned char argc, char **argv) +{ + UINT32 value; + sscanf_s(argv[0],"%d", &value); + printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value); + if(value < SF_ON_OFF_MAX){ + printf("[%s:%d] Status:%d\n", __FUNCTION__, __LINE__,GPIO_SetBacklightStatus(value)); + } + + return TRUE; +}