From 1d17099455f2ff681bba07c0bbf9d61bf878828b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com>
Date: Mon, 3 Jun 2024 13:26:34 +0000
Subject: [PATCH] Merge #218 into sdk602patch0521 from refs/changes/218/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

调整训练结束状态发送顺序

* refs/changes/218/head: (1 commits squashed)

  - 调整训练结束状态发送顺序

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/218
---
 .../fd230app/nativeui/traing/src/TraingModel.cpp   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 053e2e5f7..20ad4b6f7 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -281,17 +281,19 @@ namespace OHOS
         if (state != ExerciseState::General)
         {
             /*运动开始并且是app发起的运动*/
-            if (Openingway == true)
+            if (Openingway == true && state != ExerciseState::End)
             {
                 sendtraningstatedata(static_cast<uint8_t>(state), sportdata->duration);
             }
             else
             {
+#if 0
                 /*手表发起并且是结束状态*/
                 if (state == ExerciseState::End)
                 {
                     sendtraningstateend();
                 }
+#endif
             }
         }
         sportState_ = state;
@@ -467,6 +469,16 @@ namespace OHOS
             Startstate = false;
             Endstate = true;
 
+            /*保存数据之后再发送结束消息*/
+            if (Openingway == true)
+            {
+                sendtraningstatedata(static_cast<uint8_t>(ExerciseState::End), sportdata->duration);
+            }
+            else
+            {
+                sendtraningstateend();
+            }
+
             printf("结束运动\r\n");
         }
     }
-- 
2.17.1