From: 胡传军 <1224667075@qq.com>
Date: Fri, 8 Nov 2024 03:29:39 +0000 (+0000)
Subject: Merge #1367 into sdk602patch0911 from refs/changes/1367/head
X-Git-Tag: fd230_release_V1.3.102~101^2~1^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f88ac49d75687127c42b69b61467b2844e28eb65;p=mirrors%2FFD230.git

Merge #1367 into sdk602patch0911 from refs/changes/1367/head

取消 activity多余的订阅消息

* refs/changes/1367/head: (3 commits squashed)

  - 取消 activity多余的订阅消息

  - 取消订阅

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1367
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
index ccebd96ec..f9adf0899 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
@@ -160,8 +160,8 @@ ActivityModel::ActivityModel()
 ActivityModel::~ActivityModel()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityModel::~ActivityModel");
-    StepUnsubscribeTopic(TOPIC_EVENT_STEPDATA_UPDATE);
-    StepUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);
+    // StepUnsubscribeTopic(TOPIC_EVENT_STEPDATA_UPDATE);
+    // StepUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);
     if (g_saveEveryMinHandle != nullptr) {
         osStatus_t ret = osTimerDelete(g_saveEveryMinHandle);
         if (ret != osOK) {
@@ -180,8 +180,8 @@ ActivityModel *ActivityModel::GetInstance(void)
 
 void ActivityModel::Init()
 {
-    StepSubscribeTopic(TOPIC_EVENT_STEPDATA_UPDATE);
-    StepSubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);
+    //StepSubscribeTopic(TOPIC_EVENT_STEPDATA_UPDATE);
+    //StepSubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);
     InitStepData();
 }