mirror of
https://github.com/78/xiaozhi-esp32.git
synced 2026-02-27 14:26:36 +00:00
* Enhance GitHub Actions artifact download script - Updated the output directory structure to save downloaded files in a version-specific subdirectory (releases/<version>). - Added a new function to determine the default releases directory path relative to the script's location. - Improved artifact renaming logic to handle known extensions more robustly and ensure compatibility with filenames containing dots. * Refactor UI setup in ElectronEmojiDisplay and OttoEmojiDisplay classes - Moved SetupChatLabel call in ElectronEmojiDisplay to ensure it is executed after the parent UI is initialized, preventing potential issues with container validity. - Updated SetupUI in OttoEmojiDisplay to release the display lock before calling SetEmotion, avoiding deadlock scenarios during UI setup. * Add multiline chat message support in display configuration - Introduced a new Kconfig option to enable multiline chat message display in the default mode. - Updated the LCD display setup to accommodate a dynamic height bottom bar for multiline messages. - Modified the configuration files for the waveshare-esp32-s3-epaper-1.54 board to include the new chat message setting. * Update font and emoji settings for Magiclick boards; enhance bottom bar visibility logic in LCD display - Changed the default text and emoji fonts for Magiclick S3 2P4 and S3 2P5 boards to Noto fonts. - Improved bottom bar visibility logic in LcdDisplay to hide when there is no content, ensuring a cleaner UI experience.
135 lines
5.2 KiB
C++
135 lines
5.2 KiB
C++
#include "otto_emoji_display.h"
|
|
|
|
#include <esp_log.h>
|
|
|
|
#include <cstring>
|
|
#include <vector>
|
|
|
|
#include "assets.h"
|
|
#include "assets/lang_config.h"
|
|
#include "display/lvgl_display/emoji_collection.h"
|
|
#include "display/lvgl_display/lvgl_image.h"
|
|
#include "display/lvgl_display/lvgl_theme.h"
|
|
|
|
#define TAG "OttoEmojiDisplay"
|
|
OttoEmojiDisplay::OttoEmojiDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy)
|
|
: SpiLcdDisplay(panel_io, panel, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy) {
|
|
SetTheme(LvglThemeManager::GetInstance().GetTheme("dark"));
|
|
}
|
|
|
|
void OttoEmojiDisplay::SetupUI() {
|
|
// Prevent duplicate calls - parent SetupUI() will also check, but check here for early return
|
|
if (setup_ui_called_) {
|
|
ESP_LOGW(TAG, "SetupUI() called multiple times, skipping duplicate call");
|
|
return;
|
|
}
|
|
|
|
// Call parent SetupUI() first to create all lvgl objects
|
|
SpiLcdDisplay::SetupUI();
|
|
|
|
// Setup preview image after UI is initialized - release lock before calling SetEmotion
|
|
// to avoid deadlock (SetEmotion also acquires DisplayLockGuard internally)
|
|
{
|
|
DisplayLockGuard lock(this);
|
|
lv_obj_set_size(preview_image_, width_ , height_ );
|
|
}
|
|
|
|
// Set default emotion after UI is initialized
|
|
SetEmotion("staticstate");
|
|
}
|
|
|
|
void OttoEmojiDisplay::SetupPreviewImage() {
|
|
DisplayLockGuard lock(this);
|
|
if (preview_image_ == nullptr) {
|
|
ESP_LOGW(TAG, "SetupPreviewImage called but preview_image_ is nullptr (UI not initialized yet)");
|
|
return;
|
|
}
|
|
lv_obj_set_size(preview_image_, width_ , height_ );
|
|
}
|
|
|
|
void OttoEmojiDisplay::InitializeOttoEmojis() {
|
|
ESP_LOGI(TAG, "Otto表情初始化将由Assets系统处理");
|
|
// 表情初始化已移至assets系统,通过DEFAULT_EMOJI_COLLECTION=otto-gif配置
|
|
// assets.cc会从assets分区加载GIF表情并设置到theme
|
|
// Note: Default emotion is now set in SetupUI() after LVGL objects are created
|
|
}
|
|
|
|
LV_FONT_DECLARE(OTTO_ICON_FONT);
|
|
void OttoEmojiDisplay::SetStatus(const char* status) {
|
|
auto lvgl_theme = static_cast<LvglTheme*>(current_theme_);
|
|
auto text_font = lvgl_theme->text_font()->font();
|
|
DisplayLockGuard lock(this);
|
|
if (!status) {
|
|
ESP_LOGE(TAG, "SetStatus: status is nullptr");
|
|
return;
|
|
}
|
|
|
|
if (strcmp(status, Lang::Strings::LISTENING) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, &OTTO_ICON_FONT, 0);
|
|
lv_label_set_text(status_label_, "\xEF\x84\xB0"); // U+F130 麦克风图标
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
} else if (strcmp(status, Lang::Strings::SPEAKING) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, &OTTO_ICON_FONT, 0);
|
|
lv_label_set_text(status_label_, "\xEF\x80\xA8"); // U+F028 说话图标
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
} else if (strcmp(status, Lang::Strings::CONNECTING) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, &OTTO_ICON_FONT, 0);
|
|
lv_label_set_text(status_label_, "\xEF\x83\x81"); // U+F0c1 连接图标
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
} else if (strcmp(status, Lang::Strings::STANDBY) == 0) {
|
|
lv_obj_set_style_text_font(status_label_, text_font, 0);
|
|
lv_label_set_text(status_label_, "");
|
|
lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_clear_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_clear_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
|
|
return;
|
|
}
|
|
|
|
lv_obj_set_style_text_font(status_label_, text_font, 0);
|
|
lv_label_set_text(status_label_, status);
|
|
}
|
|
|
|
void OttoEmojiDisplay::SetPreviewImage(std::unique_ptr<LvglImage> image) {
|
|
DisplayLockGuard lock(this);
|
|
if (preview_image_ == nullptr) {
|
|
ESP_LOGE(TAG, "Preview image is not initialized");
|
|
return;
|
|
}
|
|
|
|
if (image == nullptr) {
|
|
esp_timer_stop(preview_timer_);
|
|
lv_obj_remove_flag(emoji_box_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_add_flag(preview_image_, LV_OBJ_FLAG_HIDDEN);
|
|
preview_image_cached_.reset();
|
|
if (gif_controller_) {
|
|
gif_controller_->Start();
|
|
}
|
|
return;
|
|
}
|
|
|
|
preview_image_cached_ = std::move(image);
|
|
auto img_dsc = preview_image_cached_->image_dsc();
|
|
// 设置图片源并显示预览图片
|
|
lv_image_set_src(preview_image_, img_dsc);
|
|
lv_image_set_rotation(preview_image_, 900);
|
|
if (img_dsc->header.w > 0 && img_dsc->header.h > 0) {
|
|
// zoom factor 1.0
|
|
lv_image_set_scale(preview_image_, 256 * width_ / img_dsc->header.w);
|
|
}
|
|
|
|
// Hide emoji_box_
|
|
if (gif_controller_) {
|
|
gif_controller_->Stop();
|
|
}
|
|
lv_obj_add_flag(emoji_box_, LV_OBJ_FLAG_HIDDEN);
|
|
lv_obj_remove_flag(preview_image_, LV_OBJ_FLAG_HIDDEN);
|
|
esp_timer_stop(preview_timer_);
|
|
ESP_ERROR_CHECK(esp_timer_start_once(preview_timer_, PREVIEW_IMAGE_DURATION_MS * 1000));
|
|
} |