feat:fetch exercise data

jason
1 parent 0f975482
Showing 10 changed files with 332 additions and 33 deletions
HDFwear.xcodeproj/project.pbxproj
HDFwear/20240126ReadMe.md
HDFwear/Home/HomeViewController.swift
HDFwear/Home/Model/NewExerciseModel.swift
HDFwear/Home/Model/NewExerciseRealtimeModel.swift
HDFwear/Home/TrainViewController.swift
HDFwear/Mine/MineViewController.swift
HDFwear/ReadMe.txt
HDFwear/Tools/BluetoothManager+Function.swift
HDFwear/Tools/BluetoothManager.swift
@@ -286,6 +286,7 @@
 		847482762B03793C0004F0C2 /* NewWeatherModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847482752B03793C0004F0C2 /* NewWeatherModel.swift */; };
 		847672B82B074E43007DC2DE /* NewBeiDouContactModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847672B72B074E43007DC2DE /* NewBeiDouContactModel.swift */; };
 		8477B04C2B5A243B0018ADA8 /* NewExerciseRealtimeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8477B04B2B5A243B0018ADA8 /* NewExerciseRealtimeModel.swift */; };
+		8477B04E2B5A79EE0018ADA8 /* NewExerciseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8477B04D2B5A79EE0018ADA8 /* NewExerciseModel.swift */; };
 		847AF36E2B4CF35F00E3456E /* NewSleepModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847AF36D2B4CF35F00E3456E /* NewSleepModel.swift */; };
 		847B88EF2B5780CA00851EE7 /* NewIntensiveTimeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847B88EE2B5780CA00851EE7 /* NewIntensiveTimeModel.swift */; };
 		84DA399D2B4D3A5B008D34A9 /* NewGpsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DA399C2B4D3A5B008D34A9 /* NewGpsModel.swift */; };
@@ -668,6 +669,7 @@
 		847482752B03793C0004F0C2 /* NewWeatherModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewWeatherModel.swift; sourceTree = "<group>"; };
 		847672B72B074E43007DC2DE /* NewBeiDouContactModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewBeiDouContactModel.swift; sourceTree = "<group>"; };
 		8477B04B2B5A243B0018ADA8 /* NewExerciseRealtimeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewExerciseRealtimeModel.swift; sourceTree = "<group>"; };
+		8477B04D2B5A79EE0018ADA8 /* NewExerciseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewExerciseModel.swift; sourceTree = "<group>"; };
 		847AF36D2B4CF35F00E3456E /* NewSleepModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewSleepModel.swift; sourceTree = "<group>"; };
 		847B88EE2B5780CA00851EE7 /* NewIntensiveTimeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewIntensiveTimeModel.swift; sourceTree = "<group>"; };
 		847D1C4A2B009FAC0097A96E /* 20231111ReadMe.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = 20231111ReadMe.md; sourceTree = "<group>"; };
@@ -1293,6 +1295,7 @@
 				845ADEA02B551C8E00C3AD73 /* NewStepModel.swift */,
 				847B88EE2B5780CA00851EE7 /* NewIntensiveTimeModel.swift */,
 				8477B04B2B5A243B0018ADA8 /* NewExerciseRealtimeModel.swift */,
+				8477B04D2B5A79EE0018ADA8 /* NewExerciseModel.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1642,6 +1645,7 @@
 				6CC6E57927717FF8006C01A7 /* DailSyncViewController.swift in Sources */,
 				6C6F406D2743509500F9473C /* MotionViewController.swift in Sources */,
 				6C1D4D3F27B89BD000C43AA3 /* NFCCardCell.swift in Sources */,
+				8477B04E2B5A79EE0018ADA8 /* NewExerciseModel.swift in Sources */,
 				847482762B03793C0004F0C2 /* NewWeatherModel.swift in Sources */,
 				6C6505CE2799059D0043DB7A /* TitleView.swift in Sources */,
 				6C5B545C27759CFA007F7901 /* RemindViewController.swift in Sources */,
@@ -127,5 +127,19 @@ BluetoothManager+Function
     接收: [237, 126, 0, 1, 128, 1, 0, 1, 0, 5, 0, 1, 0, 9, 0, 76, 235]
  
  
