From: Caisking <3449750381@qq.com>
Date: Sat, 13 Apr 2024 08:48:49 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1200
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=cd3391aeec6bb2c2fb91c12466dffde6e0dc7c2e;p=mirrors%2FFD230.git

Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin
---

cd3391aeec6bb2c2fb91c12466dffde6e0dc7c2e
diff --cc code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 5264620b1,13e680e26..43be18705
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@@ -89,6 -86,6 +89,7 @@@ extern "C
          cywee_activity_result_t *cyweeInfo = nullptr; // 在switch语句外部定义变量
          int rets;
          PRINT("request %d\r\n", request->msgId);
++#if 0
          switch (request->msgId)
          {
          case TOPIC_EVENT_TREADMILL_UPDATE:
@@@ -155,6 -152,6 +156,7 @@@
              // 处理未知msgId的情况
              break;
          }
++#endif
          delete cyweeInfo; // 释放内存
      }
  #ifdef __cplusplus
@@@ -194,12 -191,12 +196,14 @@@ namespace OHO
      TraingModel ::~TraingModel()
      {
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::~TraingModel()");
++#if 0
          // 取消订阅
          TraingUnsubscribeTopic(TOPIC_EVENT_TREADMILL_UPDATE);
          TraingUnsubscribeTopic(TOPIC_EVENT_OUTDOOR_RUNNING_UPDATE);
          TraingUnsubscribeTopic(TOPIC_EVENT_INDOOR_RUNNING_UPDATE);
          TraingUnsubscribeTopic(TOPIC_EVENT_FITNESS_PEDOMETERR_UPDATE);
          TraingUnsubscribeTopic(TOPIC_EVENT_FREE_TRAINING_UPDATE);
++#endif
      }
      TraingModel *TraingModel::GetInstance(void)
      {
@@@ -209,12 -206,12 +213,14 @@@
  
      void TraingModel ::Init()
      {
++#if 0
          // 进行消息订阅
          TraingSubscribeTopic(TOPIC_EVENT_TREADMILL_UPDATE);
          TraingSubscribeTopic(TOPIC_EVENT_OUTDOOR_RUNNING_UPDATE);
          TraingSubscribeTopic(TOPIC_EVENT_INDOOR_RUNNING_UPDATE);
          TraingSubscribeTopic(TOPIC_EVENT_FITNESS_PEDOMETERR_UPDATE);
          TraingSubscribeTopic(TOPIC_EVENT_FREE_TRAINING_UPDATE);
++#endif
      }
  
      /* -------------------------------------------------------------------------- */
diff --cc code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 87be72ba7,7358ad88e..aac7c2179
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@@ -230,49 -225,11 +225,49 @@@ namespace OHO
                  return true;
              }
          }
-         // 点击结束按键，弹窗显示
+         // 点击结束按键
          if (strcmp(view.GetViewId(), BUTTONEND) == 0)
          {
 -            ControlSensor(ExerciseState::End);
 +            ControlSensor(ExerciseState::Pause);
              // 弹窗显示是否结束
 +            TraingCardView::GetInstance()->SetEndViewStatus(true);
 +            TraingCardView::GetInstance()->RefreshEndView();
 +        }
 +        // 退出按键
 +        if (strcmp(view.GetViewId(), BUTTONEXIT) == 0)
 +        {
 +            TraingModel::GetInstance()->SetSportState(ExerciseState::End);
 +            ControlSensor(ExerciseState::End);
 +            if (TraingCardView::GetInstance()->RefreshEndView())
 +            {
 +                NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGWIN);
 +            }
 +            else
 +            {
 +                NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
 +            }
 +#if 0
 +            // 在点击事件中打印 SportData 对象之前，确保结束时间戳已经被设置
 +            if (TraingModel::GetInstance()->GetSportdata()->endtime == 0 && TraingModel::GetInstance()->GetSportState() == ExerciseState::End)
 +            {
 +                PRINT("RESET ENDTIMESTAMP\r\n");
 +                TraingModel::GetInstance()->SetTimestamp(); // 如果结束时间戳为0且当前为结束状态，再次调用 SetTimestamp 设置结束时间戳
 +            }
 +            // 打印 SportData 中的数据
 +            SportData *sportData = TraingModel::GetInstance()->GetSportdata();
 +
 +            std::string formattedStartTime = TraingModel::GetInstance()->AnalysisTimestamp(sportData->starttime);
 +            std::string formattedEndTime = TraingModel::GetInstance()->AnalysisTimestamp(sportData->endtime);
 +            std::string formattedTimeRange = formattedStartTime + "-" + formattedEndTime;
 +
 +            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "【SportData - StartTime: [%lu], EndTime: [%lu]  %s】", sportData->starttime, sportData->endtime, formattedTimeRange.c_str());
 +#endif
 +        }
 +        // 返回按键
 +        if (strcmp(view.GetViewId(), BUTTONBACK) == 0)
 +        {
 +            ControlSensor(ExerciseState::Continue);
 +            TraingCardView::GetInstance()->SetEndViewStatus(false);
          }
          return true;
      }