From d75b01984c89afab08bd0daaca5df72668f33625 Mon Sep 17 00:00:00 2001 From: Terrence Date: Thu, 23 Jan 2025 23:50:43 +0800 Subject: [PATCH] fixbug: add virtual --- main/boards/magiclick-2p4/magiclick_2p4_board.cc | 2 +- main/boards/magiclick-c3/magiclick_c3_board.cc | 9 +-------- .../movecall-moji-esp32s3/movecall_moji_esp32s3.cc | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/main/boards/magiclick-2p4/magiclick_2p4_board.cc b/main/boards/magiclick-2p4/magiclick_2p4_board.cc index f9f4945b..375c9a21 100644 --- a/main/boards/magiclick-2p4/magiclick_2p4_board.cc +++ b/main/boards/magiclick-2p4/magiclick_2p4_board.cc @@ -28,7 +28,7 @@ public: width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, &font_puhui_16_4, &font_awesome_16_4) {} - void SetupUI() override { + virtual void SetupUI() override { DisplayLockGuard lock(this); // 调用父类的 SetupUI 来设置基本布局 diff --git a/main/boards/magiclick-c3/magiclick_c3_board.cc b/main/boards/magiclick-c3/magiclick_c3_board.cc index 891f733e..095b66a9 100644 --- a/main/boards/magiclick-c3/magiclick_c3_board.cc +++ b/main/boards/magiclick-c3/magiclick_c3_board.cc @@ -29,7 +29,7 @@ public: width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, &font_puhui_16_4, &font_awesome_16_4) {} - void SetupUI() override { + virtual void SetupUI() override { DisplayLockGuard lock(this); // 调用父类的 SetupUI 来设置基本布局 @@ -139,13 +139,6 @@ private: esp_lcd_panel_disp_on_off(panel, true); display_ = new NV3023Display(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY); - if (display_) { - display_->SetupUI(); - } else { - ESP_LOGE(TAG, "Display is not initialized!"); - } - - } // 物联网初始化,添加对 AI 可见设备 diff --git a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc index cc28a064..6b578e88 100644 --- a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc +++ b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc @@ -1,6 +1,5 @@ #include "wifi_board.h" #include "audio_codecs/es8311_audio_codec.h" -// #include "display/ssd1306_display.h" #include "display/lcd_display.h" #include "display/no_display.h" #include "application.h"