From: xue <2144439972@qq.com> Date: Mon, 15 Dec 2025 11:06:57 +0000 (+0800) Subject: 修复蓝牙界面不提醒的bug X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=571c9e6caf1394b862740b5b583e4934a0c4e5aa;p=mirrors%2FFD230.git 修复蓝牙界面不提醒的bug --- 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 c072893da..fa0bad624 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 @@ -183,6 +183,8 @@ namespace OHOS // 日程提醒处理函数 void HandleScheduleReminder(const char* title, const char* content); + // 是否显示任务提醒界面 + bool IsShowTaskReminder(); // 任务提醒处理函数 void HandleTaskReminder(const char* scheduleName); diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h index 49ab75d5c..d13c1a0ba 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdPresenter.h @@ -49,6 +49,8 @@ namespace OHOS // 重置哄睡录音标志位 void ResetLullabyRecording(void); + + bool IsVolumeAdjustmentAvailable(int16_t currentView, int16_t currentSubView); private: bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 @@ -66,7 +68,7 @@ namespace OHOS // 辅助函数 void HandleDialogueFunction(int16_t currentView, int16_t currentSubView); void HandleLullabyFunction(int16_t currentView, int16_t currentSubView); - bool IsVolumeAdjustmentAvailable(int16_t currentView, int16_t currentSubView); + void ShowVolumeAdjustment(int volumeDelta); bool HandleViewNavigation(int16_t currentView, int16_t currentSubView, bool isUpKey, KeyType keyType); diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp index 9ce8244c2..07528fcd2 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdBlueView.cpp @@ -276,7 +276,7 @@ namespace OHOS if (RemindIcon1) { RemindIcon1->SetPosition(102, 275, 22, 22); - RemindIcon1->SetSrc("/user/res/volume_up.bin"); + RemindIcon1->SetSrc("/user/res/volume_down.bin"); RemindIcon1->SetVisible(true); } if (RemindIcon2) 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 8d4dd17d5..cdbc4ac35 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 @@ -27,6 +27,7 @@ #include #include "custom_utils.h" #include +#include "bluetooth/Ln_Bluetooth_apiC.h" #include #include #include "custom_runtime.h" @@ -2222,8 +2223,19 @@ extern "C" { // currentSubView = ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW; } + // 蓝牙界面(搜索/连接过程)强制停止、上报,并跳转提醒 + if (currentView == THUNDERBIRD_BLUEVIEW) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleScheduleReminder: in BLUEVIEW, stop scan/connect and switch to reminder"); + ln_bt_scan_stop(); + ln_bt_disconnect(); // 确保中断连接流程 + ln_bt_report_earphone_connection_status(); // 上报当前连接状态 + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER); + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->IsIcon(false); + } + } //如果当前界面是事项提醒界面,则不进行切换,防止返回原任务进入循环 - if(currentView != THUNDERBIRD_REMINDERVIEW && currentSubView != ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER) + else if(currentView != THUNDERBIRD_REMINDERVIEW && currentSubView != ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER) { ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER); ThunderBirdReminderView::GetInstance()->IsIcon(false); @@ -2241,16 +2253,34 @@ extern "C" { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Processing schedule reminder: %s - %s", title, content); } } + //是否显示任务提醒界面 + bool ThunderBirdModel::IsShowTaskReminder() + { + if(ThunderBirdMainView::GetInstance()) + { + int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); + int currentSubView = ThunderBirdMainView::GetInstance()->GetCurrentSubView(); + if ((currentView == THUNDERBIRD_REMINDERVIEW && + currentSubView == ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER) || + ThunderBirdPresenter::GetInstance()->IsVolumeAdjustmentAvailable(currentView, currentSubView)) + { + return true; + } + } + return false; + } void ThunderBirdModel::HandleTaskReminder(const char* scheduleName) { + if(!IsShowTaskReminder()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleTaskReminder: 不显示任务提醒界面"); + return; + } uapi_set_screen_on_api(); // 亮屏 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleTaskReminder"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleName: %s", scheduleName ? scheduleName : "NULL"); - // 震动提醒 - // custom_VibratorFunc_int(0); - // 这里可以添加具体的任务提醒处理逻辑 - // 例如:显示任务提醒界面、播放提醒音、更新任务列表等 + // 示例:通过图形服务显示任务提醒 if (scheduleName) {