mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

create event for watch also in follower mode

This commit is contained in:
Johan Degraeve 2021-01-03 10:49:49 +01:00
parent b9bcb6bfa2
commit 22ec7c6c21
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xdrip/Managers/Watch/WatchManager.swift
View File

@ -20,7 +20,7 @@ class WatchManager: NSObject {
/// timestamp of last reading for which calendar event is created, initially set to 1 jan 1970
private var timeStampLastProcessedReading = Date(timeIntervalSince1970: 0.0)
// MARK: - initializer
init(coreDataManager: CoreDataManager) {
@ -34,7 +34,7 @@ class WatchManager: NSObject {
/// process new readings
/// - lastConnectionStatusChangeTimeStamp : when was the last transmitter dis/reconnect - if nil then 1 1 1970 is used
public func processNewReading(lastConnectionStatusChangeTimeStamp: Date) {
public func processNewReading(lastConnectionStatusChangeTimeStamp: Date?) {
// check if createCalenderEvent is enabled in the settings and if so create calender event
if UserDefaults.standard.createCalendarEvent {
@ -45,7 +45,7 @@ class WatchManager: NSObject {
// MARK: - private functions
private func createCalendarEvent(lastConnectionStatusChangeTimeStamp: Date) {
private func createCalendarEvent(lastConnectionStatusChangeTimeStamp: Date?) {
// check that access to calendar is authorized by the user
guard EKEventStore.authorizationStatus(for: .event) == .authorized else {
@ -69,8 +69,8 @@ class WatchManager: NSObject {
}
// check if timeStampLastProcessedReading is at least minimiumTimeBetweenTwoReadingsInMinutes earlier than now (or it's at least minimiumTimeBetweenTwoReadingsInMinutes minutes ago that event was created for reading) - otherwise don't create event
// exception : there's been a disconnect/reconnect after the last spoken reading
if (abs(timeStampLastProcessedReading.timeIntervalSince(Date())) < ConstantsWatch.minimiumTimeBetweenTwoReadingsInMinutes * 60.0 && lastConnectionStatusChangeTimeStamp.timeIntervalSince(timeStampLastProcessedReading) < 0) {
// exception : there's been a disconnect/reconnect after the last processed reading (if lastConnectionStatusChangeTimeStamp != nil)
if (abs(timeStampLastProcessedReading.timeIntervalSince(Date())) < ConstantsWatch.minimiumTimeBetweenTwoReadingsInMinutes * 60.0 && (lastConnectionStatusChangeTimeStamp != nil ? lastConnectionStatusChangeTimeStamp! : Date(timeIntervalSince1970: 0)).timeIntervalSince(timeStampLastProcessedReading) < 0) {
trace("in createCalendarEvent, no new calendar event will be created because it's too close to previous event", log: log, category: ConstantsLog.categoryWatchManager, type: .info)
return

3
xdrip/View Controllers/Root View Controller/RootViewController.swift
View File

@ -1824,6 +1824,9 @@ extension RootViewController:NightScoutFollowerDelegate {
bluetoothPeripheralManager?.sendLatestReading()
// ask watchManager to process new reading, ignore last connection change timestamp because this is follower mode, there is no connection to a transmitter
watchManager?.processNewReading(lastConnectionStatusChangeTimeStamp: nil)
// send also to loopmanager, not interesting for loop probably, but the data is also used for today widget
self.loopManager?.share()