From b7e8a01f50af3b8dfd27b7441c5213f2608227f7 Mon Sep 17 00:00:00 2001 From: xue <2144439972@qq.com> Date: Tue, 4 Nov 2025 15:41:19 +0800 Subject: [PATCH] =?utf8?q?=E6=8F=90=E9=86=92=E6=97=A0=E6=B3=95=E9=80=80?= =?utf8?q?=E5=87=BABug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../thunderbird/src/ThunderBirdModel.cpp | 1 + .../thunderbird/src/ThunderBirdPresenter.cpp | 48 ++++++++----------- .../src/ThunderBirdReminderView.cpp | 24 +++++----- 3 files changed, 32 insertions(+), 41 deletions(-) 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 bd9ca3593..8fc0d46bf 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 @@ -2462,6 +2462,7 @@ // 录音结束处理函数 void ThunderBirdModel::HandleAudioRecordingEnd() { + return ;//需要vad的时候在处理 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleAudioRecordingEnd: 录音结束"); // 获取当前视图状态 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 d1e971366..5968f89d1 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 @@ -290,10 +290,10 @@ namespace OHOS } if(currentView == THUNDERBIRD_LULLABYVIEW && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3) - { - // HandleLullabyFunction(currentView, currentSubView); - ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST); - ThunderBirdLullabyView::GetInstance()->listenAnimator->Start(); + { + HandleLullabyFunction(currentView, currentSubView); + // ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST); + // ThunderBirdLullabyView::GetInstance()->listenAnimator->Start(); } else if(isDialogueing == true) { @@ -349,11 +349,11 @@ namespace OHOS bool ThunderBirdPresenter::HandleVendorDownKey(uint16_t keyState, int16_t currentView, int16_t currentSubView, int screenState) { // 长按VENDOR_DOWN 5秒 - if (keyState == InputDevice::STATE_LONG_PRESS) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VENDOR_DOWN long press 5s detected"); - // 可以在这里添加具体的功能 - return true; - } + // if (keyState == InputDevice::STATE_LONG_PRESS) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VENDOR_DOWN long press 5s detected"); + // // 可以在这里添加具体的功能 + // return true; + // } if (keyState == InputDevice::STATE_PRESS && screenState == 0) { @@ -362,13 +362,6 @@ namespace OHOS ShowVolumeAdjustment(-10); // -10 return true; } - - // OTA界面特殊处理 - // if (currentView == THUNDERBIRD_OTAVIEW) { - // return HandleOtaViewNavigation(currentSubView, KEY_TYPE_VENDOR_DOWN); - // } - - // 其他界面的通用导航处理 return HandleViewNavigation(currentView, currentSubView, false, KEY_TYPE_VENDOR_DOWN); } @@ -423,26 +416,26 @@ namespace OHOS currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3) { if(isLullabyRecording == false) { - ThunderBirdModel::GetInstance()->StartRecording(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始录音"); + // ThunderBirdModel::GetInstance()->StartRecording(); isLullabyRecording = true; ThunderBirdLullabyView::GetInstance()->listenAnimator->Start(); + ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST); return; } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "结束录音"); // 停止录音并发送 - ThunderBirdModel::GetInstance()->StopRecording(); + // ThunderBirdModel::GetInstance()->StopRecording(); + ln_ws_end_audio_chat(); isLullabyRecording = false; - do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_STORY_CHOOSE, NULL, 0); ThunderBirdLullabyView::GetInstance()->listenAnimator->Stop(); + //跳转到故事界面 + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4); return; } } - else if(currentView == THUNDERBIRD_LULLABYVIEW && - currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4) - { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5); - } } /** @@ -597,12 +590,9 @@ namespace OHOS break; case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3: ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4); - ln_ws_end_audio_chat();//结束对话 - AI_ForceInterrupt(); - ln_ws_send_voice_chat_interrupt("进入哄睡"); - ThunderBirdModel::GetInstance()->ClearAudioTextQueue(); // ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST); ln_ws_send_random_story_request("随机故事"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleLullabyViewNavigation: 随机故事"); break; case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4: ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5); @@ -662,7 +652,7 @@ namespace OHOS //回原界面 ThunderBirdModel::GetInstance()->StopCountUpTimer(); // 手动跳转时关闭定时器 ThunderBirdModel::GetInstance()->HighFrequence(); - ThunderBirdMainView::GetInstance()->ChangeView(THUNDERBIRD_ADJUSTVIEW, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW); + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW); break; case ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH://提醒界面-对话不足 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 6131799bc..0ebdfe593 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 @@ -157,18 +157,6 @@ namespace OHOS RemindIcon->SetSrc("/user/res/notification.bin"); RemindIcon->SetVisible(true); } - - if (TextLabel) - { - // 文本位置：图标右侧，紧挨着 - TextLabel->SetPosition(35, 64, 325, 42); - TextLabel->SetText("你有一条提醒"); - TextLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 左对齐，因为已经整体居中了 - TextLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - TextLabel->SetRollSpeed(35); - TextLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - TextLabel->SetVisible(true); - } if (TextLabel_Y) { // 黑色文本：位置比白色文本偏移2像素 @@ -181,6 +169,18 @@ namespace OHOS TextLabel_Y->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); TextLabel_Y->SetVisible(true); } + if (TextLabel) + { + // 文本位置：图标右侧，紧挨着 + TextLabel->SetPosition(TextLabel_Y->GetX()-2, TextLabel_Y->GetY()-2, 325, 42); + TextLabel->SetText("你有一条提醒"); + TextLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 左对齐，因为已经整体居中了 + TextLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + TextLabel->SetRollSpeed(35); + TextLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + TextLabel->SetVisible(true); + } + if (RemindButton) { RemindButton->SetPosition(102, 114, 168, 40); -- 2.17.1