From 11129f22ef243c575389b02dbae7a18b2109f814 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Fri, 13 Oct 2023 09:41:13 +0800 Subject: [PATCH] Meger setting screen code of ding. --- .../cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 + .../UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h | 38 +- .../UIFlowMenuCommonItem/MenuMovie.c | 88 ++-- .../UIFlowMenuCommonItem/MenuPhoto.h | 1 + .../UIFlowMenuCommonItem/MenuPlayback.h | 2 +- .../UIFlowMenuCommonItem.c | 79 ++-- .../UIFlowMenuCommonItemEventCallback.c | 443 +++++++++--------- 7 files changed, 365 insertions(+), 288 deletions(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index fb4a6188b..46a6825fb 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -16,6 +16,8 @@ #define UPDFW_MODE ENABLE #define VOICE_MODE DISABLE +#define MOVIE_EIS DISABLE + #define IPCAM_FUNC DISABLE #define STAMP_FUNC DISABLE #define UI_FUNC ENABLE 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 01a43b9b7..61c6f0b36 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 @@ -14,6 +14,7 @@ enum _MENU_ID { IDM_COMMON_MODE, IDM_COMMON_MENU, IDM_COMMON_LOCAL, + IDM_COMMON_LIVESTREAM, IDM_COMMON_CLOUD, IDM_COMMON_SETUP, IDM_COMMON_EXT_SETUP, @@ -53,6 +54,7 @@ enum _MENU_ID { IDM_MOVIE_AUDIO, IDM_MOVIE_DATEIMPRINT, IDM_MOVIE_RSC, + IDM_MOVIE_RSC_EFFECT, IDM_MOVIE_GSENSOR, IDM_MOVIE_TIMELAPSE_REC, IDM_MOVIE_IR_CUT, @@ -122,7 +124,10 @@ enum _MENU_ID { IDM_DATE_AND_TIME, // Setting Send page - IDM_SEND, + IDM_MAX_NUM_DAY, + IDM_SETTINGS_CHECK, + IDM_SEND_TYPE, + IDM_CHECK, }; @@ -272,7 +277,7 @@ enum _MENU_IDS { IDS_DUAL_CAM_BOTH2 = LV_PLUGIN_STRING_ID_STRID_BOTH2, // Movie Page - IDS_MOVIE_SIZE = LV_PLUGIN_STRING_ID_STRID_NULL_, + IDS_MOVIE_SIZE = LV_PLUGIN_STRING_ID_STRID_RESOLUTION, IDS_MOVIE_EV = LV_PLUGIN_STRING_ID_STRID_EXPOSURE, IDS_MOVIE_CYCLIC_REC = LV_PLUGIN_STRING_ID_STRID_CYCLIC_REC, IDS_MOVIE_HDR = LV_PLUGIN_STRING_ID_STRID_HDR, @@ -281,6 +286,7 @@ enum _MENU_IDS { IDS_MOVIE_AUDIO = LV_PLUGIN_STRING_ID_STRID_RECORD_AUDIO, IDS_MOVIE_DATEIMPRINT = LV_PLUGIN_STRING_ID_STRID_DATE_STAMP, IDS_MOVIE_RSC = LV_PLUGIN_STRING_ID_STRID_RSC, + IDS_MOVIE_RSC_EFFECT = LV_PLUGIN_STRING_ID_STRID_RSC, IDS_MOVIE_GSENSOR = LV_PLUGIN_STRING_ID_STRID_G_SENSOR, IDS_MOVIE_TIMELAPSE_REC = LV_PLUGIN_STRING_ID_STRID_TIMELAPSE_REC, IDS_MOVIE_IR_CUT = LV_PLUGIN_STRING_ID_STRID_IRCUT, @@ -357,9 +363,7 @@ enum _MENU_IDS { IDS_MOVIE_SIZE_CLONE_1920x1080P60_640x360P30 = LV_PLUGIN_STRING_ID_STRID_CLONE_1920X1080P60_640X360P30, //FHD WVGA IDS_MOVIE_SIZE_CLONE_1920x1080P30_848x480P30 = LV_PLUGIN_STRING_ID_STRID_CLONE_1920X1080P30_848X480P30, //FHD WVGA IDS_MOVIE_SIZE_CLONE_2048x2048P30_480x480P30 = LV_PLUGIN_STRING_ID_STRID_CLONE_2048X2048P30_480X480P30, - IDS_MOVIE_SIZE_CLONE_3840x2160P30_848x480P30 = LV_PLUGIN_STRING_ID_STRID_NULL_, - IDS_MOVIE_SIZE_CLONE_1920x1080P30_1280x720P60 = LV_PLUGIN_STRING_ID_STRID_NULL_, - IDS_MOVIE_SIZE_CLONE_2560x1440P60_848x480P30 = LV_PLUGIN_STRING_ID_STRID_NULL_, + #if 0 IDS_MOVIE_SIZE_1080FHD = LV_PLUGIN_STRING_ID_STRID_1080FHDWXH, @@ -419,6 +423,11 @@ enum _MENU_IDS { // Movie RSC Options IDS_MOVIE_RSC_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, IDS_MOVIE_RSC_ON = LV_PLUGIN_STRING_ID_STRID_ON, + + IDS_MOVIE_RSC_LOW = LV_PLUGIN_STRING_ID_STRID_LOW, + IDS_MOVIE_RSC_MED = LV_PLUGIN_STRING_ID_STRID_MED, + IDS_MOVIE_RSC_HIGH = LV_PLUGIN_STRING_ID_STRID_HIGH, + IDS_MOVIE_RSC_SUPER_HIGH = LV_PLUGIN_STRING_ID_STRID_HIGH, // Movie G Sensor Options IDS_MOVIE_GSENSOR_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, @@ -521,6 +530,7 @@ enum _MENU_IDS { IDS_COMMON_MENU = LV_PLUGIN_STRING_ID_STRID_SETUP, #if !defined(_NVT_SDIO_WIFI_NONE_) || !defined(_NVT_USB_WIFI_NONE_) IDS_COMMON_LOCAL = LV_PLUGIN_STRING_ID_STRID_WIFI, + IDS_COMMON_LIVESTREAM = LV_PLUGIN_STRING_ID_STRID_WIFI, #else IDS_COMMON_LOCAL = LV_PLUGIN_STRING_ID_STRID_WIFI_ETH, #endif @@ -689,7 +699,7 @@ enum _MENU_IDS { IDS_DATE_AND_TIME_MANUAL = LV_PLUGIN_STRING_ID_STRID_ISO3200, // Setting Send page - // IDS_SEND = + // IDS_MAX_NUM_DAY = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_END, @@ -708,7 +718,7 @@ enum _MENU_IDI { IDI_QUICK_REVIEW = LV_PLUGIN_IMG_ID_ICON_QUICK_REVIEW_M, IDI_DATE_STAMP = LV_PLUGIN_IMG_ID_ICON_DATE_PRINT_M, IDI_ISO = LV_PLUGIN_IMG_ID_ICON_ISO_M, - IDI_EV = LV_PLUGIN_IMG_ID_ICON_EV_M, + IDI_EV = LV_PLUGIN_IMG_ID_SF_CAMERA_NAME, IDI_FD = LV_PLUGIN_IMG_ID_ICON_FACE_ON_M, IDI_FLASH = LV_PLUGIN_IMG_ID_ICON_FLASH_ON_M, IDI_RSC = LV_PLUGIN_IMG_ID_ICON_RSC_ON_M, @@ -749,15 +759,16 @@ enum _MENU_IDI { IDI_PHOTO_SIZE_VGA = LV_PLUGIN_IMG_ID_ICON_OK, // Movie Page - IDI_MOVIE_SIZE = LV_PLUGIN_IMG_ID_ICON_RESOLUTION_M, - IDI_MOVIE_EV = LV_PLUGIN_IMG_ID_ICON_EV_M, - IDI_MOVIE_CYCLIC_REC = LV_PLUGIN_IMG_ID_ICON_CYCLIC_REC_M, + IDI_MOVIE_SIZE = LV_PLUGIN_IMG_ID_SF_VIDEO_SIZE, + IDI_MOVIE_EV = LV_PLUGIN_IMG_ID_SF_CAMERA_NAME, + IDI_MOVIE_CYCLIC_REC = LV_PLUGIN_IMG_ID_SF_VIDEO_LENGTH, IDI_MOVIE_HDR = LV_PLUGIN_IMG_ID_ICON_HDR_M, - IDI_MOVIE_WDR = LV_PLUGIN_IMG_ID_ICON_MENU_WDR_M, - IDI_MOVIE_MOTION_DET = LV_PLUGIN_IMG_ID_ICON_MOTION_DET_ON_M, + IDI_MOVIE_WDR = LV_PLUGIN_IMG_ID_SF_CAMERA_MODE, + IDI_MOVIE_MOTION_DET = LV_PLUGIN_IMG_ID_SF_FLASH_POWER, IDI_MOVIE_AUDIO = LV_PLUGIN_IMG_ID_ICON_SOUND_REC_ON_M, IDI_MOVIE_DATEIMPRINT = LV_PLUGIN_IMG_ID_ICON_DATE_PRINT_M, IDI_MOVIE_RSC = LV_PLUGIN_IMG_ID_ICON_RSC_ON_M, + IDI_MOVIE_RSC_EFFECT = LV_PLUGIN_IMG_ID_ICON_RSC_ON_M, IDI_MOVIE_TIMELAPSE_REC = LV_PLUGIN_IMG_ID_ICON_TIME_LAPSE_ON_M, IDI_MOVIE_GSENSOR = LV_PLUGIN_IMG_ID_ICON_G_SENSOR_M, IDI_MOVIE_IR_CUT = LV_PLUGIN_IMG_ID_ICON_IRCUT_ON_M, @@ -795,6 +806,7 @@ enum _MENU_IDI { IDI_COMMON_MODE = LV_PLUGIN_IMG_ID_ICON_MENU_MODECHANG_M, // no menu icon IDI_COMMON_MENU = LV_PLUGIN_IMG_ID_ICON_MODE_VIDEO_M, IDI_COMMON_LOCAL = LV_PLUGIN_IMG_ID_ICON_WIFI_OFF_M, + IDI_COMMON_LIVESTREAM = LV_PLUGIN_IMG_ID_ICON_WIFI_ON, IDI_COMMON_CLOUD = LV_PLUGIN_IMG_ID_ICON_CLOUD_OFF_M, IDI_COMMON_SETUP = LV_PLUGIN_IMG_ID_ICON_MENU_SETUP_ON_M, IDI_COMMON_EXT_SETUP = LV_PLUGIN_IMG_ID_ICON_MENU_SETUP_ON_M, @@ -878,6 +890,7 @@ enum _MENU_IDF { IDF_COMMON_MODE = FL_COMMON_MODE, IDF_COMMON_MENU = FL_COMMON_MENU, IDF_COMMON_LOCAL = FL_COMMON_LOCAL, + // IDF_COMMON_LIVESTREAM = FL_COMMON_LIVESTREAM, IDF_COMMON_CLOUD = FL_COMMON_CLOUD, IDF_COMMON_SETUP = FL_COMMON_SETUP, IDF_COMMON_EXT_SETUP = FL_COMMON_EXT_SETUP, @@ -890,6 +903,7 @@ enum _MENU_IDF { IDF_MOVIE_AUDIO = FL_MOVIE_AUDIO, IDF_MOVIE_DATEIMPRINT = FL_MOVIE_DATEIMPRINT, IDF_MOVIE_RSC = FL_MovieRSCIndex_MENU, + // IDF_MOVIE_RSC_EFFECT = FL_MovieRSCEffect_MENU, IDF_MOVIE_GSENSOR = FL_GSENSOR, //#NT#2016/08/15#KCHong#[0106941] -begin //#NT#Fixed FCW/LDWS/Timelapse cannot reset to default diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c index fa1271603..a84d86b45 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c @@ -24,32 +24,28 @@ TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P240, TM_OPTION_NOT_SU TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P120, TM_OPTION_NOT_SUPPORT) /// HD P120 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P60, TM_OPTION_NOT_SUPPORT) /// HD P60 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P30, TM_OPTION_NOT_SUPPORT) /// HD P30 -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_848x480P60, TM_OPTION_NOT_SUPPORT) /// WVGA P60 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_848x480P30, TM_OPTION_NOT_SUPPORT) /// WVGA P30 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_640x480P240, TM_OPTION_NOT_SUPPORT) /// VGA P240 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_640x480P30, TM_OPTION_NOT_SUPPORT) /// VGA P30 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_320x240P30, TM_OPTION_NOT_SUPPORT) /// QVGA P30 #if (_BOARD_DRAM_SIZE_ > 0x08000000) -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1280x720P30, TM_OPTION_ENABLE) /// QHD HD +#if (SENSOR_CAPS_COUNT >= 4) +TMDEF_OPTION_TEXT_S(MOVIE_SIZE_QUAD_1920x1080P30, TM_OPTION_ENABLE) /// FHD FHD FHD FHD +#else +TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_3840x2160P30_1920x1080P30, TM_OPTION_ENABLE) /// QHD HD +TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// QHD HD +TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1920x1080P30, TM_OPTION_ENABLE) /// QHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2304x1296P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// 3MHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1920x1080P30, TM_OPTION_ENABLE) /// FHD FHD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// FHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD WVGA +#endif #elif (_BOARD_DRAM_SIZE_ > 0x04000000) -#if (defined(_MODEL_565_CARDV_HS880C_) || defined(_MODEL_565_CARDV_HS880CC_)) -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// QHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1920x1080P30, TM_OPTION_ENABLE) /// QHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2304x1296P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// 3MHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1920x1080P30, TM_OPTION_NOT_SUPPORT) /// FHD FHD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// FHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD WVGA -#else TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// QHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2304x1296P30_1280x720P30, TM_OPTION_ENABLE) /// 3MHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1920x1080P30, TM_OPTION_ENABLE) /// FHD FHD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// FHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD WVGA -#endif #else TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// QHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2304x1296P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// 3MHD HD @@ -58,8 +54,30 @@ TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1280x720P30, TM_OPTION_NOT_SU TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_848x480P30, TM_OPTION_ENABLE) /// FHD WVGA #endif #else // only 1 sensor +#if (defined(_MODEL_580_SDV_SJ10_) || defined(_MODEL_580_SDV_SJ10_FAST_BT_) || defined(_MODEL_580_SDV_C300_) || defined(_MODEL_580_SDV_C300_FAST_BT_)) + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2880x2160P50, TM_OPTION_NOT_SUPPORT) /// UHD P50 (DAR) + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_3840x2160P30, TM_OPTION_ENABLE) /// UHD P30 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2880x2160P24, TM_OPTION_NOT_SUPPORT) /// UHD P24 (DAR) + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2704x2032P60, TM_OPTION_NOT_SUPPORT) /// 2.7K P60 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2560x1440P80, TM_OPTION_NOT_SUPPORT) /// QHD P80 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2560x1440P60, TM_OPTION_ENABLE) /// QHD P60 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2560x1440P30, TM_OPTION_ENABLE) /// QHD P30 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2304x1296P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// 3MHD HD + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1920x1080P120, TM_OPTION_ENABLE) /// FHD P120 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1920x1080P96, TM_OPTION_NOT_SUPPORT) /// FHD P96 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1920x1080P60, TM_OPTION_ENABLE) /// FHD P60 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1920x1080P30, TM_OPTION_ENABLE) /// FHD P30 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P240, TM_OPTION_NOT_SUPPORT) /// HD P24 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P120, TM_OPTION_ENABLE) /// HD P120 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P60, TM_OPTION_ENABLE) /// HD P60 + TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P30, TM_OPTION_ENABLE) /// HD P30 +#else TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2880x2160P50, TM_OPTION_NOT_SUPPORT) /// UHD P50 (DAR) +#if defined(_MODEL_580_CARDV_ETHCAM_RX_EVB_) && (ETH_REARCAM_CAPS_COUNT==1) || defined(_sen_imx415_) || defined(_sen_imx317_) +TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_3840x2160P30, TM_OPTION_ENABLE) /// UHD P30 +#else TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_3840x2160P30, TM_OPTION_NOT_SUPPORT) /// UHD P30 +#endif TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2880x2160P24, TM_OPTION_NOT_SUPPORT) /// UHD P24 (DAR) TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2704x2032P60, TM_OPTION_NOT_SUPPORT) /// 2.7K P60 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_2560x1440P80, TM_OPTION_NOT_SUPPORT) /// QHD P80 @@ -77,29 +95,19 @@ TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1920x1080P30, TM_OPTION_ENABLE TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P240, TM_OPTION_NOT_SUPPORT) /// HD P240 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P120, TM_OPTION_NOT_SUPPORT)////TM_OPTION_ENABLE) /// HD P120 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P60, TM_OPTION_NOT_SUPPORT)////TM_OPTION_ENABLE) /// HD P60 +#if !defined(_MODEL_580_CARDV_ETHCAM_RX_EVB_) TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_1280x720P30, TM_OPTION_ENABLE) /// HD P30 -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_848x480P30, TM_OPTION_ENABLE) /// WVGA P30 +#endif +TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_848x480P30, TM_OPTION_NOT_SUPPORT) /// WVGA P30 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_640x480P240, TM_OPTION_NOT_SUPPORT) /// VGA P240 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_640x480P30, TM_OPTION_NOT_SUPPORT) /// VGA P30 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_FRONT_320x240P30, TM_OPTION_NOT_SUPPORT) /// QVGA P30 TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// QHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2560x1440P30_1920x1080P30, TM_OPTION_NOT_SUPPORT) /// QHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_2304x1296P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// 3MHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1920x1080P30, TM_OPTION_NOT_SUPPORT) /// FHD FHD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// FHD HD TMDEF_OPTION_TEXT_S(MOVIE_SIZE_DUAL_1920x1080P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD WVGA -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_3840x2160P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// QHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P30, TM_OPTION_NOT_SUPPORT) /// QHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_1920x1080P30_1280x720P60, TM_OPTION_NOT_SUPPORT) /// 3MHD HD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_1920x1080P30_1280x720P30, TM_OPTION_NOT_SUPPORT) /// FHD FHD -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_2560x1440P60_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD HD - -#if (MOVIE_AI_DEMO == DISABLE) -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_2560x1440P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD WVGA -#else -TMDEF_OPTION_TEXT_S(MOVIE_SIZE_CLONE_2560x1440P30_848x480P30, TM_OPTION_NOT_SUPPORT) /// FHD WVGA #endif - #endif TMDEF_END_OPTIONS() @@ -142,6 +150,13 @@ TMDEF_OPTION_TEXT_S(MOVIE_RSC_OFF, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(MOVIE_RSC_ON, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(MOVIE_RSC_EFFECT) +TMDEF_OPTION_TEXT_S(MOVIE_RSC_LOW, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(MOVIE_RSC_MED, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(MOVIE_RSC_HIGH, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(MOVIE_RSC_SUPER_HIGH, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() + TMDEF_BEGIN_OPTIONS(MOVIE_GSENSOR) TMDEF_OPTION_TEXT_S(MOVIE_GSENSOR_OFF, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(MOVIE_GSENSOR_LOW, TM_OPTION_ENABLE) @@ -245,8 +260,9 @@ TMDEF_ITEM_TEXTID(EV) TMDEF_ITEM_TEXTID(MOVIE_MOTION_DET) TMDEF_ITEM_TEXTID(MOVIE_AUDIO) TMDEF_ITEM_TEXTID(MOVIE_DATEIMPRINT) -#if (MOVIE_RSC == ENABLE) +#if (MOVIE_EIS == ENABLE) TMDEF_ITEM_TEXTID(MOVIE_RSC) +TMDEF_ITEM_TEXTID(MOVIE_RSC_EFFECT) #endif ////TMDEF_ITEM_TEXTID(MOVIE_GSENSOR) TMDEF_ITEM_TEXTID(MOVIE_TIMELAPSE_REC) @@ -266,6 +282,7 @@ TMDEF_ITEM_TEXTID(MOVIE_DUAL_CAM) TMDEF_ITEM_TEXTID(MOVIE_CODEC) TMDEF_END_ITEMS() +#if 0 // -------------------------------------------------------------------------- // PAGES // -------------------------------------------------------------------------- @@ -274,6 +291,19 @@ TMDEF_BEGIN_PAGES(MOVIE) TMDEF_PAGE_TEXT_ICON(MOVIE) TMDEF_END_PAGES() +TMDEF_EMNU(gMovieMenu, MOVIE, Movie_MenuCallback) +#endif +// -------------------------------------------------------------------------- +// PAGES +// -------------------------------------------------------------------------- +// Movie Menu Pages +TMDEF_BEGIN_PAGES(MOVIE) +TMDEF_PAGE_TEXT_ICON(MOVIE) +TMDEF_PAGE_TEXT_ICON(MOVIE) +TMDEF_PAGE_TEXT_ICON(MOVIE) +TMDEF_PAGE_TEXT_ICON(MOVIE) +TMDEF_END_PAGES() + TMDEF_EMNU(gMovieMenu, MOVIE, Movie_MenuCallback) // -------------------------------------------------------------------------- @@ -290,8 +320,6 @@ int Movie_MenuCallback(UINT32 uiMessage, UINT32 uiParam) switch (uwItemId) { case IDM_MOVIE_SIZE: - - printf("IDM_MOVIE_SIZE = %lu\n", uwOption); //Set Movie size event until menu is closed. //Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_MOVIESIZE, 1, uwOption); //Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_IMAGE_RATIO, 1, GetMovieSizeRatio(UI_GetData(FL_MOVIE_SIZE))); @@ -302,7 +330,9 @@ int Movie_MenuCallback(UINT32 uiMessage, UINT32 uiParam) break; case IDM_MOVIE_WDR: +#if(!defined(_NVT_ETHREARCAM_RX_))//67x tx must cvhg movie mode Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_MOVIE_WDR, 1, uwOption); +#endif break; case IDM_MOVIE_HDR: @@ -347,7 +377,7 @@ int Movie_MenuCallback(UINT32 uiMessage, UINT32 uiParam) break; case IDM_MOVIE_SENSOR_ROTATE: - Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_MOVIE_SENSOR_ROTATE, 1, uwOption); + //Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_MOVIE_SENSOR_ROTATE, 1, uwOption); break; case IDM_MOVIE_PTZ: @@ -390,7 +420,7 @@ int Movie_MenuCallback(UINT32 uiMessage, UINT32 uiParam) break; case IDM_MOVIE_CODEC: - Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_MOVIE_CODEC, 1, uwOption); + //Ux_SendEvent(&CustomMovieObjCtrl, NVTEVT_EXE_MOVIE_CODEC, 1, uwOption); break; default: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h index 25dccfca6..aebf85be5 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h @@ -2,6 +2,7 @@ #define _MENUPHOTO_H extern TM_MENU gPhotoMenu; +extern TM_ITEM gTM_ITEMS_PHOTO[]; extern TM_OPTION gTM_OPTIONS_PHOTO_SIZE[PHOTO_SIZE_ID_MAX]; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.h index fafe19f22..1a1553dd1 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.h @@ -2,5 +2,5 @@ #define _MENUPLAYBACK_H extern TM_MENU gPlaybackMenu; - +extern TM_ITEM gTM_ITEMS_PLAYBACK[]; #endif diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c index b65055990..3755d7822 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c @@ -26,6 +26,7 @@ lv_obj_t* image_item4_scr_uiflowmenucommonitem; lv_obj_t* image_button_item5_scr_uiflowmenucommonitem; lv_obj_t* label_item5_scr_uiflowmenucommonitem; lv_obj_t* image_item5_scr_uiflowmenucommonitem; + lv_obj_t* container_option_1_scr_uiflowmenucommonitem; lv_obj_t* label_option_1_scr_uiflowmenucommonitem; lv_obj_t* image_option_1_scr_uiflowmenucommonitem; @@ -41,11 +42,13 @@ lv_obj_t* image_option_4_scr_uiflowmenucommonitem; lv_obj_t* container_option_5_scr_uiflowmenucommonitem; lv_obj_t* label_option_5_scr_uiflowmenucommonitem; lv_obj_t* image_option_5_scr_uiflowmenucommonitem; + lv_obj_t* image_option_01_scr_uiflowmenucommonitem; lv_obj_t* image_option_02_scr_uiflowmenucommonitem; lv_obj_t* image_option_03_scr_uiflowmenucommonitem; lv_obj_t* image_option_04_scr_uiflowmenucommonitem; lv_obj_t* image_option_05_scr_uiflowmenucommonitem; + lv_obj_t* container_tab_scr_uiflowmenucommonitem; lv_obj_t* image_button_tab1_scr_uiflowmenucommonitem; lv_obj_t* label_tab_1_scr_uiflowmenucommonitem; @@ -61,7 +64,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_event_cb(parent, UIFlowMenuCommonItemEventCallback); lv_color_t color = {0}; - STYLE_COLOR_PROP(0x0a, 0x80, 0x00, 0x00); + STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57); _lv_obj_set_style_local_color(parent,0,LV_STYLE_BG_COLOR, color); if(color.full== LV_COLOR_TRANSP.full){ @@ -1046,44 +1049,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_8bpp); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_1 = lv_label_create(container_option_1, NULL); lv_obj_set_hidden(label_option_1, false); lv_obj_set_click(label_option_1, false); @@ -1143,7 +1146,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_1, false); lv_obj_set_drag(image_option_1, false); lv_obj_set_pos(image_option_1, 78, 0); - lv_obj_set_size(image_option_1, 27, 40); + lv_obj_set_size(image_option_1, 32, 40); lv_img_set_src(image_option_1, &sf_next1); lv_obj_add_style(image_option_1, 0, &image_option_1_s0); @@ -1291,7 +1294,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_2, false); lv_obj_set_drag(image_option_2, false); lv_obj_set_pos(image_option_2, 78, 0); - lv_obj_set_size(image_option_2, 27, 40); + lv_obj_set_size(image_option_2, 32, 40); lv_img_set_src(image_option_2, &sf_next1); lv_obj_add_style(image_option_2, 0, &image_option_2_s0); @@ -1439,7 +1442,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_3, false); lv_obj_set_drag(image_option_3, false); lv_obj_set_pos(image_option_3, 78, 0); - lv_obj_set_size(image_option_3, 27, 40); + lv_obj_set_size(image_option_3, 32, 40); lv_img_set_src(image_option_3, &sf_next1); lv_obj_add_style(image_option_3, 0, &image_option_3_s0); @@ -1587,7 +1590,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_4, false); lv_obj_set_drag(image_option_4, false); lv_obj_set_pos(image_option_4, 78, 0); - lv_obj_set_size(image_option_4, 27, 40); + lv_obj_set_size(image_option_4, 32, 40); lv_img_set_src(image_option_4, &sf_next1); lv_obj_add_style(image_option_4, 0, &image_option_4_s0); @@ -1735,7 +1738,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_5, false); lv_obj_set_drag(image_option_5, false); lv_obj_set_pos(image_option_5, 78, 0); - lv_obj_set_size(image_option_5, 27, 40); + lv_obj_set_size(image_option_5, 32, 40); lv_img_set_src(image_option_5, &sf_next1); lv_obj_add_style(image_option_5, 0, &image_option_5_s0); @@ -1748,37 +1751,37 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DISABLED, color); lv_obj_t *image_option_01 = lv_img_create(container_main_menu, NULL); lv_obj_set_hidden(image_option_01, true); lv_obj_set_click(image_option_01, false); @@ -2069,8 +2072,9 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab1, 80, 40); lv_imgbtn_set_state(image_button_tab1, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab1, false); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab1, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab1, 0, &image_button_tab1_s0); @@ -2184,8 +2188,9 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab2, 80, 40); lv_imgbtn_set_state(image_button_tab2, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab2, false); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab2, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab2, 0, &image_button_tab2_s0); @@ -2299,8 +2304,9 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab3, 80, 40); lv_imgbtn_set_state(image_button_tab3, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab3, false); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab3, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab3, 0, &image_button_tab3_s0); @@ -2409,12 +2415,13 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_hidden(image_button_tab4, false); lv_obj_set_click(image_button_tab4, true); lv_obj_set_drag(image_button_tab4, false); - lv_obj_set_pos(image_button_tab4, 240, -1); + lv_obj_set_pos(image_button_tab4, 240, 0); lv_obj_set_size(image_button_tab4, 80, 40); lv_imgbtn_set_state(image_button_tab4, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab4, false); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab4, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab4, 0, &image_button_tab4_s0); 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 58f554f51..a2d8c159c 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 @@ -5,9 +5,11 @@ #include #define PAGE 6 +#define TAB_PAGE 4 static TM_MENU *g_pItemMenu = 0; static lv_group_t* gp = NULL; +static lv_obj_t* menu_tab = NULL; static lv_obj_t* menu_item = NULL; //static lv_obj_t* menu_option = NULL; //static lv_obj_t* label_menu_item = NULL; @@ -42,63 +44,128 @@ static TM_MENU *MenuCommonItem_GetCurrentMenu(void) static void MenuCommonItem_UpdateContent(TM_MENU *pMenu); +static void MenuItem_OnPrev(lv_obj_t* obj) +{ + TM_MENU* pMenu = TM_GetMenu(); + TM_PAGE *pPage; + TM_ITEM *pItem; + + pPage = &pMenu->pPages[pMenu->SelPage]; + if (pMenu->Status == TMS_ON_TAB){ + if(pMenu->SelPage == 0){ + DBG_WRN("already foucs on tab !"); + return; + } + pMenu->Status = TMS_ON_ITEM; + lv_plugin_menu_select_item(menu_item, 0); + }else{ + //if item = 0; up key foucs to tab + if(pMenu->SelPage == 0){ + pMenu->Status = TMS_ON_TAB; + pItem = &pPage->pItems[0]; + lv_plugin_menu_set_item_string_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); + lv_plugin_menu_set_item_img_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); + lv_plugin_menu_set_item_hidden(menu_item, 0, false); + return; + } + + pMenu->SelPage--; + lv_plugin_menu_select_prev_item(menu_item); + } +} + static void MenuItem_OnNext(lv_obj_t* obj) { - - TM_MENU *pMenu; - TM_PAGE *pPage; - - pMenu = MenuCommonItem_GetCurrentMenu(); - pPage = &pMenu->pPages[pMenu->SelPage]; - pPage->SelItem++; - //check item if disable - TM_CheckItemStatus(pMenu, &pPage->SelItem, TRUE); - if (pPage->SelItem == pPage->Count) { - lv_plugin_scr_close(obj, NULL); - } else { - MenuCommonItem_UpdateContent(pMenu); + TM_MENU* pMenu = TM_GetMenu(); + + if (pMenu->Status == TMS_ON_TAB){ + pMenu->Status = TMS_ON_ITEM; + pMenu->SelPage = 0; + lv_plugin_menu_select_item(menu_item, 0); + }else{ + pMenu->SelPage++; lv_plugin_menu_select_next_item(menu_item); } } -static void MenuItem_OnPrev(lv_obj_t* obj) + +#if 1 + +static void MenuItem_OnUp(lv_obj_t* obj) { - TM_MENU *pMenu; - TM_PAGE *pPage; + TM_MENU* pMenu = TM_GetMenu(); - - pMenu = MenuCommonItem_GetCurrentMenu(); - pPage = &pMenu->pPages[pMenu->SelPage]; - if (pPage->SelItem == 0) { - // Close current UI Window now -// Ux_CloseWindow(&MenuCommonItemCtrl, 0); - - lv_plugin_scr_close(obj, NULL); - - - } else { - pPage->SelItem--; - //check item if disable - TM_CheckItemStatus(pMenu, &pPage->SelItem, FALSE); - if (pPage->SelItem == pPage->Count) { - lv_plugin_scr_close(obj, NULL); - - } else { - MenuCommonItem_UpdateContent(pMenu); - lv_plugin_menu_select_prev_item(menu_item); - } - } + if (pMenu->Status == TMS_ON_TAB) + { + TM_ShiftTab(pMenu, -1); + lv_plugin_menu_select_prev_item(menu_tab); + MenuCommonItem_UpdateContent(pMenu); + } } + +static void MenuItem_OnDown(lv_obj_t* obj) +{ + + TM_MENU* pMenu = TM_GetMenu(); + + if (pMenu->Status == TMS_ON_TAB) + { + TM_ShiftTab(pMenu, +1); + lv_plugin_menu_select_next_item(menu_tab); + MenuCommonItem_UpdateContent(pMenu); + } +} +#endif + + static void MenuItem_OnSelected(lv_obj_t* obj) { - TM_MENU *pMenu; + TM_MENU *pMenu = TM_GetMenu(); TM_PAGE *pPage; TM_ITEM *pItem; - TM_MENU *pNextMenu; +// TM_MENU *pNextMenu; + + if (pMenu->Status == TMS_ON_ITEM) + { + pPage = &pMenu->pPages[pMenu->SelPage]; +// pPage->SelItem = UxMenu_GetData(&MenuCommonItem_MenuCtrl, MNU_CURITM); // update selected item of tab menu + pItem = &pPage->pItems[pPage->SelItem]; + + //#NT#2016/09/20#Bob Huang -begin + //#NT#Support HDMI Display with 3DNR Out + //Only support FHD p30 size, cannot change size when 3DNR Out enabled + #if (_3DNROUT_FUNC == ENABLE) + if(pItem->SysFlag == FL_MOVIE_SIZE_MENU && gb3DNROut) + { + return; + } + #endif + //#NT#2016/09/20#Bob Huang -end + + if (pItem->Count != 0 && pItem->SysFlag != 0) // standard process + { + if (TM_MENU_CALLBACK(pMenu, TMM_ENTER_OPTION, MAKE_LONG(pItem->ItemId, 0)) == TMF_PASS_MESSAGE) + { + return; + } + } + + if (pItem->Count != 0 && pItem->SysFlag != 0) // standard process + { + pMenu->Status = TMS_ON_OPTION; + lv_plugin_scr_open(UIFlowMenuCommonOption, NULL); + } + else if (pItem->pOptions != 0) // custom process + { + pMenu->Status = TMS_ON_CUSTOM; + TM_ITEM_CALLBACK(pItem, 0, 0); // execute custom menu flow + } + } - pMenu = MenuCommonItem_GetCurrentMenu(); +#if 0 + pMenu = TM_GetMenu(); pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; @@ -174,13 +241,14 @@ static void MenuItem_OnSelected(lv_obj_t* obj) } else if (pItem->SysFlag == FL_COMMON_EXT_SETUP) { #if _TODO // Enter 2nd level menu and pop up various memu item. -// Ux_OpenWindow(&MenuCommonOptionCtrl, 1, &gExtSetupMenu); + //Ux_OpenWindow(&MenuCommonOptionCtrl, 1, &gExtSetupMenu); #endif } else { DBG_ERR("not supp %d\r\n", pItem->SysFlag); } } +#endif } void MenuItem_OnClose(lv_obj_t* obj) @@ -213,135 +281,48 @@ void MenuItem_OnClose(lv_obj_t* obj) void MenuItem_OnOpen(lv_obj_t* obj) { DBG_DUMP("MenuItem_OnOpen\r\n"); - TM_MENU *pMenu = NULL; - TM_PAGE *pPage = NULL; - TM_ITEM *pItem = NULL; -// TM_OPTION *pOption = NULL; -// TM_ITEM *pModeItem = NULL; - TM_MENU *pNextMenu; -#if (PHOTO_MODE==ENABLE) -// INT32 curMode = 0; -#endif - -#if 0 -#if(WIFI_FUNC==ENABLE) - if (UI_GetData(FL_WIFI_LINK) == WIFI_LINK_OK && UI_GetData(FL_NetWorkMode) == NET_STATION_MODE) { - SysSetFlag(FL_COMMON_CLOUD, CLOUD_ON); - } else { - SysSetFlag(FL_COMMON_CLOUD, CLOUD_OFF); - } -#else - SysSetFlag(FL_COMMON_CLOUD, CLOUD_OFF); -#endif - - if (System_GetEnableSensor() == (SENSOR_1 | SENSOR_2)) { - TM_SetItemStatus(&gMovieMenu, IDM_MOVIE_DUAL_CAM, TM_ITEM_ENABLE); -#if (PHOTO_MODE==ENABLE) - TM_SetItemStatus(&gPhotoMenu, IDM_DUAL_CAM, TM_ITEM_ENABLE); -#endif -#if (_BOARD_DRAM_SIZE_ == 0x04000000) - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_DUAL_1920x1080P30_1280x720P30, TM_OPTION_ENABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_DUAL_1920x1080P30_848x480P30, TM_OPTION_ENABLE); -#else - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_DUAL_1920x1080P30_1920x1080P30, TM_OPTION_ENABLE); -#endif - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2880x2160P50, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_3840x2160P30, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2704x2032P60, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2560x1440P80, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2560x1440P60, TM_OPTION_DISABLE); - } else { -#if (SENSOR_CAPS_COUNT > 1) - TM_SetItemStatus(&gMovieMenu, IDM_MOVIE_DUAL_CAM, TM_ITEM_DISABLE); - TM_SetItemStatus(&gPhotoMenu, IDM_DUAL_CAM, TM_ITEM_DISABLE); -#endif - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_DUAL_1920x1080P30_1920x1080P30, TM_OPTION_DISABLE); - //#NT#2016/08/12#Hideo Lin -begin - //#NT#For small size clone movie -#if (SMALL_CLONE_MOVIE == DISABLE) - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2880x2160P50, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_3840x2160P30, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2704x2032P60, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2560x1440P80, TM_OPTION_DISABLE); - TM_SetOptionStatus(&gMovieMenu, IDM_MOVIE_SIZE, MOVIE_SIZE_FRONT_2560x1440P60, TM_OPTION_DISABLE); -#endif - //#NT#2016/08/12#Hideo Lin -end - } -#endif + TM_MENU* pCurMenu; #if (PHOTO_MODE == ENABLE) // Enter 2nd level menu and pop up current mode's menu lists if (System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_PHOTO) { - pNextMenu = &gPhotoMenu; + pCurMenu = &gPhotoMenu; #if (PLAY_MODE == ENABLE) } else if (System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_PLAYBACK) { - pNextMenu = &gPlaybackMenu; + pCurMenu = &gPlaybackMenu; #endif } else { - pNextMenu = &gMovieMenu; + pCurMenu = &gMovieMenu; } #else //pNextMenu = &gCommonMenu;//use for codebase sportcam/LVGL UI or touch - pNextMenu = &gMovieMenu; + pCurMenu = &gMovieMenu; #endif + // pCurMenu = QR_UI + //replace to setup menu dynamically + pCurMenu->pPages[1]= gPhotoMenu.pPages[0]; //= General_UI + pCurMenu->pPages[2]= gPlaybackMenu.pPages[0]; //= Send_UI + pCurMenu->pPages[3]= gSetupMenu.pPages[0]; //= QR_UI - pNextMenu = &gGeneralMenu; // TODO: test - //MenuCommonItem_SetCurrentMenu(&gCommonMenu); - MenuCommonItem_SetCurrentMenu(pNextMenu); - pMenu = MenuCommonItem_GetCurrentMenu(); + TM_SetMenu(pCurMenu); - pMenu->Status = TMS_ON_ITEM; - pMenu->SelPage = 0; // reset page to 0 - - pPage = &pMenu->pPages[pMenu->SelPage]; - pPage->SelItem = 0; // reset item to 0 - //check item if disable - TM_CheckItemStatus(pMenu, &pPage->SelItem, TRUE); - - pItem = &pPage->pItems[pPage->SelItem]; - - if(pItem->Count){ -// pOption = &pItem->pOptions[SysGetFlag(pItem->SysFlag)]; -// lv_plugin_label_set_text(label_menu_option, pOption->TextId); -// lv_plugin_label_update_font(label_menu_option, LV_OBJ_PART_MAIN); + pMenu = TM_GetMenu(); + pMenu->Status = TMS_ON_TAB; // current menu status is TAB + pMenu->SelPage = 0; // reset page to 0 + /* check menu tab is init */ + if(!lv_plugin_menu_item_cnt(menu_tab)){ + /* allocate menu item */ + lv_plugin_menu_init_items(menu_tab, TAB_PAGE); } -#if 0 - if(pNextMenu != &gCommonMenu){ -#if (PHOTO_MODE==ENABLE) - curMode = System_GetState(SYS_STATE_CURRMODE); - if (curMode == PRIMARY_MODE_PHOTO) { - pModeItem = &pPage->pItems[1]; - pModeItem->IconId = LV_PLUGIN_IMG_ID_ICON_MODE_CAPTURE_M; - pModeItem->TextId = LV_PLUGIN_STRING_ID_STRID_CAP_MODE; - } else if (curMode == PRIMARY_MODE_MOVIE) { - pModeItem = &pPage->pItems[1]; - pModeItem->IconId = LV_PLUGIN_IMG_ID_ICON_MODE_VIDEO_M; - pModeItem->TextId = LV_PLUGIN_STRING_ID_STRID_MOVIE; -#if (PLAY_MODE == ENABLE) - } else if (curMode == PRIMARY_MODE_PLAYBACK) { - pModeItem = &pPage->pItems[1]; - pModeItem->IconId = LV_PLUGIN_IMG_ID_ICON_MODE_PLAYBACK_M; - pModeItem->TextId = LV_PLUGIN_STRING_ID_STRID_PLAYBACK; -#endif - } -#else - pModeItem = &pPage->pItems[1]; - pModeItem->IconId = ICON_MODE_VIDEO_M; - pModeItem->TextId = STRID_MOVIE; - -#endif - } -#endif - + lv_plugin_menu_select_item(menu_tab, 0); /* check menu item is init */ if(!lv_plugin_menu_item_cnt(menu_item)){ /* allocate menu item */ lv_plugin_menu_init_items(menu_item, PAGE); } - +// lv_plugin_menu_select_item(menu_item, 0); MenuCommonItem_UpdateContent(pMenu); - lv_plugin_menu_select_item(menu_item, 0); } @@ -350,25 +331,54 @@ static void MenuCommonItem_UpdateContent(TM_MENU *pMenu) TM_PAGE *pPage; TM_ITEM *pItem; TM_OPTION *pOption; - UINT32 i; - UINT16 SelOption = 0; - UINT16 startIndex = 0; + UINT32 i = 0; UINT16 itemIndex = 0; - BOOL u_hiddentext = FALSE; + BOOL u_hiddenitem = false; + BOOL u_ItemSel = false; + lv_plugin_res_id img_id = LV_PLUGIN_IMG_ID_ICON_REC_TRANSPAENT; +// UINT32 uiIcon[TAB_PAGE]; // 2 pages per menu +// UINT32 uiText[TAB_PAGE]; // 2 pages per menu pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; - SelOption = SysGetFlag(pItem->SysFlag); -// pOption = &pItem->pOptions[SysGetFlag(pItem->SysFlag)]; - DBG_DUMP("%s SelOption =%d\r\n", __func__,SelOption); - //lv_plugin_label_set_text(label_menu_item, pItem->TextId); - //lv_plugin_label_update_font(label_menu_item, LV_OBJ_PART_MAIN); +#if 0 + DBG_DUMP("\r\n %s pMenu Status= %d\r\n", __func__, pMenu->Status); + DBG_DUMP("\r\n %s pMenu SelPage= %d\r\n", __func__, pMenu->SelPage); + DBG_DUMP("\r\n %s pMenu FirstPage= %d\r\n", __func__, pMenu->FirstPage); + DBG_DUMP("\r\n %s pMenu Count= %d\r\n", __func__, pMenu->Count); - //find startIndex - TM_FindStartIndex(pMenu, PAGE, &startIndex); + DBG_DUMP("\r\n %s pPage TextId= %d\r\n", __func__, pPage->TextId); + DBG_DUMP("\r\n %s pPage IconId= %d\r\n", __func__, pPage->IconId); + DBG_DUMP("\r\n %s pPage IconIdX= %d\r\n", __func__, pPage->IconIdX); + DBG_DUMP("\r\n %s pPage SelItem= %d\r\n", __func__, pPage->SelItem); + DBG_DUMP("\r\n %s pPage FirstItem= %d\r\n", __func__, pPage->FirstItem); + DBG_DUMP("\r\n %s pPage Count= %d\r\n", __func__, pPage->Count); +#endif +#if 0 + if (pMenu->Status == TMS_ON_TAB) + { + for (i = 0; i < TAB_PAGE; i++) { + if ((UINT32)pMenu->SelPage == i){ + uiIcon[i] = (&pMenu->pPages[i])->IconId; + u_ItemSel = false; + }else{ + uiIcon[i] = (&pMenu->pPages[i])->IconIdX; + u_ItemSel = true; + } + uiText[i] = (&pMenu->pPages[i])->TextId; + if(u_ItemSel){ + lv_plugin_menu_set_item_string_id(menu_tab, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, uiText[i]); + lv_plugin_menu_set_item_img_id(menu_tab, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, uiIcon[i]); + }else{ + lv_plugin_menu_set_item_string_id(menu_tab, i, LV_PLUGIN_MENU_ITEM_STATE_FOCUSED, uiText[i]); + lv_plugin_menu_set_item_img_id(menu_tab, i, LV_PLUGIN_MENU_ITEM_STATE_FOCUSED, uiIcon[i]); + } + lv_plugin_menu_set_item_hidden(menu_tab, i, false); + } + } +#endif //draw item form startIndex - itemIndex = startIndex; for (i = 0; i < PAGE; i++) { //check item if disable TM_CheckItemStatus(pMenu, &itemIndex, TRUE); @@ -376,8 +386,14 @@ static void MenuCommonItem_UpdateContent(TM_MENU *pMenu) lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); lv_plugin_menu_set_item_hidden(menu_item, i, true); + u_ItemSel = true; } else { - lv_plugin_res_id img_id; +#if 0////demo for only one container + pItem = &pPage->pItems[i]; + lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); + lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); + lv_plugin_menu_set_item_hidden(menu_item, i, false); +#endif pItem = &pPage->pItems[itemIndex]; if(pItem->ItemId == IDM_MOVIE_WDR){ static lv_plugin_res_id res[] = { @@ -397,52 +413,58 @@ static void MenuCommonItem_UpdateContent(TM_MENU *pMenu) lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); lv_plugin_menu_set_item_hidden(menu_item, i, false); - - u_hiddentext = TRUE; + u_hiddenitem = true; }else{ lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); lv_plugin_menu_set_item_hidden(menu_item, i, false); - - u_hiddentext = FALSE; + u_hiddenitem = false; + } + u_ItemSel = false; + itemIndex++; + } + if(u_ItemSel){ + if(i == 0){ + lv_obj_set_hidden(image_option_01_scr_uiflowmenucommonitem, true); + lv_obj_set_hidden(container_option_1_scr_uiflowmenucommonitem, true); + }else if(i == 1){ + lv_obj_set_hidden(image_option_02_scr_uiflowmenucommonitem, true); + lv_obj_set_hidden(container_option_2_scr_uiflowmenucommonitem, true); + }else if(i == 2){ + lv_obj_set_hidden(image_option_03_scr_uiflowmenucommonitem, true); + lv_obj_set_hidden(container_option_3_scr_uiflowmenucommonitem, true); + }else if(i == 3){ + lv_obj_set_hidden(image_option_04_scr_uiflowmenucommonitem, true); + lv_obj_set_hidden(container_option_4_scr_uiflowmenucommonitem, true); + }else if(i == 4){ + lv_obj_set_hidden(image_option_05_scr_uiflowmenucommonitem, true); + lv_obj_set_hidden(container_option_5_scr_uiflowmenucommonitem, true); } - -#if 1 - if(!u_hiddentext){ + }else{ + if(!u_hiddenitem){ pOption = &pItem->pOptions[SysGetFlag(pItem->SysFlag)]; -// DBG_DUMP("%s pOption->TextId =%d\r\n", __func__,pOption->TextId); if(i == 0){ - CHKPNT;//image_option_1_scr_uiflowmenucommonitem lv_obj_set_hidden(image_option_01_scr_uiflowmenucommonitem, true); -// lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); lv_plugin_label_set_text(label_option_1_scr_uiflowmenucommonitem, pOption->TextId); lv_plugin_label_update_font(label_option_1_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN); lv_obj_set_hidden(container_option_1_scr_uiflowmenucommonitem, false); }else if(i == 1){ - CHKPNT; lv_obj_set_hidden(image_option_02_scr_uiflowmenucommonitem, true); -// lv_plugin_img_set_src(image_option_2_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); lv_plugin_label_set_text(label_option_2_scr_uiflowmenucommonitem, pOption->TextId); lv_plugin_label_update_font(label_option_2_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN); lv_obj_set_hidden(container_option_2_scr_uiflowmenucommonitem, false); }else if(i == 2){ - CHKPNT; lv_obj_set_hidden(image_option_03_scr_uiflowmenucommonitem, true); -// lv_plugin_img_set_src(image_option_3_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); lv_plugin_label_set_text(label_option_3_scr_uiflowmenucommonitem, pOption->TextId); lv_plugin_label_update_font(label_option_3_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN); lv_obj_set_hidden(container_option_3_scr_uiflowmenucommonitem, false); }else if(i == 3){ - CHKPNT; lv_obj_set_hidden(image_option_04_scr_uiflowmenucommonitem, true); -// lv_plugin_img_set_src(image_option_4_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); lv_plugin_label_set_text(label_option_4_scr_uiflowmenucommonitem, pOption->TextId); lv_plugin_label_update_font(label_option_4_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN); lv_obj_set_hidden(container_option_4_scr_uiflowmenucommonitem, false); }else if(i == 4){ - CHKPNT; lv_obj_set_hidden(image_option_05_scr_uiflowmenucommonitem, true); -// lv_plugin_img_set_src(image_option_5_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); lv_plugin_label_set_text(label_option_5_scr_uiflowmenucommonitem, pOption->TextId); lv_plugin_label_update_font(label_option_5_scr_uiflowmenucommonitem, LV_OBJ_PART_MAIN); lv_obj_set_hidden(container_option_5_scr_uiflowmenucommonitem, false); @@ -470,13 +492,8 @@ static void MenuCommonItem_UpdateContent(TM_MENU *pMenu) lv_obj_set_hidden(image_option_05_scr_uiflowmenucommonitem, false); } } -#endif - itemIndex++; } } -// lv_plugin_img_set_src(cont_menu_option2, LV_PLUGIN_IMG_ID_SF_NEXT1); -// lv_plugin_label_set_text(cont_menu_option2, LV_PLUGIN_STRING_ID_STRID_MODE); -// lv_plugin_label_update_font(cont_menu_option2, LV_OBJ_PART_MAIN); } @@ -514,32 +531,11 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj) menu_item = lv_plugin_menu_create(obj, container_main_menu_scr_uiflowmenucommonitem); lv_plugin_menu_set_wrap(menu_item, true); } -// if(menu_option == NULL){ -// menu_option = lv_plugin_menu_create(obj, container_itemoptinfo_scr_uiflowmenucommonitem); -// lv_plugin_menu_set_wrap(menu_option, true); -// } - - //if(label_menu_item == NULL) - //label_menu_item = label_option1_scr_uiflowmenucommonitem;//; - -#if 0 - if(container_option1 == NULL){ -// container_option1 = lv_plugin_menu_create(obj, container_option_1_scr_uiflowmenucommonitem); -// lv_plugin_menu_set_wrap(container_option1, true); - container_option1 = container_option_1_scr_uiflowmenucommonitem;//; - } - if(container_option2 == NULL) - container_option1 = container_option_2_scr_uiflowmenucommonitem;//; - if(container_option3 == NULL) - container_option3 = container_option_3_scr_uiflowmenucommonitem;//; -// if(container_option4 == NULL) -// container_option4 = label_menu_option4_scr_uiflowmenucommonitem;//; -// if(container_option5 == NULL) -// container_option5 = label_menu_option5_scr_uiflowmenucommonitem;//; -#endif -// if(cont_menu_option2 == NULL) -// cont_menu_option2 = container_option_2_scr_uiflowmenucommonitem;//; + if(menu_tab == NULL){ + menu_tab = lv_plugin_menu_create(obj, container_tab_scr_uiflowmenucommonitem); + lv_plugin_menu_set_wrap(menu_tab, true); + } MenuItem_OnOpen(obj); @@ -553,18 +549,39 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_NEXT: { + printf("=============== down.\n"); MenuItem_OnNext(obj); + // MenuItem_OnDown(obj); break; } case LV_USER_KEY_PREV: { + printf("=============== up.\n"); MenuItem_OnPrev(obj); + // MenuItem_OnUp(obj); + break; + } + + case LV_USER_KEY_UP: + { + printf("=============== up.\n"); + // MenuItem_OnPrev(obj); + MenuItem_OnUp(obj); + break; + } + + case LV_USER_KEY_DOWN: + { + printf("=============== down.\n"); + // MenuItem_OnNext(obj); + MenuItem_OnDown(obj); break; } case LV_USER_KEY_SELECT: { + printf("=============== select.\n"); MenuItem_OnSelected(obj); break; } @@ -632,6 +649,7 @@ void container_main_menu_callback(lv_obj_t* obj, lv_event_t event) void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) { + printf("=================== event.\n", event); switch(event) { case LV_PLUGIN_EVENT_SCR_OPEN: @@ -639,6 +657,9 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) UIFlowMenuCommonItem_ScrOpen(obj); break; } + // case NVTEVT_KEY_MOVIE: + // printf("=================== left.\n"); + // break; case LV_PLUGIN_EVENT_SCR_CLOSE: { @@ -662,12 +683,14 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) break; case LV_EVENT_CLICKED: + printf("ssssssssss LV_EVENT_CLICKED\n"); MenuItem_OnSelected(obj); break; case LV_EVENT_KEY: { uint32_t* key = (uint32_t*)lv_event_get_data(); + printf("wwwwwwww LV_EVENT_KEY = %d\n", key); /* handle key event */ UIFlowMenuCommonItem_Key(obj, *key);