TBR

martingdela · Nov 26, 2018 · d63fc9f · d63fc9f
1 parent df6b53e
commit d63fc9f
Show file tree

Hide file tree

Showing 30 changed files with 1,205 additions and 696 deletions.
diff --git a/Musgravite.xcodeproj/project.pbxproj b/Musgravite.xcodeproj/project.pbxproj
@@ -20,6 +20,8 @@
 		BD2564AE2197CF4200A1779A /* UtilityFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2564AD2197CF4200A1779A /* UtilityFunctions.swift */; };
 		BD2564B02197EAC200A1779A /* LabTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2564AF2197EAC200A1779A /* LabTableViewCell.swift */; };
 		BD2564B22197F07F00A1779A /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2564B12197F07F00A1779A /* DetailViewController.swift */; };
+		BD2A22EB21ABB33400C6ADA1 /* floor.json in Resources */ = {isa = PBXBuildFile; fileRef = BD2A22E921ABB33400C6ADA1 /* floor.json */; };
+		BD2A22EC21ABB33400C6ADA1 /* lab.json in Resources */ = {isa = PBXBuildFile; fileRef = BD2A22EA21ABB33400C6ADA1 /* lab.json */; };
 		BD3AE4B6219E5B850005FB16 /* Resnet50.mlmodel in Sources */ = {isa = PBXBuildFile; fileRef = BD3AE4B5219E5B850005FB16 /* Resnet50.mlmodel */; };
 		BD3AE4B9219E5C4B0005FB16 /* ARDomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3AE4B8219E5C4B0005FB16 /* ARDomeViewController.swift */; };
 		BD58704121A1DED8004FCB1C /* LabInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD58704021A1DED8004FCB1C /* LabInterfaceController.swift */; };
@@ -28,8 +30,6 @@
 		BD58704721A1E4E8004FCB1C /* FloorRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD58704621A1E4E8004FCB1C /* FloorRow.swift */; };
 		BD58704921A1E591004FCB1C /* LabRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD58704821A1E591004FCB1C /* LabRow.swift */; };
 		BD58704B21A1EA5B004FCB1C /* FloorData.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD58704A21A1EA5B004FCB1C /* FloorData.swift */; };
-		BD58704F21A1EB59004FCB1C /* lab.json in Resources */ = {isa = PBXBuildFile; fileRef = BD58704E21A1EB59004FCB1C /* lab.json */; };
-		BD58705121A1EB6A004FCB1C /* floor.json in Resources */ = {isa = PBXBuildFile; fileRef = BD58705021A1EB6A004FCB1C /* floor.json */; };
 		BD58705321A1EC9D004FCB1C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD58705221A1EC9D004FCB1C /* SwiftyJSON.swift */; };
 		BD58705521A1F00B004FCB1C /* LabData.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD58705421A1F00B004FCB1C /* LabData.swift */; };
 		BD65307B21A21417007CFCE7 /* WaitInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD65307A21A21417007CFCE7 /* WaitInterfaceController.swift */; };
@@ -135,6 +135,8 @@
 		BD2564AD2197CF4200A1779A /* UtilityFunctions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilityFunctions.swift; sourceTree = "<group>"; };
 		BD2564AF2197EAC200A1779A /* LabTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabTableViewCell.swift; sourceTree = "<group>"; };
 		BD2564B12197F07F00A1779A /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
+		BD2A22E921ABB33400C6ADA1 /* floor.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = floor.json; sourceTree = "<group>"; };
+		BD2A22EA21ABB33400C6ADA1 /* lab.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = lab.json; sourceTree = "<group>"; };
 		BD3AE4B5219E5B850005FB16 /* Resnet50.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = Resnet50.mlmodel; sourceTree = "<group>"; };
 		BD3AE4B8219E5C4B0005FB16 /* ARDomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARDomeViewController.swift; sourceTree = "<group>"; };
 		BD58703F21A1D1F1004FCB1C /* WMusgravite Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WMusgravite Extension.entitlements"; sourceTree = "<group>"; };
@@ -144,8 +146,6 @@
 		BD58704621A1E4E8004FCB1C /* FloorRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloorRow.swift; sourceTree = "<group>"; };
 		BD58704821A1E591004FCB1C /* LabRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabRow.swift; sourceTree = "<group>"; };
 		BD58704A21A1EA5B004FCB1C /* FloorData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloorData.swift; sourceTree = "<group>"; };
-		BD58704E21A1EB59004FCB1C /* lab.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = lab.json; sourceTree = "<group>"; };
-		BD58705021A1EB6A004FCB1C /* floor.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = floor.json; sourceTree = "<group>"; };
 		BD58705221A1EC9D004FCB1C /* SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyJSON.swift; sourceTree = "<group>"; };
 		BD58705421A1F00B004FCB1C /* LabData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabData.swift; sourceTree = "<group>"; };
 		BD65307A21A21417007CFCE7 /* WaitInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitInterfaceController.swift; sourceTree = "<group>"; };
@@ -293,9 +293,9 @@
 		BD65307E21A21494007CFCE7 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				BD2A22E921ABB33400C6ADA1 /* floor.json */,
