From 34eea2eaf8e203dd0af5e7f319116eae142cf1c9 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Mon, 9 Oct 2023 16:12:02 +0800 Subject: [PATCH] Open play screen. --- .../SrcCode/UIApp/Photo/UIAppPhoto_Exe.c | 18 ++++++++ .../ALEXA/UIFlow/UIFlowPhoto/UIFlowWndPhoto.c | 1 - .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 41 +++++++++++-------- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index e231203e4..4ef032cef 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -4135,6 +4135,23 @@ INT32 PhotoExe_OnSensorHotPlug(VControl *pCtrl, UINT32 paramNum, UINT32 *paramAr return NVTEVT_CONSUME; } +INT32 PhotoExe_OnForceToPlaybackMode(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) +{ + printf(" ssssssssssssssssssssssssssssssssssss \n"); +#if (PLAY_MODE==ENABLE) + UINT32 uiCurrMode; + + uiCurrMode = UI_GetData(FL_NextMode); + + if ((INT32)uiCurrMode != PRIMARY_MODE_PLAYBACK) { + UI_SetData(FL_PreMode, uiCurrMode); + UI_SetData(FL_NextMode, PRIMARY_MODE_PLAYBACK); + Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PLAYBACK); + } +#endif + return NVTEVT_CONSUME; +} + BOOL FlowPhoto_CheckReOpenItem(void) { BOOL bReOpen = FALSE; @@ -6827,6 +6844,7 @@ EVENT_ENTRY CustomPhotoObjCmdMap[] = { {NVTEVT_EXE_SLICE_ENCODE, PhotoExe_Preview_SliceEncode}, #endif #endif + {NVTEVT_FORCETO_PLAYBACK_MODE, PhotoExe_OnForceToPlaybackMode}, {NVTEVT_NULL, 0}, }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/ALEXA/UIFlow/UIFlowPhoto/UIFlowWndPhoto.c b/code/application/source/cardv/SrcCode/UIWnd/ALEXA/UIFlow/UIFlowPhoto/UIFlowWndPhoto.c index 92664d744..065e652ce 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/ALEXA/UIFlow/UIFlowPhoto/UIFlowWndPhoto.c +++ b/code/application/source/cardv/SrcCode/UIWnd/ALEXA/UIFlow/UIFlowPhoto/UIFlowWndPhoto.c @@ -795,7 +795,6 @@ INT32 UIFlowWndPhoto_OnKeySelect(VControl *pCtrl, UINT32 paramNum, UINT32 *param INT32 UIFlowWndPhoto_OnKeyNext(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) { - printf(" ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss \n"); return UIFlowWndPhoto_OnKeyMenu(pCtrl, paramNum, paramArray); } 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 6122174bc..926983928 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 @@ -768,25 +768,29 @@ static void UIFlowPhoto_OnExeZoomInStop(lv_obj_t* obj) return; } -static void UIFlowPhoto_OnExeZoomOutStart(lv_obj_t* obj) +static void UIFlowPhoto_OnExeOpenPlayScreen(lv_obj_t* obj) { -#if(PHOTO_MODE==ENABLE && DZOOM_FUNC) - switch (gPhotoData.State) { - - case PHOTO_ST_VIEW: - case PHOTO_ST_VIEW|PHOTO_ST_ZOOM: -// Input_SetKeyMask(KEY_PRESS, FLGKEY_KEY_MASK_NULL); - gPhotoData.State |= PHOTO_ST_ZOOM; - Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_ZOOM, 1, UI_ZOOM_CTRL_OUT); - break; - - default: - break; - } -#endif - - return; + Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_FORCETO_PLAYBACK_MODE, 0); } +// static void UIFlowPhoto_OnExeZoomOutStart(lv_obj_t* obj) +// { +// #if(PHOTO_MODE==ENABLE && DZOOM_FUNC) +// switch (gPhotoData.State) { + +// case PHOTO_ST_VIEW: +// case PHOTO_ST_VIEW|PHOTO_ST_ZOOM: +// // Input_SetKeyMask(KEY_PRESS, FLGKEY_KEY_MASK_NULL); +// gPhotoData.State |= PHOTO_ST_ZOOM; +// Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_ZOOM, 1, UI_ZOOM_CTRL_OUT); +// break; + +// default: +// break; +// } +// #endif + +// return; +// } static void UIFlowPhoto_OnExeZoomOutStop(lv_obj_t* obj) { @@ -1367,7 +1371,8 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_PREV: case LV_USER_KEY_ZOOMOUT: { - UIFlowPhoto_OnExeZoomOutStart(obj); + // UIFlowPhoto_OnExeZoomOutStart(obj); + UIFlowPhoto_OnExeOpenPlayScreen(obj); break; }