From: xue <2144439972@qq.com> Date: Wed, 15 Oct 2025 07:00:51 +0000 (+0800) Subject: 完善对话时切换变化操作 X-Git-Tag: V1.0.9_20251128_194606_LN~244^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7ed9f28547a03f530c6557965b50483b72588d5d;p=mirrors%2FFD230.git 完善对话时切换变化操作 --- diff --git a/code/sdk/application/brandy/brandy_recovery/recovery_display.c b/code/sdk/application/brandy/brandy_recovery/recovery_display.c index fd917a6aa..f49f1d803 100644 --- a/code/sdk/application/brandy/brandy_recovery/recovery_display.c +++ b/code/sdk/application/brandy/brandy_recovery/recovery_display.c @@ -111,13 +111,17 @@ static errcode_t recovery_dispay_layer_and_surface_init(ext_dpu_surface *surface void recovery_display_sample(void) { + errcode_t ret; td_handle dpu_handle; ext_dpu_surface surface = {0}; ext_dpu_layer_info layer_info = {0}; - ext_rect update_rect = {0, 0, 466, 466}; // 定义一个局部区域 +#ifdef LEINIAO + ext_rect update_rect = {0, 0, 360, 360}; // 定义一个局部区域 + #else + ext_rect update_rect = {0, 0, 450, 450}; // 定义一个局部区域 // ext_rect update_rect = {223, 223, 20, 20}; // 定义一个局部区域 - + #endif recovery_dispay_layer_and_surface_init(&surface, &layer_info, &update_rect); // 设置layer全白色, 也可以使用接口 recovery_dispay_read_image_and_savein_surface 实现从文件系统读图片 /* image_tool 图片压缩参数如下: @@ -129,6 +133,8 @@ void recovery_display_sample(void) // memset_s((void *)surface.phy_addr, surface.size, 0xFF, surface.size); #ifdef SINGLE_USER_PARTITION recovery_dispay_read_image_and_savein_surface("/user/system/OTAUpdataRecover.bin",&surface); + #elif defined LEINIAO + recovery_dispay_read_image_and_savein_surface("/user/system/SystemUpdateing.bin",&surface); #else recovery_dispay_read_image_and_savein_surface("/system/OTAUpdataRecover.bin",&surface); #endif diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp index 6c89f3771..92575aa82 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaPresenter.cpp @@ -146,6 +146,7 @@ namespace OHOS if(currentView == OtaView::OTA_VIEW_UPDATE_SUCCESS) OtaModel::GetInstance()->ClearNightUpdateStatus(); ThunderBirdModel::GetInstance()->ResetOtaStatus(); + // do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0); NativeAbility::GetInstance().SwitchSlice(VIEW_THUNDER_BIRD); } //倒计时界面确认,开始升级,定时器停止,进入升级中界面 @@ -173,11 +174,13 @@ namespace OHOS else if (currentView == OtaView::OTA_VIEW_NIGHT_UPDATE_SUCCESS || currentView == OtaView::OTA_VIEW_NIGHT_UPDATE || currentView == OtaView::OTA_VIEW_COUNTDOWN) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "夜间升级界面跳转普通升级"); ThunderBirdModel::GetInstance()->ResetOtaStatus(); + //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0); NativeAbility::GetInstance().SwitchSlice(VIEW_THUNDER_BIRD); } else if (currentView == OtaView::OTA_VIEW_NETWORK_ERROR || currentView == OtaView::OTA_VIEW_LOW_BATTERY || currentView == OtaView::OTA_VIEW_MEMORY_ERROR ||currentView == OtaView::OTA_VIEW_UPDATE_FAILED) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "网络异常、电量不足、内存不足界面跳转普通升级"); ThunderBirdModel::GetInstance()->ResetOtaStatus(); + //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_EXIT_SLEEP, NULL, 0); NativeAbility::GetInstance().SwitchSlice(VIEW_THUNDER_BIRD); } diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp index e11aece9b..585eb3eb7 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp @@ -12,6 +12,7 @@ #include "custom_runtime.h" #include "custom_utils.h" #include "vibrator_service.h" +#include "custom_runtime.h" namespace OHOS { static ShutdownDeviceView *g_pShutdownDeviceView{nullptr}; @@ -41,6 +42,8 @@ static const char *RB_SD_PATHS[RB_SD_ANIM_FRAMES] = { ShutdownDeviceView::ShutdownDeviceView() { + // 关机增加震动 + custom_VibratorFunc_int(0); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShutdownDeviceView::ShutdownDeviceView"); g_pShutdownDeviceView = this; } diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdMainView.h b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdMainView.h index dbf889890..b27026450 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdMainView.h +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdMainView.h @@ -95,6 +95,7 @@ namespace OHOS MediaVideoPlay *video_ = nullptr; MediaVideoPlay *videoPlay_ = nullptr; + std::string currentVideoPath_; // 当前播放的视频文件路径 UIImageView *batteryimage{nullptr}; // 电池图片 UILabel *batteryLabel{nullptr}; // 电池电量 UILabel *batteryLabelBlack{nullptr}; // 黑色电量组件 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 7ae09a379..0f68f457d 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 @@ -228,6 +228,15 @@ namespace OHOS // NPC表情变化处理函数 void HandleNpcEmotionChange(const char* emotion); + // 时间线状态变化处理函数 + void HandleTimelineStatusChange(const char* description, const char* emotion); + + // 进入对话模式时记录当前表情 + void OnEnterDialogueMode(); + + // 退出对话模式时恢复表情 + void OnExitDialogueMode(); + // 音频文本队列操作函数 void EnqueueAudioText(const std::string& text); void DequeueAndPushAudioText(); @@ -309,6 +318,7 @@ namespace OHOS // 对话状态显示相关变量 std::string m_currentExpression; // 当前表情状态 std::string m_currentStatusText; // 当前状态文本 + std::string m_dialogueExpression; // 对话界面表情状态 int downloadFileType = -1; }; diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp index 98d01db3b..bba05ffeb 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdAdjustView.cpp @@ -2,6 +2,7 @@ #include "thunderbird/include/ThunderBirdMainView.h" #include "wearable_log.h" #include "common/image_cache_manager.h" +#include "custom_utils.h" namespace OHOS { @@ -185,6 +186,7 @@ namespace OHOS } case THUNDERBIRD_ADJUSTVIEW_WARNING: { + uapi_set_screen_on_api(); // 亮屏 if (TextLabel) { TextLabel->SetPosition(112, 148, 248, 42); diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp index e6e52c974..15368ba79 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp @@ -374,7 +374,6 @@ namespace OHOS TextLabel_Y->SetRollSpeed(35); TextLabel_Y->SetVisible(true); } - ThunderBirdLullabyView::UpdateLullabyText(ThunderBirdModel::GetInstance()->GetTextStr().c_str()); break; } case THUNDERBIRD_LULLABYVIEW_5: diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp index 2872f5986..8965e820b 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp @@ -76,6 +76,9 @@ namespace OHOS //ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 打开屏幕常亮 ThunderBirdModel::GetInstance()->StartTimeDisplayTimer(); ThunderBirdModel::GetInstance()->StartStatusTimer(); + + // 初始化当前视频路径为空 + currentVideoPath_ = ""; } ThunderBirdMainView::~ThunderBirdMainView() @@ -351,6 +354,13 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::SwitchVideo: Invalid parameters"); return false; } + + // 检查是否尝试切换到同一个文件 + if (currentVideoPath_ == std::string(uri)) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::SwitchVideo: Already playing the same video, skipping: %s", uri); + return true; // 返回true表示"成功",因为不需要切换 + } // 停止并销毁旧播放器 if (videoPlay_ != nullptr) { @@ -388,6 +398,9 @@ namespace OHOS return false; } + // 更新当前播放的视频路径 + currentVideoPath_ = std::string(uri); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::SwitchVideo: Successfully switched to video: %s", uri); return true; } 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 f8058237e..f8b644619 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 @@ -102,7 +102,7 @@ printf(" screenImageAsEmoji_ = %d", screenImageAsEmoji_); // 初始化对话状态显示变量 - m_currentExpression = " "; + m_currentExpression = "CloseEyes"; m_currentStatusText = "发呆中..."; } @@ -313,6 +313,7 @@ if(status == 1 || status == 2 || status == 3)//OTA升级 { SetViewModel(); + //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_ENTER_SLEEP, NULL, 0); NativeAbility::GetInstance().ChangeSlice(VIEW_OTA); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "进入OTA"); } @@ -968,6 +969,13 @@ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "第一个文本直接显示在对话界面: %s", textId); } + // 直接推送到哄睡界面 + if(ThunderBirdLullabyView::GetInstance() && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4) + { + ThunderBirdLullabyView::GetInstance()->UpdateLullabyText(textId); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "第一个文本直接显示在哄睡界面: %s", textId); + } + // 不入队,避免重复显示 } else { // 非第一个文本,加入队列等待音频开始播放时同步出队 @@ -1310,7 +1318,8 @@ { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测到夜间更新已启用,切换到OTA slice"); // 切换到OTA slice - NativeAbility::GetInstance().SwitchSlice(VIEW_OTA); + //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_ENTER_SLEEP, NULL, 0); + NativeAbility::GetInstance().ChangeSlice(VIEW_OTA); } } view->UpdateTimeText(currentTime.c_str()); @@ -2048,15 +2057,38 @@ { // 参数验证 if (videoPath == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SwitchExpressionVideo: videoPath is null"); return false; } + // 再次验证文件是否存在(双重检查) + if (access(videoPath, F_OK) != 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SwitchExpressionVideo: file does not exist: %s", videoPath); + return false; + } + + // 预处理文件路径,确保realpath能够成功 + std::string normalizedPath = videoPath; + + // 尝试使用realpath规范化路径 + char resolvedPath[PATH_MAX]; + if (realpath(videoPath, resolvedPath) != nullptr) { + normalizedPath = std::string(resolvedPath); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SwitchExpressionVideo: normalized path: %s", normalizedPath.c_str()); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SwitchExpressionVideo: realpath failed for %s, using original path", videoPath); + // 如果realpath失败,使用原始路径 + normalizedPath = std::string(videoPath); + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SwitchExpressionVideo: switching to video: %s", normalizedPath.c_str()); + // 通过图形服务调用 ThunderBirdMainView 的 SwitchVideo 函数 // 注意:PostGraphicEvent 是异步的,这里直接返回 true 表示调用已提交 GraphicService::GetInstance()->PostGraphicEvent( - [videoPath]() { + [normalizedPath]() { if (ThunderBirdMainView::GetInstance()) { - ThunderBirdMainView::GetInstance()->SwitchVideo(videoPath); + ThunderBirdMainView::GetInstance()->SwitchVideo(normalizedPath.c_str()); } }); @@ -2085,14 +2117,13 @@ // 通过图形服务调用 ThunderBirdMainView 的 SwitchHair 函数 // 注意:PostGraphicEvent 是异步的,这里直接返回 true 表示调用已提交 - GraphicService::GetInstance()->PostGraphicEvent( - [hairPath]() { + if (ThunderBirdMainView::GetInstance()) { ThunderBirdMainView::GetInstance()->SwitchHair(hairPath.c_str()); } else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SwitchHair: ThunderBirdMainView instance is null"); } - }); + return true; // 异步调用,返回 true 表示调用已提交 } @@ -2164,10 +2195,13 @@ { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleApiError"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error message: %s", message ? message : "null"); + if(ThunderBirdMainView::GetInstance()) + { int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_WARNING); - if (ThunderBirdAdjustView::GetInstance()) { - ThunderBirdAdjustView::GetInstance()->UpdateTaskReminderText(message); + if (ThunderBirdAdjustView::GetInstance()) { + ThunderBirdAdjustView::GetInstance()->UpdateTaskReminderText(message); + } } } @@ -2192,6 +2226,7 @@ } //跳转到OTA下载界 downloadFileType = type; + //do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_WS_ENTER_SLEEP, NULL, 0); NativeAbility::GetInstance().ChangeSlice(VIEW_OTA); } @@ -2205,7 +2240,8 @@ void ThunderBirdModel::HandleAudioPlaybackEnd() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleAudioPlaybackEnd"); - if(ThunderBirdDialogueView::GetInstance()) + int currentSubView = ThunderBirdMainView::GetInstance()->GetCurrentSubView(); + if(ThunderBirdDialogueView::GetInstance() && currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING) { ThunderBirdDialogueView::GetInstance()->AudioPlaybackEnd(); } @@ -2225,19 +2261,87 @@ return; } - //判断对话界面当前表情 - // 获取当前视图状态 int16_t currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); int16_t currentSubView = ThunderBirdMainView::GetInstance()->GetCurrentSubView(); - // 如果当前在对话界面,更新表情显示 + // 如果当前在对话界面,处理表情变化 if(ThunderBirdDialogueView::GetInstance() && currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING) { - // 这里可以调用对话界面的表情更新函数 - // 更新当前表情状态 - //ThunderBirdMainView::SwitchVideo(emotion); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NPC表情已更新: %s", emotion); + // 检查传入的表情是否与当前对话界面表情不同 + if (m_dialogueExpression != emotion) { + // 记录新的对话界面表情 + m_dialogueExpression = emotion; + + // 切换表情 + std::string expressionPath = "/user/userdata/leiniao/emoji/" + eyesShape_ + "/" + eyesColor_ + "/" + "thinking" + ".mp4"; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NPC表情: %s", expressionPath.c_str()); + //判断表情文件是否存在 + if(access(expressionPath.c_str(), F_OK) != -1) + { + SwitchExpressionVideo(expressionPath.c_str()); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NPC表情已更新: %s", expressionPath.c_str()); + } + else + { + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NPC表情不存在: %s", expressionPath.c_str()); + } + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NPC表情未变化,跳过更新: %s", emotion); + } + } + else + { + // 不在对话界面时,记录传入的表情但不切换 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "不在对话界面,记录表情: %s", emotion); + } + } + + // 时间线状态变化处理函数 + void ThunderBirdModel::HandleTimelineStatusChange(const char* description, const char* emotion) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleTimelineStatusChange"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Description: %s", description ? description : "NULL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Emotion: %s", emotion ? emotion : "NULL"); + + if (description == nullptr || emotion == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleTimelineStatusChange: description or emotion is null"); + return; + } + + // 处理时间线状态变化 + // 这里可以根据description和emotion进行相应的处理 + // 例如:更新UI显示、记录状态变化等 + + // 如果emotion不为空,可以调用表情变化处理 + if (strlen(emotion) > 0) { + HandleNpcEmotionChange(emotion); + } + + // 可以根据description进行其他处理 + // 例如:更新状态文本、记录日志等 + if (strlen(description) > 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "时间线状态描述: %s", description); + // 这里可以添加更多基于description的处理逻辑 + } + } + + // 进入对话模式时记录当前表情 + void ThunderBirdModel::OnEnterDialogueMode() + { + // 记录进入对话模式前的表情,不改变当前表情 + m_dialogueExpression = m_currentExpression; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::OnEnterDialogueMode: 记录进入对话模式前的表情: %s", m_currentExpression.c_str()); + } + + // 退出对话模式时恢复表情 + void ThunderBirdModel::OnExitDialogueMode() + { + // 恢复到进入对话模式前记录的表情 + if (!m_currentExpression.empty()) { + SetCurrentExpression(m_currentExpression); + SetCurrentExpressionAndStatus(); } } @@ -2269,18 +2373,26 @@ } //切换表情 //不为屏保模式 + std::string expressionPath; if(screenImageAsEmoji_ == false) { //获取当前角色配置 //为默认表情 if(eyesColor_.empty() == true || eyesShape_.empty() == true) { - std::string expressionPath = "/user/res/video/Default/"+ m_currentExpression + ".mp4"; + expressionPath = "/user/res/video/Default/"+ m_currentExpression + ".mp4"; SwitchExpressionVideo(expressionPath.c_str()); } else { - std::string expressionPath = "/user/userdata/leiniao/emoji/" + eyesShape_ + "/" + eyesColor_ + "/" + m_currentExpression + ".mp4"; + if(m_currentExpression == "CloseEyes")//如果为眨眼表情,则在默认文件目录里面 + { + expressionPath = "/user/res/video/CloseEyes/" + eyesShape_ + "/" + eyesColor_ + ".mp4"; + } + else//非眨眼表情,则在下载文件目录里面 + { + expressionPath = "/user/userdata/leiniao/emoji/" + eyesShape_ + "/" + eyesColor_ + "/" + m_currentExpression + ".mp4"; + } //判断表情文件是否存在 if(access(expressionPath.c_str(), F_OK) != -1) { @@ -2294,7 +2406,7 @@ } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::SetCurrentExpressionAndStatus: expression=%s, statusText=%s", - m_currentExpression.c_str(), m_currentStatusText.c_str()); + expressionPath.c_str(), m_currentStatusText.c_str()); } // 获取当前表情状态 diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp index d1b7856f9..d28cca29e 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp @@ -530,6 +530,9 @@ namespace OHOS break; case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5: do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_STORY_FINISH, NULL, 0);//确认结束哄睡 + ai_media_play_stop(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdDialogueView::AudioPlaybackEnd: Stopped audio playback"); + ln_ws_end_audio_chat();//结束对话 ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW); break; } @@ -562,6 +565,7 @@ namespace OHOS //通知界面-关闭通知 case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER://事项提醒界面-关闭通知 //回原界面 + ThunderBirdModel::GetInstance()->HighFrequence(); ThunderBirdMainView::GetInstance()->GoBackToPreviousView(); break; case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH://提醒界面-对话不足 @@ -652,23 +656,28 @@ namespace OHOS { ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_LISTENING); isDialogueing = true; + // 进入对话模式时记录当前表情 + ThunderBirdModel::GetInstance()->OnEnterDialogueMode(); ln_ws_start_audio_chat(LN_AUDIO_CHAT_VOICE_CHAT_REQUEST);//开始对话 } else if(currentView == THUNDERBIRD_DIALOGUEVIEW) { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW); - if(currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_LISTENING) - { - ThunderBirdModel::GetInstance()->StopCountUpTimer(); - } + // 停止实际的音频播放 ai_media_play_stop(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdDialogueView::AudioPlaybackEnd: Stopped audio playback"); ln_ws_end_audio_chat();//结束对话 + // 退出对话模式时恢复表情 isDialogueing = false; + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW); + if(currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_LISTENING) + { + ThunderBirdModel::GetInstance()->StopCountUpTimer(); + } + ThunderBirdModel::GetInstance()->OnExitDialogueMode(); } //当为故事模式 - else if(currentView = THUNDERBIRD_LULLABYVIEW && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4) + else if(currentView == THUNDERBIRD_LULLABYVIEW && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdPresenter::HandleFuncKeyLongPress"); ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5); diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp index c14ab40e9..59e8fcd8b 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp @@ -148,6 +148,7 @@ namespace OHOS } case THUNDERBIRD_REMINDERVIEW_TASK_REMINDER: { + ThunderBirdModel::GetInstance()->LowFrequence(); if (RemindIcon) { // 图标位置:整体居中的左侧 diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp index 27980e287..0449d597c 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/uiservice/src/ui_service.cpp @@ -635,14 +635,50 @@ void HandNpcEmotionChangeNotify(Request *request) std::string emotion(static_cast(request->data), request->len); WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandNpcEmotionChangeNotify emotion = %s", emotion.c_str()); GraphicService::GetInstance()->PostGraphicEvent( - std::bind(&OHOS::ThunderBirdModel::HandleNpcEmotionChange,OHOS::ThunderBirdModel::GetInstance(),emotion.c_str())); + std::bind(&OHOS::ThunderBirdModel::HandleNpcEmotionChange,OHOS::ThunderBirdModel::GetInstance(),const_cast(emotion.c_str()))); } // 通知时间线状态变化 void HandTimelineStatusChangeNotify(Request *request) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify msg_id = %d", request->msgId); + + if (request->data == nullptr || request->len <= 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify: invalid data"); + return; + } + + // 解析接收到的数据:时间线状态变化信息(以'|'分隔) + // 格式: "description|emotion" std::string payload(static_cast(request->data), request->len); WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify payload = %s", payload.c_str()); + + // 解析各个字段 + std::vector fields; + std::stringstream ss(payload); + std::string field; + while (std::getline(ss, field, '|')) { + fields.push_back(field); + } + + if (fields.size() < 2) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify: invalid payload format, expected at least 2 fields, got %zu", fields.size()); + return; + } + + std::string description = fields[0]; + std::string emotion = fields[1]; + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify description = %s", description.c_str()); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_UI_SERVICE, "HandTimelineStatusChangeNotify emotion = %s", emotion.c_str()); + + // 通过图形服务调用 ThunderBirdModel 的处理函数 + GraphicService::GetInstance()->PostGraphicEvent( + [description, emotion]() { + if (OHOS::ThunderBirdModel::GetInstance()) { + OHOS::ThunderBirdModel::GetInstance()->HandleTimelineStatusChange( + description.c_str(), emotion.c_str()); + } + }); } /* -------------------------------------------------------------------------- */ #ifdef __cplusplus diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c index afd44bebd..a6c4ff45d 100644 --- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c +++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c @@ -1498,7 +1498,6 @@ static void ln_ws_default_message_handler(const ws_data_msg_t *data_msg, ws_comm break; case WS_CMD_SENTENCE_PLAYBACK_COMPLETE: //推送文本到UI - push_audio_playback_start_notification(); LN_WS_DEBUG("Default: Processing Sentence Playback Complete event\n"); break; case WS_CMD_AUDIO_RECORDING_START: