update project

Author: Richard Chin

SailsSDKDemo.xcodeproj/project.pbxproj

@@ -10,7 +10,7 @@
 		795D32531D38ADBB00002BB5 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 795D32521D38ADBB00002BB5 /* Launch Screen.storyboard */; };
 		795D32C11D38CBCC00002BB5 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 795D32C01D38CBCC00002BB5 /* libxml2.tbd */; };
 		795D32C31D38CBD500002BB5 /* libz.1.2.5.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 795D32C21D38CBD500002BB5 /* libz.1.2.5.tbd */; };
-		799923C51DDD51A800E91D3C /* locating.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 799923C41DDD51A800E91D3C /* locating.framework */; };
+		79D4F16D1F56E96B003C0063 /* locating.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79D4F1651F56E6B3003C0063 /* locating.framework */; };
 		E1FCF430196A7D5100A5C4B9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E1FCF42E196A7D5100A5C4B9 /* InfoPlist.strings */; };
 		E1FCF432196A7D5100A5C4B9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E1FCF431196A7D5100A5C4B9 /* main.m */; };
 		E1FCF436196A7D5100A5C4B9 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E1FCF435196A7D5100A5C4B9 /* AppDelegate.m */; };
@@ -34,7 +34,7 @@
 		795D32521D38ADBB00002BB5 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		795D32C01D38CBCC00002BB5 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
 		795D32C21D38CBD500002BB5 /* libz.1.2.5.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.2.5.tbd; path = usr/lib/libz.1.2.5.tbd; sourceTree = SDKROOT; };
-		799923C41DDD51A800E91D3C /* locating.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = locating.framework; path = SailsSDKDemo/locating.framework; sourceTree = "<group>"; };
+		79D4F1651F56E6B3003C0063 /* locating.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = locating.framework; sourceTree = "<group>"; };
 		E1FCF422196A7D5100A5C4B9 /* SailsSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SailsSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E1FCF42D196A7D5100A5C4B9 /* SailsSDKDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SailsSDKDemo-Info.plist"; sourceTree = "<group>"; };
 		E1FCF42F196A7D5100A5C4B9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -56,9 +56,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				799923C51DDD51A800E91D3C /* locating.framework in Frameworks */,
 				795D32C31D38CBD500002BB5 /* libz.1.2.5.tbd in Frameworks */,
 				795D32C11D38CBCC00002BB5 /* libxml2.tbd in Frameworks */,
+				79D4F16D1F56E96B003C0063 /* locating.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -75,14 +75,14 @@
 		79EFDFC41DDD4FE400A2AB6D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				79D4F1651F56E6B3003C0063 /* locating.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		E1FCF419196A7D5100A5C4B9 = {
 			isa = PBXGroup;
 			children = (
-				799923C41DDD51A800E91D3C /* locating.framework */,
 				E1FCF42B196A7D5100A5C4B9 /* SailsSDKDemo */,
 				E1FCF444196A7D5100A5C4B9 /* SailsSDKDemoTests */,
 				E1FCF423196A7D5100A5C4B9 /* Products */,
@@ -374,6 +374,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/SailsSDKDemo",
+					"$(PROJECT_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SailsSDKDemo/SailsSDKDemo-Prefix.pch";
@@ -405,6 +406,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/SailsSDKDemo",
+					"$(PROJECT_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SailsSDKDemo/SailsSDKDemo-Prefix.pch";

SailsSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/richard.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",

SailsSDKDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -8,6 +8,10 @@
 
 #import <Foundation/Foundation.h>
 
+@class MapDatabase;
+@class Dijkstra3DNode;
+@class Sails;
+
 #pragma mark Location Region Language
 /**
  * LocationRegionLanguage.
@@ -43,6 +47,14 @@ typedef NS_ENUM(NSInteger, LocationRegionLanguage) {
 @property (nonatomic, strong) NSString *url;
 @property (nonatomic) int locationSelf;
 
+@property(nonatomic) double updatedLength;
+@property(nonatomic) int changeFloorCount;
+@property(nonatomic) BOOL useDynamicPathLink;
+@property(nonatomic, strong) Dijkstra3DNode *dynamicAnchor;
+
+- (id)initWithLabel:(NSString *)labelName Longitude:(double)longitude Latitude:(double)latitude Floor:(NSString *)floorName Sails:(Sails *)sails;
+
+
 #pragma mark Setter Method
 
 /**
@@ -71,6 +83,8 @@ typedef NS_ENUM(NSInteger, LocationRegionLanguage) {
 - (NSString *)getFloorName;
 
 
+- (MapDatabase *)getFloor;
+
 /**
  * Get location region's floor description.
  *
@@ -132,4 +146,9 @@ typedef NS_ENUM(NSInteger, LocationRegionLanguage) {
  */
 - (BOOL)hasPathNode;
 
