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 37d8059b3..90a6997d1 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_DE_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 224cbeb72..3d91bc879 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = { { "Operating Time", 14 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "Format SD", 9 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "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 */ + { "Check in Photo", 14 }, /* LV_PLUGIN_STRING_ID_STRING_CHECK_IN_PHOTO */ }; 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 34cbfa7b9..294b1a201 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_ES_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 d43a1da40..b8f021714 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_FR_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 4a7f8ade0..9ce546707 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_IT_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 477a5a44f..5ee87c8a5 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_JP_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 68fc24a41..7359ab1da 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_PO_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 5736c39bf..67b1490a0 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_RU_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 681ab2a78..7d16a4c50 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_SC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; 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 ad430ae97..7750594bf 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 @@ -587,6 +587,10 @@ lv_plugin_string_t lv_plugin_TC_string_table[] = { { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_FORMAT_SD */ { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME */ + { "", 0 }, /* LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY */ + { "", 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 */ }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr index 4cbdb49df..857369227 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr @@ -977,7 +977,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 32, + "width": 27, "x": 78, "y": 0 }, @@ -1146,7 +1146,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 32, + "width": 27, "x": 78, "y": 0 }, @@ -1315,7 +1315,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 32, + "width": 27, "x": 78, "y": 0 }, @@ -1484,7 +1484,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 32, + "width": 27, "x": 78, "y": 0 }, @@ -1653,7 +1653,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 32, + "width": 27, "x": 78, "y": 0 }, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr index ec63a2aee..f8e4c21ae 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr @@ -1477,7 +1477,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 40, + "width": 48, "x": 0, "y": 0 }, 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 b7de979f7..9909a86a2 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,63 +1040,38 @@ "opa_scale": 120 }, "Text": { - "text_color": "0x31404f", - "text_sel_bg_color": "0x00b495", - "text_sel_color": "0x3c3c3c" + "text_color": "0x31404f" }, "part": 0, "state": 0 }, { "Text": { - "text_color": "0xffffff", - "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_color": "0xffffff" }, "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_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_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_font": "montserrat 16 4bpp" }, "part": 0, "state": 6 @@ -1193,62 +1168,37 @@ "opa_scale": 120 }, "Text": { - "text_color": "0x31404f", - "text_sel_bg_color": "0x00b495", - "text_sel_color": "0x3c3c3c" + "text_color": "0x31404f" }, "part": 0, "state": 0 }, { "Text": { - "text_color": "0xffffff", - "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_color": "0xffffff" }, "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_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_sel_bg_color": "0x01a2b1", - "text_sel_color": "0x3b3e42" + "text_color": "0x888888" }, "part": 0, "state": 6 @@ -1803,7 +1753,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 40, + "width": 48, "x": 0, "y": 0 }, @@ -1907,7 +1857,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 40, + "width": 48, "x": 0, "y": 0 }, 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 73d03704f..ddda69230 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -853,7 +853,11 @@ "Delay", "Operating Time", "Format SD", - "Date&Time" + "Date&Time", + "Max Num/Day", + "Settings Check", + "Send Type", + "Check in Photo" ] }, { @@ -1443,6 +1447,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -2033,6 +2041,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -2623,6 +2635,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -3213,6 +3229,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -3803,6 +3823,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -4393,6 +4417,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -4983,6 +5011,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -5573,6 +5605,10 @@ "", "", "", + "", + "", + "", + "", "" ] }, @@ -6163,6 +6199,10 @@ "", "", "", + "", + "", + "", + "", "" ] } @@ -6753,6 +6793,10 @@ "STRING_DELAY", "STRING_OPERATING_TIME", "STRING_FORMAT_SD", - "STRING_DATE_AND_TIME" + "STRING_DATE_AND_TIME", + "STRING_MAX_NUM_DAY", + "STRING_SETTINGS_CHECK", + "STRING_SEND_TYPE", + "STRING_CHECK_IN_PHOTO" ] } 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 d657ce7e2..ab0f9cda6 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 @@ -1236,6 +1236,10 @@ lv_plugin_res_id lv_plugin_fixed_language_string_id_table[] = { LV_PLUGIN_RES_ID_NONE, /* 584*/ LV_PLUGIN_RES_ID_NONE, /* 585*/ LV_PLUGIN_RES_ID_NONE, /* 586*/ + LV_PLUGIN_RES_ID_NONE, /* 587*/ + LV_PLUGIN_RES_ID_NONE, /* 588*/ + LV_PLUGIN_RES_ID_NONE, /* 589*/ + LV_PLUGIN_RES_ID_NONE, /* 590*/ }; 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 44494a0ab..1d896888e 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 @@ -1647,7 +1647,11 @@ LV_IMG_DECLARE(sy_redline2); #define LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME 584 #define LV_PLUGIN_STRING_ID_STRING_FORMAT_SD 585 #define LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME 586 -#define LV_PLUGIN_STRING_TABLE_SIZE 587 +#define LV_PLUGIN_STRING_ID_STRING_MAX_NUM_DAY 587 +#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_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 7753b63c9..d6ef4f71d 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 @@ -701,11 +701,24 @@ enum _MENU_IDS { // Setting Send page // IDS_MAX_NUM_DAY = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_MAX_NUM_DAY = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SETTINGS_CHECK = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_SEND_TYPE = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_CHECK_IN_PHOTO = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, - IDS_GPS = LV_PLUGIN_LANGUAGE_FONT_TYPE_SIZE, + 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_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_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_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_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, + IDS_GPS_ON = LV_PLUGIN_STRING_ID_STRID_ON, IDS_END, @@ -872,11 +885,11 @@ enum _MENU_IDI { IDI_DATE_AND_TIME = LV_PLUGIN_IMG_ID_ICON_DATE_TIME, // Setting send page - IDI_MAX_NUM_DAY = LV_PLUGIN_IMG_ID_ICON_BUST_M, - IDI_SETTINGS_CHECK = LV_PLUGIN_IMG_ID_ICON_BUST_M, - IDI_SEND_TYPE = LV_PLUGIN_IMG_ID_ICON_BUST_M, - IDI_CHECK_IN_PHOTO = LV_PLUGIN_IMG_ID_ICON_BUST_M, - IDI_GPS = LV_PLUGIN_IMG_ID_ICON_BUST_M, + IDI_MAX_NUM_DAY = LV_PLUGIN_IMG_ID_SF_MAX_NUM_DAY, + IDI_SETTINGS_CHECK = LV_PLUGIN_STRING_ID_STRING_SETTINGS_CHECK, + 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, #if 0 // Language Options diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c index a84d86b45..efcc86267 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c @@ -313,7 +313,7 @@ int Movie_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { UINT16 uwItemId; UINT16 uwOption; - +printf("=========================================================\n"); if (uiMessage == TMM_CONFIRM_OPTION) { uwItemId = LO_WORD(uiParam); uwOption = HI_WORD(uiParam); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index 6842a0c28..90e713140 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -2,19 +2,27 @@ #include "UIWnd/UIFlow.h" TMDEF_BEGIN_OPTIONS(MAX_NUM_DAY) -TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(MAX_NUM_DAY_UNLIMITED, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(MAX_NUM_DAY_NUMBER, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(SETTINGS_CHECK) -TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SETTINGS_CHECK_DAILAY, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SETTINGS_CHECK_INSTANT, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SETTINGS_CHECK_HYBRID, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(SEND_TYPE) -TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SEND_TYPE_TIMELY, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SEND_TYPE_ONCE_DAY, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SEND_TYPE_TWICE_DAY, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(SEND_TYPE_4_TIMES_DAY, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(CHECK_IN_PHOTO) -TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(CHECK_IN_PHOTO_OFF, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(CHECK_IN_PHOTO_ON, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(GPS) -TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(GPS_OFF, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(GPS_ON, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_ITEMS(SEND) @@ -48,22 +56,26 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) // uwOption = HI_WORD(uiParam); switch (uwItemId) { - // case IDM_NETWORK_SELECTION: - // { - // break; - // } - // case IDM_QR_PICTURE: - // { - // break; - // } - // case IDM_PASSWORD: - // { - // break; - // } - // case IDM_CAMERA_NAME: - // { - // break; - // } + case IDM_MAX_NUM_DAY: + { + break; + } + case IDM_SETTINGS_CHECK: + { + break; + } + case IDM_SEND_TYPE: + { + break; + } + case IDM_CHECK_IN_PHOTO: + { + break; + } + case IDM_GPS: + { + break; + } default: { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c index 3755d7822..b65055990 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c @@ -26,7 +26,6 @@ lv_obj_t* image_item4_scr_uiflowmenucommonitem; lv_obj_t* image_button_item5_scr_uiflowmenucommonitem; lv_obj_t* label_item5_scr_uiflowmenucommonitem; lv_obj_t* image_item5_scr_uiflowmenucommonitem; - lv_obj_t* container_option_1_scr_uiflowmenucommonitem; lv_obj_t* label_option_1_scr_uiflowmenucommonitem; lv_obj_t* image_option_1_scr_uiflowmenucommonitem; @@ -42,13 +41,11 @@ lv_obj_t* image_option_4_scr_uiflowmenucommonitem; lv_obj_t* container_option_5_scr_uiflowmenucommonitem; lv_obj_t* label_option_5_scr_uiflowmenucommonitem; lv_obj_t* image_option_5_scr_uiflowmenucommonitem; - lv_obj_t* image_option_01_scr_uiflowmenucommonitem; lv_obj_t* image_option_02_scr_uiflowmenucommonitem; lv_obj_t* image_option_03_scr_uiflowmenucommonitem; lv_obj_t* image_option_04_scr_uiflowmenucommonitem; lv_obj_t* image_option_05_scr_uiflowmenucommonitem; - lv_obj_t* container_tab_scr_uiflowmenucommonitem; lv_obj_t* image_button_tab1_scr_uiflowmenucommonitem; lv_obj_t* label_tab_1_scr_uiflowmenucommonitem; @@ -64,7 +61,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_event_cb(parent, UIFlowMenuCommonItemEventCallback); lv_color_t color = {0}; - STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57); + STYLE_COLOR_PROP(0x0a, 0x80, 0x00, 0x00); _lv_obj_set_style_local_color(parent,0,LV_STYLE_BG_COLOR, color); if(color.full== LV_COLOR_TRANSP.full){ @@ -1049,44 +1046,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_8bpp); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_1 = lv_label_create(container_option_1, NULL); lv_obj_set_hidden(label_option_1, false); lv_obj_set_click(label_option_1, false); @@ -1146,7 +1143,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_1, false); lv_obj_set_drag(image_option_1, false); lv_obj_set_pos(image_option_1, 78, 0); - lv_obj_set_size(image_option_1, 32, 40); + lv_obj_set_size(image_option_1, 27, 40); lv_img_set_src(image_option_1, &sf_next1); lv_obj_add_style(image_option_1, 0, &image_option_1_s0); @@ -1294,7 +1291,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_2, false); lv_obj_set_drag(image_option_2, false); lv_obj_set_pos(image_option_2, 78, 0); - lv_obj_set_size(image_option_2, 32, 40); + lv_obj_set_size(image_option_2, 27, 40); lv_img_set_src(image_option_2, &sf_next1); lv_obj_add_style(image_option_2, 0, &image_option_2_s0); @@ -1442,7 +1439,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_3, false); lv_obj_set_drag(image_option_3, false); lv_obj_set_pos(image_option_3, 78, 0); - lv_obj_set_size(image_option_3, 32, 40); + lv_obj_set_size(image_option_3, 27, 40); lv_img_set_src(image_option_3, &sf_next1); lv_obj_add_style(image_option_3, 0, &image_option_3_s0); @@ -1590,7 +1587,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_4, false); lv_obj_set_drag(image_option_4, false); lv_obj_set_pos(image_option_4, 78, 0); - lv_obj_set_size(image_option_4, 32, 40); + lv_obj_set_size(image_option_4, 27, 40); lv_img_set_src(image_option_4, &sf_next1); lv_obj_add_style(image_option_4, 0, &image_option_4_s0); @@ -1738,7 +1735,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_click(image_option_5, false); lv_obj_set_drag(image_option_5, false); lv_obj_set_pos(image_option_5, 78, 0); - lv_obj_set_size(image_option_5, 32, 40); + lv_obj_set_size(image_option_5, 27, 40); lv_img_set_src(image_option_5, &sf_next1); lv_obj_add_style(image_option_5, 0, &image_option_5_s0); @@ -1751,37 +1748,37 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DISABLED, color); lv_obj_t *image_option_01 = lv_img_create(container_main_menu, NULL); lv_obj_set_hidden(image_option_01, true); lv_obj_set_click(image_option_01, false); @@ -2072,9 +2069,8 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab1, 80, 40); lv_imgbtn_set_state(image_button_tab1, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab1, false); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_RELEASED, &sf_tab_select); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_PRESSED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_DISABLED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_RELEASED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_PRESSED, &sf_tab_select); lv_btn_set_layout(image_button_tab1, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab1, 0, &image_button_tab1_s0); @@ -2188,9 +2184,8 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab2, 80, 40); lv_imgbtn_set_state(image_button_tab2, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab2, false); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_RELEASED, &sf_tab_select); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_PRESSED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_DISABLED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_RELEASED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_PRESSED, &sf_tab_select); lv_btn_set_layout(image_button_tab2, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab2, 0, &image_button_tab2_s0); @@ -2304,9 +2299,8 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab3, 80, 40); lv_imgbtn_set_state(image_button_tab3, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab3, false); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_RELEASED, &sf_tab_select); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_PRESSED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_DISABLED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_RELEASED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_PRESSED, &sf_tab_select); lv_btn_set_layout(image_button_tab3, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab3, 0, &image_button_tab3_s0); @@ -2415,13 +2409,12 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_hidden(image_button_tab4, false); lv_obj_set_click(image_button_tab4, true); lv_obj_set_drag(image_button_tab4, false); - lv_obj_set_pos(image_button_tab4, 240, 0); + lv_obj_set_pos(image_button_tab4, 240, -1); lv_obj_set_size(image_button_tab4, 80, 40); lv_imgbtn_set_state(image_button_tab4, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab4, false); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_RELEASED, &sf_tab_select); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_PRESSED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_DISABLED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_RELEASED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_PRESSED, &sf_tab_select); lv_btn_set_layout(image_button_tab4, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab4, 0, &image_button_tab4_s0); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index 0af5eb7bd..38dfc8f74 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