From 2e2ce5a8a2b2a6a00828f6495045536bcce3f666 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Sat, 14 Oct 2023 14:55:09 +0800 Subject: [PATCH] Setting send page improve. --- .../Resource/Languages/Language_DE.c | 17 ++ .../Resource/Languages/Language_EN.c | 19 +- .../Resource/Languages/Language_ES.c | 17 ++ .../Resource/Languages/Language_FR.c | 17 ++ .../Resource/Languages/Language_IT.c | 17 ++ .../Resource/Languages/Language_JP.c | 17 ++ .../Resource/Languages/Language_PO.c | 17 ++ .../Resource/Languages/Language_RU.c | 17 ++ .../Resource/Languages/Language_SC.c | 17 ++ .../Resource/Languages/Language_TC.c | 17 ++ .../UIFlowLVGL.UIFlowPhoto.lvglscr | 33 ++- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang | 193 +++++++++++++++++- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c | 17 ++ .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h | 19 +- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h | 34 +-- .../UIFlowMenuCommonItemEventCallback.c | 2 +- 16 files changed, 441 insertions(+), 29 deletions(-) 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 8acbb2988..7a5ac7c2f 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_DE_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 1a67f910b..ad2d30267 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 @@ -589,7 +589,7 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = { { "Date&Time", 9 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ { "Max Num/Day", 11 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ { "Settings Check", 14 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ - { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ + { "Send Type", 9 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "Check in Photo", 14 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ { "GPS", 3 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ { "Unlimited", 9 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = { { "Once/day", 8 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "Twice/day", 9 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "4 times/day", 11 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "Photo", 5 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "PIC+VID", 7 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "8M", 2 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "12M", 3 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "16M", 3 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "FHD", 3 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "HD", 2 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "WVGA", 4 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "10s", 3 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "15s", 3 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "MaxRange", 8 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "Balance", 7 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "Min Blur", 8 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "High", 4 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "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 */ }; 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 31256b712..e6232f872 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_ES_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 20b3aa582..70fbe7c42 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_FR_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 4955dbe14..4842cb717 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_IT_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 8a86e4d0f..936f1cca2 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_JP_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 a321e2f38..158cd6d79 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_PO_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 41a025ad8..8fd97eae2 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_RU_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 85d314a0d..10f624008 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_SC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 9dfb3fec4..e9eb8aba7 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 @@ -601,6 +601,23 @@ lv_plugin_string_t lv_plugin_TC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_PIC_VID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_8M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_12M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SIZE_16M */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FHD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HD */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_WVGA */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_10S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_15S */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_RANGE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_BALANCE */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MIN_BLUR */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HIGH */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_LOW */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_AUTO_UTC */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MANUAL */ }; 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 a53e19cd2..1f1a9b0a1 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 @@ -1040,38 +1040,62 @@ "opa_scale": 120 }, "Text": { - "text_color": "0x31404f" + "text_color": "0x31404f", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 }, { "Text": { - "text_color": "0xffffff" + "text_color": "0xffffff", + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" }, "part": 0, "state": 1 }, { + "Text": { + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 2 }, { + "Text": { + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 3 }, { + "Text": { + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 4 }, { + "Text": { + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 5 }, { "Text": { "text_color": "0x888888", - "text_font": "montserrat 16 4bpp" + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" }, "part": 0, "state": 6 @@ -1196,7 +1220,6 @@ }, { "Text": { - "text_font": "montserrat 16 4bpp", "text_sel_bg_color": "0x01a2b1", "text_sel_color": "0x3b3e42" }, @@ -1205,7 +1228,6 @@ }, { "Text": { - "text_font": "montserrat 16 4bpp", "text_sel_bg_color": "0x01a2b1", "text_sel_color": "0x3b3e42" }, @@ -1214,7 +1236,6 @@ }, { "Text": { - "text_font": "montserrat 16 4bpp", "text_sel_bg_color": "0x01a2b1", "text_sel_color": "0x3b3e42" }, 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 8b8e82f56..83015e0d7 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -856,7 +856,7 @@ "Date&Time", "Max Num/Day", "Settings Check", - "", + "Send Type", "Check in Photo", "GPS", "Unlimited", @@ -867,7 +867,24 @@ "Timely", "Once/day", "Twice/day", - "4 times/day" + "4 times/day", + "Photo", + "PIC+VID", + "8M", + "12M", + "16M", + "FHD", + "HD", + "WVGA", + "10s", + "15s", + "MaxRange", + "Balance", + "Min Blur", + "High", + "Low", + "Auto UTC", + "Manual" ] }, { @@ -1471,6 +1488,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -2075,6 +2109,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -2679,6 +2730,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -3283,6 +3351,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -3887,6 +3972,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -4491,6 +4593,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -5095,6 +5214,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -5699,6 +5835,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -6303,6 +6456,23 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] } @@ -6907,6 +7077,23 @@ "STRING_TIMELY", "STRING_ONCE_DAY", "STRING_TWICE_DAY", - "STRING_4TIMES_DAY" + "STRING_4TIMES_DAY", + "STRING_PHOTO", + "STRING_PIC_VID", + "STRING_SIZE_8M", + "STRING_SIZE_12M", + "STRING_SIZE_16M", + "STRING_FHD", + "STRING_HD", + "STRING_WVGA", + "STRING_10S", + "STRING_15S", + "STRING_MAX_RANGE", + "STRING_BALANCE", + "STRING_MIN_BLUR", + "STRING_HIGH", + "STRING_LOW", + "STRING_AUTO_UTC", + "STRING_MANUAL" ] } 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 019678635..cf3fd9076 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 @@ -1250,6 +1250,23 @@ lv_plugin_res_id lv_plugin_fixed_language_string_id_table[] = { LV_PLUGIN_RES_ID_NONE, /* 598*/ LV_PLUGIN_RES_ID_NONE, /* 599*/ LV_PLUGIN_RES_ID_NONE, /* 600*/ + LV_PLUGIN_RES_ID_NONE, /* 601*/ + LV_PLUGIN_RES_ID_NONE, /* 602*/ + LV_PLUGIN_RES_ID_NONE, /* 603*/ + LV_PLUGIN_RES_ID_NONE, /* 604*/ + LV_PLUGIN_RES_ID_NONE, /* 605*/ + LV_PLUGIN_RES_ID_NONE, /* 606*/ + LV_PLUGIN_RES_ID_NONE, /* 607*/ + LV_PLUGIN_RES_ID_NONE, /* 608*/ + LV_PLUGIN_RES_ID_NONE, /* 609*/ + LV_PLUGIN_RES_ID_NONE, /* 610*/ + LV_PLUGIN_RES_ID_NONE, /* 611*/ + LV_PLUGIN_RES_ID_NONE, /* 612*/ + LV_PLUGIN_RES_ID_NONE, /* 613*/ + LV_PLUGIN_RES_ID_NONE, /* 614*/ + LV_PLUGIN_RES_ID_NONE, /* 615*/ + LV_PLUGIN_RES_ID_NONE, /* 616*/ + LV_PLUGIN_RES_ID_NONE, /* 617*/ }; 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 69dfa5fc9..8edba039a 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 @@ -1661,7 +1661,24 @@ LV_IMG_DECLARE(sy_redline2); #define LV_PLUGIN_STRING_ID_STRING_ONCE_DAY 598 #define LV_PLUGIN_STRING_ID_STRING_TWICE_DAY 599 #define LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY 600 -#define LV_PLUGIN_STRING_TABLE_SIZE 601 +#define LV_PLUGIN_STRING_ID_STRING_PHOTO 601 +#define LV_PLUGIN_STRING_ID_STRING_PIC_VID 602 +#define LV_PLUGIN_STRING_ID_STRING_SIZE_8M 603 +#define LV_PLUGIN_STRING_ID_STRING_SIZE_12M 604 +#define LV_PLUGIN_STRING_ID_STRING_SIZE_16M 605 +#define LV_PLUGIN_STRING_ID_STRING_FHD 606 +#define LV_PLUGIN_STRING_ID_STRING_HD 607 +#define LV_PLUGIN_STRING_ID_STRING_WVGA 608 +#define LV_PLUGIN_STRING_ID_STRING_10S 609 +#define LV_PLUGIN_STRING_ID_STRING_15S 610 +#define LV_PLUGIN_STRING_ID_STRING_MAX_RANGE 611 +#define LV_PLUGIN_STRING_ID_STRING_BALANCE 612 +#define LV_PLUGIN_STRING_ID_STRING_MIN_BLUR 613 +#define LV_PLUGIN_STRING_ID_STRING_HIGH 614 +#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_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 7831249d0..ff8b21392 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 @@ -667,26 +667,26 @@ enum _MENU_IDS { // Setting GENERAL page IDS_CAMERA_MODE = LV_PLUGIN_STRING_ID_STRING_CAMERA_MODE, - IDS_CAMERA_MODE_PHOTO = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_CAMERA_MODE_PHOTO_AND_VIDEO = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_CAMERA_MODE_PHOTO = LV_PLUGIN_STRING_ID_STRING_PHOTO, + IDS_CAMERA_MODE_PHOTO_AND_VIDEO = LV_PLUGIN_STRING_ID_STRING_PIC_VID, IDS_IMAGE_SIZE = LV_PLUGIN_STRING_ID_STRING_IMAGE_SIZE, - IDS_IMAGE_SIZE_8M = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_IMAGE_SIZE_12M = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_IMAGE_SIZE_16M = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_IMAGE_SIZE_8M = LV_PLUGIN_STRING_ID_STRING_SIZE_8M, + IDS_IMAGE_SIZE_12M = LV_PLUGIN_STRING_ID_STRING_SIZE_12M, + IDS_IMAGE_SIZE_16M = LV_PLUGIN_STRING_ID_STRING_SIZE_16M, IDS_VIDEO_SIZE = LV_PLUGIN_STRING_ID_STRING_VIDEO_SIZE, - IDS_VIDEO_SIZE_FHD = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_VIDEO_SIZE_HD = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_VIDEO_SIZE_WVGA = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_VIDEO_SIZE_FHD = LV_PLUGIN_STRING_ID_STRING_FHD, + IDS_VIDEO_SIZE_HD = LV_PLUGIN_STRING_ID_STRING_HD, + IDS_VIDEO_SIZE_WVGA = LV_PLUGIN_STRING_ID_STRING_WVGA, IDS_VIDEA_LENGTH = LV_PLUGIN_STRING_ID_STRING_VIDEO_LENGTH, - IDS_VIDEA_LENGTH_10S = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_VIDEA_LENGTH_15S = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_VIDEA_LENGTH_10S = LV_PLUGIN_STRING_ID_STRING_10S, + IDS_VIDEA_LENGTH_15S = LV_PLUGIN_STRING_ID_STRING_15S, IDS_NIGHT_MODE = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_NIGHT_MODE_MAX_RANGE = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_NIGHT_MODE_BALANCE = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_NIGHT_MODE_MINBLUR = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_NIGHT_MODE_MAX_RANGE = LV_PLUGIN_STRING_ID_STRING_MAX_RANGE, + IDS_NIGHT_MODE_BALANCE = LV_PLUGIN_STRING_ID_STRING_BALANCE, + IDS_NIGHT_MODE_MINBLUR = LV_PLUGIN_STRING_ID_STRING_MIN_BLUR, IDS_FLASH_POWER = LV_PLUGIN_STRING_ID_STRING_FLASH_POWER, - IDS_FLASH_POWER_HIGH = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_FLASH_POWER_LOW = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_FLASH_POWER_HIGH = LV_PLUGIN_STRING_ID_STRING_HIGH, + IDS_FLASH_POWER_LOW = LV_PLUGIN_STRING_ID_STRING_LOW, IDS_SENSITIVITY = LV_PLUGIN_STRING_ID_STRING_SENSITIVITY, IDS_DELAY = LV_PLUGIN_STRING_ID_STRING_DELAY, IDS_DELAY_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, @@ -696,8 +696,8 @@ enum _MENU_IDS { IDS_OPERATING_TIME_ON = LV_PLUGIN_STRING_ID_STRID_ON, IDS_FORMAT_SD = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD, IDS_DATE_AND_TIME = LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME, - IDS_DATE_AND_TIME_AUTO_UTC = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_DATE_AND_TIME_MANUAL = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_DATE_AND_TIME_AUTO_UTC = LV_PLUGIN_STRING_ID_STRING_AUTO_UTC, + IDS_DATE_AND_TIME_MANUAL = LV_PLUGIN_STRING_ID_STRING_MANUAL, // Setting Send page // IDS_MAX_NUM_DAY = LV_PLUGIN_STRING_ID_STRID_ISO3200, 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 0af5eb7bd..9689ef177 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 @@ -301,7 +301,7 @@ void MenuItem_OnOpen(lv_obj_t* obj) //pNextMenu = &gCommonMenu;//use for codebase sportcam/LVGL UI or touch pCurMenu = &gMovieMenu; #endif - pCurMenu = &gSendMenu; + pCurMenu = &gGeneralMenu; //replace to setup menu dynamically pCurMenu->pPages[1]= gPhotoMenu.pPages[0]; //= General_UI pCurMenu->pPages[2]= gPlaybackMenu.pPages[0]; //= Send_UI