+拉取运动记录
+    func getExerciseData(option: SyncOption = .now, closure: ExerciseClosure? = nil)
+    建议用代理来处理回调，这里不确定所有的0x8024都由拉取动作而来
+    0x8024触发BluetoothSyncDelegate中的didReceiveExerciseData
+    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 7, 1, 191, 95]
+    接收: [237, 126, 0, 1, 128, 36, 0, 1, 0, 56, 1, 101, 167, 77, 196, 0, 0, 0, 1, 54, 0, 0, 13, 152, 0, 0, 0, 72, 0, 183, 0, 23, 0, 0, 0, 29, 0, 120, 0, 45, 1, 128, 3, 12, 0, 120, 0, 100, 86, 6, 180, 60, 120, 0, 0, 0, 0, 2, 60, 180, 120, 120, 0, 0, 0, 120, 0, 92]
+    接收: [237, 126, 0, 1, 128, 36, 0, 2, 0, 12, 0, 5, 0, 100, 0, 150, 0, 200, 0, 250, 1, 44, 12, 70]
+    接收: [237, 126, 0, 1, 128, 36, 0, 3, 0, 12, 0, 5, 0, 120, 0, 135, 0, 110, 0, 150, 0, 60, 227, 165]
+    接收: [237, 126, 0, 1, 128, 36, 0, 4, 0, 12, 0, 5, 0, 183, 0, 150, 0, 200, 0, 100, 0, 160, 68, 241]
+    接收: [237, 126, 0, 1, 128, 36, 0, 5, 0, 12, 0, 5, 0, 80, 0, 150, 0, 170, 0, 120, 0, 60, 53, 89]
+    接收: [237, 126, 0, 1, 128, 36, 0, 6, 0, 12, 0, 5, 0, 100, 0, 120, 0, 150, 0, 170, 0, 190, 169, 1]
+    接收: [237, 126, 0, 1, 128, 36, 0, 7, 0, 12, 0, 5, 0, 65, 0, 48, 0, 98, 0, 115, 0, 140, 194, 200]
+    接收: [237, 126, 0, 1, 128, 36, 0, 1, 0, 1, 255, 46, 6]
+
  
 接受数据类
