From 8e3ea3e4088f5a2a67028962c11868d18f2b1453 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Mon, 3 Jun 2024 21:03:34 +0800
Subject: [PATCH] =?utf8?q?=E8=B0=83=E6=95=B4=E8=AE=AD=E7=BB=83=E7=BB=93?=
 =?utf8?q?=E6=9D=9F=E7=8A=B6=E6=80=81=E5=8F=91=E9=80=81=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../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