Commit 7ccb8cd1a2d43f286a0e983538557835894572d4
1 parent
ee74e4fd
fix:sleep model caculate
Showing
1 changed file
with
5 additions
and
5 deletions
HDFwear/Home/Model/NewSleepModel.swift
... | ... | @@ -76,9 +76,9 @@ class NewSleepModel: NSObject { |
76 | 76 | // 将数组分成9个一组 |
77 | 77 | for index in stride(from: 0, to: data.count, by: 9) { |
78 | 78 | let sleepStatus = NewSleepStatus(rawValue: data[index]) ?? .awake |
79 | - let combinedUInt32 = data[1..<5].reduce(0) { ($0 << 8) + UInt32($1) } | |
79 | + let combinedUInt32 = data[index + 1..<index + 5].reduce(0) { ($0 << 8) + UInt32($1) } | |
80 | 80 | let startTime = Date(timeIntervalSince1970: TimeInterval(combinedUInt32)) |
81 | - let duration = UInt32(data[5..<9].reduce(0) { ($0 << 8) + UInt32($1) }) | |
81 | + let duration = UInt32(data[index + 5..<index + 9].reduce(0) { ($0 << 8) + UInt32($1) }) | |
82 | 82 | |
83 | 83 | let fragment = SleepFragment(sleepStatus: sleepStatus, startTime: startTime, duration: duration) |
84 | 84 | sleepFragments.append(fragment) |
... | ... | @@ -91,11 +91,11 @@ class NewSleepModel: NSObject { |
91 | 91 | var napFragments = [NapFragment]() |
92 | 92 | // 将数组分成12个一组 |
93 | 93 | for index in stride(from: 0, to: data.count, by: 12) { |
94 | - let startCombinedUInt32 = data[0..<4].reduce(0) { ($0 << 8) + UInt32($1) } | |
94 | + let startCombinedUInt32 = data[index + 0..<index + 4].reduce(0) { ($0 << 8) + UInt32($1) } | |
95 | 95 | let startTime = Date(timeIntervalSince1970: TimeInterval(startCombinedUInt32)) |
96 | - let endCombinedUInt32 = data[4..<8].reduce(0) { ($0 << 8) + UInt32($1) } | |
96 | + let endCombinedUInt32 = data[index + 4..<index + 8].reduce(0) { ($0 << 8) + UInt32($1) } | |
97 | 97 | let endTime = Date(timeIntervalSince1970: TimeInterval(endCombinedUInt32)) |
98 | - let duration = data[8..<12].reduce(0) { ($0 << 8) + UInt32($1) } | |
98 | + let duration = data[index + 8..<index + 12].reduce(0) { ($0 << 8) + UInt32($1) } | |
99 | 99 | |
100 | 100 | let napFragment = NapFragment(startTime: startTime, endTime: endTime, duration: duration) |
101 | 101 | napFragments.append(napFragment) | ... | ... |