浏览代码

Its actually working. Nice !

Thomas Chef 3 年之前
父节点
当前提交
2ba1f2a745
共有 2 个文件被更改,包括 14 次插入7 次删除
  1. 5 5
      JourneyGPSTracker/Base.lproj/Main.storyboard
  2. 9 2
      JourneyGPSTracker/ViewController.swift

+ 5 - 5
JourneyGPSTracker/Base.lproj/Main.storyboard

@@ -42,15 +42,15 @@
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gjP-2D-NvA">
-                                <rect key="frame" x="330" y="208" width="11" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gjP-2D-NvA">
+                                <rect key="frame" x="287" y="208" width="65" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yVZ-Xq-Fgc">
-                                <rect key="frame" x="330" y="228" width="11" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yVZ-Xq-Fgc">
+                                <rect key="frame" x="287" y="228" width="65" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -83,7 +83,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="131.8840579710145" y="104.46428571428571"/>
+            <point key="canvasLocation" x="130.40000000000001" y="103.89805097451276"/>
         </scene>
     </scenes>
     <resources>

+ 9 - 2
JourneyGPSTracker/ViewController.swift

@@ -22,6 +22,7 @@ class ViewController: UIViewController {
     var locationManager: CLLocationManager?
     
     var noOfSentPos: Int = 0
+    var noOfSentToServer: Int = 0
     
     var gpsLogData: [NSManagedObject] = []
     
@@ -37,7 +38,7 @@ class ViewController: UIViewController {
         locationManager?.requestAlwaysAuthorization()
         locationManager?.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
         locationManager?.activityType = CLActivityType.otherNavigation
-        locationManager?.distanceFilter = 100.0
+        locationManager?.distanceFilter = 10.0
         locationManager?.allowsBackgroundLocationUpdates = true
         pauseSwitch.isEnabled = false
         
@@ -56,7 +57,7 @@ class ViewController: UIViewController {
     
     func setupTimer() {
         
-        _ = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { timer in
+        _ = Timer.scheduledTimer(withTimeInterval: 60.0, repeats: true) { [self] timer in
             
             print("New Timer fired!")
             
@@ -73,8 +74,11 @@ class ViewController: UIViewController {
                     let ts = self.convertStartDate(StartDate: row.ts!)
                     let gpsPosLog = GPS_POS_LOG(latitude:row.latitude,longitude: row.longitud,ts: ts)
                     positions.append(gpsPosLog)
+                    cnxt.delete(row)
+                    self.noOfSentToServer += 1
                 }
                 sendToHttpServer(gpsPosLog: positions)
+                noOfSentGPSToServer.text = String(noOfSentToServer)
                 
             } catch let error as NSError {
                 print("Could not fetch. \(error), \(error.userInfo)")
@@ -119,6 +123,9 @@ class ViewController: UIViewController {
             locationManager?.startUpdatingLocation()
             pauseSwitch.isEnabled = true
             noOfSentPos = 0
+            noOfSentToServer = 0
+            noOfRxGPSPos.text = String(noOfSentPos)
+            noOfSentGPSToServer.text = String(noOfSentToServer)
             setupTimer()
         default:
             print("OFF")