+				BD2A22EA21ABB33400C6ADA1 /* lab.json */,
 				BDF94E76219FE415004A7666 /* PushNotificationPayload.apns */,
-				BD58704E21A1EB59004FCB1C /* lab.json */,
-				BD58705021A1EB6A004FCB1C /* floor.json */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -631,9 +631,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BD58705121A1EB6A004FCB1C /* floor.json in Resources */,
+				BD2A22EB21ABB33400C6ADA1 /* floor.json in Resources */,
 				BDF94E74219FE415004A7666 /* Assets.xcassets in Resources */,
-				BD58704F21A1EB59004FCB1C /* lab.json in Resources */,
+				BD2A22EC21ABB33400C6ADA1 /* lab.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate b/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Musgravite/Controller/DetailViewController.swift"
-            timestampString = "564868373.942006"
+            timestampString = "564904426.326576"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "197"
-            endingLineNumber = "197"
+            startingLineNumber = "205"
+            endingLineNumber = "205"
             landmarkName = "getData(_:_:_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Musgravite/Controller/DetailViewController.swift"
-            timestampString = "564868373.94261"
+            timestampString = "564904426.327051"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "198"
-            endingLineNumber = "198"
+            startingLineNumber = "206"
+            endingLineNumber = "206"
             landmarkName = "getData(_:_:_:)"
             landmarkType = "7">
          </BreakpointContent>

diff --git a/Musgravite/Assets.xcassets/Other/Contents.json b/Musgravite/Assets.xcassets/Other/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/....xcassets/Nautilus.imageset/Contents.json → ...ets/Other/Nautilus.imageset/Contents.json b/....xcassets/Nautilus.imageset/Contents.json → ...ets/Other/Nautilus.imageset/Contents.json
diff --git a/...xcassets/Nautilus.imageset/Untitled-2.png → ...ts/Other/Nautilus.imageset/Untitled-2.png b/...xcassets/Nautilus.imageset/Untitled-2.png → ...ts/Other/Nautilus.imageset/Untitled-2.png
diff --git a/...sets.xcassets/grid.imageset/Contents.json → ...cassets/Other/grid.imageset/Contents.json b/...sets.xcassets/grid.imageset/Contents.json → ...cassets/Other/grid.imageset/Contents.json
diff --git a/...te/Assets.xcassets/grid.imageset/grid.png → ...ets.xcassets/Other/grid.imageset/grid.png b/...te/Assets.xcassets/grid.imageset/grid.png → ...ets.xcassets/Other/grid.imageset/grid.png
diff --git a/...ets.xcassets/men-1.imageset/Contents.json → ...assets/Other/men-1.imageset/Contents.json b/...ets.xcassets/men-1.imageset/Contents.json → ...assets/Other/men-1.imageset/Contents.json
diff --git a/.../Assets.xcassets/men-1.imageset/bg-cc.png → ...s.xcassets/Other/men-1.imageset/bg-cc.png b/.../Assets.xcassets/men-1.imageset/bg-cc.png → ...s.xcassets/Other/men-1.imageset/bg-cc.png
diff --git a/...ets.xcassets/men-2.imageset/Contents.json → ...assets/Other/men-2.imageset/Contents.json b/...ets.xcassets/men-2.imageset/Contents.json → ...assets/Other/men-2.imageset/Contents.json
diff --git a/...ssets.xcassets/men-2.imageset/cedetec.jpg → ...xcassets/Other/men-2.imageset/cedetec.jpg b/...ssets.xcassets/men-2.imageset/cedetec.jpg → ...xcassets/Other/men-2.imageset/cedetec.jpg
diff --git a/...et/737967_470791919634819_573986955_o.jpg → ...et/737967_470791919634819_573986955_o.jpg b/...et/737967_470791919634819_573986955_o.jpg → ...et/737967_470791919634819_573986955_o.jpg
diff --git a/...ets.xcassets/men-3.imageset/Contents.json → ...assets/Other/men-3.imageset/Contents.json b/...ets.xcassets/men-3.imageset/Contents.json → ...assets/Other/men-3.imageset/Contents.json
diff --git a/...ets.xcassets/naut2.imageset/Contents.json → ...assets/Other/naut2.imageset/Contents.json b/...ets.xcassets/naut2.imageset/Contents.json → ...assets/Other/naut2.imageset/Contents.json
diff --git a/.../Assets.xcassets/naut2.imageset/naut2.png → ...s.xcassets/Other/naut2.imageset/naut2.png b/.../Assets.xcassets/naut2.imageset/naut2.png → ...s.xcassets/Other/naut2.imageset/naut2.png
diff --git a/...ssets.xcassets/ph1.imageset/Contents.json → ...xcassets/Other/ph1.imageset/Contents.json b/...ssets.xcassets/ph1.imageset/Contents.json → ...xcassets/Other/ph1.imageset/Contents.json
diff --git a/...ite/Assets.xcassets/ph1.imageset/img1.jpg → ...sets.xcassets/Other/ph1.imageset/img1.jpg b/...ite/Assets.xcassets/ph1.imageset/img1.jpg → ...sets.xcassets/Other/ph1.imageset/img1.jpg
diff --git a/...ssets.xcassets/ph2.imageset/Contents.json → ...xcassets/Other/ph2.imageset/Contents.json b/...ssets.xcassets/ph2.imageset/Contents.json → ...xcassets/Other/ph2.imageset/Contents.json
diff --git a/...ite/Assets.xcassets/ph2.imageset/img2.jpg → ...sets.xcassets/Other/ph2.imageset/img2.jpg b/...ite/Assets.xcassets/ph2.imageset/img2.jpg → ...sets.xcassets/Other/ph2.imageset/img2.jpg
diff --git a/...ssets.xcassets/ph3.imageset/Contents.json → ...xcassets/Other/ph3.imageset/Contents.json b/...ssets.xcassets/ph3.imageset/Contents.json → ...xcassets/Other/ph3.imageset/Contents.json
diff --git a/...ite/Assets.xcassets/ph3.imageset/img3.jpg → ...sets.xcassets/Other/ph3.imageset/img3.jpg b/...ite/Assets.xcassets/ph3.imageset/img3.jpg → ...sets.xcassets/Other/ph3.imageset/img3.jpg
diff --git a/...ssets.xcassets/ph4.imageset/Contents.json → ...xcassets/Other/ph4.imageset/Contents.json b/...ssets.xcassets/ph4.imageset/Contents.json → ...xcassets/Other/ph4.imageset/Contents.json
diff --git a/...ite/Assets.xcassets/ph4.imageset/img4.jpg → ...sets.xcassets/Other/ph4.imageset/img4.jpg b/...ite/Assets.xcassets/ph4.imageset/img4.jpg → ...sets.xcassets/Other/ph4.imageset/img4.jpg
diff --git a/Musgravite/Controller/ARControllers/ModelViewController.swift b/Musgravite/Controller/ARControllers/ModelViewController.swift
@@ -144,7 +144,7 @@ class ModelViewController: UIViewController, ARSCNViewDelegate {
             let planeAnchor = anchor as! ARPlaneAnchor
             let plane = SCNPlane(width: CGFloat(planeAnchor.extent.x), height: CGFloat(planeAnchor.extent.z))
             let gridMaterial = SCNMaterial()
-            gridMaterial.diffuse.contents = UIImage(named: "Assets.xcassets/grid.png")
+            gridMaterial.diffuse.contents = UIImage(named: "grid")
             plane.materials = [gridMaterial]
             let planeNode = SCNNode()
             planeNode.geometry = plane

diff --git a/Musgravite/Controller/DetailViewController.swift b/Musgravite/Controller/DetailViewController.swift
@@ -43,6 +43,8 @@ class DetailViewController: UIViewController, UICollectionViewDelegate, UICollec
     @IBOutlet weak var bigTitleOutlet: UITextView!
     @IBOutlet weak var bigImageOutlet: UIImageView!
     @IBOutlet weak var gradientCategory: UIImageView!
+    @IBOutlet weak var watchSend: UIButton!
+
 
     //CollectionViews
     @IBOutlet weak var imagesCollectionView: UICollectionView!
@@ -70,9 +72,15 @@ class DetailViewController: UIViewController, UICollectionViewDelegate, UICollec
         SVProgressHUD.setDefaultMaskType(.black)
         presentStaticContent()
         /* WatchKit connectivity */
