From 2b8226ceb200b2c344e984a770a74b70e9ee4e64 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com>
Date: Thu, 18 Sep 2025 04:13:56 +0000
Subject: [PATCH] Merge #2292 into sdk650pathc0423 from refs/changes/2292/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Code review from 袁清梦

* refs/changes/2292/head: (2 commits squashed)

  - 增加雷鸟对话文本的获取与设置

  - Merge branch &#39;sdk650pathc0423&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2292
---
 .../thunderbird/include/ThunderBirdModel.h    |  8 +++
 .../thunderbird/src/ThunderBirdModel.cpp      | 61 +++++++++++++++----
 2 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h
index ad890a6bf..149cd9020 100644
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h
@@ -79,6 +79,13 @@ namespace OHOS
         bool LoadRemindersFromFile();
         std::string GetReminderFilePath() const;
         uint32_t GenerateReminderId();
+        
+        // 对话文本管理函数
+        std::string GetTextStr();
+        void SetTextStr(const char *textId);
+        void ClearTextStr();
+        size_t GetTextLength() const;
+        bool IsTextEmpty() const;
 
     private:
         ThunderBirdModel();
@@ -89,6 +96,7 @@ namespace OHOS
         // 提醒数据存储
         std::vector<ReminderData> m_reminders;
         uint32_t m_nextReminderId;
+        std::string m_currentTimeStr;
     };
 }
 
diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
index fe266f325..3de10715f 100644
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
@@ -20,7 +20,6 @@
  #include "wearable_log.h"
  #include <sys/time.h>
  #include <service/graphic_service.h>
- #include "wearable_log.h"
  #include "custom_utils.h"
  #include <string.h>
  #include <algorithm>
@@ -562,17 +561,20 @@
          return "模拟对话文本"; // 模拟返回
      }
  
-     bool ThunderBirdModel::EndConversation()
-     {
-         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::EndConversation");
-         
-         // TODO: 实现结束对话逻辑
-         // 1. 清理对话状态
-         // 2. 保存对话记录
-         // 3. 释放相关资源
-         
-         return true; // 模拟成功
-     }
+    bool ThunderBirdModel::EndConversation()
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::EndConversation");
+        
+        // 清理对话状态
+        ClearTextStr();
+        
+        // TODO: 实现其他结束对话逻辑
+        // 1. 保存对话记录
+        // 2. 释放相关资源
+        // 3. 重置对话状态
+        
+        return true; // 模拟成功
+    }
  
      // ==================== 哄睡模式相关函数 ====================
      bool ThunderBirdModel::StartLullabyMode()
@@ -839,6 +841,41 @@
          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Loaded %u reminders from file", static_cast<uint32_t>(m_reminders.size()));
          return true;
      }
+
+     // ==================== 对话文本管理函数 ====================
+     std::string ThunderBirdModel::GetTextStr()
+     { 
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::GetTextStr, length: %zu", m_currentTimeStr.length());
+         return m_currentTimeStr;
+     }
+     
+     void ThunderBirdModel::SetTextStr(const char *textId)
+     {
+         if (textId == nullptr) {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetTextStr: textId is null");
+             return;
+         }
+         
+         // 添加文本内容
+         m_currentTimeStr += textId;
+         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetTextStr: added text, current length: %zu", m_currentTimeStr.length());
+     }
+     
+     void ThunderBirdModel::ClearTextStr()
+     {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ClearTextStr: clearing text, previous length: %zu", m_currentTimeStr.length());
+         m_currentTimeStr.clear();
+     }
+     
+     size_t ThunderBirdModel::GetTextLength() const
+     {
+         return m_currentTimeStr.length();
+     }
+     
+     bool ThunderBirdModel::IsTextEmpty() const
+     {
+         return m_currentTimeStr.empty();
+     }
  
  /*
          1、新手引导 
-- 
2.17.1