Commit 8225514b80f25f4143a1724d3e6382a509bec8f3
1 parent
40bc8724
feat:sleep model add properties
Showing
1 changed file
with
7 additions
and
1 deletions
HDFwear/Home/Model/NewSleepModel.swift
... | ... | @@ -22,6 +22,8 @@ class NewSleepModel: NSObject { |
22 | 22 | var sleepStatus: NewSleepStatus |
23 | 23 | var startTimeInterval: TimeInterval |
24 | 24 | var startTime: Date? |
25 | + var endTimeInterval: TimeInterval | |
26 | + var endTime: Date? | |
25 | 27 | var duration: UInt32 |
26 | 28 | } |
27 | 29 | |
... | ... | @@ -55,6 +57,8 @@ class NewSleepModel: NSObject { |
55 | 57 | description += " Status: \(fragment.sleepStatus)\n" |
56 | 58 | description += " Start TimeInterval: \(fragment.startTimeInterval)\n" |
57 | 59 | description += " Start Time: \(dateFormatter.string(from: fragment.startTime ?? Date()))\n" |
60 | + description += " End TimeInterval: \(fragment.endTimeInterval)\n" | |
61 | + description += " End Time: \(dateFormatter.string(from: fragment.endTime ?? Date()))\n" | |
58 | 62 | description += " Duration: \(fragment.duration) seconds\n" |
59 | 63 | } |
60 | 64 | } |
... | ... | @@ -118,8 +122,10 @@ class NewSleepModel: NSObject { |
118 | 122 | let combinedUInt32 = data[index + 1..<index + 5].reduce(0) { ($0 << 8) + UInt32($1) } |
119 | 123 | let startTime = Date(timeIntervalSince1970: TimeInterval(combinedUInt32)) |
120 | 124 | let duration = UInt32(data[index + 5..<index + 9].reduce(0) { ($0 << 8) + UInt32($1) }) |
125 | + let endTimeInterval = TimeInterval(combinedUInt32 + duration) | |
126 | + let endTime = Date(timeIntervalSince1970: endTimeInterval) | |
121 | 127 | |
122 | - let fragment = SleepFragment(sleepStatus: sleepStatus,startTimeInterval: TimeInterval(combinedUInt32), startTime: startTime, duration: duration) | |
128 | + let fragment = SleepFragment(sleepStatus: sleepStatus,startTimeInterval: TimeInterval(combinedUInt32), startTime: startTime, endTimeInterval: endTimeInterval, endTime: endTime, duration: duration) | |
123 | 129 | sleepFragments.append(fragment) |
124 | 130 | } |
125 | 131 | return sleepFragments | ... | ... |