diff --git a/HDFwear/Home/Model/HealthModel.swift b/HDFwear/Home/Model/HealthModel.swift index 853e539..af5d1f1 100644 --- a/HDFwear/Home/Model/HealthModel.swift +++ b/HDFwear/Home/Model/HealthModel.swift @@ -19,7 +19,7 @@ class StepModel: Object { @Persisted var date: Date? = nil @Persisted var percent: Int = 0 - convenience init(number: Int, calorie: Float, distance: Float, date: Date) { + convenience init(number: Int, calorie: Float = 0, distance: Float = 0, date: Date) { self.init() self.number = number self.distance = Float(Int(distance*100))/100.0 @@ -30,14 +30,14 @@ class StepModel: Object { class func toStepArray(_ bytes: [UInt8]) -> [StepModel] { var stepArray: [StepModel] = [] - let date = DateInRegion(year: Int(bytes[0])+2000, month: Int(bytes[1]), day: Int(bytes[2]), hour: 0, minute: 0, second: 0).date - let stepBytes: [UInt8] = Array(bytes[4.. 0 else { + print("无有效的信息") + stepClosure?([], nil) + return + } + let array = StepModel.toStepArray(content) + StepModel.addArray(array)// 加入数据库 + stepClosure?(array, nil) + } + }