feat:no callback for empty data

jason
1 parent cbc826f8
Showing 1 changed file with 18 additions and 9 deletions
HDFwear/Tools/BluetoothManager+Function.swift
@@ -727,11 +727,14 @@ extension BluetoothManager {
     func parseHeartRateData (_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            heartRateClosure?([], nil)
+//            heartRateClosure?([], nil)
             return
         }
         let hrArray = HeartRateModel.toHeartRateArray(content)
         HeartRateModel.addArray(hrArray)// 加入数据库
+        guard hrArray.count > 0 else {
+            return
+        }
         heartRateClosure?(hrArray, nil)
     }
  
@@ -739,10 +742,13 @@ extension BluetoothManager {
     func parseBlooodOxygenData (_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            bloodOxygenClosure?([], nil)
+//            bloodOxygenClosure?([], nil)
             return
         }
         let array = BloodOxygenModel.toBloodOxygenArray(content)
+        guard array.count > 0 else {
+            return
+        }
         BloodOxygenModel.addArray(array)// 加入数据库
         bloodOxygenClosure?(array, nil)
     }
@@ -761,10 +767,13 @@ extension BluetoothManager {
     func parsePressureData (_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            pressureClosure?([], nil)
+//            pressureClosure?([], nil)
             return
         }
         let array = PressureModel.toPressureArray(content)
+        guard array.count > 0 else {
+            return
+        }
         PressureModel.addArray(array)// 加入数据库
         pressureClosure?(array, nil)
     }
@@ -774,7 +783,7 @@ extension BluetoothManager {
     func parseStepData (_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            stepClosure?([], nil)
+//            stepClosure?([], nil)
             return
         }
         let array = StepModel.toStepArray(content)
@@ -786,7 +795,7 @@ extension BluetoothManager {
     func parseSleepData (_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            sleepClosure?(nil, nil)
+//            sleepClosure?(nil, nil)
             return
         }
         let model = NewSleepModel.toSleepModel(content)
@@ -797,7 +806,7 @@ extension BluetoothManager {
     func parseStepCalorieDistanceData (_ content: [UInt8]) {
         guard content.count >= 16 else {
             print("无有效的信息")
-            stepClosure?([], nil)
+//            stepClosure?([], nil)
             return
         }
         let steps = NewStepModel.toStepArray(content)
@@ -812,7 +821,7 @@ extension BluetoothManager {
     func parseGpsData(_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            gpsClosure?(nil, nil)
+//            gpsClosure?(nil, nil)
             return
         }
         let gpsModel = NewGpsModel.toGpsModel(content)
@@ -823,7 +832,7 @@ extension BluetoothManager {
     func parseIntensiveTimeData(_ content: [UInt8]) {
         guard content.count > 0 else {
             print("无有效的信息")
-            intensiveTimeClosure?(nil, nil)
+//            intensiveTimeClosure?(nil, nil)
             return
         }
         let gpsModel = NewIntensiveTimeModel.toIntensiveTimeModel(content)
@@ -845,7 +854,7 @@ extension BluetoothManager {
     func parseExerciseData(_ content: [UInt8], _ index: Int) {
         guard content.count > 0 else {
             print("无有效的信息")
-            exerciseClosure?(nil, nil)
+//            exerciseClosure?(nil, nil)
             return
         }
         NewExerciseModel.toExerciseModel(content, index)