yang/uv-k5-firmware-chinese-lts
1
0
Fork 0
mirror of https://github.com/silenty4ng/uv-k5-firmware-chinese-lts synced 2025-01-15 14:54:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

修复信道名显示

Browse source
This commit is contained in:
wu58430 2024-01-10 19:51:24 +08:00
parent 1ed17674da
commit ba2b7f8ec6
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/main.c
View file

@ -651,11 +651,14 @@ if (!gDTMF_InputMode) {
} }
if (gEeprom.CHANNEL_DISPLAY_MODE == MDF_NAME) { if (gEeprom.CHANNEL_DISPLAY_MODE == MDF_NAME) {
#if ENABLE_CHINESE_FULL==4
show_move_flag=1; show_move_flag=1;
#endif
UI_PrintStringSmall(String, 32, 0, line); UI_PrintStringSmall(String, 32, 0, line);
} else { } else {
#if ENABLE_CHINESE_FULL==4
show_move_flag=1; show_move_flag=1;
#endif
UI_PrintStringSmall(String, 32 + 4, 0, line); UI_PrintStringSmall(String, 32 + 4, 0, line);
// show the channel frequency below the channel number/name // show the channel frequency below the channel number/name
@ -727,7 +730,7 @@ if (!gDTMF_InputMode) {
#endif #endif
} }
if (Level) { if (Level) {
#if ENABLE_CHINESE_FULL==0 #if ENABLE_CHINESE_FULL!=4
DrawSmallAntennaAndBars(p_line1 + LCD_WIDTH, Level); DrawSmallAntennaAndBars(p_line1 + LCD_WIDTH, Level);
#else #else
if(IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num]) ) if(IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num]) )

24
ui/menu.c
View file

@ -726,8 +726,9 @@ void UI_DisplayMenu(void) {
UI_PrintStringSmall(String, menu_item_x1 - 12, menu_item_x2, 5); UI_PrintStringSmall(String, menu_item_x1 - 12, menu_item_x2, 5);
} }
SETTINGS_FetchChannelName(String, gSubMenuSelection); SETTINGS_FetchChannelName(String, gSubMenuSelection);
#if ENABLE_CHINESE_FULL==4
show_move_flag=1; show_move_flag=1;
#endif
UI_PrintStringSmall(String[0] ? String : "--", menu_item_x1 - 12, menu_item_x2, 3); UI_PrintStringSmall(String[0] ? String : "--", menu_item_x1 - 12, menu_item_x2, 3);
already_printed = true; already_printed = true;
break; break;
@ -781,15 +782,23 @@ void UI_DisplayMenu(void) {
if (!gIsInSubMenu || edit_index < 0) { // show the channel name if (!gIsInSubMenu || edit_index < 0) { // show the channel name
SETTINGS_FetchChannelName(String, gSubMenuSelection); SETTINGS_FetchChannelName(String, gSubMenuSelection);
char *pPrintStr = String[0] ? String : "--"; char *pPrintStr = String[0] ? String : "--";
#if ENABLE_CHINESE_FULL == 4
show_move_flag=1; show_move_flag=1;
#endif
UI_PrintStringSmall(pPrintStr, menu_item_x1 - 12, menu_item_x2, 3); UI_PrintStringSmall(pPrintStr, menu_item_x1 - 12, menu_item_x2, 3);
} else if (!CHINESE_JUDGE(tmp_name, strlen(tmp_name))) { // show the channel name being edited #if ENABLE_CHINESE_FULL == 4
UI_PrintStringSmall(edit, menu_item_x1 - 12, 0, 3);
} else if (CHINESE_JUDGE(tmp_name, strlen(tmp_name))) {
edit_index = -1;
}else if (!CHINESE_JUDGE(tmp_name, strlen(tmp_name))) { // show the channel name being edited
#else
}else{
#endif
UI_PrintStringSmall(edit, menu_item_x1 - 12, menu_item_x2, 3);
if (edit_index < MAX_EDIT_INDEX) if (edit_index < MAX_EDIT_INDEX)
UI_PrintStringSmall("^", menu_item_x1 - 12 + (7 * edit_index), 0, 4); // show the cursor UI_PrintStringSmall("^", menu_item_x1 - 12+7*edit_index+(((menu_item_x2 - menu_item_x1 + 12 ) - (7*MAX_EDIT_INDEX)) + 1) / 2 , 0, 4); // show the cursor
} else if (CHINESE_JUDGE(tmp_name, strlen(tmp_name))) {
edit_index = -1;
} }
if (!gAskForConfirmation) { // show the frequency so that the user knows the channels frequency if (!gAskForConfirmation) { // show the frequency so that the user knows the channels frequency
@ -1072,8 +1081,9 @@ void UI_DisplayMenu(void) {
// channel number // channel number
UI_PrintStringSmall(pPrintStr, menu_item_x1 - 12, menu_item_x2, 2); UI_PrintStringSmall(pPrintStr, menu_item_x1 - 12, menu_item_x2, 2);
#if ENABLE_CHINESE_FULL==4
show_move_flag=1; show_move_flag=1;
#endif
SETTINGS_FetchChannelName(String, gSubMenuSelection); SETTINGS_FetchChannelName(String, gSubMenuSelection);
pPrintStr = String[0] ? String : "--"; pPrintStr = String[0] ? String : "--";