payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug number 10174.

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-28 14:28:08 +08:00
parent 6a8f98821b
commit 8ceea2da17
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c
View File

@ -155,8 +155,8 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = {
{ "Русский", 14 }, /* LV_PLUGIN_STRING_ID_STRID_LANG_RU */ { "Русский", 14 }, /* LV_PLUGIN_STRING_ID_STRID_LANG_RU */
{ "USB", 3 }, /* LV_PLUGIN_STRING_ID_STRID_USB */ { "USB", 3 }, /* LV_PLUGIN_STRING_ID_STRID_USB */
{ "PC Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_PC_MODE */ { "PC Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_PC_MODE */
{ "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */ { "MSDC", 4 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */
{ "PC Camera", 9 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */ { "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */
{ "Pictbridge", 10 }, /* LV_PLUGIN_STRING_ID_STRID_PICTBRIDGE */ { "Pictbridge", 10 }, /* LV_PLUGIN_STRING_ID_STRID_PICTBRIDGE */
{ "Power Charging", 14 }, /* LV_PLUGIN_STRING_ID_STRID_USBCHARGE */ { "Power Charging", 14 }, /* LV_PLUGIN_STRING_ID_STRID_USBCHARGE */
{ "TV Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_TV_MODE */ { "TV Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_TV_MODE */

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowUSB.lvglscr
View File

@ -60,7 +60,7 @@
"state": 6 "state": 6
} }
], ],
"text": "PC-ACM", "text": "MSDC",
"widget": "Label" "widget": "Label"
}, },
{ {

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang
View File

@ -422,8 +422,8 @@
"Русский", "Русский",
"USB", "USB",
"PC Mode", "PC Mode",
"MSDC",
"PC-ACM", "PC-ACM",
"PC Camera",
"Pictbridge", "Pictbridge",
"Power Charging", "Power Charging",
"TV Mode", "TV Mode",

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c
View File

@ -115,7 +115,7 @@ lv_obj_t* UIFlowUSB_create(){
lv_obj_set_drag(label_usbmode, false); lv_obj_set_drag(label_usbmode, false);
lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_allocate_ext_attr(label_usbmode);
lv_plugin_label_set_text(label_usbmode, LV_PLUGIN_STRING_ID_STRID_MSDC); lv_plugin_label_set_text(label_usbmode, LV_PLUGIN_STRING_ID_STRID_MSDC);
lv_label_set_text(label_usbmode,"PC-ACM"); lv_label_set_text(label_usbmode,"MSDC");
lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_allocate_ext_attr(label_usbmode);
lv_plugin_label_set_font_type(label_usbmode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_plugin_label_set_font_type(label_usbmode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0);
lv_label_set_align(label_usbmode, LV_LABEL_ALIGN_CENTER); lv_label_set_align(label_usbmode, LV_LABEL_ALIGN_CENTER);

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c
View File

@ -22,7 +22,7 @@ static void UIFlowUsb_Key(lv_obj_t* obj, uint32_t key)
switch(key) switch(key)
{ {
case LV_USER_KEY_SHUTTER2: case LV_KEY_ENTER:
if((System_GetState(SYS_STATE_CURRMODE) != PRIMARY_MODE_USBMSDC)){ if((System_GetState(SYS_STATE_CURRMODE) != PRIMARY_MODE_USBMSDC)){
Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBMSDC); Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBMSDC);
} }