mirror of https://github.com/jetkvm/kvm.git
feat: remove lvgl examples and demos
This commit is contained in:
Siyuan Miao
parent
365a419164
commit
8c225ce18f
29
display.go
29
display.go
|
|
@ -33,14 +33,7 @@ var (
|
|||
|
||||
func updateDisplay() {
|
||||
nativeInstance.UpdateLabelIfChanged("home_info_ipv4_addr", networkState.IPv4String())
|
||||
ipv6 := networkState.IPv6String()
|
||||
if ipv6 != "" {
|
||||
nativeInstance.UpdateLabelIfChanged("home_info_ipv6_addr", ipv6)
|
||||
nativeInstance.ObjShow("home_info_ipv6_addr")
|
||||
} else {
|
||||
nativeInstance.UpdateLabelIfChanged("home_info_ipv6_addr", "")
|
||||
nativeInstance.ObjHide("home_info_ipv6_addr")
|
||||
}
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("home_info_ipv6_addr", networkState.IPv6String())
|
||||
|
||||
nativeInstance.ObjHide("menu_btn_network")
|
||||
nativeInstance.ObjHide("menu_btn_access")
|
||||
|
|
@ -52,14 +45,14 @@ func updateDisplay() {
|
|||
_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_DEFAULT")
|
||||
} else {
|
||||
nativeInstance.UpdateLabelIfChanged("usb_status_label", "Disconnected")
|
||||
_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_USER_2")
|
||||
_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_DISABLED")
|
||||
}
|
||||
if lastVideoState.Ready {
|
||||
nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Connected")
|
||||
_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_DEFAULT")
|
||||
} else {
|
||||
nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Disconnected")
|
||||
_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_USER_2")
|
||||
_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_DISABLED")
|
||||
}
|
||||
nativeInstance.UpdateLabelIfChanged("cloud_status_label", fmt.Sprintf("%d active", actionSessions))
|
||||
|
||||
|
|
@ -164,8 +157,8 @@ func updateStaticContents() {
|
|||
if err == nil {
|
||||
nativeInstance.UpdateLabelIfChanged("boot_screen_version", systemVersion.String())
|
||||
nativeInstance.UpdateLabelIfChanged("boot_screen_app_version", appVersion.String())
|
||||
nativeInstance.UpdateLabelIfChanged("system_version_label", systemVersion.String())
|
||||
nativeInstance.UpdateLabelIfChanged("app_version_label", appVersion.String())
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("system_version", systemVersion.String())
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("app_version", appVersion.String())
|
||||
}
|
||||
|
||||
// get cpu info
|
||||
|
|
@ -174,7 +167,7 @@ func updateStaticContents() {
|
|||
for _, line := range strings.Split(string(cpuInfo), "\n") {
|
||||
if strings.HasPrefix(line, "Serial") {
|
||||
serial := strings.SplitN(line, ":", 2)[1]
|
||||
nativeInstance.UpdateLabelIfChanged("cpu_serial_label", strings.TrimSpace(serial))
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("cpu_serial", strings.TrimSpace(serial))
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
@ -184,14 +177,14 @@ func updateStaticContents() {
|
|||
if err == nil {
|
||||
kernelVersion := strings.TrimPrefix(string(kernelVersion), "Linux version ")
|
||||
kernelVersion = strings.SplitN(kernelVersion, " ", 2)[0]
|
||||
nativeInstance.UpdateLabelIfChanged("kernel_version_label", kernelVersion)
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("kernel_version", kernelVersion)
|
||||
}
|
||||
|
||||
nativeInstance.UpdateLabelIfChanged("build_branch_label", version.Branch)
|
||||
nativeInstance.UpdateLabelIfChanged("build_date_label", version.BuildDate)
|
||||
nativeInstance.UpdateLabelIfChanged("golang_version_label", version.GoVersion)
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("build_branch", version.Branch)
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("build_date", version.BuildDate)
|
||||
nativeInstance.UpdateLabelAndChangeVisibility("golang_version", version.GoVersion)
|
||||
|
||||
nativeInstance.UpdateLabelIfChanged("boot_screen_device_id", GetDeviceID())
|
||||
// nativeInstance.UpdateLabelAndChangeVisibility("boot_screen_device_id", GetDeviceID())
|
||||
}
|
||||
|
||||
// setDisplayBrightness sets /sys/class/backlight/backlight/brightness to alter
|
||||
|
|
|
|||
|
|
@ -24,11 +24,15 @@ set(RK_MEDIA_OUTPUT "${RK_SDK_BASE}/media/out")
|
|||
set(RK_MEDIA_INCLUDE_PATH "${RK_MEDIA_OUTPUT}/include")
|
||||
set(RK_APP_MEDIA_LIBS_PATH "${RK_MEDIA_OUTPUT}/lib")
|
||||
|
||||
set(LV_BUILD_EXAMPLES 0 CACHE BOOL "" FORCE)
|
||||
|
||||
# Fetch LVGL from GitHub
|
||||
FetchContent_Declare(
|
||||
lvgl
|
||||
GIT_REPOSITORY https://github.com/lvgl/lvgl.git
|
||||
GIT_TAG v8.3.11
|
||||
GIT_SHALLOW 1
|
||||
PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/lvgl-no-examples.patch
|
||||
)
|
||||
FetchContent_MakeAvailable(lvgl)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,5 +14,6 @@ VERBOSE=1 cmake -B build \
|
|||
-DCMAKE_CROSSCOMPILING=1 \
|
||||
-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE \
|
||||
-DSKIP_GLIBC_NAMES=ON \
|
||||
-DMAKE_BUILD_TYPE=Release
|
||||
|
||||
cmake --build build
|
||||
|
|
@ -428,7 +428,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
|
|||
|
||||
#define LV_USE_CHECKBOX 1
|
||||
|
||||
#define LV_USE_DROPDOWN 1 /*Requires: lv_label*/
|
||||
#define LV_USE_DROPDOWN 0 /*Requires: lv_label*/
|
||||
|
||||
#define LV_USE_IMG 1 /*Requires: lv_label*/
|
||||
|
||||
|
|
@ -440,7 +440,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
|
|||
|
||||
#define LV_USE_LINE 1
|
||||
|
||||
#define LV_USE_ROLLER 1 /*Requires: lv_label*/
|
||||
#define LV_USE_ROLLER 0 /*Requires: lv_label*/
|
||||
#if LV_USE_ROLLER
|
||||
# define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/
|
||||
#endif
|
||||
|
|
@ -454,7 +454,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
|
|||
# define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/
|
||||
#endif
|
||||
|
||||
#define LV_USE_TABLE 1
|
||||
#define LV_USE_TABLE 0
|
||||
|
||||
/*==================
|
||||
* EXTRA COMPONENTS
|
||||
|
|
@ -463,7 +463,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
|
|||
/*-----------
|
||||
* Widgets
|
||||
*----------*/
|
||||
#define LV_USE_CALENDAR 1
|
||||
#define LV_USE_CALENDAR 0
|
||||
#if LV_USE_CALENDAR
|
||||
# define LV_CALENDAR_WEEK_STARTS_MONDAY 0
|
||||
# if LV_CALENDAR_WEEK_STARTS_MONDAY
|
||||
|
|
@ -531,7 +531,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
|
|||
#define LV_USE_THEME_BASIC 1
|
||||
|
||||
/*A theme designed for monochrome displays*/
|
||||
#define LV_USE_THEME_MONO 1
|
||||
#define LV_USE_THEME_MONO 0
|
||||
|
||||
/*-----------
|
||||
* Layouts
|
||||
|
|
|
|||
|
|
@ -0,0 +1,207 @@
|
|||
diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake
|
||||
index 7da68124b..1fbe2d3de 100644
|
||||
--- a/env_support/cmake/custom.cmake
|
||||
+++ b/env_support/cmake/custom.cmake
|
||||
@@ -15,8 +15,6 @@ get_filename_component(LV_CONF_DIR ${LV_CONF_PATH} DIRECTORY)
|
||||
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
|
||||
|
||||
file(GLOB_RECURSE SOURCES ${LVGL_ROOT_DIR}/src/*.c)
|
||||
-file(GLOB_RECURSE EXAMPLE_SOURCES ${LVGL_ROOT_DIR}/examples/*.c)
|
||||
-file(GLOB_RECURSE DEMO_SOURCES ${LVGL_ROOT_DIR}/demos/*.c)
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_library(lvgl SHARED ${SOURCES})
|
||||
@@ -25,10 +23,6 @@ else()
|
||||
endif()
|
||||
|
||||
add_library(lvgl::lvgl ALIAS lvgl)
|
||||
-add_library(lvgl_examples STATIC ${EXAMPLE_SOURCES})
|
||||
-add_library(lvgl::examples ALIAS lvgl_examples)
|
||||
-add_library(lvgl_demos STATIC ${DEMO_SOURCES})
|
||||
-add_library(lvgl::demos ALIAS lvgl_demos)
|
||||
|
||||
target_compile_definitions(
|
||||
lvgl PUBLIC $<$<BOOL:${LV_LVGL_H_INCLUDE_SIMPLE}>:LV_LVGL_H_INCLUDE_SIMPLE>
|
||||
@@ -37,15 +31,6 @@ target_compile_definitions(
|
||||
# Include root and optional parent path of LV_CONF_PATH
|
||||
target_include_directories(lvgl SYSTEM PUBLIC ${LVGL_ROOT_DIR} ${LV_CONF_DIR})
|
||||
|
||||
-# Include /examples folder
|
||||
-target_include_directories(lvgl_examples SYSTEM
|
||||
- PUBLIC ${LVGL_ROOT_DIR}/examples)
|
||||
-target_include_directories(lvgl_demos SYSTEM
|
||||
- PUBLIC ${LVGL_ROOT_DIR}/demos)
|
||||
-
|
||||
-target_link_libraries(lvgl_examples PUBLIC lvgl)
|
||||
-target_link_libraries(lvgl_demos PUBLIC lvgl)
|
||||
-
|
||||
# Lbrary and headers can be installed to system using make install
|
||||
file(GLOB LVGL_PUBLIC_HEADERS "${CMAKE_SOURCE_DIR}/lv_conf.h"
|
||||
"${CMAKE_SOURCE_DIR}/lvgl.h")
|
||||
diff --git a/lvgl.mk b/lvgl.mk
|
||||
index 0ea126daa..300fb6cbe 100644
|
||||
--- a/lvgl.mk
|
||||
+++ b/lvgl.mk
|
||||
@@ -1,5 +1,3 @@
|
||||
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk
|
||||
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/lv_examples.mk
|
||||
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk
|
||||
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk
|
||||
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/lv_extra.mk
|
||||
diff --git a/src/font/lv_font.h b/src/font/lv_font.h
|
||||
index e3b670c87..4cceffc45 100644
|
||||
--- a/src/font/lv_font.h
|
||||
+++ b/src/font/lv_font.h
|
||||
@@ -132,114 +132,10 @@ static inline lv_coord_t lv_font_get_line_height(const lv_font_t * font_p)
|
||||
|
||||
#define LV_FONT_DECLARE(font_name) extern const lv_font_t font_name;
|
||||
|
||||
-#if LV_FONT_MONTSERRAT_8
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_8)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_10
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_10)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_12
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_12)
|
||||
-#endif
|
||||
-
|
||||
#if LV_FONT_MONTSERRAT_14
|
||||
LV_FONT_DECLARE(lv_font_montserrat_14)
|
||||
#endif
|
||||
|
||||
-#if LV_FONT_MONTSERRAT_16
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_16)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_18
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_18)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_20
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_20)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_22
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_22)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_24
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_24)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_26
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_26)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_28
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_28)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_30
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_30)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_32
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_32)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_34
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_34)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_36
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_36)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_38
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_38)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_40
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_40)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_42
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_42)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_44
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_44)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_46
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_46)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_48
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_48)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_12_SUBPX
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_12_subpx)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_MONTSERRAT_28_COMPRESSED
|
||||
-LV_FONT_DECLARE(lv_font_montserrat_28_compressed)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_DEJAVU_16_PERSIAN_HEBREW
|
||||
-LV_FONT_DECLARE(lv_font_dejavu_16_persian_hebrew)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_SIMSUN_16_CJK
|
||||
-LV_FONT_DECLARE(lv_font_simsun_16_cjk)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_UNSCII_8
|
||||
-LV_FONT_DECLARE(lv_font_unscii_8)
|
||||
-#endif
|
||||
-
|
||||
-#if LV_FONT_UNSCII_16
|
||||
-LV_FONT_DECLARE(lv_font_unscii_16)
|
||||
-#endif
|
||||
-
|
||||
/*Declare the custom (user defined) fonts*/
|
||||
#ifdef LV_FONT_CUSTOM_DECLARE
|
||||
LV_FONT_CUSTOM_DECLARE
|
||||
diff --git a/src/font/lv_font.mk b/src/font/lv_font.mk
|
||||
index 2201b73f2..7b2707da4 100644
|
||||
--- a/src/font/lv_font.mk
|
||||
+++ b/src/font/lv_font.mk
|
||||
@@ -2,33 +2,7 @@ CSRCS += lv_font.c
|
||||
CSRCS += lv_font_fmt_txt.c
|
||||
CSRCS += lv_font_loader.c
|
||||
|
||||
-CSRCS += lv_font_dejavu_16_persian_hebrew.c
|
||||
-CSRCS += lv_font_montserrat_8.c
|
||||
-CSRCS += lv_font_montserrat_10.c
|
||||
-CSRCS += lv_font_montserrat_12.c
|
||||
-CSRCS += lv_font_montserrat_12_subpx.c
|
||||
CSRCS += lv_font_montserrat_14.c
|
||||
-CSRCS += lv_font_montserrat_16.c
|
||||
-CSRCS += lv_font_montserrat_18.c
|
||||
-CSRCS += lv_font_montserrat_20.c
|
||||
-CSRCS += lv_font_montserrat_22.c
|
||||
-CSRCS += lv_font_montserrat_24.c
|
||||
-CSRCS += lv_font_montserrat_26.c
|
||||
-CSRCS += lv_font_montserrat_28.c
|
||||
-CSRCS += lv_font_montserrat_28_compressed.c
|
||||
-CSRCS += lv_font_montserrat_30.c
|
||||
-CSRCS += lv_font_montserrat_32.c
|
||||
-CSRCS += lv_font_montserrat_34.c
|
||||
-CSRCS += lv_font_montserrat_36.c
|
||||
-CSRCS += lv_font_montserrat_38.c
|
||||
-CSRCS += lv_font_montserrat_40.c
|
||||
-CSRCS += lv_font_montserrat_42.c
|
||||
-CSRCS += lv_font_montserrat_44.c
|
||||
-CSRCS += lv_font_montserrat_46.c
|
||||
-CSRCS += lv_font_montserrat_48.c
|
||||
-CSRCS += lv_font_simsun_16_cjk.c
|
||||
-CSRCS += lv_font_unscii_8.c
|
||||
-CSRCS += lv_font_unscii_16.c
|
||||
|
||||
DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font
|
||||
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font
|
||||
|
|
@ -124,6 +124,8 @@ func (n *Native) StartNativeVideo() {
|
|||
setLogHandler()
|
||||
setVideoHandler()
|
||||
|
||||
C.jetkvm_set_app_version(C.CString(n.appVersion.String()))
|
||||
|
||||
C.jetkvm_ui_init()
|
||||
|
||||
n.UpdateLabelIfChanged("boot_screen_version", n.appVersion.String())
|
||||
|
|
|
|||
|
|
@ -18,6 +18,19 @@ func (n *Native) UpdateLabelIfChanged(objName string, newText string) {
|
|||
}
|
||||
}
|
||||
|
||||
func (n *Native) UpdateLabelAndChangeVisibility(objName string, newText string) {
|
||||
containerName := objName + "_container"
|
||||
if newText == "" {
|
||||
_, _ = n.ObjHide(objName)
|
||||
_, _ = n.ObjHide(containerName)
|
||||
} else {
|
||||
_, _ = n.ObjShow(objName)
|
||||
_, _ = n.ObjShow(containerName)
|
||||
}
|
||||
|
||||
n.UpdateLabelIfChanged(objName, newText)
|
||||
}
|
||||
|
||||
func (n *Native) SwitchToScreenIf(screenName string, shouldSwitch []string) {
|
||||
currentScreen := n.GetCurrentScreen()
|
||||
if currentScreen == screenName {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue