From 429ee0cddfa42fe47e5b2f750a556341fbdc0d1f Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sat, 31 Jan 2026 21:27:13 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E6=A0=87=E8=BE=BE?= =?utf8?q?=E6=88=90=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../msg_center/src/msg_center_customer.cpp | 33 +++----- .../src/notify/goal_notification.cpp | 75 +++++++------------ 2 files changed, 34 insertions(+), 74 deletions(-) diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp index 1fe7dd129..97541ecc0 100644 --- a/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp @@ -589,6 +589,12 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req) { + + NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO); + NotificationManager::GetInstance()->ShowNotify(ShowGoalNotify, static_cast(topic), true); + return; + + #ifdef SUPPORT_BATTERY_SERVICE unused(req); WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger Plug !"); @@ -1038,29 +1044,7 @@ static_cast(topic), true); } #endif - - //每日活动 - void MsgCenterNotifygoalnotificationviewProc(const Topic topic, Request* req) - { - unused(req); - if (CheckPriority(topic)) { - - uint8_t* data=(uint8_t*)req->data; - - if(get_Is_show_flag(data[0])) - { - set_goal_flag_view(data[0]); - set_Is_show_flag(0,data[0]); - - uapi_set_screen_on_api(); - - NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO); - NotificationManager::GetInstance()->ShowNotify(ShowGoalNotify, static_cast(topic), true); - } - - } - - } + static uint8_t goal_type=0; void MsgCenterNotifystepProc(const Topic topic, Request* req) { @@ -1348,6 +1332,7 @@ NotificationManager::GetInstance()->ShowNotify(showDebugOutputNotify, (uint16_t)topic, true); } } + //运动目标通知 void MsgCenterNotifyGoalShowViewProc(const Topic topic, Request* req) { unused(req); @@ -1551,7 +1536,7 @@ {TOPIC_EVENT_INACTIVITY_UPDATE, MsgCenterNotifyInactivityProc}, // {TOPIC_EVENT_INACTIVITY_ACCUMULATE_TIME_UPDATE, MsgCenterNotifyInactivityAccumulateTimeProc}, #endif - {TOPIC_EVENT_GOAL_SHOW_VIEW, MsgCenterNotifygoalnotificationviewProc}, + {TOPIC_EVENT_GOAL_SHOW_VIEW, MsgCenterNotifyGoalShowViewProc}, {TOPIC_EVENT_BLE_TRANSMIT, MsgCenterNotifybleTransmit}, {TOPIC_EVENT_CHARGE_PLUG, MsgCenterNotifyChargePlugProc}, diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp index 2d9870f90..3f171d95d 100644 --- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp +++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp @@ -55,18 +55,16 @@ namespace OHOS if (getView != nullptr) { getView->RemoveAll(); - - if (labeltag) - { - delete labeltag; - labeltag = nullptr; - } - if (labeltitle) { delete labeltitle; labeltitle = nullptr; } + if (labelgettag) + { + delete labelgettag; + labelgettag = nullptr; + } if (labelpre) { delete labelpre; @@ -77,6 +75,11 @@ namespace OHOS delete buttonok_; buttonok_ = nullptr; } + if (labeltag) + { + delete labeltag; + labeltag = nullptr; + } if (imageAnimator) { imageAnimator->Stop(); @@ -87,13 +90,6 @@ namespace OHOS delete[] winimageAnimatorInfo; winimageAnimatorInfo = nullptr; } - if (labelgettag) - { - - delete labelgettag; - labelgettag = nullptr; - } - if (GoalviewShow_timer) { osTimerStop(GoalviewShow_timer); @@ -101,13 +97,10 @@ namespace OHOS if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disatransmitting_timer failed ret = %lx!", ret); - // return; } GoalviewShow_timer = nullptr; } - RootView::GetInstance()->Remove(getView); - delete getView; getView = nullptr; } @@ -276,22 +269,16 @@ namespace OHOS default: break; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, - "tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType, - tagString.c_str()); - InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 80); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType,tagString.c_str()); + InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(),DEFAULT_VECTOR_FONT_FILENAME, 80); labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); labeltag->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - getView->Add(labeltag); - // 初始化图片数组以及动画 winimageInfos = CreateImageInfoArray(winbasePath.c_str(), 94); winimageAnimatorInfo = new ImageAnimatorInfo[94]; InitImageAnimatorSource(imageAnimator, winimageAnimatorInfo, winimageInfos, 94, 173, 100, 120, 120, "imageAnimator1", 10); imageAnimator->Start(); - getView->Add(imageAnimator); } static uint8_t GoalviewShowCallBack_FALG = 0; @@ -365,38 +352,26 @@ namespace OHOS getView->SetReboundSize(50); getView->SetDirection(1); - UIView::OnClickListener *button1Click = static_cast(GoalViewEventListener::GetInstance()); - getView->SetOnClickListener(button1Click); - getView->SetTouchable(true); - - // 初始化Lable - // InitRollLabel(labeltitle, 83, 50, 300, 35, "label1", STR_GOAL_ACHIEVED, DEFAULT_VECTOR_FONT_FILENAME, 35); - // TODO:多国语言 - InitLabelExt(labeltitle, 83, 50, 300, 35, "label3", - STR_GOAL_DOWN, DEFAULT_VECTOR_FONT_FILENAME_EN, - 35); + /* -------------------------------------------------------------------------- */ + InitLabelExt(labeltitle, 58, 53, 350, 35, "label3",STR_GOAL_DOWN, DEFAULT_VECTOR_FONT_FILENAME_EN, 35); labeltitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); labeltitle->SetRollSpeed(23); - getView->Add(labeltitle); - InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, - DEFAULT_VECTOR_FONT_FILENAME, 30); - getView->Add(labelgettag); - InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", - DEFAULT_VECTOR_FONT_FILENAME, 30); - getView->Add(labelpre); - + /* -------------------------------------------------------------------------- */ + InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL,DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%",DEFAULT_VECTOR_FONT_FILENAME, 30); // 初始化按键 InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30); buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE); + buttonok_->SetOnClickListener(static_cast(GoalViewEventListener::GetInstance())); + InitImageAnimator(); + /* -------------------------------------------------------------------------- */ + getView->Add(labeltitle); + getView->Add(labelgettag); + getView->Add(labelpre); getView->Add(buttonok_); - - RootView::GetInstance()->Add(getView); - - getView->SetDraggable(false); - getView->SetTouchable(true); + getView->Add(labeltag); + getView->Add(imageAnimator); NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(Freegoalview); - - InitImageAnimator(); } else { -- 2.17.1