From 3bdd082a9f56ab266d67c5494a9e8c9449f672c8 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Mon, 16 Oct 2023 11:15:49 +0800 Subject: [PATCH] Setting More page show. --- code/application/source/cardv/Makefile | 1 + .../Resource/Languages/Language_DE.c | 9 ++ .../Resource/Languages/Language_EN.c | 9 ++ .../Resource/Languages/Language_ES.c | 9 ++ .../Resource/Languages/Language_FR.c | 9 ++ .../Resource/Languages/Language_IT.c | 9 ++ .../Resource/Languages/Language_JP.c | 9 ++ .../Resource/Languages/Language_PO.c | 9 ++ .../Resource/Languages/Language_RU.c | 9 ++ .../Resource/Languages/Language_SC.c | 9 ++ .../Resource/Languages/Language_TC.c | 9 ++ .../UIFlowLVGL.UIFlowPhoto.lvglscr | 42 +++---- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang | 103 +++++++++++++++++- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c | 9 ++ .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h | 11 +- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h | 35 ++++++ .../UIFlowMenuCommonItem/MenuMore.c | 51 +++++++++ .../UIFlowMenuCommonItem/MenuMore.h | 7 ++ .../UIFlowMenuCommonItemEventCallback.c | 2 +- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 38 +++---- .../UIFlowPlay/UIFlowPlayEventCallback.c | 48 +++++++- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h | 1 + .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 7 ++ 23 files changed, 385 insertions(+), 60 deletions(-) create mode 100644 code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c create mode 100644 code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.h diff --git a/code/application/source/cardv/Makefile b/code/application/source/cardv/Makefile index 4b31af912..404d42a1c 100755 --- a/code/application/source/cardv/Makefile +++ b/code/application/source/cardv/Makefile @@ -285,6 +285,7 @@ SRC += \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c \ + ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.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/Resource/Languages/Language_DE.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_DE.c index 7a5ac7c2f..63e226c98 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_DE.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_DE.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_DE_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c index ad2d30267..1a12bef7b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = { { "Low", 3 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "Auto UTC", 8 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "Manual", 6 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "Battery Type", 12 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "Alkaline", 8 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "NI-MH", 5 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "Lithium", 7 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "Lith Pack", 9 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "SD Loop", 7 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "Camera FW Upgrade", 17 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "Module FW Upgrade", 17 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "Reset", 5 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_ES.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_ES.c index e6232f872..54c61dc5a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_ES.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_ES.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_ES_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_FR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_FR.c index 70fbe7c42..ae76d2a26 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_FR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_FR.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_FR_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_IT.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_IT.c index 4842cb717..8f72a2681 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_IT.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_IT.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_IT_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_JP.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_JP.c index 936f1cca2..cfb9dbc2c 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_JP.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_JP.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_JP_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_PO.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_PO.c index 158cd6d79..6da38abc6 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_PO.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_PO.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_PO_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_RU.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_RU.c index 8fd97eae2..997ddf8cc 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_RU.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_RU.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_RU_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_SC.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_SC.c index 10f624008..1447ce67a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_SC.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_SC.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_SC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_TC.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_TC.c index e9eb8aba7..dd178a923 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_TC.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_TC.c @@ -618,6 +618,15 @@ lv_plugin_string_t lv_plugin_TC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ALKALINE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NI-MH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITHIUM */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LITH_PACK */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SD_LOOP */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_RESET */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr index 1f1a9b0a1..68ddb7020 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr @@ -1041,8 +1041,7 @@ }, "Text": { "text_color": "0x31404f", - "text_sel_bg_color": "0x00b495", - "text_sel_color": "0x3c3c3c" + "text_sel_bg_color": "0x00b495" }, "part": 0, "state": 0 @@ -1051,8 +1050,7 @@ "Text": { "text_color": "0xffffff", "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 1 @@ -1060,32 +1058,28 @@ { "Text": { "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 2 }, { "Text": { - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 3 }, { "Text": { - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 4 }, { "Text": { - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 5 @@ -1094,8 +1088,7 @@ "Text": { "text_color": "0x888888", "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 6 @@ -1193,8 +1186,7 @@ }, "Text": { "text_color": "0x31404f", - "text_sel_bg_color": "0x00b495", - "text_sel_color": "0x3c3c3c" + "text_sel_bg_color": "0x00b495" }, "part": 0, "state": 0 @@ -1203,8 +1195,7 @@ "Text": { "text_color": "0xffffff", "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 1 @@ -1212,32 +1203,28 @@ { "Text": { "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 2 }, { "Text": { - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 3 }, { "Text": { - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 4 }, { "Text": { - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 5 @@ -1245,8 +1232,7 @@ { "Text": { "text_color": "0x888888", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_sel_bg_color": "0x01a2b1" }, "part": 0, "state": 6 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang index 83015e0d7..8fbf28af0 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -884,7 +884,16 @@ "High", "Low", "Auto UTC", - "Manual" + "Manual", + "Battery Type", + "Alkaline", + "NI-MH", + "Lithium", + "Lith Pack", + "SD Loop", + "Camera FW Upgrade", + "Module FW Upgrade", + "Reset" ] }, { @@ -1505,6 +1514,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -2126,6 +2144,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -2747,6 +2774,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -3368,6 +3404,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -3989,6 +4034,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -4610,6 +4664,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -5231,6 +5294,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -5852,6 +5924,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -6473,6 +6554,15 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] } @@ -7094,6 +7184,15 @@ "STRING_HIGH", "STRING_LOW", "STRING_AUTO_UTC", - "STRING_MANUAL" + "STRING_MANUAL", + "STRING_BATTERY_TYPE", + "STRING_ALKALINE", + "STRING_NI-MH", + "STRING_LITHIUM", + "STRING_LITH_PACK", + "STRING_SD_LOOP", + "STRING_CAMERA_FW_UPGRADE", + "STRING_MODE_FW_UPGRADE", + "STRING_RESET" ] } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c index cf3fd9076..b7a6aacf1 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c @@ -1267,6 +1267,15 @@ lv_plugin_res_id lv_plugin_fixed_language_string_id_table[] = { LV_PLUGIN_RES_ID_NONE, /* 615*/ LV_PLUGIN_RES_ID_NONE, /* 616*/ LV_PLUGIN_RES_ID_NONE, /* 617*/ + LV_PLUGIN_RES_ID_NONE, /* 618*/ + LV_PLUGIN_RES_ID_NONE, /* 619*/ + LV_PLUGIN_RES_ID_NONE, /* 620*/ + LV_PLUGIN_RES_ID_NONE, /* 621*/ + LV_PLUGIN_RES_ID_NONE, /* 622*/ + LV_PLUGIN_RES_ID_NONE, /* 623*/ + LV_PLUGIN_RES_ID_NONE, /* 624*/ + LV_PLUGIN_RES_ID_NONE, /* 625*/ + LV_PLUGIN_RES_ID_NONE, /* 626*/ }; lv_plugin_res_t lv_plugin_UIFlowLVGL_res = diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h index 8edba039a..23ad9d6ce 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h @@ -1678,7 +1678,16 @@ LV_IMG_DECLARE(sy_redline2); #define LV_PLUGIN_STRING_ID_STRING_LOW 615 #define LV_PLUGIN_STRING_ID_STRING_AUTO_UTC 616 #define LV_PLUGIN_STRING_ID_STRING_MANUAL 617 -#define LV_PLUGIN_STRING_TABLE_SIZE 618 +#define LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE 618 +#define LV_PLUGIN_STRING_ID_STRING_ALKALINE 619 +// #define LV_PLUGIN_STRING_ID_STRING_NI-MH 620 +#define LV_PLUGIN_STRING_ID_STRING_LITHIUM 621 +#define LV_PLUGIN_STRING_ID_STRING_LITH_PACK 622 +#define LV_PLUGIN_STRING_ID_STRING_SD_LOOP 623 +#define LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE 624 +#define LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE 625 +#define LV_PLUGIN_STRING_ID_STRING_RESET 626 +#define LV_PLUGIN_STRING_TABLE_SIZE 627 #define LV_PLUGIN_LANGUAGE_ID_EN 1 #define LV_PLUGIN_LANGUAGE_ID_FR 2 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 ff8b21392..6d76ae76f 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 @@ -130,6 +130,13 @@ enum _MENU_ID { IDM_CHECK_IN_PHOTO, IDM_GPS, + // Setting More page + IDM_BATTERY_TYPE, + IDM_SD_LOOP, + IDM_CAMERA_FW_UPGRADE, + IDM_MODULE_FW_UPGRADE, + IDM_RESET, + }; // Menu String ID @@ -307,6 +314,7 @@ enum _MENU_IDS { IDS_QR = LV_PLUGIN_STRING_ID_STRID_MOVIE, IDS_GENERAL = LV_PLUGIN_STRING_ID_STRID_MOVIE, IDS_SEND = LV_PLUGIN_STRING_ID_STRID_MOVIE, + IDS_MORE = LV_PLUGIN_STRING_ID_STRID_MOVIE, IDS_MOVIE_DUAL_CAM = LV_PLUGIN_STRING_ID_STRID_DUAL_CAM, IDS_MOVIE_CODEC = LV_PLUGIN_STRING_ID_STRID_CODEC, @@ -720,6 +728,17 @@ enum _MENU_IDS { IDS_GPS_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, IDS_GPS_ON = LV_PLUGIN_STRING_ID_STRID_ON, + // Setting More page + IDS_BATTERY_TYPE = LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE, + IDS_BATTERY_TYPE_ALKALINE = LV_PLUGIN_STRING_ID_STRING_ALKALINE, + IDS_BATTERY_TYPE_NI_MH = LV_PLUGIN_STRING_ID_STRING_BATTERY_TYPE, + IDS_BATTERY_TYPE_LITHIUM = LV_PLUGIN_STRING_ID_STRING_LITHIUM, + IDS_BATTERY_TYPE_LITH_PACK = LV_PLUGIN_STRING_ID_STRING_LITH_PACK, + IDS_SD_LOOP = LV_PLUGIN_STRING_ID_STRING_SD_LOOP, + IDS_CAMERA_FW_UPGRADE = LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE, + IDS_MODULE_FW_UPGRADE = LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE, + IDS_RESET = LV_PLUGIN_STRING_ID_STRING_RESET, + IDS_END, }; @@ -811,6 +830,8 @@ enum _MENU_IDI { IDIX_GENERAL = LV_PLUGIN_RES_ID_NONE, IDI_SEND = LV_PLUGIN_RES_ID_NONE, IDIX_SEND = LV_PLUGIN_RES_ID_NONE, + IDI_MORE = LV_PLUGIN_RES_ID_NONE, + IDIX_MORE = LV_PLUGIN_RES_ID_NONE, IDI_MOVIE_DUAL_CAM = LV_PLUGIN_IMG_ID_ICON_DUALCAM_BOTH_M, IDI_MOVIE_CODEC = LV_PLUGIN_IMG_ID_ICON_MENU_SETUP_ON_M, @@ -890,6 +911,13 @@ enum _MENU_IDI { IDI_SEND_TYPE = LV_PLUGIN_IMG_ID_SF_SEND_TYPE, IDI_CHECK_IN_PHOTO = LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO, IDI_GPS = LV_PLUGIN_IMG_ID_SF_GPS, + + // Setting More page + IDI_BATTERY_TYPE = LV_PLUGIN_IMG_ID_SF_BATTERY_TYPE, + IDI_SD_LOOP = LV_PLUGIN_IMG_ID_SF_SD_LOOP, + IDI_CAMERA_FW_UPGRADE = LV_PLUGIN_IMG_ID_SF_CAMERA_FW_UPGRADE, + IDI_MODULE_FW_UPGRADE = LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE, + IDI_RESET = LV_PLUGIN_IMG_ID_SF_RESET, #if 0 // Language Options @@ -1014,6 +1042,13 @@ enum _MENU_IDF { IDF_SEND_TYPE = FL_SEND_TYPE, IDF_CHECK_IN_PHOTO = FL_CHECK_IN_PHOTO, IDF_GPS = FL_GPS, + + // Setting More page + IDF_BATTERY_TYPE = FL_BATTERY_TYPE, + IDF_SD_LOOP = FL_SD_LOOP, + IDF_CAMERA_FW_UPGRADE = FL_CAMERA_FW_UPGRADE, + IDF_MODULE_FW_UPGRADE = FL_MODULE_FW_UPGRADE, + IDF_RESET = FL_RESET, }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c new file mode 100644 index 000000000..65e5f00f7 --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c @@ -0,0 +1,51 @@ +#include "PrjInc.h" +#include "UIWnd/UIFlow.h" + + +TMDEF_BEGIN_OPTIONS(BATTERY_TYPE) +TMDEF_OPTION_TEXT_S(BATTERY_TYPE_ALKALINE, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(BATTERY_TYPE_NI_MH, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITHIUM, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(SD_LOOP) +// TMDEF_OPTION_TEXT_S(GPS_OFF, TM_OPTION_ENABLE) +// TMDEF_OPTION_TEXT_S(GPS_ON, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(CAMERA_FW_UPGRADE) +// TMDEF_OPTION_TEXT_S(GPS_OFF, TM_OPTION_ENABLE) +// TMDEF_OPTION_TEXT_S(GPS_ON, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(MODULE_FW_UPGRADE) +// TMDEF_OPTION_TEXT_S(GPS_OFF, TM_OPTION_ENABLE) +// TMDEF_OPTION_TEXT_S(GPS_ON, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() +TMDEF_BEGIN_OPTIONS(RESET) +// TMDEF_OPTION_TEXT_S(GPS_OFF, TM_OPTION_ENABLE) +// TMDEF_OPTION_TEXT_S(GPS_ON, TM_OPTION_ENABLE) +TMDEF_END_OPTIONS() + +TMDEF_BEGIN_ITEMS(MORE) +TMDEF_ITEM_TEXTID(BATTERY_TYPE) +TMDEF_ITEM_TEXTID(SD_LOOP) +TMDEF_ITEM_TEXTID(CAMERA_FW_UPGRADE) +TMDEF_ITEM_TEXTID(MODULE_FW_UPGRADE) +TMDEF_ITEM_TEXTID(RESET) +TMDEF_END_ITEMS() + +// -------------------------------------------------------------------------- +// PAGES +// -------------------------------------------------------------------------- +// MORE Menu Pages +TMDEF_BEGIN_PAGES(MORE) +TMDEF_PAGE_TEXT_ICON(MORE) +TMDEF_END_PAGES() +TMDEF_EMNU(gMoreMenu, MORE, More_MenuCallback) + +// -------------------------------------------------------------------------- +// Menu Callback +// -------------------------------------------------------------------------- +int More_MenuCallback(UINT32 uiMessage, UINT32 uiParam) +{ + return TMF_PROCESSED; +} \ No newline at end of file diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.h new file mode 100644 index 000000000..2e79bb82b --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.h @@ -0,0 +1,7 @@ +#ifndef _MENUM_MORE_H_ +#define _MENUM_MORE_H_ + +extern TM_MENU gMoreMenu; +extern TM_ITEM gTM_ITEMS_MORE[]; + +#endif \ No newline at end of file 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 c76d1eaaa..dd39c96c1 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 @@ -256,7 +256,7 @@ void LV_MenuItem_OnOpen(lv_obj_t* obj) pCurMenu->pPages[0]= gQrMenu.pPages[0]; //= QR_UI pCurMenu->pPages[1]= gGeneralMenu.pPages[0]; //= General_UI pCurMenu->pPages[2]= gSendMenu.pPages[0]; //= Send_UI - pCurMenu->pPages[3]= gQrMenu.pPages[0]; //= QR_UI + pCurMenu->pPages[3]= gMoreMenu.pPages[0]; //= QR_UI pCurMenu->Count = 4; TM_SetMenu(pCurMenu); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c index fe1e03ffe..66cc71d47 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c @@ -1090,20 +1090,18 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_EDITED, color); @@ -1128,7 +1126,6 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DISABLED, color); lv_obj_t *label_2 = lv_label_create(button_2, NULL); @@ -1228,43 +1225,38 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_3_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_EDITED,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_3_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_DISABLED, color); lv_obj_t *label_3 = lv_label_create(button_3, NULL); lv_obj_set_hidden(label_3, false); lv_obj_set_click(label_3, false); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c index 3785074cc..7ec2d3832 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c @@ -5,6 +5,7 @@ #include #include "GxVideoFile.h" #include "FileDB.h" +#include "UIFlowLVGL_SPORTCAM.h" #include "exif/Exif.h" #include "exif/ExifDef.h" #include "UIApp/ExifVendor.h" @@ -1348,9 +1349,7 @@ static void UIFlowPlay_OnKeyPrev(lv_obj_t* obj) { case PLB_ST_FULL: DBG_DUMP("UIFlowPlay_OnKeyPrev PLB_ST_FULL\r\n"); -// UIFlowPlay_UserBtnCheck(curr_pressbtn, PLB_BTN_FWD); - lv_group_focus_prev(gp_btns); - + lv_group_focus_prev(gp_btns); break; case PLB_ST_PLAY_MOV: case PLB_ST_FWD_MOV: @@ -1422,8 +1421,6 @@ static void UIFlowPlay_OnKeyNext(lv_obj_t* obj) switch (g_PlbData.State) { case PLB_ST_FULL: - DBG_DUMP("%s: curr_btn = %d\r\n", __func__, 0); -// UIFlowPlay_UserBtnCheck(curr_pressbtn, PLB_BTN_BWD); lv_group_focus_next(gp_btns); break; case PLB_ST_PLAY_MOV: @@ -1486,6 +1483,37 @@ static void UIFlowPlay_OnKeyNext(lv_obj_t* obj) } +static void UIFlowPlay_OnKeyUp(lv_obj_t* obj) +{ + switch (g_PlbData.State) + { + case PLB_ST_FULL: + UIPlay_PlaySingle(PB_SINGLE_PREV); + FlowPlay_CheckFileAndRecovery(obj); + update_playicons(PLB_ST_FULL); + break; + + default: + DBG_DUMP("%s: need State = PLB_ST_FULL but is: %d\r\n", __func__, g_PlbData.State); + break; + } +} + +static void UIFlowPlay_OnKeyDown(lv_obj_t* obj) +{ + switch (g_PlbData.State) + { + case PLB_ST_FULL: + UIPlay_PlaySingle(PB_SINGLE_NEXT); + FlowPlay_CheckFileAndRecovery(obj); + update_playicons(PLB_ST_FULL); + break; + default: + DBG_DUMP("%s: need State = PLB_ST_FULL but is: %d\r\n", __func__, g_PlbData.State); + break; + } +} + static void UIFlowPlay_OnKeyZoomIn(lv_obj_t* obj) { #if 1//_TODO @@ -1767,6 +1795,16 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key) // UIFlowPlay_OnKeySelect(obj); break; } + case LV_USER_KEY_LEFT: + { + UIFlowPlay_OnKeyUp(obj); + break; + } + case LV_USER_KEY_RIGHT: + { + UIFlowPlay_OnKeyDown(obj); + break; + } case LV_USER_KEY_UP: case LV_USER_KEY_PREV: 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 f498558c8..f6b76cac2 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 @@ -40,6 +40,7 @@ extern const PALETTE_ITEM gDemoKit_Palette_Palette[256]; #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.h" +#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMode.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h" 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 4fc34657f..47a684330 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 @@ -239,6 +239,13 @@ typedef enum { FL_SEND_TYPE, FL_CHECK_IN_PHOTO, FL_GPS, + + // Setting More page + FL_BATTERY_TYPE, + FL_SD_LOOP, + FL_CAMERA_FW_UPGRADE, + FL_MODULE_FW_UPGRADE, + FL_RESET, //Setup FL_LCD_OFF,