From f6816d00ea68e7c810b0c89d7e66997514358fbc Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 23 Nov 2023 15:39:41 +0800 Subject: [PATCH] Fixed bug about string and button matrix. --- .../UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c | 4 ++-- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang | 4 ++-- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c | 1 + .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 1 + .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c | 1 + .../UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) 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 29f6b9182..99a9c1db8 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 @@ -115,8 +115,8 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = { { "y/m/d", 5 }, /* LV_PLUGIN_STRING_ID_STRID_Y_M_D */ { "d/m/y", 5 }, /* LV_PLUGIN_STRING_ID_STRID_D_M_Y */ { "m/d/y", 5 }, /* LV_PLUGIN_STRING_ID_STRID_M_D_Y */ - { "On", 2 }, /* LV_PLUGIN_STRING_ID_STRID_ON */ - { "Off", 3 }, /* LV_PLUGIN_STRING_ID_STRID_OFF */ + { "ON", 2 }, /* LV_PLUGIN_STRING_ID_STRID_ON */ + { "OFF", 3 }, /* LV_PLUGIN_STRING_ID_STRID_OFF */ { "Digital Zoom", 12 }, /* LV_PLUGIN_STRING_ID_STRID_DZ */ { "Quick Review", 12 }, /* LV_PLUGIN_STRING_ID_STRID_QUICK_VIEW */ { "Saturation", 10 }, /* LV_PLUGIN_STRING_ID_STRID_SATURATION */ 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 e243b5398..50399a81b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -382,8 +382,8 @@ "y/m/d", "d/m/y", "m/d/y", - "On", - "Off", + "ON", + "OFF", "Digital Zoom", "Quick Review", "Saturation", diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index 5930ea8e5..fd5f00646 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -259,6 +259,7 @@ static void init_Matrix_style(void) lv_style_set_value_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); + lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_FOCUSED,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index d6a80f39e..b154d31ca 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -174,6 +174,7 @@ static void init_Matrix_style(void) lv_style_set_value_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); + lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_FOCUSED,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); 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 55d2b10e7..6e2d0b803 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 @@ -183,6 +183,7 @@ static void init_Matrix_style(void) lv_style_set_value_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); + lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_FOCUSED,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c index 625eb75bc..3332feb40 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c @@ -93,6 +93,7 @@ static void init_Matrix_style(void) lv_style_set_value_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); + lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_FOCUSED,&sf_ui_text_bold_20_1bpp); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);