From: dxy15521469561 <1731678236@qq.com>
Date: Thu, 17 Aug 2023 01:37:12 +0000 (+0800)
Subject: K01 K5部分界面调整
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a8192ff9a98282ff3aab657bf421885fc15d8f83;p=mirrors%2FASR1603_G5.git

K01 K5部分界面调整
---

diff --git a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h
index ee66b692..a6c64eec 100644
--- a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h
+++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.h
@@ -246,7 +246,7 @@ LV_FONT_DECLARE(lv_font_28_dial)
 LV_FONT_DECLARE(lv_font_60_main_menu)
 #endif
 #ifdef PROJECT_NAME_G3_K01
-LV_FONT_DECLARE(K01_font_15_ALL)
+LV_FONT_DECLARE(K01_font_16_ALL)
 #endif
 /*Declare the custom (user defined) fonts*/
 #ifdef LV_FONT_CUSTOM_DECLARE
diff --git a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk
index 8f4a3b12..443974c5 100644
--- a/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk
+++ b/2.sdk/Helios_SDK/services/microPython/lib/lvgl/src/font/lv_font.mk
@@ -99,4 +99,4 @@ lvgl_SRCS  += $(LVGL_DIR_NAME)/src/font/lv_font_18_simsum.c
 lvgl_SRCS  += $(LVGL_DIR_NAME)/src/font/lv_font_70_bold.c
 lvgl_SRCS  += $(LVGL_DIR_NAME)/src/font/lv_font_28_dial.c
 lvgl_SRCS  += $(LVGL_DIR_NAME)/src/font/lv_font_60_main_menu.c
-lvgl_SRCS  += $(LVGL_DIR_NAME)/src/font/K01_font_15_ALL.c
+lvgl_SRCS  += $(LVGL_DIR_NAME)/src/font/K01_font_16_ALL.c
diff --git a/2.sdk/Helios_SDK/services/microPython/microPython.mk b/2.sdk/Helios_SDK/services/microPython/microPython.mk
index 72b84586..3b78e8ee 100644
--- a/2.sdk/Helios_SDK/services/microPython/microPython.mk
+++ b/2.sdk/Helios_SDK/services/microPython/microPython.mk
@@ -501,7 +501,7 @@ lib/lvgl/src/font/lv_font_18_simsum.c \
 lib/lvgl/src/font/lv_font_70_bold.c \
 lib/lvgl/src/font/lv_font_28_dial.c \
 lib/lvgl/src/font/lv_font_60_main_menu.c \
-lib/lvgl/src/font/K01_font_15_ALL.c \
+lib/lvgl/src/font/K01_font_16_ALL.c \
 lib/lvgl/src/hal/lv_hal_disp.c \
 lib/lvgl/src/hal/lv_hal_indev.c \
 lib/lvgl/src/hal/lv_hal_tick.c \
diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c
index 0fc57569..cb1a4ad5 100644
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c
@@ -26843,9 +26843,9 @@ STATIC const mp_lv_struct_t mp_lv_font_60_main_menu = {
 };
 #endif
 #ifdef PROJECT_NAME_G3_K01
-STATIC const mp_lv_struct_t mp_K01_font_15_ALL = {
+STATIC const mp_lv_struct_t mp_K01_font_16_ALL = {
 { &mp_lv_font_t_type },
-(lv_font_t*)&K01_font_15_ALL
+(lv_font_t*)&K01_font_16_ALL
 };
 
 #endif
@@ -32647,7 +32647,7 @@ STATIC const mp_rom_map_elem_t lvgl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_font_60_main_menu), MP_ROM_PTR(&mp_lv_font_60_main_menu) },
 #endif
 #ifdef PROJECT_NAME_G3_K01
-    { MP_ROM_QSTR(MP_QSTR_K01_font_15_ALL), MP_ROM_PTR(&mp_K01_font_15_ALL) },
+    { MP_ROM_QSTR(MP_QSTR_K01_font_16_ALL), MP_ROM_PTR(&mp_K01_font_16_ALL) },
 #endif
 
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_lvgl) },
diff --git a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index 865248c2..d07efd54 100644
Binary files a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