diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index 4b37e650d..9ab210880 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -46,13 +46,13 @@ TMDEF_EMNU(gQrMenu, QR, Qr_MenuCallback) // -------------------------------------------------------------------------- int Qr_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { - printf(" ====================================================== gQrMenu\n"); UINT16 uwItemId; -// UINT16 uwOption; + UINT16 uwOption; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); if (uiMessage == TMM_CONFIRM_OPTION) { uwItemId = LO_WORD(uiParam); - // uwOption = HI_WORD(uiParam); + uwOption = HI_WORD(uiParam); switch (uwItemId) { case IDM_NETWORK_SELECTION: @@ -65,6 +65,8 @@ int Qr_MenuCallback(UINT32 uiMessage, UINT32 uiParam) } case IDM_PASSWORD: { + puiPara->PwdSwitch = uwOption; + printf("password switch %d\n", puiPara->PwdSwitch); break; } case IDM_CAMERA_NAME: @@ -253,12 +255,12 @@ void hidde_qr_picture_page(void) // -------------------------------------------------------------------------- static int PasswordIndex = 0; static lv_obj_t* PasswordMatrixObj = NULL; -static char PasswordBuf1[2] = "0"; -static char PasswordBuf2[2] = "0"; -static char PasswordBuf3[2] = "0"; -static char PasswordBuf4[2] = "0"; -static char PasswordBuf5[2] = "0"; -static char PasswordBuf6[2] = "0"; +static char PasswordBuf1[2] = {'0', 0}; +static char PasswordBuf2[2] = {'0', 0}; +static char PasswordBuf3[2] = {'0', 0}; +static char PasswordBuf4[2] = {'0', 0}; +static char PasswordBuf5[2] = {'0', 0}; +static char PasswordBuf6[2] = {'0', 0}; static const char* PasswordMap[7] = { PasswordBuf1, @@ -291,7 +293,7 @@ void show_Password_page(lv_obj_t* obj) init_Matrix_style(); UIMenuStoreInfo *puiPara = sf_ui_para_get(); - if(!puiPara->PwdSwitch) + // if(!puiPara->PwdSwitch) { memset(puiPara->PwdStr, '0' ,sizeof(puiPara->PwdStr)); } 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 9a428d7a7..acf47f9b3 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 @@ -3,6 +3,7 @@ #include "GxStrg.h" #include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" +#include "UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.h" #include #include "SysMain.h" #if (USE_DCF == ENABLE) @@ -1439,11 +1440,16 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event) { - +#define PASSWORD_SWITCH_ON 1 + UIMenuStoreInfo *puiPara = sf_ui_para_get(); switch(event) { case LV_PLUGIN_EVENT_SCR_OPEN: UIFlowMovie_ScrOpen(obj); + if(PASSWORD_SWITCH_ON == puiPara->PwdSwitch) + { + OpenPasswordScreen(); + } #if HUNTING_CAMERA_MCU == ENABLE UIMenuStoreInfo *puiPara = sf_ui_para_get(); if((SF_CAM_MODE_VIDEO == puiPara->CamMode)) @@ -1462,7 +1468,7 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event) break; case LV_EVENT_CLICKED: - UIFlowMovie_OnKeyMenu(obj); + // UIFlowMovie_OnKeyMenu(obj); break; case LV_EVENT_KEY: