From 435b0ed51fb7cd6dacf725ff29668aac5877a95b Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Fri, 5 Jul 2024 16:46:39 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?utf8?q?=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../application/wearable/nativeabilityfwk/src/Ability.cpp | 6 ++++-- .../wearable/service/msg_center/src/msg_center_customer.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp b/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp index 7daacf004..8d5467b82 100755 --- a/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp +++ b/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp @@ -118,9 +118,11 @@ ListsNode* Ability::Find(const uint16_t sliceId) */ void Ability::ChangeSlice(const uint16_t targetSliceId, TransitionType type, const uint16_t priority) { - if (GetCurSliceId() == targetSliceId) { + /* + if (GetCurSliceId() == targetSliceId) { return; - } + } + */ if (osal_atomic_read(&transitionCount_) <= 0) { osal_atomic_inc(&transitionCount_); // onStop释放当前页面需要和当前页面的事件监听异步执行,否则会出现自己杀掉自己的情况 diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp index 809b41fab..f3f9edd31 100644 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp @@ -954,7 +954,7 @@ void MsgCenterNotifyDrinkReminderProc(const Topic topic, Request *req) break; } } - +//每日训练 void MsgCenterNotifyActivityProc(const Topic topic, Request* req) { unused(topic); -- 2.17.1