summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM.Stephen <truestyle2005@163.com>2019-12-09 23:59:31 +0800
committerM.Stephen <truestyle2005@163.com>2019-12-09 23:59:31 +0800
commit99f07389b55fe8fa86d146cd423ffc91a41c173f (patch)
treeaa44a650ead3929ec35cd104fbfbae09d68b7549
parent32b55c155390749c98beb922bf36a70ab2eb5c4a (diff)
downloadqtlocation-mapboxgl-99f07389b55fe8fa86d146cd423ffc91a41c173f.tar.gz
add configs
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj20
-rw-r--r--platform/ios/sdk-files.json2
-rw-r--r--platform/macos/macos.xcodeproj/project.pbxproj18
-rw-r--r--platform/macos/sdk-files.json2
-rw-r--r--platform/macos/src/MGLNativeInterfaceReceiver.h8
-rw-r--r--platform/macos/src/MGLNativeInterfaceReceiver.m48
6 files changed, 97 insertions, 1 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 350a8014fd..bd612cd14e 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -532,6 +532,10 @@
CAE7AD5520F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAE7AD5420F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift */; };
CAFB3C14234505D500399265 /* MGLMapSnapshotter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = CAFB3C13234505D500399265 /* MGLMapSnapshotter_Private.h */; };
CAFB3C15234505D500399265 /* MGLMapSnapshotter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = CAFB3C13234505D500399265 /* MGLMapSnapshotter_Private.h */; };
+ CF0E9076239EA6950074A30D /* MGLNativeInterfaceReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = CF0E9074239EA6950074A30D /* MGLNativeInterfaceReceiver.h */; };
+ CF0E9077239EA6950074A30D /* MGLNativeInterfaceReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = CF0E9074239EA6950074A30D /* MGLNativeInterfaceReceiver.h */; };
+ CF0E9078239EA6950074A30D /* MGLNativeInterfaceReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = CF0E9075239EA6950074A30D /* MGLNativeInterfaceReceiver.m */; };
+ CF0E9079239EA6950074A30D /* MGLNativeInterfaceReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = CF0E9075239EA6950074A30D /* MGLNativeInterfaceReceiver.m */; };
CF75A91522D85E860058A5C4 /* MGLLoggingConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF75A91422D85E860058A5C4 /* MGLLoggingConfiguration.mm */; };
CF75A91622D85E860058A5C4 /* MGLLoggingConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF75A91422D85E860058A5C4 /* MGLLoggingConfiguration.mm */; };
DA00FC8E1D5EEB0D009AABC8 /* MGLAttributionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1225,6 +1229,8 @@
CAE7AD5320F46EF5003B6782 /* integration-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "integration-Bridging-Header.h"; sourceTree = "<group>"; };
CAE7AD5420F46EF5003B6782 /* MGLMapSnapshotterSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MGLMapSnapshotterSwiftTests.swift; sourceTree = "<group>"; };
CAFB3C13234505D500399265 /* MGLMapSnapshotter_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLMapSnapshotter_Private.h; sourceTree = "<group>"; };
+ CF0E9074239EA6950074A30D /* MGLNativeInterfaceReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLNativeInterfaceReceiver.h; sourceTree = "<group>"; };
+ CF0E9075239EA6950074A30D /* MGLNativeInterfaceReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLNativeInterfaceReceiver.m; sourceTree = "<group>"; };
CF75A91422D85E860058A5C4 /* MGLLoggingConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLoggingConfiguration.mm; sourceTree = "<group>"; };
DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = "<group>"; };
DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = "<group>"; };
@@ -1961,6 +1967,15 @@
name = Annotations;
sourceTree = "<group>";
};
+ CF0E9073239EA6800074A30D /* Interface */ = {
+ isa = PBXGroup;
+ children = (
+ CF0E9074239EA6950074A30D /* MGLNativeInterfaceReceiver.h */,
+ CF0E9075239EA6950074A30D /* MGLNativeInterfaceReceiver.m */,
+ );
+ name = Interface;
+ sourceTree = "<group>";
+ };
DA1DC9411CB6C1C2006E619F = {
isa = PBXGroup;
children = (
@@ -2188,6 +2203,7 @@
DA8848331CBAFB2A00AB86E3 /* Kit */ = {
isa = PBXGroup;
children = (
+ CF0E9073239EA6800074A30D /* Interface */,
DAD165841CF4D06B001FF4B9 /* Annotations */,
35CE617F1D4165C2004F2359 /* Categories */,
DA8848881CBB036000AB86E3 /* SMCalloutView */,
@@ -2618,6 +2634,7 @@
350098BB1D480108004B2AF0 /* MGLVectorTileSource.h in Headers */,
DA8847F61CBAFA5100AB86E3 /* MGLOfflineStorage.h in Headers */,
DAD1656E1CF41981001FF4B9 /* MGLFeature_Private.h in Headers */,
+ CF0E9076239EA6950074A30D /* MGLNativeInterfaceReceiver.h in Headers */,
DA88483C1CBAFB8500AB86E3 /* MGLMapView.h in Headers */,
3EA9363147E77DD29FA06063 /* MGLRendererConfiguration.h in Headers */,
55E5665121C2A1C20008B8B5 /* MMEReachability.h in Headers */,
@@ -2812,6 +2829,7 @@
74CB5EB2219B252C00102936 /* MGLStyleLayerManager.h in Headers */,
9221BAB020699F8A0054BDF4 /* MGLTilePyramidOfflineRegion_Private.h in Headers */,
96E516F5200059B100A02306 /* MGLNetworkConfiguration.h in Headers */,
+ CF0E9077239EA6950074A30D /* MGLNativeInterfaceReceiver.h in Headers */,
96E516DD200054F200A02306 /* MGLPolygon_Private.h in Headers */,
353933F91D3FB79F003F57D7 /* MGLLineStyleLayer.h in Headers */,
9C6E282622A980AC0056B7BE /* UIKit+MMEMobileEvents.h in Headers */,
@@ -3355,6 +3373,7 @@
9620BB3A1E69FE1700705A1D /* MGLSDKUpdateChecker.mm in Sources */,
354B83981D2E873E005D9406 /* MGLUserLocationAnnotationView.m in Sources */,
40834BEE1FE05E1800C1BD0D /* MMEEventsConfiguration.m in Sources */,
+ CF0E9078239EA6950074A30D /* MGLNativeInterfaceReceiver.m in Sources */,
DA88485D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m in Sources */,
DAD165701CF41981001FF4B9 /* MGLFeature.mm in Sources */,
30E578191DAA855E0050F07E /* UIImage+MGLAdditions.mm in Sources */,
@@ -3482,6 +3501,7 @@
DAA4E4221CBB730400178DFB /* MGLPointAnnotation.mm in Sources */,
40834C021FE05E1800C1BD0D /* MMEEventsConfiguration.m in Sources */,
DAED38661D62D0FC00D7640F /* NSURL+MGLAdditions.m in Sources */,
+ CF0E9079239EA6950074A30D /* MGLNativeInterfaceReceiver.m in Sources */,
DAD165711CF41981001FF4B9 /* MGLFeature.mm in Sources */,
30E5781A1DAA855E0050F07E /* UIImage+MGLAdditions.mm in Sources */,
ACD0245B2187EABA00D8C8A7 /* MMEMetricsManager.m in Sources */,
diff --git a/platform/ios/sdk-files.json b/platform/ios/sdk-files.json
index dc59e179c8..5c67a32b7f 100644
--- a/platform/ios/sdk-files.json
+++ b/platform/ios/sdk-files.json
@@ -9,6 +9,7 @@
"platform/ios/src/MGLSDKUpdateChecker.mm",
"platform/ios/src/MGLUserLocationAnnotationView.m",
"platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMEEventsConfiguration.m",
+ "platform/ios/src/MGLNativeInterfaceReceiver.m",
"platform/ios/src/MGLFaux3DUserLocationAnnotationView.m",
"platform/darwin/src/MGLFeature.mm",
"platform/ios/src/UIImage+MGLAdditions.mm",
@@ -285,6 +286,7 @@
"MGLUserLocationAnnotationView_Private.h": "platform/ios/src/MGLUserLocationAnnotationView_Private.h",
"MGLRasterTileSource_Private.h": "platform/darwin/src/MGLRasterTileSource_Private.h",
"MGLFeature_Private.h": "platform/darwin/src/MGLFeature_Private.h",
+ "MGLNativeInterfaceReceiver.h": "platform/ios/src/MGLNativeInterfaceReceiver.h",
"MGLRendererConfiguration.h": "platform/darwin/src/MGLRendererConfiguration.h",
"MMEReachability.h": "platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/Reachability/MMEReachability.h",
"MMENamespacedDependencies.h": "platform/ios/vendor/mapbox-events-ios/MapboxMobileEvents/MMENamespacedDependencies.h",
diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj
index 226bc62312..7fe87eed96 100644
--- a/platform/macos/macos.xcodeproj/project.pbxproj
+++ b/platform/macos/macos.xcodeproj/project.pbxproj
@@ -134,6 +134,8 @@
CA8FBC0D21A4A74300D1203C /* MGLRendererConfigurationTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = CA8FBC0C21A4A74300D1203C /* MGLRendererConfigurationTests.mm */; };
CA9461A620884CCB0015EB12 /* MGLAnnotationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA9461A520884CCB0015EB12 /* MGLAnnotationTests.m */; };
CAD9D0AC22A88A32001B25EE /* MGLResourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = CAD9D0AB22A88A32001B25EE /* MGLResourceTests.mm */; };
+ CF0E907E239EA6BB0074A30D /* MGLNativeInterfaceReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = CF0E907C239EA6BB0074A30D /* MGLNativeInterfaceReceiver.h */; };
+ CF0E907F239EA6BB0074A30D /* MGLNativeInterfaceReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = CF0E907D239EA6BB0074A30D /* MGLNativeInterfaceReceiver.m */; };
CF762DEF22DC7EFF00338472 /* MGLLoggingConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF762DEE22DC7EFF00338472 /* MGLLoggingConfiguration.mm */; };
DA00FC8A1D5EEAC3009AABC8 /* MGLAttributionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA00FC881D5EEAC3009AABC8 /* MGLAttributionInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
DA00FC8B1D5EEAC3009AABC8 /* MGLAttributionInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA00FC891D5EEAC3009AABC8 /* MGLAttributionInfo.mm */; };
@@ -425,7 +427,7 @@
5591AC692298361600FF9ADF /* MGLMapView+Impl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MGLMapView+Impl.mm"; sourceTree = "<group>"; };
55CAF6312294407F00F17770 /* MGLMapView+OpenGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MGLMapView+OpenGL.h"; sourceTree = "<group>"; };
55CAF6332294409B00F17770 /* MGLMapView+OpenGL.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "MGLMapView+OpenGL.mm"; sourceTree = "<group>"; };
- 55CF7532213EDADF00ED86C4 /* libmbgl-vendor-icu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmbgl-vendor-icu.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 55CF7532213EDADF00ED86C4 /* libmbgl-vendor-icu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libmbgl-vendor-icu.a"; sourceTree = BUILT_PRODUCTS_DIR; };
55D120A41F7906E6004B6D81 /* libmbgl-filesource.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libmbgl-filesource.a"; sourceTree = BUILT_PRODUCTS_DIR; };
55D9B4B01D005D3900C1CCE2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
55E2AD101E5B0A6900E8C587 /* MGLOfflineStorageTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLOfflineStorageTests.mm; path = ../../darwin/test/MGLOfflineStorageTests.mm; sourceTree = "<group>"; };
@@ -475,6 +477,8 @@
CA8FBC0C21A4A74300D1203C /* MGLRendererConfigurationTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLRendererConfigurationTests.mm; path = ../../darwin/test/MGLRendererConfigurationTests.mm; sourceTree = "<group>"; };
CA9461A520884CCB0015EB12 /* MGLAnnotationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLAnnotationTests.m; path = test/MGLAnnotationTests.m; sourceTree = SOURCE_ROOT; };
CAD9D0AB22A88A32001B25EE /* MGLResourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLResourceTests.mm; path = ../../darwin/test/MGLResourceTests.mm; sourceTree = "<group>"; };
+ CF0E907C239EA6BB0074A30D /* MGLNativeInterfaceReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLNativeInterfaceReceiver.h; sourceTree = "<group>"; };
+ CF0E907D239EA6BB0074A30D /* MGLNativeInterfaceReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLNativeInterfaceReceiver.m; sourceTree = "<group>"; };
CF762DEE22DC7EFF00338472 /* MGLLoggingConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLoggingConfiguration.mm; sourceTree = "<group>"; };
DA00FC881D5EEAC3009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = "<group>"; };
DA00FC891D5EEAC3009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = "<group>"; };
@@ -880,6 +884,15 @@
name = "Test Helpers";
sourceTree = "<group>";
};
+ CF0E907B239EA6AF0074A30D /* Interface */ = {
+ isa = PBXGroup;
+ children = (
+ CF0E907C239EA6BB0074A30D /* MGLNativeInterfaceReceiver.h */,
+ CF0E907D239EA6BB0074A30D /* MGLNativeInterfaceReceiver.m */,
+ );
+ name = Interface;
+ sourceTree = "<group>";
+ };
DA33895E1FA3E997001EA329 /* Recovered References */ = {
isa = PBXGroup;
children = (
@@ -1267,6 +1280,7 @@
DAE6C39E1CC31E7C00DB3429 /* Kit */ = {
isa = PBXGroup;
children = (
+ CF0E907B239EA6AF0074A30D /* Interface */,
DA90B12C1DB43B180073CF55 /* Categories */,
DAE6C39F1CC31E9400DB3429 /* MGLAnnotationImage.h */,
DAC2ABC41CC6D343006D18C4 /* MGLAnnotationImage_Private.h */,
@@ -1406,6 +1420,7 @@
3538AA231D542685008EC33D /* MGLStyleLayer.h in Headers */,
DAE6C35C1CC31E0400DB3429 /* MGLGeometry.h in Headers */,
DAE6C35A1CC31E0400DB3429 /* MGLAccountManager.h in Headers */,
+ CF0E907E239EA6BB0074A30D /* MGLNativeInterfaceReceiver.h in Headers */,
DA551B821DB496AC0009AFAF /* MGLTileSource.h in Headers */,
35602C001D3EA9B40050646F /* MGLForegroundStyleLayer.h in Headers */,
DAE6C35D1CC31E0400DB3429 /* MGLMapCamera.h in Headers */,
@@ -1654,6 +1669,7 @@
files = (
07A019EF1ED665CD00ACD43E /* MGLImageSource.mm in Sources */,
92092EF11F5EB10E00AF5130 /* MGLMapSnapshotter.mm in Sources */,
+ CF0E907F239EA6BB0074A30D /* MGLNativeInterfaceReceiver.m in Sources */,
40ABDB561DB0022100372083 /* NSImage+MGLAdditions.mm in Sources */,
DAF25715201901C200367EF5 /* MGLHillshadeStyleLayer.mm in Sources */,
DAE6C3901CC31E2A00DB3429 /* MGLPointAnnotation.mm in Sources */,
diff --git a/platform/macos/sdk-files.json b/platform/macos/sdk-files.json
index 13760da70f..88ddfc2c1f 100644
--- a/platform/macos/sdk-files.json
+++ b/platform/macos/sdk-files.json
@@ -3,6 +3,7 @@
"sources": [
"platform/darwin/src/MGLImageSource.mm",
"platform/darwin/src/MGLMapSnapshotter.mm",
+ "platform/macos/src/MGLNativeInterfaceReceiver.m",
"platform/macos/src/NSImage+MGLAdditions.mm",
"platform/darwin/src/MGLHillshadeStyleLayer.mm",
"platform/darwin/src/MGLPointAnnotation.mm",
@@ -193,6 +194,7 @@
"MGLValueEvaluator.h": "platform/darwin/src/MGLValueEvaluator.h",
"MGLOfflinePack_Private.h": "platform/darwin/src/MGLOfflinePack_Private.h",
"MGLFoundation_Private.h": "platform/darwin/src/MGLFoundation_Private.h",
+ "MGLNativeInterfaceReceiver.h": "platform/macos/src/MGLNativeInterfaceReceiver.h",
"MGLCompassCell.h": "platform/macos/src/MGLCompassCell.h",
"MGLShapeSource_Private.h": "platform/darwin/src/MGLShapeSource_Private.h",
"MGLStyle_Private.h": "platform/darwin/src/MGLStyle_Private.h",
diff --git a/platform/macos/src/MGLNativeInterfaceReceiver.h b/platform/macos/src/MGLNativeInterfaceReceiver.h
new file mode 100644
index 0000000000..367adf9f3f
--- /dev/null
+++ b/platform/macos/src/MGLNativeInterfaceReceiver.h
@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#include <mbgl/interface/native_apple_interface.h>
+
+@interface MGLNativeInterfaceReceiver : NSObject <MGLNativeAppleInterfaceDelegate>
+
++ (MGLNativeInterfaceReceiver *)shared;
+
+@end
diff --git a/platform/macos/src/MGLNativeInterfaceReceiver.m b/platform/macos/src/MGLNativeInterfaceReceiver.m
new file mode 100644
index 0000000000..e1a676d507
--- /dev/null
+++ b/platform/macos/src/MGLNativeInterfaceReceiver.m
@@ -0,0 +1,48 @@
+#import "MGLNativeInterfaceReceiver.h"
+
+#import "MGLLoggingConfiguration_Private.h"
+#import "MGLNetworkConfiguration_Private.h"
+
+#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
+#import "MGLAccountManager_Private.h"
+#endif
+
+@implementation MGLNativeInterfaceReceiver
+
+static MGLNativeInterfaceReceiver *instance = nil;
+
++ (MGLNativeInterfaceReceiver *)shared {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ instance = [[MGLNativeInterfaceReceiver alloc] init];
+ });
+ return instance;
+}
+
+#pragma mark - MGLNativeAppleInterfaceManager delegate -
+
+- (NSString *)nai_skuToken {
+ return MGLAccountManager.skuToken;
+}
+
+- (NSURLSessionConfiguration *)nai_sessionConfiguration {
+ return [MGLNetworkConfiguration sharedManager].sessionConfiguration;
+}
+
+- (NSString *)nai_accountType {
+ return MGLMapboxAccountTypeKey;
+}
+
+- (void)nai_startDownloadEvent:(NSString *)event type:(NSString *)type {
+ [[MGLNetworkConfiguration sharedManager] startDownloadEvent:event type:@"tile"];
+}
+
+- (void)nai_cancelDownloadEventForResponse:(NSURLResponse *)response {
+ [[MGLNetworkConfiguration sharedManager] cancelDownloadEventForResponse:response];
+}
+
+- (void)nai_stopDownloadEventForResponse:(NSURLResponse *)response {
+ [[MGLNetworkConfiguration sharedManager] stopDownloadEventForResponse:response];
+}
+
+@end