From 930806e1e92ea86a0f5909af7ebdcdbdbcce2301 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Fri, 13 Oct 2023 15:33:05 +0800 Subject: [PATCH] backup. --- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h | 24 +++++++++++++++-- .../UIFlowMenuCommonItem/MenuSend.c | 26 +++++++++++++++---- .../UIFlowMenuCommonItemEventCallback.c | 7 ++--- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 7 +++++ 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h index 61c6f0b36..7753b63c9 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h @@ -127,7 +127,8 @@ enum _MENU_ID { IDM_MAX_NUM_DAY, IDM_SETTINGS_CHECK, IDM_SEND_TYPE, - IDM_CHECK, + IDM_CHECK_IN_PHOTO, + IDM_GPS, }; @@ -700,6 +701,11 @@ enum _MENU_IDS { // Setting Send page // IDS_MAX_NUM_DAY = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_MAX_NUM_DAY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + IDS_SETTINGS_CHECK = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + IDS_SEND_TYPE = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + IDS_CHECK_IN_PHOTO = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + IDS_GPS = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, IDS_END, @@ -865,6 +871,13 @@ enum _MENU_IDI { IDI_FORMAT_SD = LV_PLUGIN_IMG_ID_SF_FORMAT_SD, IDI_DATE_AND_TIME = LV_PLUGIN_IMG_ID_ICON_DATE_TIME, + // Setting send page + IDI_MAX_NUM_DAY = LV_PLUGIN_IMG_ID_ICON_BUST_M, + IDI_SETTINGS_CHECK = LV_PLUGIN_IMG_ID_ICON_BUST_M, + IDI_SEND_TYPE = LV_PLUGIN_IMG_ID_ICON_BUST_M, + IDI_CHECK_IN_PHOTO = LV_PLUGIN_IMG_ID_ICON_BUST_M, + IDI_GPS = LV_PLUGIN_IMG_ID_ICON_BUST_M, + #if 0 // Language Options IDI_LANG_EN = LV_PLUGIN_IMG_ID_ICON_OK, @@ -980,7 +993,14 @@ enum _MENU_IDF { IDF_DELAY = FL_DELAY, IDF_OPERATING_TIME = FL_OPERATING_TIME, IDF_FORMAT_SD = FL_FORMAT_SD, - IDF_DATE_AND_TIME = FL_DATE_AND_TIME + IDF_DATE_AND_TIME = FL_DATE_AND_TIME, + + // Setting send page + IDF_MAX_NUM_DAY = FL_MAX_NUM_DAY, + IDF_SETTINGS_CHECK = FL_SETTINGS_CHECK, + IDF_SEND_TYPE = FL_SEND_TYPE, + IDF_CHECK_IN_PHOTO = FL_CHECK_IN_PHOTO, + IDF_GPS = FL_GPS, }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index 31f62fb3f..6842a0c28 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -1,12 +1,28 @@ #include "PrjInc.h" #include "UIWnd/UIFlow.h" +TMDEF_BEGIN_OPTIONS(MAX_NUM_DAY) +TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(SETTINGS_CHECK) +TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(SEND_TYPE) +TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(CHECK_IN_PHOTO) +TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(GPS) +TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() + TMDEF_BEGIN_ITEMS(SEND) -// TMDEF_ITEM_TEXTID(NETWORK_SELECTION) -// TMDEF_ITEM_TEXTID(QR_PICTURE) -// TMDEF_ITEM_TEXTID(PASSWORD) -// TMDEF_ITEM_TEXTID(CAMERA_INFO) -// TMDEF_ITEM_TEXTID(CAMERA_NAME) +TMDEF_ITEM_TEXTID(MAX_NUM_DAY) +TMDEF_ITEM_TEXTID(SETTINGS_CHECK) +TMDEF_ITEM_TEXTID(SEND_TYPE) +TMDEF_ITEM_TEXTID(CHECK_IN_PHOTO) +TMDEF_ITEM_TEXTID(GPS) TMDEF_END_ITEMS() // -------------------------------------------------------------------------- diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index efc1408d6..0af5eb7bd 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -2,6 +2,7 @@ #include "PrjInc.h" #include "UIFlowLVGL/UIFlowLVGL.h" #include "UIApp/Network/UIAppNetwork.h" +#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h" #include "UIFlowLVGL_SPORTCAM.h" #include @@ -300,7 +301,7 @@ void MenuItem_OnOpen(lv_obj_t* obj) //pNextMenu = &gCommonMenu;//use for codebase sportcam/LVGL UI or touch pCurMenu = &gMovieMenu; #endif - // pCurMenu = QR_UI + pCurMenu = &gSendMenu; //replace to setup menu dynamically pCurMenu->pPages[1]= gPhotoMenu.pPages[0]; //= General_UI pCurMenu->pPages[2]= gPlaybackMenu.pPages[0]; //= Send_UI @@ -551,8 +552,8 @@ printf(" wwwwwwwwwwwwwwwwww key = %d\n", key); case LV_USER_KEY_RIGHT: { printf("=============== right.\n"); - MenuItem_OnSelected(obj); - break; + // MenuItem_OnSelected(obj); + // break; MenuItem_OnDown(obj); break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index a16be7ff1..4fc34657f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -233,6 +233,13 @@ typedef enum { FL_FORMAT_SD, FL_DATE_AND_TIME, + // Send page + FL_MAX_NUM_DAY, + FL_SETTINGS_CHECK, + FL_SEND_TYPE, + FL_CHECK_IN_PHOTO, + FL_GPS, + //Setup FL_LCD_OFF, FL_BrightAdjIndex,