瀏覽代碼

Merge pull request #68 from josep1972/dev

Fix to Dexcom PR
jonfawcett 6 年之前
父節點
當前提交
f5dd84e485
共有 2 個文件被更改,包括 16 次插入10 次删除
  1. 10 8
      LoopFollow/Extensions/ShareClientExtension.swift
  2. 6 2
      LoopFollow/ViewControllers/MainViewController.swift

+ 10 - 8
LoopFollow/Extensions/ShareClientExtension.swift

@@ -16,14 +16,16 @@ public struct ShareGlucoseData: Codable {
 }
 
 private var TrendTable: [String] = [
-   "NONE",            // 0
-   "DoubleUp",        // 1
-   "SingleUp",        // 2
-   "FourtyFiveUp",    // 3
-   "Flat",            // 4
-   "FourtyFiveDown",  // 5
-   "SingleDown",      // 6
-   "DoubleDown"       // 7
+   "NONE",             // 0
+   "DoubleUp",         // 1
+   "SingleUp",         // 2
+   "FortyFiveUp",      // 3
+   "Flat",             // 4
+   "FortyFiveDown",    // 5
+   "SingleDown",       // 6
+   "DoubleDown",       // 7
+   "NOT COMPUTABLE",   // 8
+   "RATE OUT OF RANGE" // 9
 ]
 
 // TODO: probably better to make this an inherited class rather than an extension

+ 6 - 2
LoopFollow/ViewControllers/MainViewController.swift

@@ -181,7 +181,9 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             dexShare?.fetchData(262) { (err, result) -> () in
                 
                 // TODO: add error checking
-                self.bgDataShare = result!
+                if(err == nil) {
+                   self.bgDataShare = result!
+                }
                 // print("\(self.bgDataShare)")
             }
         }
@@ -312,7 +314,9 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         dexShare?.fetchData(262) { (err, result) -> () in
             
             // TODO: add error checking
-            self.bgDataShare = result!
+            if(err == nil) {
+              self.bgDataShare = result!
+            }
             // print("\(self.bgDataShare)")
         }
     }