From 173eaa7463f00df3dde9adb78b977bc05b114cbe Mon Sep 17 00:00:00 2001 From: baidxi Date: Wed, 4 Feb 2026 21:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8Display=E5=9F=BA=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0SetupUI=E8=99=9A=E5=87=BD=E6=95=B0=20(#1742)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jeck.chen --- main/application.cc | 2 +- main/display/display.h | 1 + main/display/lcd_display.cc | 6 ------ main/display/lcd_display.h | 3 +-- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/main/application.cc b/main/application.cc index 9d544c70..5a640c85 100644 --- a/main/application.cc +++ b/main/application.cc @@ -64,7 +64,7 @@ void Application::Initialize() { // Setup the display auto display = board.GetDisplay(); - + display->SetupUI(); // Print board name/version info display->SetChatMessage("system", SystemInfo::GetUserAgent().c_str()); diff --git a/main/display/display.h b/main/display/display.h index f6139eee..cc34a073 100644 --- a/main/display/display.h +++ b/main/display/display.h @@ -40,6 +40,7 @@ public: virtual Theme* GetTheme() { return current_theme_; } virtual void UpdateStatusBar(bool update_all = false); virtual void SetPowerSaveMode(bool on); + virtual void SetupUI() { } inline int width() const { return width_; } inline int height() const { return height_; } diff --git a/main/display/lcd_display.cc b/main/display/lcd_display.cc index a6eb4f0e..1a75f181 100644 --- a/main/display/lcd_display.cc +++ b/main/display/lcd_display.cc @@ -169,8 +169,6 @@ SpiLcdDisplay::SpiLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_h if (offset_x != 0 || offset_y != 0) { lv_display_set_offset(display_, offset_x, offset_y); } - - SetupUI(); } @@ -232,8 +230,6 @@ RgbLcdDisplay::RgbLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_h if (offset_x != 0 || offset_y != 0) { lv_display_set_offset(display_, offset_x, offset_y); } - - SetupUI(); } MipiLcdDisplay::MipiLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, @@ -285,8 +281,6 @@ MipiLcdDisplay::MipiLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel if (offset_x != 0 || offset_y != 0) { lv_display_set_offset(display_, offset_x, offset_y); } - - SetupUI(); } LcdDisplay::~LcdDisplay() { diff --git a/main/display/lcd_display.h b/main/display/lcd_display.h index 110b04d8..e5be55e3 100644 --- a/main/display/lcd_display.h +++ b/main/display/lcd_display.h @@ -37,7 +37,6 @@ protected: bool hide_subtitle_ = false; // Control whether to hide chat messages/subtitles void InitializeLcdThemes(); - void SetupUI(); virtual bool Lock(int timeout_ms = 0) override; virtual void Unlock() override; @@ -51,7 +50,7 @@ public: virtual void SetChatMessage(const char* role, const char* content) override; virtual void ClearChatMessages() override; virtual void SetPreviewImage(std::unique_ptr image) override; - + virtual void SetupUI() override; // Add theme switching function virtual void SetTheme(Theme* theme) override;