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 90a6997d1..8acbb2988 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_DE_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 3d91bc879..1a67f910b 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,8 +589,18 @@ 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 */ - { "Send Type", 9 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ + { "", 0 }, /* 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 */ + { "01-99", 5 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "Daily", 5 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "Instant", 7 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "Hybrid", 6 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "Timely", 6 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "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 */ }; 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 294b1a201..31256b712 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_ES_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 b8f021714..20b3aa582 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_FR_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 9ce546707..4955dbe14 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_IT_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 5ee87c8a5..8a86e4d0f 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_JP_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 7359ab1da..a321e2f38 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_PO_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 67b1490a0..41a025ad8 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_RU_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 7d16a4c50..85d314a0d 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_SC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 7750594bf..9dfb3fec4 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 @@ -591,6 +591,16 @@ lv_plugin_string_t lv_plugin_TC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_SEND_TYPE */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_GPS */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_UNLIMITED */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_NUMBER */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DAILY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_INSTANT */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_HYBRID */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TIMELY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_ONCE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_TWICE_DAY */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY */ }; 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 9909a86a2..a53e19cd2 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 @@ -1168,37 +1168,64 @@ "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_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 3 }, { + "Text": { + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 4 }, { + "Text": { + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" + }, "part": 0, "state": 5 }, { "Text": { - "text_color": "0x888888" + "text_color": "0x888888", + "text_sel_bg_color": "0x01a2b1", + "text_sel_color": "0x3b3e42" }, "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 ddda69230..8b8e82f56 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -856,8 +856,18 @@ "Date&Time", "Max Num/Day", "Settings Check", - "Send Type", - "Check in Photo" + "", + "Check in Photo", + "GPS", + "Unlimited", + "01-99", + "Daily", + "Instant", + "Hybrid", + "Timely", + "Once/day", + "Twice/day", + "4 times/day" ] }, { @@ -1451,6 +1461,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -2045,6 +2065,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -2639,6 +2669,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -3233,6 +3273,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -3827,6 +3877,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -4421,6 +4481,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -5015,6 +5085,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -5609,6 +5689,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -6203,6 +6293,16 @@ "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "" ] } @@ -6797,6 +6897,16 @@ "STRING_MAX_NUM_DAY", "STRING_SETTINGS_CHECK", "STRING_SEND_TYPE", - "STRING_CHECK_IN_PHOTO" + "STRING_CHECK_IN_PHOTO", + "STRING_GPS", + "STRING_UNLIMITED", + "STRING_NUMBER", + "STRING_DAILY", + "STRING_INSTANT", + "STRING_HYBRID", + "STRING_TIMELY", + "STRING_ONCE_DAY", + "STRING_TWICE_DAY", + "STRING_4TIMES_DAY" ] } 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 ab0f9cda6..019678635 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 @@ -1240,6 +1240,16 @@ lv_plugin_res_id lv_plugin_fixed_language_string_id_table[] = { LV_PLUGIN_RES_ID_NONE, /* 588*/ LV_PLUGIN_RES_ID_NONE, /* 589*/ LV_PLUGIN_RES_ID_NONE, /* 590*/ + LV_PLUGIN_RES_ID_NONE, /* 591*/ + LV_PLUGIN_RES_ID_NONE, /* 592*/ + LV_PLUGIN_RES_ID_NONE, /* 593*/ + LV_PLUGIN_RES_ID_NONE, /* 594*/ + LV_PLUGIN_RES_ID_NONE, /* 595*/ + LV_PLUGIN_RES_ID_NONE, /* 596*/ + LV_PLUGIN_RES_ID_NONE, /* 597*/ + LV_PLUGIN_RES_ID_NONE, /* 598*/ + LV_PLUGIN_RES_ID_NONE, /* 599*/ + LV_PLUGIN_RES_ID_NONE, /* 600*/ }; 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 1d896888e..69dfa5fc9 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 @@ -1651,7 +1651,17 @@ LV_IMG_DECLARE(sy_redline2); #define LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK 588 #define LV_PLUGIN_STRING_ID_STRING_SEND_TYPE 589 #define LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO 590 -#define LV_PLUGIN_STRING_TABLE_SIZE 591 +#define LV_PLUGIN_STRING_ID_STRING_GPS 591 +#define LV_PLUGIN_STRING_ID_STRING_UNLIMITED 592 +#define LV_PLUGIN_STRING_ID_STRING_NUMBER 593 +#define LV_PLUGIN_STRING_ID_STRING_DAILY 594 +#define LV_PLUGIN_STRING_ID_STRING_INSTANT 595 +#define LV_PLUGIN_STRING_ID_STRING_HYBRID 596 +#define LV_PLUGIN_STRING_ID_STRING_TIMELY 597 +#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_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 d6ef4f71d..7831249d0 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 @@ -702,21 +702,21 @@ enum _MENU_IDS { // Setting Send page // IDS_MAX_NUM_DAY = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_MAX_NUM_DAY = LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY, - IDS_MAX_NUM_DAY_UNLIMITED = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_MAX_NUM_DAY_NUMBER = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_MAX_NUM_DAY_UNLIMITED = LV_PLUGIN_STRING_ID_STRING_UNLIMITED, + IDS_MAX_NUM_DAY_NUMBER = LV_PLUGIN_STRING_ID_STRING_NUMBER, IDS_SETTINGS_CHECK = LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK, - IDS_SETTINGS_CHECK_DAILAY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SETTINGS_CHECK_INSTANT = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SETTINGS_CHECK_HYBRID = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + IDS_SETTINGS_CHECK_DAILAY = LV_PLUGIN_STRING_ID_STRING_DAILY, + IDS_SETTINGS_CHECK_INSTANT = LV_PLUGIN_STRING_ID_STRING_INSTANT, + IDS_SETTINGS_CHECK_HYBRID = LV_PLUGIN_STRING_ID_STRING_HYBRID, IDS_SEND_TYPE = LV_PLUGIN_STRING_ID_STRING_SEND_TYPE, - IDS_SEND_TYPE_TIMELY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SEND_TYPE_ONCE_DAY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SEND_TYPE_TWICE_DAY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SEND_TYPE_4_TIMES_DAY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + IDS_SEND_TYPE_TIMELY = LV_PLUGIN_STRING_ID_STRING_TIMELY, + IDS_SEND_TYPE_ONCE_DAY = LV_PLUGIN_STRING_ID_STRING_ONCE_DAY, + IDS_SEND_TYPE_TWICE_DAY = LV_PLUGIN_STRING_ID_STRING_TWICE_DAY, + IDS_SEND_TYPE_4_TIMES_DAY = LV_PLUGIN_STRING_ID_STRING_4TIMES_DAY, IDS_CHECK_IN_PHOTO = LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO, IDS_CHECK_IN_PHOTO_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, IDS_CHECK_IN_PHOTO_ON = LV_PLUGIN_STRING_ID_STRID_ON, - IDS_GPS = LV_PLUGIN_STRING_ID_STRING_SEND_TYPE, + IDS_GPS = LV_PLUGIN_STRING_ID_STRING_GPS, IDS_GPS_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, IDS_GPS_ON = LV_PLUGIN_STRING_ID_STRID_ON, 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 38dfc8f74..0af5eb7bd 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -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 = &gSendMenu; //replace to setup menu dynamically pCurMenu->pPages[1]= gPhotoMenu.pPages[0]; //= General_UI pCurMenu->pPages[2]= gPlaybackMenu.pPages[0]; //= Send_UI 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 449274b56..fe1e03ffe 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,18 +1090,20 @@ 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, 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(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(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);