-        wcSession = WCSession.default
-        wcSession.delegate = self
-        wcSession.activate()
+        if WCSession.isSupported() {
+            wcSession = WCSession.default
+            wcSession.delegate = self
+            wcSession.activate()
+            if wcSession.isPaired {
+                watchSend.isHidden = true
+            }
+        }
+        print("scoop")
         button3D.isHidden = true
         /* MapKit Delegate */
         mapOutlet.delegate = self

diff --git a/Musgravite/View/Base.lproj/Main.storyboard b/Musgravite/View/Base.lproj/Main.storyboard
@@ -909,6 +909,7 @@
                         <outlet property="mapOutlet" destination="WR3-fo-K6O" id="YBa-1K-gTP"/>
                         <outlet property="modelCollectionView" destination="q00-yE-fR5" id="rSd-Sx-udA"/>
                         <outlet property="videoCollectionView" destination="Ijw-yQ-9WS" id="YAD-K9-24U"/>
+                        <outlet property="watchSend" destination="TVa-AP-i7W" id="fG3-Cf-zXW"/>
                         <segue destination="SON-WU-SIL" kind="show" identifier="VideoViewController" id="hYp-ZW-713"/>
                         <segue destination="LvW-hC-men" kind="show" identifier="ModelViewController" id="uV5-Eq-h3m"/>
                         <segue destination="s8X-83-4W3" kind="show" identifier="ARDomeViewController" id="gbv-DA-A8p"/>
