diff --git a/code/application/source/cardv/Makefile b/code/application/source/cardv/Makefile index 93716fff9..33ac10c92 100755 --- a/code/application/source/cardv/Makefile +++ b/code/application/source/cardv/Makefile @@ -282,6 +282,7 @@ SRC += \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/TabMenu.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuCommon.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c \ + ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.c \ 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 080ebd194..f952b6b0d 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 @@ -98,6 +98,9 @@ enum _MENU_ID { IDM_NR, IDM_IPP_ISO, + // Setting QR page + IDM_NETWORK_SELECTION, + }; // Menu String ID @@ -614,6 +617,11 @@ enum _MENU_IDS { // IDS_IPP_ISO_6400 = LV_PLUGIN_STRING_ID_STRID_ISO6400, // IDS_IPP_ISO_12800 = LV_PLUGIN_STRING_ID_STRID_ISO12800, + // Setting QR page + IDS_NETWORK_SELECTION = LV_PLUGIN_STRING_ID_STRID_ISO3200, + + IDS_END, + }; // Menu Icon ID @@ -748,6 +756,9 @@ enum _MENU_IDI { IDI_EXT_SETUP = LV_PLUGIN_RES_ID_NONE, IDIX_EXT_SETUP = LV_PLUGIN_RES_ID_NONE, + // Setting QR page + IDI_NETWORK_SELECTION = LV_PLUGIN_RES_ID_NONE, + #if 0 // Language Options IDI_LANG_EN = LV_PLUGIN_IMG_ID_ICON_OK, @@ -843,6 +854,9 @@ enum _MENU_IDF { IDF_NR = FL_NR, IDF_IPP_ISO = FL_IPP_ISO, + // Setting QR page + IDF_NETWORK_SELECTION = FL_NULL, + }; #endif // __MENUID_H 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 new file mode 100644 index 000000000..4d001b83b --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -0,0 +1,48 @@ +// #include "MenuQR.h" +#include "PrjInc.h" +#include "UIWnd/UIFlow.h" + +TMDEF_BEGIN_OPTIONS(NETWORK_SELECTION) +TMDEF_OPTION_TEXT_S(END, TM_OPTION_NOT_SUPPORT) +TMDEF_END_OPTIONS() + +TMDEF_BEGIN_ITEMS(QR) +TMDEF_ITEM_TEXTID(NETWORK_SELECTION) +TMDEF_END_ITEMS() + +// -------------------------------------------------------------------------- +// PAGES +// -------------------------------------------------------------------------- +// QR Menu Pages +TMDEF_BEGIN_PAGES(QR) +// TMDEF_PAGE_TEXT_ICON(QR) +TMDEF_END_PAGES() +TMDEF_EMNU(gQrMenu, QR, Qr_MenuCallback) + +// -------------------------------------------------------------------------- +// Menu Callback +// -------------------------------------------------------------------------- +int Qr_MenuCallback(UINT32 uiMessage, UINT32 uiParam) +{ + UINT16 uwItemId; +// UINT16 uwOption; + if (uiMessage == TMM_CONFIRM_OPTION) + { + uwItemId = LO_WORD(uiParam); + // uwOption = HI_WORD(uiParam); + switch (uwItemId) + { + case IDM_NETWORK_SELECTION: + { + + break; + } + default: + { + + break; + } + } + } + return TMF_PROCESSED; +} \ No newline at end of file diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h new file mode 100644 index 000000000..d84f105cf --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h @@ -0,0 +1,7 @@ +#ifndef _MENUM_QR_H +#define _MENUM_QR_H + +extern TM_MENU gQrMenu; +extern TM_ITEM gTM_ITEMS_QR[]; + +#endif diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h index 04c51ff17..48b0b815b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h @@ -37,6 +37,7 @@ extern const PALETTE_ITEM gDemoKit_Palette_Palette[256]; #include "UIFlowLVGL/UIFlowMenuCommonItem/TabMenu.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.h" +#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMode.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h"