From cfb68c1ec9a87a160e15f658419d2b88b049b809 Mon Sep 17 00:00:00 2001 From: ligenxxxx <59721724+ligenxxxx@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:55:35 +0800 Subject: [PATCH] fix live stream translate --- mkapp/app/language/zh_hans.ini | 2 +- src/ui/page_wifi.c | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/mkapp/app/language/zh_hans.ini b/mkapp/app/language/zh_hans.ini index 49790a8f..fb78211a 100644 --- a/mkapp/app/language/zh_hans.ini +++ b/mkapp/app/language/zh_hans.ini @@ -137,7 +137,7 @@ Invalid Format = "格式无效" Password Requirements = "密码要求" Minimum 8 characters = "最少8个字符" maximum 64 characters = "最多64个字符" -Live stream: = "直播:" +Live stream = "直播" Connect to the WiFi network identified above = "连接上面标识的WiFi网络" Use VLC Player to open a Network Stream = "使用VLC播放器打开网络串流" Apply Settings = "生效设置" diff --git a/src/ui/page_wifi.c b/src/ui/page_wifi.c index bb9c1876..20bff823 100644 --- a/src/ui/page_wifi.c +++ b/src/ui/page_wifi.c @@ -357,22 +357,22 @@ static void page_wifi_update_page_1_notes() { static char buf[1024]; snprintf(buf, sizeof(buf), "%s:\n %s,%s.\n\n%s:\n 1. %s.\n 2. %s:\n\n rtsp://%s:8554/hdzero\n\n", - _lang("Password Requirements"), - _lang("Minimum 8 characters"), - _lang("maximum 64 characters"), - _lang("Live Stream"), - _lang("Connect to the WiFi network identified above"), - _lang("Use VLC Player to open a Network Stream"), - address ? address : page_wifi.page_2.ip_addr.text); + _lang("Password Requirements"), + _lang("Minimum 8 characters"), + _lang("maximum 64 characters"), + _lang("Live stream"), + _lang("Connect to the WiFi network identified above"), + _lang("Use VLC Player to open a Network Stream"), + address ? address : page_wifi.page_2.ip_addr.text); lv_label_set_text(page_wifi.page_1.note, buf); } static void page_wifi_update_page_3_notes() { static char buf[256]; snprintf(buf, sizeof(buf), "%s:\n %s,%s.\n\n", - _lang("Password Requirements"), - _lang("Minimum 8 characters"), - _lang("maximum 64 characters")); + _lang("Password Requirements"), + _lang("Minimum 8 characters"), + _lang("maximum 64 characters")); lv_label_set_text(page_wifi.page_3.note, buf); } @@ -859,7 +859,7 @@ static void page_wifi_on_roller(uint8_t key) { /** * Common handling method of the three "apply settings" buttons. */ -static void page_wifi_handle_apply_button(lv_obj_t* apply_button) { +static void page_wifi_handle_apply_button(lv_obj_t *apply_button) { if (page_wifi.confirm_settings) { lv_label_set_text(apply_button, "#FF0000 Updating WiFi...#"); page_wifi_apply_settings_timer = lv_timer_create(page_wifi_apply_settings_timer_cb, 1000, NULL); @@ -1016,7 +1016,6 @@ static void page_wifi_on_click(uint8_t key, int sel) { break; } - // Enable/Disable panel scrolling when elements are in focus pp_wifi.p_arr.max = keyboard_active() || page_wifi.page_2.rf_channel.active