@@ -1126,7 +1127,7 @@
         <scene sceneID="PsT-nS-S81">
             <objects>
                 <viewController storyboardIdentifier="CharacterCreatorViewController" id="S8d-Th-MfX" customClass="CharacterCreatorViewController" customModule="Musgravite" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleAspectFit" ambiguous="YES" id="NQ2-oG-PU9">
+                    <view key="view" contentMode="scaleAspectFit" id="NQ2-oG-PU9">
                         <rect key="frame" x="0.0" y="0.0" width="1850" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
@@ -1173,7 +1174,7 @@
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
-                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5xA-Ou-6R2">
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5xA-Ou-6R2">
                                 <rect key="frame" x="0.0" y="524" width="1850" height="288"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PTZ-PQ-1q9">

diff --git a/WMusgravite Extension/Controller/LabInterfaceController.swift b/WMusgravite Extension/Controller/LabInterfaceController.swift
@@ -39,6 +39,7 @@ class LabInterfaceController: WKInterfaceController {
                 let labs = labData.array
                 if let labs = labs {
                     for l in labs {
+                        print(l["coordinates"].arrayValue[0])
                         if Int(l["piso"].stringValue) == receivedFloor {
                             let model = LabData(
                                 nombre: l["nombre"].stringValue,

diff --git a/WMusgravite Extension/Model/floor.json b/WMusgravite Extension/Model/floor.json
@@ -1,22 +1,26 @@
 [
-    {
-        "name": "Primer piso",
-        "description": "Talleres, alimentos y mas",
-        "cod": 1
-    },
-    {
-        "name": "Segundo piso",
-        "description": "Salones de computo",
-        "cod": 2
-    },
-    {
-        "name": "Tercer piso",
-        "description": "Tramites escolares y laboratorios",
-        "cod": 3
-    },
-    {
-        "name": "Cuarto piso",
-        "description": "Talleres de diseÃ±o y arquitectura",
-        "cod": 4
-    }
+  {
+    "name": "Primer piso",
+    "description": "Talleres, alimentos y mas",
+    "cod": "1",
+    "PosterImage": "https://s3.amazonaws.com/purple-cdtc/pictures/PrimerPiso.jpg"
+  },
+  {
+    "name": "Segundo piso",
+    "description": "Salones de computo",
+    "cod": "2",
+    "PosterImage": "https://s3.amazonaws.com/purple-cdtc/pictures/SegundoPiso.jpg"
+  },
+  {
+    "name": "Tercer piso",
+    "description": "Tramites escolares y laboratorios",
+    "cod": "3",
+    "PosterImage": "https://s3.amazonaws.com/purple-cdtc/pictures/TercerPiso.jpg"
+  },
+  {
+    "name": "Cuarto piso",
+    "description": "Talleres de diseño y arquitectura",
+    "cod": "4",
+    "PosterImage": "https://s3.amazonaws.com/purple-cdtc/pictures/CuartoPiso.jpg"
+  }
 ]