v1.10

ronan18 · Feb 7, 2020 · 59ce75a · 59ce75a
1 parent 7d4affa
commit 59ce75a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Arrival-iOS2.xcodeproj/project.pbxproj b/Arrival-iOS2.xcodeproj/project.pbxproj
@@ -541,7 +541,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ronanfuruta.arrival;
 				PRODUCT_NAME = Arrival;
 				SWIFT_VERSION = 5.0;
@@ -563,7 +563,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ronanfuruta.arrival;
 				PRODUCT_NAME = Arrival;
 				SWIFT_VERSION = 5.0;

diff --git a/Arrival-iOS2/AppData.swift b/Arrival-iOS2/AppData.swift
@@ -136,15 +136,19 @@ class AppData: NSObject, ObservableObject,CLLocationManagerDelegate {
                 for data in result as! [NSManagedObject] {
                     let toStation = data.value(forKey: "toStation") as! String
                     let fromStation = data.value(forKey: "fromStation") as! String
-                    let user = data.value(forKey: "user") as! String?
+                    var user = data.value(forKey: "user")
                     let hour = data.value(forKey: "hour") as! Int
                     let day = data.value(forKey: "day") as! Int
-                    let userString = user as! String
-                    print("knn user", user, "knn pass", knnPass, user as! String == knnPass, user == nil, userString.isEmpty)
+                    if (user  == nil) {
+                         data.setValue(knnPass, forKey: "user")
+                        user = knnPass
+                    }
+                    //let userString = user as! String
+                    print("knn user", user, "knn pass", knnPass, user as! String == knnPass, user == nil)
 
-                    if (userString.isEmpty || user == nil || user as! String == knnPass) {
+                    if (user as! String == knnPass) {
                         print("knn data", user, hour, day, toStation, fromStation)
-                        data.setValue(knnPass, forKey: "user")
+
                         if (toStation != "none" && fromStation != "load") {
                             if (JSON(priorities)[toStation].intValue > 0) {
                                 priorities[toStation] = priorities[toStation]! + 1