From 6e55b705a3a66a65626eb4bfe4f3a3aa603fcb97 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 3 Oct 2024 20:04:27 +0800
Subject: [PATCH] =?utf8?q?=E8=AE=AD=E7=BB=83=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?utf8?q?=E9=85=8D=E9=80=9F=E8=A1=A8=E4=B8=8E=E5=BF=83=E7=8E=87=E8=A1=A8?=
 =?utf8?q?=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/traing/include/TraingModel.h        | 16 +++++++++-------
 .../fd230app/nativeui/traing/src/TraingModel.cpp |  9 ++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index 7f469f3b9..92eff522f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -176,16 +176,18 @@ enum ENTEYTYPE {
   MAIN_ENTER = 0,
   APPLIST_ENTER,
 };
+#pragma pack(1)
+struct PaceEntry {
+  uint32_t timestamp; // 4 bytes
+  uint16_t pace;      // 2 bytes
+};
 //心率表结构体
+#pragma pack(push, 1)
 struct HeartRateEntry {
-  uint32_t timestamp;
-  uint8_t heartRate;
-};
-//配速结果体
-struct PaceEntry {
-  uint32_t timestamp;
-  uint16_t pace;
+  uint32_t timestamp; // 4 bytes
+  uint8_t heartRate;  // 1 byte
 };
+#pragma pack()
 struct SportData {
   uint32 starttime; // 开始时间时间戳
   uint32 endtime;   // 结束时间时间戳
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 eff80f78f..18147f3f6 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -1203,8 +1203,7 @@ bool TraingModel::SaveHeartTable() {
   }
 
   // 存储表数据
-  heartRateFile.write(reinterpret_cast<const char *>(&heartRateCount),
-                      sizeof(heartRateCount));
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateCount = %d", heartRateCount);
   if (!heartRateFile.write(
           reinterpret_cast<const char *>(heartRateTable.data()),
           heartRateCount * sizeof(HeartRateEntry))) {
@@ -1240,10 +1239,6 @@ bool TraingModel::SavePaceTable() {
                   filePath.c_str());
     return false; // 返回失败
   }
-
-  // 写入 paceCount
-  paceFile.write(reinterpret_cast<const char *>(&paceCount), sizeof(paceCount));
-
   // 写入配速数据
   if (!paceFile.write(reinterpret_cast<const char *>(paceTable.data()),
                       paceCount * sizeof(PaceEntry))) {
@@ -1426,7 +1421,7 @@ void TraingModel::StoreDataIfMinutePassed() {
     }
   }
 
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "duration:[%d] g_motionTimes[%d]\r\n",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "duration:[%d] g_motionTimes[%d]\r\n",
                 sportdata->duration, g_motionTimes);
 }
 #ifdef __cplusplus
-- 
2.17.1