@@ -798,7 +798,7 @@ extension HomeViewController: XMLParserDelegate {
     func syncTrain(_ day: SyncDay) {
         print("\(queryArray)---同步训练---\(day)")
         if queryArray.contains("Train"),  let index = queryArray.firstIndex(of: "Train") {
-            BluetoothManager.shared.getTrainHistoryData() {[weak self] train, error in
+            BluetoothManager.shared.getExerciseData() {[weak self] train, error in
                 if error == nil || error == 2000 || error == -1001 {
                     self?.queryArray.remove(at: index)
                     if day == .today {
+//
+//  NewExerciseModel.swift
+//  HDFwear
+//
+//  Created by admin on 2024/1/19.
+//
+
+import Foundation
+import UIKit
+import HandyJSON
+import SwiftDate
+
+var localExerciseModel : NewExerciseModel?
+
+class NewExerciseModel: NSObject {
+    required override init() { }
+    
+    // 每次分7组数据传过来，一定会有7组，不管是否空
+    // 第一组
+    var starter: UInt32 = 0//谁发起的运动
+    var type: UInt32 = 0//运动类型
+    var startTimeInterval: TimeInterval = 0
+    var startTime: Date?//运动开始时间
+    var strength: UInt32 = 0//训练负荷
+    var duration: UInt32 = 0//运动时长
+    var distance: Float = 0//距离
+    var calorie: Float = 0//卡路里
+    var avaragePace: Float = 0//平均配速
+    var maxPace: Float = 0//最大配速
+    var step: UInt32 = 0//步数
+    var stepPitch: Float = 0//步距
+    var avarageFrequency: Float = 0//平均步频
+    var maxFrequency: Float = 0//最大步频
+    var climbAltitude: Float = 0//海拔  累计爬升
+    var maxAltitude: Float = 0//最大海拔
+    var minAltitude: Float = 0//最小海拔
+    var maxOxygenUptake: UInt32 = 0//最大摄氧量
+    var oxygenUptakeGrade: UInt32 = 0//摄氧量等级
+    var maxHr: UInt32 = 0//最大心率
+    var minHr: UInt32 = 0//最小心率
+    var avarageHr: UInt32 = 0//平均心率
+    var hrSectionPercent_warmUp: UInt32 = 0//心率区间百分比 热身
+    var hrSectionPercent_fatBurning: UInt32 = 0//心率区间百分比 燃脂
+    var hrSectionPercent_cardiopulmonary: UInt32 = 0//心率区间百分比 心肺提高
+    var hrSectionPercent_anaerobic: UInt32 = 0//心率区间百分比 无氧
+    var masterSwimming: UInt32 = 0//主泳姿
+    var strokes: UInt32 = 0//划水次数
+    var lap: UInt32 = 0//趟数
+    var avarageSwolf: UInt32 = 0//平均swolf
+    var maxSwolf: UInt32 = 0//最大swolf
+    var hiits: UInt32 = 0//hiit个数
+    //第二组
+    var altitudeCount: UInt32 = 0//海拔高度个数
+    var altitudeArray: [Float] = []//实时海拔
+    //第三组
+    var frequencyCount: UInt32 = 0//步频个数
+    var frequencyArray: [Float] = []//实时步频
+    //第四组
+    var paceCount: UInt32 = 0//配速个数
+    var paceArray: [Float] = []//实时配速
+    //第五组
+    var speedCount: UInt32 = 0//速度个数
+    var speedArray: [Float] = []//实时速度
+    //第六组
+    var swolfCount: UInt32 = 0//swolf个数
+    var swolfArray: [UInt32] = []//实时swolf
+    //第七组
+    var strokeCount: UInt32 = 0//划水个数
+    var strokeArray: [UInt32] = []//划水速度
+    
+    override var description: String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        dateFormatter.timeZone = TimeZone.current
+        
+            var desc = "NewExerciseModel\n"
+            desc += "Starter: \(starter)\n"
+            desc += "Type: \(type)\n"
+            desc += "StartTime: \(dateFormatter.string(from:(startTime ?? Date())))\n"
+            desc += "Strength: \(strength)\n"
+            desc += "Duration: \(duration)\n"
+            desc += "Distance: \(distance)\n"
+            desc += "Calorie: \(calorie)\n"
+            desc += "AveragePace: \(avaragePace)\n"
+            desc += "MaxPace: \(maxPace)\n"
+            desc += "Step: \(step)\n"
+            desc += "StepPitch: \(stepPitch)\n"
+            desc += "AverageFrequency: \(avarageFrequency)\n"
+            desc += "MaxFrequency: \(maxFrequency)\n"
+            desc += "ClimbAltitude: \(climbAltitude)\n"
+            desc += "MaxAltitude: \(maxAltitude)\n"
+            desc += "MinAltitude: \(minAltitude)\n"
+            desc += "MaxOxygenUptake: \(maxOxygenUptake)\n"
+            desc += "OxygenUptakeGrade: \(oxygenUptakeGrade)\n"
+            desc += "MaxHr: \(maxHr)\n"
+            desc += "MinHr: \(minHr)\n"
+            desc += "AvarageHr: \(avarageHr)\n"
+            desc += "HrSectionPercent_warmUp: \(hrSectionPercent_warmUp)\n"
+            desc += "HrSectionPercent_fatBurning: \(hrSectionPercent_fatBurning)\n"
+            desc += "HrSectionPercent_cardiopulmonary: \(hrSectionPercent_cardiopulmonary)\n"
+            desc += "HrSectionPercent_anaerobic: \(hrSectionPercent_anaerobic)\n"
+            desc += "MasterSwimming: \(masterSwimming)\n"
+            desc += "Strokes: \(strokes)\n"
+            desc += "Lap: \(lap)\n"
+            desc += "AvarageSwolf: \(avarageSwolf)\n"
+            desc += "MaxSwolf: \(maxSwolf)\n"
+            desc += "Hiits: \(hiits)\n"
+
+            // 第二组
+            desc += "Altitude Count: \(altitudeCount)\n"
+            desc += "Altitude Array: \(altitudeArray)\n"
+
+            // 第三组
+            desc += "Frequency Count: \(frequencyCount)\n"
+            desc += "Frequency Array: \(frequencyArray)\n"
+
+            // 第四组
+            desc += "Pace Count: \(paceCount)\n"
+            desc += "Pace Array: \(paceArray)\n"
+
+            // 第五组
+            desc += "Speed Count: \(speedCount)\n"
+            desc += "Speed Array: \(speedArray)\n"
+
+            // 第六组
+            desc += "Swolf Count: \(swolfCount)\n"
+            desc += "Swolf Array: \(swolfArray)\n"
+
+            // 第七组
+            desc += "Stroke Count: \(strokeCount)\n"
+            desc += "Stroke Array: \(strokeArray)\n"
+
+            return desc
+        }
+    
+    class func toExerciseModel(_ data: [UInt8], _ index: Int) {
+        if index == 1 {
+            guard data.count >= 57 else {
+                return
+            }
+        }else {
+            guard data.count >= 1, localExerciseModel != nil else {
+                return
+            }
+        }
+        
+        switch index {
+        case 1:
+            localExerciseModel = NewExerciseModel()
+            localExerciseModel?.starter = data[0..<1].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.type = data[1..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            let hexValue = data[2..<6].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.startTimeInterval = TimeInterval(hexValue)
+            localExerciseModel?.startTime = Date(timeIntervalSince1970: TimeInterval(hexValue))
+            localExerciseModel?.strength = data[6..<7].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.duration = data[7..<11].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.distance = Float(data[11..<15].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.calorie = Float(data[15..<19].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.avaragePace = Float(data[19..<21].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.maxPace = Float(data[21..<23].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.step = data[23..<27].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.stepPitch = Float(data[27..<29].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.avarageFrequency = Float(data[29..<31].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.maxFrequency = Float(data[31..<33].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.climbAltitude = Float(data[33..<35].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.maxAltitude = Float(data[35..<37].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.minAltitude = Float(data[37..<39].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
+            localExerciseModel?.maxOxygenUptake = data[39..<40].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.oxygenUptakeGrade = data[40..<41].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.maxHr = data[41..<42].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.minHr = data[42..<43].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.avarageHr = data[43..<44].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.hrSectionPercent_warmUp = data[44..<45].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.hrSectionPercent_fatBurning = data[45..<46].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.hrSectionPercent_cardiopulmonary = data[46..<47].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.hrSectionPercent_anaerobic = data[47..<48].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.masterSwimming = data[48..<49].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.strokes = data[49..<50].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.lap = data[50..<51].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.avarageSwolf = data[51..<52].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.maxSwolf = data[52..<53].reduce(0) { ($0 << 8) + UInt32($1) }
+            localExerciseModel?.hiits = data[53..<57].reduce(0) { ($0 << 8) + UInt32($1) }
+        case 2:
+            localExerciseModel!.altitudeCount = data[0..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            if data.count >= 2 * localExerciseModel!.altitudeCount + 2 {
+                // 从下标1开始，每次取2个元素，合并为一个数
+                localExerciseModel!.altitudeArray = stride(from: 2, to: data.count, by: 2).map { index in
+                    let combinedValue = data[index..<index + 2].reduce(0) { ($0 << 8) + UInt32($1) }
+                    return Float(combinedValue) / 100
+                }
+            }
+        case 3:
+            localExerciseModel!.frequencyCount = data[0..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            if data.count >= 2 * localExerciseModel!.frequencyCount + 2 {
+                // 从下标1开始，每次取2个元素，合并为一个数
+                localExerciseModel!.frequencyArray = stride(from: 2, to: data.count, by: 2).map { index in
+                    let combinedValue = data[index..<index + 2].reduce(0) { ($0 << 8) + UInt32($1) }
+                    return Float(combinedValue) / 100
+                }
+            }
+        case 4:
+            localExerciseModel!.paceCount = data[0..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            if data.count >= 2 * localExerciseModel!.paceCount + 2 {
+                // 从下标1开始，每次取2个元素，合并为一个数
+                localExerciseModel!.paceArray = stride(from: 2, to: data.count, by: 2).map { index in
+                    let combinedValue = data[index..<index + 2].reduce(0) { ($0 << 8) + UInt32($1) }
+                    return Float(combinedValue) / 100
+                }
+            }
+        case 5:
+            localExerciseModel!.speedCount = data[0..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            if data.count >= 2 * localExerciseModel!.speedCount + 2 {
+                // 从下标1开始，每次取2个元素，合并为一个数
+                localExerciseModel!.speedArray = stride(from: 2, to: data.count, by: 2).map { index in
+                    let combinedValue = data[index..<index + 2].reduce(0) { ($0 << 8) + UInt32($1) }
+                    return Float(combinedValue) / 100
+                }
+            }
+        case 6:
+            localExerciseModel!.swolfCount = data[0..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            if data.count >= 2 * localExerciseModel!.swolfCount + 2 {
+                // 从下标1开始，每次取2个元素，合并为一个数
+                localExerciseModel!.swolfArray = stride(from: 2, to: data.count, by: 2).map { index in
+                    let combinedValue = data[index..<index + 2].reduce(0) { ($0 << 8) + UInt32($1) }
+                    return combinedValue
+                }
+            }
+        case 7:
+            localExerciseModel!.strokeCount = data[0..<2].reduce(0) { ($0 << 8) + UInt32($1) }
+            if data.count >= 2 * localExerciseModel!.strokeCount + 2 {
+                // 从下标1开始，每次取2个元素，合并为一个数
+                localExerciseModel!.strokeArray = stride(from: 2, to: data.count, by: 2).map { index in
+                    let combinedValue = data[index..<index + 2].reduce(0) { ($0 << 8) + UInt32($1) }
+                    return combinedValue
+                }
+            }
+        default: break
+        }
+    }
+}
@@ -15,7 +15,7 @@ class NewExerciseRealtimeModel: NSObject {
  
     var hr: UInt32 = 0
     var step: UInt32 = 0
-    var calorie: UInt32 = 0
+    var calorie: Float = 0
  
  
     override var description: String {
@@ -29,7 +29,7 @@ class NewExerciseRealtimeModel: NSObject {
         let s = NewExerciseRealtimeModel()
         s.hr = data[0..<1].reduce(0) { ($0 << 8) + UInt32($1) }
         s.step = data[1..<5].reduce(0) { ($0 << 8) + UInt32($1) }
-        s.calorie = data[5..<9].reduce(0) { ($0 << 8) + UInt32($1) }
+        s.calorie = Float(data[5..<9].reduce(0) { ($0 << 8) + UInt32($1) }) / 100
         return s;
     }
 }
@@ -52,7 +52,7 @@ class TrainViewController: UIViewController, DateSegmentViewDelegate, RangeSlide
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        BluetoothManager.shared.getTrainHistoryData() {[weak self] train, error in
+        BluetoothManager.shared.getExerciseData() {[weak self] train, error in
             if error == 2000 || error == nil {
                 self?.updateTodayData()
 //                self?.didSelectedDate(date: DateInRegion((self?.selectedDate)!, region: .current), dateType: .day)
@@ -561,17 +561,6 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
             }
         }
  
-        let archiveAction16 = UIAlertAction(title: "getTrainHistoryData", style: .default) {[weak self] action in
-            BluetoothManager.shared.getTrainHistoryData() { tArray, error in
-                if error != nil {
-                    print("getTrainHistoryData" + (error?.description ?? ""))
-                }else {
-                    self?.showDetailAlert(msg: tArray?.description)
-                    print("getTrainHistoryData success")
-                }
-            }
-        }
-        
         let archiveAction17a = UIAlertAction(title: "getPressureData now", style: .default) {[weak self] action in
             BluetoothManager.shared.getPressureData(option: .now) { pArray, error in
                 if error != nil {
@@ -656,6 +645,27 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
             }
         }
  
+        let archiveAction104a = UIAlertAction(title: "getExerciseData now", style: .default) {[weak self] action in
+            BluetoothManager.shared.getExerciseData() {exerciseModel, error in
+                if error != nil {
+                    print("getExerciseData" + (error?.description ?? ""))
+                }else {
+//                    self?.showDetailAlert(msg: card)
+                    print("getExerciseData success")
+                }
+            }
+        }
+        let archiveAction104b = UIAlertAction(title: "getExerciseData history", style: .default) {[weak self] action in
+            BluetoothManager.shared.getExerciseData(option: .history) {exerciseModel, error in
+                if error != nil {
+                    print("getExerciseData" + (error?.description ?? ""))
+                }else {
+//                    self?.showDetailAlert(msg: card)
+                    print("getExerciseData success")
+                }
+            }
+        }
+        
         alert.addAction(archiveAction9a)
         alert.addAction(archiveAction9b)
         alert.addAction(archiveAction10a)
@@ -664,7 +674,6 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
         alert.addAction(archiveAction14b)
         alert.addAction(archiveAction15a)
         alert.addAction(archiveAction15b)
-        alert.addAction(archiveAction16)
         alert.addAction(archiveAction17a)
         alert.addAction(archiveAction17b)
         alert.addAction(archiveAction22)
@@ -673,6 +682,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate {
         alert.addAction(archiveAction102a)
         alert.addAction(archiveAction102b)
         alert.addAction(archiveAction103)
+        alert.addAction(archiveAction104a)
+        alert.addAction(archiveAction104b)
  
         alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil))
         present(alert, animated: true, completion: nil)
@@ -704,4 +715,8 @@ extension MineViewController: BluetoothSyncDelegate {
     func didReceiveExerciseRealtimeData(realtimeData: NewExerciseRealtimeModel) {
         showDetailAlert(msg: realtimeData.description)
     }
+    
+    func didReceiveExerciseData(exerciseData: NewExerciseModel) {
+        showDetailAlert(msg: exerciseData.description)
+    }
 }
@@ -39,10 +39,6 @@ BluetoothManager+Function
     func newSetNotDisturb(remind: RemindModel, weekflag:[WeekFlag], isRepeat:Bool, completion: @escaping(_ error: Int?) -> ())
     发送: [237, 126, 0, 1, 0, 39, 0, 1, 0, 7, 0, 1, 33, 22, 0, 22, 0, 159, 5]
  
-23. 拉取训练数据
-    func getTrainHistoryData(closure: TrainClosure? = nil)
-    发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 1, 7, 224, 11]
-    
 接受数据类
 1. 通用返回数据
     private func parseDefaultResponseData(_ bytes: [UInt8])
@@ -284,8 +284,8 @@ extension BluetoothManager {
         newStartSyncHealthData(closure: closure, data: data, synType: .step)
     }
  
-    // 拉取训练数据
-    func getTrainHistoryData(option: SyncOption = .now, closure: TrainClosure? = nil) {
+    // 拉取运动记录
+    func getExerciseData(option: SyncOption = .now, closure: ExerciseClosure? = nil) {
         let data = BleMessage.shared.getSyncCmd(.train, option)
         newStartSyncHealthData(closure: closure, data: data, synType: .train)
     }
@@ -339,11 +339,11 @@ extension BluetoothManager {
                     stepClosure?([], -1002)
                     stepClosure = nil
                 }
-            case is TrainClosure:
-                if trainClosure == nil {
-                    trainClosure = closure as? TrainClosure
-                    trainClosure?(nil, -1002)
-                    trainClosure = nil
+            case is ExerciseClosure:
+                if exerciseClosure == nil {
+                    exerciseClosure = closure as? ExerciseClosure
+                    exerciseClosure?(nil, -1002)
+                    exerciseClosure = nil
                 }
             case is PressureClosure:
                 if pressureClosure == nil {
@@ -565,6 +565,17 @@ extension BluetoothManager {
                     delegate.didReceiveExerciseRealtimeData(realtimeData: realtimeData)
                 }
             }
+        case 0x8024:// 运动实时数据
+            print("运动实时数据")
+            let content = parseContentFromBytes(bytes)
+            if (content.count == 1 && content.first == 0xff) {
+                for delegate in syncDelegateList {
+                    delegate.didReceiveFinishCommand(0x8028)
+                }
+            }else {
+                let index = Int(UInt16(bytes[6]) << 8 | UInt16(bytes[7]))
+                parseExerciseData(content, index)
+            }
         case 0x8025://手表户外运动定位轨迹
             print("gps轨迹")
             let content = parseContentFromBytes(bytes)
@@ -807,4 +818,21 @@ extension BluetoothManager {
         let card = String(bytes: content, encoding: .ascii)
         beidouCardClosure?(card, nil)
     }
+    
+    // 运动数据
+    func parseExerciseData(_ content: [UInt8], _ index: Int) {
+        guard content.count > 0 else {
+            print("无有效的信息")
+            exerciseClosure?(nil, nil)
+            return
+        }
+        NewExerciseModel.toExerciseModel(content, index)
+        if let em = localExerciseModel, index == 7 {
+            for delegate in syncDelegateList {
+                delegate.didReceiveExerciseData(exerciseData: em)
+            }
+            exerciseClosure?(em, nil)
+        }
+
+    }
 }
@@ -42,6 +42,7 @@ protocol BluetoothSyncDelegate {
     func didReceiveCameraCommand(status: UInt8)// 0x00 进入拍照 0x01 拍照 0x02 关闭
     func didReceiveExerciseStatus(value: Int)
     func didReceiveExerciseRealtimeData(realtimeData: NewExerciseRealtimeModel)
+    func didReceiveExerciseData(exerciseData: NewExerciseModel)
  
     func didReceiveFinishCommand(_ receiveDataType: Int)
 }
@@ -61,6 +62,7 @@ extension BluetoothSyncDelegate {
     func didReceiveCameraCommand(status: UInt8) { }
     func didReceiveExerciseStatus(value: Int) { }
     func didReceiveExerciseRealtimeData(realtimeData: NewExerciseRealtimeModel) { }
+    func didReceiveExerciseData(exerciseData: NewExerciseModel) { }
  
     func didReceiveFinishCommand(_ receiveDataType: Int) { }
 }
@@ -93,8 +95,8 @@ class BluetoothManager: NSObject {
     var sleepClosure: SleepClosure?
     typealias StepClosure = (_ stepArray: [NewStepModel], _ error: Int?) -> Void
     var stepClosure: StepClosure?
-    typealias TrainClosure = (_ trainArray: TrainModel?, _ error: Int?) -> Void
-    var trainClosure: TrainClosure?
+    typealias ExerciseClosure = (_ trainArray: NewExerciseModel?, _ error: Int?) -> Void
+    var exerciseClosure: ExerciseClosure?
     typealias PressureClosure = (_ pressureArray: [PressureModel], _ error: Int?) -> Void
     var pressureClosure: PressureClosure?
     typealias MettClosure = (_ mettArray: [MettModel], _ error: Int?) -> Void
@@ -1287,7 +1289,7 @@ class BluetoothManager: NSObject {
         bloodOxygenClosure?([], -1001)
         sleepClosure?(nil, -1001)
         stepClosure?([], -1001)
-        trainClosure?(nil, -1001)
+        exerciseClosure?(nil, -1001)
         pressureClosure?([], -1001)
         mettClosure?([], -1001)
     }
@@ -1298,7 +1300,7 @@ class BluetoothManager: NSObject {
         bloodOxygenClosure = nil
         sleepClosure = nil
         stepClosure = nil
-        trainClosure = nil
+        exerciseClosure = nil
         pressureClosure = nil
         mettClosure = nil
         gpsClosure = nil
@@ -1315,8 +1317,8 @@ class BluetoothManager: NSObject {
             sleepClosure = closure as? SleepClosure
         case is StepClosure:
             stepClosure = closure as? StepClosure
-        case is TrainClosure:
-            trainClosure = closure as? TrainClosure
+        case is ExerciseClosure:
+            exerciseClosure = closure as? ExerciseClosure
         case is PressureClosure:
             pressureClosure = closure as? PressureClosure
         case is MettClosure: