From: xue <2144439972@qq.com> Date: Mon, 29 Sep 2025 03:36:11 +0000 (+0800) Subject: 增加通知,任务,充值提醒亮屏 X-Git-Tag: V1.0.9_20251128_194606_LN~250^2~25^2~2^2~10 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ec146a088a46f7f11ab688a4c9f0ef51173e3258;p=mirrors%2FFD230.git 增加通知,任务,充值提醒亮屏 --- 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 cd56fd2d6..a70c731ff 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 @@ -1414,6 +1414,7 @@ void ThunderBirdModel::HandleScheduleReminder(const char* title, const char* content) { + uapi_set_screen_on_api(); // 亮屏 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleScheduleReminder"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title: %s", title ? title : "NULL"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Content: %s", content ? content : "NULL"); @@ -1421,12 +1422,16 @@ // 示例:通过图形服务显示提醒 if (title && content) { // 可以在这里调用UI相关的显示逻辑 - int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER); - - // 更新任务提醒的文本内容 - if (ThunderBirdReminderView::GetInstance()) { - ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText(content,nullptr); + if (ThunderBirdMainView::GetInstance()) { + int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER); + + // 更新任务提醒的文本内容 + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText(content,nullptr); + } + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView instance is null, cannot show schedule reminder"); } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Processing schedule reminder: %s - %s", title, content); @@ -1435,6 +1440,7 @@ void ThunderBirdModel::HandleTaskReminder(const char* scheduleName) { + uapi_set_screen_on_api(); // 亮屏 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleTaskReminder"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleName: %s", scheduleName ? scheduleName : "NULL"); @@ -1444,12 +1450,16 @@ // 示例:通过图形服务显示任务提醒 if (scheduleName) { // 可以在这里调用UI相关的显示逻辑 - int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER); - - // 更新任务提醒的文本内容 - if (ThunderBirdReminderView::GetInstance()) { - ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText(scheduleName,nullptr); + if (ThunderBirdMainView::GetInstance()) { + int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_TASK_REMINDER); + + // 更新任务提醒的文本内容 + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText(scheduleName,nullptr); + } + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView instance is null, cannot show task reminder"); } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Processing task reminder: %s", scheduleName); } @@ -1492,6 +1502,7 @@ void ThunderBirdModel::HandleChatStaminaChange(int chatLeft, const char* chatDesc, int flowLeft, const char* flowDesc, const char* qrcodeUrl) { + uapi_set_screen_on_api(); // 亮屏 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleChatStaminaChange"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " chatLeft: %d", chatLeft); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " chatDesc: %s", chatDesc ? chatDesc : "null"); @@ -1500,26 +1511,38 @@ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " qrcodeUrl: %s", qrcodeUrl ? qrcodeUrl : "null"); // 这里可以添加聊天体力更改的具体处理逻辑 - int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); - if((chatLeft < 20 && chatLeft > 0))//对话不足 - { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); - ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("对话额度不足20è½®\n可扫码续充"); - } - else if(flowLeft < 80 && flowLeft > 0)//流量不足 - { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); - ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("流量不足100M了哦\n扫码可重置流量"); - } - else if(chatLeft == 0)//对话用尽 - { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); - ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("啊哦,对话轮数已用完,\n扫码续上吧"); - } - else if(flowLeft == 0)//流量用尽 - { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); - ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("流量用完了哦"); + if (ThunderBirdMainView::GetInstance()) { + int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); + if((chatLeft < 20 && chatLeft > 0))//对话不足 + { + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("对话额度不足20è½®\n可扫码续充"); + } + } + else if(flowLeft < 80 && flowLeft > 0)//流量不足 + { + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("流量不足100M了哦\n扫码可重置流量"); + } + } + else if(chatLeft == 0)//对话用尽 + { + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("啊哦,对话轮数已用完,\n扫码续上吧"); + } + } + else if(flowLeft == 0)//流量用尽 + { + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_REMINDERVIEW, ThunderBirdReminderView::THUNDERBIRD_REMINDERVIEW_DIALOGUE_NOT_ENOUGH); + if (ThunderBirdReminderView::GetInstance()) { + ThunderBirdReminderView::GetInstance()->UpdateTaskReminderText("流量用完了哦"); + } + } + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView instance is null, cannot show chat stamina reminder"); } @@ -1612,16 +1635,24 @@ void ThunderBirdModel::HandleSleepModeStart(const char* theme) { - int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleSleepModeStart"); - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_2); + if (ThunderBirdMainView::GetInstance()) { + int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图 + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_2); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView instance is null, cannot start sleep mode"); + } } void ThunderBirdModel::HandleSleepModeEnd() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleSleepModeEnd"); - int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图 - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5); + if (ThunderBirdMainView::GetInstance()) { + int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图 + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView instance is null, cannot end sleep mode"); + } } void ThunderBirdModel::HandleBindAndUnbind(int is_bind) @@ -1635,6 +1666,7 @@ (void)UtilsSetValue("bind_status", "1"); //绑定成功 if(ThunderBirdMainView::GetInstance()){ + uapi_set_screen_on_api(); // 亮屏 int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图 ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_ADJUSTVIEW, ThunderBirdAdjustView::THUNDERBIRD_ADJUSTVIEW_BIND_SUCCESS); }