Enhance device activation and OTA update process

- Add support for device activation with audio feedback
- Refactor OTA update flow to include activation code handling
- Update asset management for localized sound resources
- Improve error handling and device state management
- Reorganize binary asset includes and CMake configuration

main/display/display.cc

@@ -210,6 +210,11 @@ void Display::SetIcon(const char* icon) {
 }
 
 void Display::SetChatMessage(const std::string &role, const std::string &content) {
+    DisplayLockGuard lock(this);
+    if (chat_message_label_ == nullptr) {
+        return;
+    }
+    lv_label_set_text(chat_message_label_, content.c_str());
 }
 
 void Display::SetBacklight(uint8_t brightness) {

main/display/display.h

@@ -42,6 +42,7 @@ protected:
     lv_obj_t *notification_label_ = nullptr;
     lv_obj_t *mute_label_ = nullptr;
     lv_obj_t *battery_label_ = nullptr;
+    lv_obj_t* chat_message_label_ = nullptr;
     const char* battery_icon_ = nullptr;
     const char* network_icon_ = nullptr;
     bool muted_ = false;

main/display/lcd_display.cc

@@ -274,14 +274,6 @@ void LcdDisplay::SetupUI() {
     lv_obj_set_style_text_font(battery_label_, fonts_.icon_font, 0);
 }
 
-void LcdDisplay::SetChatMessage(const std::string &role, const std::string &content) {
-    DisplayLockGuard lock(this);
-    if (chat_message_label_ == nullptr) {
-        return;
-    }
-    lv_label_set_text(chat_message_label_, content.c_str());
-}
-
 void LcdDisplay::SetEmotion(const std::string &emotion) {
     struct Emotion {
         const char* icon;

main/display/lcd_display.h

@@ -26,7 +26,6 @@ protected:
     lv_obj_t* content_ = nullptr;
     lv_obj_t* container_ = nullptr;
     lv_obj_t* side_bar_ = nullptr;
-    lv_obj_t* chat_message_label_ = nullptr;
 
     DisplayFonts fonts_;
 
@@ -46,7 +45,6 @@ public:
                   DisplayFonts fonts);
     ~LcdDisplay();
 
-    virtual void SetChatMessage(const std::string &role, const std::string &content) override;
     virtual void SetEmotion(const std::string &emotion) override;
     virtual void SetIcon(const char* icon) override;
     virtual void SetBacklight(uint8_t brightness) override;

main/display/ssd1306_display.cc

@@ -132,6 +132,20 @@ void Ssd1306Display::Unlock() {
     lvgl_port_unlock();
 }
 
+void Ssd1306Display::SetChatMessage(const std::string &role, const std::string &content) {
+    DisplayLockGuard lock(this);
+    if (content_right_ == nullptr) {
+        lv_label_set_text(chat_message_label_, content.c_str());
+    } else {
+        if (content.empty()) {
+            lv_obj_add_flag(content_right_, LV_OBJ_FLAG_HIDDEN);
+        } else {
+            lv_label_set_text(chat_message_label_, content.c_str());
+            lv_obj_clear_flag(content_right_, LV_OBJ_FLAG_HIDDEN);
+        }
+    }
+}
+
 void Ssd1306Display::SetupUI_128x64() {
     DisplayLockGuard lock(this);
 
@@ -149,20 +163,46 @@ void Ssd1306Display::SetupUI_128x64() {
 
     /* Status bar */
     status_bar_ = lv_obj_create(container_);
-    lv_obj_set_size(status_bar_, LV_HOR_RES, 18);
+    lv_obj_set_size(status_bar_, LV_HOR_RES, 16);
+    lv_obj_set_style_border_width(status_bar_, 0, 0);
+    lv_obj_set_style_pad_all(status_bar_, 0, 0);
     lv_obj_set_style_radius(status_bar_, 0, 0);
     
     /* Content */
     content_ = lv_obj_create(container_);
     lv_obj_set_scrollbar_mode(content_, LV_SCROLLBAR_MODE_OFF);
-    lv_obj_set_style_radius(status_bar_, 0, 0);
+    lv_obj_set_style_radius(content_, 0, 0);
+    lv_obj_set_style_pad_all(content_, 0, 0);
     lv_obj_set_width(content_, LV_HOR_RES);
     lv_obj_set_flex_grow(content_, 1);
+    lv_obj_set_flex_flow(content_, LV_FLEX_FLOW_ROW);
+    lv_obj_set_style_flex_main_place(content_, LV_FLEX_ALIGN_CENTER, 0);
 
-    emotion_label_ = lv_label_create(content_);
+    // 创建左侧固定宽度的容器
+    content_left_ = lv_obj_create(content_);
+    lv_obj_set_size(content_left_, 32, LV_SIZE_CONTENT);  // 固定宽度32像素
+    lv_obj_set_style_pad_all(content_left_, 0, 0);
+    lv_obj_set_style_border_width(content_left_, 0, 0);
+    
+    emotion_label_ = lv_label_create(content_left_);
     lv_obj_set_style_text_font(emotion_label_, &font_awesome_30_1, 0);
     lv_label_set_text(emotion_label_, FONT_AWESOME_AI_CHIP);
     lv_obj_center(emotion_label_);
+    lv_obj_set_style_pad_top(emotion_label_, 8, 0);
+
+    // 创建右侧可扩展的容器
+    content_right_ = lv_obj_create(content_);
+    lv_obj_set_size(content_right_, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
+    lv_obj_set_style_pad_all(content_right_, 0, 0);
+    lv_obj_set_style_border_width(content_right_, 0, 0);
+    lv_obj_set_flex_grow(content_right_, 1);
+    lv_obj_add_flag(content_right_, LV_OBJ_FLAG_HIDDEN);
+
+    chat_message_label_ = lv_label_create(content_right_);
+    lv_label_set_text(chat_message_label_, "");
+    lv_label_set_long_mode(chat_message_label_, LV_LABEL_LONG_WRAP);
+    lv_obj_set_width(chat_message_label_, lv_pct(100));
+    lv_obj_set_style_text_align(chat_message_label_, LV_TEXT_ALIGN_LEFT, 0);
 
     /* Status bar */
     lv_obj_set_flex_flow(status_bar_, LV_FLEX_FLOW_ROW);
@@ -250,17 +290,19 @@ void Ssd1306Display::SetupUI_128x32() {
     lv_label_set_text(battery_label_, "");
     lv_obj_set_style_text_font(battery_label_, icon_font_, 0);
 
-    status_label_ = lv_label_create(side_bar_);
-    lv_obj_set_flex_grow(status_label_, 1);
-    lv_obj_set_width(status_label_, width_ - 32);
-    lv_label_set_long_mode(status_label_, LV_LABEL_LONG_SCROLL_CIRCULAR);
+    status_label_ = lv_label_create(status_bar_);
+    lv_obj_set_style_pad_left(status_label_, 2, 0);
     lv_label_set_text(status_label_, "正在初始化");
 
-    notification_label_ = lv_label_create(side_bar_);
-    lv_obj_set_flex_grow(notification_label_, 1);
-    lv_obj_set_width(notification_label_, width_ - 32);
-    lv_label_set_long_mode(notification_label_, LV_LABEL_LONG_SCROLL_CIRCULAR);
+    notification_label_ = lv_label_create(status_bar_);
     lv_label_set_text(notification_label_, "通知");
+    lv_obj_set_style_pad_left(notification_label_, 2, 0);
     lv_obj_add_flag(notification_label_, LV_OBJ_FLAG_HIDDEN);
+
+    chat_message_label_ = lv_label_create(side_bar_);
+    lv_obj_set_flex_grow(chat_message_label_, 1);
+    lv_obj_set_width(chat_message_label_, width_ - 32);
+    lv_label_set_long_mode(chat_message_label_, LV_LABEL_LONG_SCROLL_CIRCULAR);
+    lv_label_set_text(chat_message_label_, "");
 }
 

main/display/ssd1306_display.h

@@ -13,6 +13,8 @@ private:
 
     lv_obj_t* status_bar_ = nullptr;
     lv_obj_t* content_ = nullptr;
+    lv_obj_t* content_left_ = nullptr;
+    lv_obj_t* content_right_ = nullptr;
     lv_obj_t* container_ = nullptr;
     lv_obj_t* side_bar_ = nullptr;
 
@@ -29,6 +31,8 @@ public:
     Ssd1306Display(void* i2c_master_handle, int width, int height, bool mirror_x, bool mirror_y,
                    const lv_font_t* text_font, const lv_font_t* icon_font);
     ~Ssd1306Display();
+
+    virtual void SetChatMessage(const std::string &role, const std::string &content);
 };
 
 #endif // SSD1306_DISPLAY_H