+- (void)setGpsArea:(bool)gpsArea;
+
+- (BOOL)gpsArea;
+
+- (void)setUpdatedLength:(double)updatedLength;
 @end

SailsSDKDemo/locating.framework/Headers locating.framework/Headers

@@ -39,7 +39,17 @@ typedef NS_ENUM(NSInteger, PathRoutingMode) {
      * Routing Mode: only take elevator and escalator into 3D routing account.
      *
      */
-    ElevatorAndEscalatorMode = 4
+    ElevatorAndEscalatorMode = 4,
+    /**
+     * Routing Mode: wheel-can-go path routing.
+     *
+     */
+    WheelMode = 5,
+    ElevatorFirstMode = 6,
+    EscalatorFirstMode = 7,
+    EscalatorAndStairFirstMode = 8
+
+
 };
 
 #pragma mark Path Routing Node Type
@@ -93,6 +103,10 @@ typedef NS_ENUM(NSInteger, PathRoutingDirection) {
 
 #pragma mark Switch Method
 
+@property(nonatomic) BOOL routingOnce;
+
+@property(nonatomic) BOOL routed;
+
 /**
  * Begin to route. (Note: start & end point must be set before going to route)
  */
@@ -162,6 +176,10 @@ typedef NS_ENUM(NSInteger, PathRoutingDirection) {
  */
 - (void)setTargetRegion:(LocationRegion *)target;
 
+/**
+ * Get all path routing nodes (return GeoNode object)
+ */
+- (NSArray *)getCurrentAllPathNodes;
 
 #pragma mark Set Routing Update Callback Block Method
 
@@ -296,7 +314,17 @@ typedef NS_ENUM(NSInteger, PathRoutingDirection) {
  */
 - (BOOL)isArriveTarget;
 
-- (NSArray *)getCurrentAllPathNodes;
+
+
+- (PathRoutingManager *)locationRegionCrossable:(BOOL)crossable;
+
+- (PathRoutingManager *)avoidUpDownFloor:(BOOL)avoid;
+
+- (PathRoutingManager *)routingOnlyOnce:(BOOL)once;
+
+- (void)routingOnceRefresh;
+
+- (int)getCurrentFloorRemainingDistance;
 @end
 
 
@@ -349,6 +377,7 @@ typedef NS_ENUM(NSInteger, PathRoutingDirection) {
  */
 @property (nonatomic, strong) LocationRegion *fromBelongsRegion;
 
+
 - (id)initWithGeoNode:(GeoNode *)geonode nodeType:(PathRoutingNodeType)nodetype direction:(PathRoutingDirection)nodedirection toFloorName:(NSString *)tofloorname;
 
 @end

SailsSDKDemo/locating.framework/Versions/A/Headers/LocationRegion.h locating.framework/Versions/A/Headers/LocationRegion.h

@@ -8,22 +8,57 @@
 
 #import <Foundation/Foundation.h>
 #import "SailsMapCommon.h"
+#import "PathRoutingManager.h"
 
 static int WITHOUT_FOLLOW_HEADING = 512;
 static int WITH_GPS = 2048;
+static int SIMULATION = 8192;
 
 @class LocationRegion;
+@class RoutingInfo;
+@class GPSLocation;
 
 @interface Sails : NSObject
 
 #pragma mark Switch Method
 
+@property(nonatomic, copy) NSString *gpsFloorLayer;
+
+@property(nonatomic) double userHeading;
+
+
+@property(nonatomic) double speedfactor;
+
+@property(nonatomic) BOOL lockAngle;
+
+@property(nonatomic, strong) LocationRegion *savelr;
+
+@property(nonatomic) PathRoutingMode routingMode;
+
+@property(nonatomic) bool isProcessLonLat;
+
+- (RoutingInfo *)route3DwithSavedRoutedPath:(NSArray *)routedPath target:(LocationRegion *)lr;
+
+- (NSMutableArray *)sortLocationRegionsByPathLength:(NSArray *)locationRegions;
+
+- (void)setSimulationUserHeading:(double)userHeading;
+
+- (void)setSimulationLongitude:(double)longitude;
+
+- (void)setSimulationLatitude:(double)latitude;
+
+- (void)setSimulationFloor:(NSString *)layer;
+
 - (void)setGPSFloorLayer:(NSString *)layer;
 
+- (void)setGPSFloorLayerInternal:(NSString *)layer;
+
 - (BOOL)isUseGPS;
 
 - (void)setMode:(int)m;
 
+- (void)setSpeedFactor:(double)factor;
+
 - (BOOL)checkMode:(int)m;
 
 - (void)setMagneticDefaultInclinationAngle:(float)angle;
@@ -36,6 +71,12 @@ static int WITH_GPS = 2048;
 - (void)startLocatingEngine;
 
 
+- (NSArray *)getBuildingsName;
+
+- (LocationRegion *)getInBuildingNameLon:(double)lon Lat:(double)lat;
+
+- (LocationRegion *)getCurrentInBuildingName;
+
 /**
  * Call for stop locate. engine will be turn off.
  */
@@ -71,6 +112,13 @@ static int WITH_GPS = 2048;
 
 - (void)loadLocalZipBuildingFile:(NSURL *)filePath success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
 
+- (void)loadCloudBuilding:(NSString *)token buildingID:(NSString *)buildingId onCachedLoaded:(void (^)(void))onCacheLoaded onNetworkLoadingProgress:(void (^)(BOOL done, int progress))networkProgress onNetworkLoadingFailed:(void (^)(NSError *error))failure;
+
+
+- (void)cancelDownload;
+
+- (void)refreshCloudBuilding:(NSString *)buildingId success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
 /**
  * Load building project from cloud.
  *
@@ -83,6 +131,9 @@ static int WITH_GPS = 2048;
 
 
 #pragma mark Setter Method
+
+- (NSDictionary *)getBackgroundLocation:(NSArray *)scanResults;
+
 /**
  * Initialize map view, must include when do initialization.
  *
@@ -117,6 +168,8 @@ static int WITH_GPS = 2048;
 - (void)setLocationRegionFloor:(LocationRegion *)region andFloorName:(NSString *)floorName;
 
 
+- (void)setPathRoutingNodeList:(NSMutableArray *)pathList;
+
 #pragma mark Set Sails Callback Block Method
 
 /**
@@ -445,6 +498,17 @@ static int WITH_GPS = 2048;
  * @return true if fix location is in location region.
  */
 - (BOOL)amIHere:(LocationRegion *)region;
+
+- (void)setGPSThresholdParameterInToOut:(int)inToOut outToIn:(int)outToIn powerThreshold:(int)rssi;
+/**
+ * Get user orientation degree.
+ *
+ * @return heading angle by degree.
+ */
+- (double)getUserHeading;
+
+- (double)getMapViewRotation;
+
 /**
  * Get current longitude of user location.
  *
@@ -459,13 +523,20 @@ static int WITH_GPS = 2048;
  * @return double value of latitude.
  */
 - (double)getLatitude;
+///**
+// * Get user orientation degree.
+// *
+// * @return heading angle by degree.
+// */
+
 
 -(void) loadZipPackageWithURL: (NSString*) url version:(NSString*) version success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
 
 -(BOOL) isLatterVersion:(NSString*) version;
 
 - (void) loadLastBuildingAuto: (NSURL *)filePath withVersion:(NSString*) version success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
 
+
 @end
 
 
@@ -477,6 +548,7 @@ static int WITH_GPS = 2048;
 @property (nonatomic) double latitude;
 @property (nonatomic) int floorNumber;
 @property (nonatomic, strong) NSString *floorName;
+@property (nonatomic, strong) NSString *floorDesc;
 @property (nonatomic, strong) LocationRegion *belongsRegion;
 
 - (id)initWithLogitude:(double)lon latitude:(double)lat;