ios / yh_analytics · Commits

Go to a project

Authored by 朱小军
Commit b9fd2202c0a6867f03574f59b2fe76e74b89eb8d 1 parent b4864421

carrier优先取cache中的

Inline Side-by-side
Showing 7 changed files with 95 additions and 206 deletions
Pod::Spec.new do |s|
s.name = "YH_Analytics"
s.version = "3.2.2"
s.version = "3.2.3"
s.summary = "Analytics Kit"
s.description = <<-DESC
Analytics Kit
... ... @@ -49,5 +49,6 @@ Pod::Spec.new do |s|
end
s.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
s.dependency 'YH_FoundationKit'
s.dependency 'YH_AFNetworking3'
end
... ...
platform :ios, '8.0'
inhibit_all_warnings!
pod 'YH_AFNetworking3', :git => 'http://git.yoho.cn/ios/YH_AFNetworking3.git', :tag => '3.1.2'
use_frameworks!
source 'http://git.yoho.cn/ios/YHPodSpecs.git'
target 'YH_Analytics' do
pod 'YH_Analytics', :path => '../'
end
... ...
PODS:
- YH_AFNetworking3 (3.1.2):
- YH_AFNetworking3/AFNetworking (= 3.1.2)
- YH_AFNetworking3/UIKit+AFNetworking (= 3.1.2)
- YH_AFNetworking3/Util (= 3.1.2)
- YH_AFNetworking3/AFNetworking (3.1.2)
- YH_AFNetworking3/UIKit+AFNetworking (3.1.2)
- YH_AFNetworking3/Util (3.1.2)
- YH_AFNetworking3 (3.1.3):
- YH_AFNetworking3/AFNetworking (= 3.1.3)
- "YH_AFNetworking3/UIKit+AFNetworking (= 3.1.3)"
- YH_AFNetworking3/Util (= 3.1.3)
- YH_AFNetworking3/AFNetworking (3.1.3)
- "YH_AFNetworking3/UIKit+AFNetworking (3.1.3)":
- YH_AFNetworking3/AFNetworking
- YH_AFNetworking3/Util (3.1.3)
- YH_Analytics (3.2.2):
- YH_AFNetworking3
- YH_Analytics/Factory (= 3.2.2)
- YH_Analytics/JTSHardwareInfo (= 3.2.2)
- YH_Analytics/KeychainStore (= 3.2.2)
- YH_Analytics/Model (= 3.2.2)
- YH_Analytics/OpenUDID (= 3.2.2)
- YH_Analytics/Utils (= 3.2.2)
- YH_FoundationKit
- YH_Analytics/Factory (3.2.2):
- YH_AFNetworking3
- YH_FoundationKit
- YH_Analytics/JTSHardwareInfo (3.2.2):
- YH_AFNetworking3
- YH_FoundationKit
- YH_Analytics/KeychainStore (3.2.2):
- YH_AFNetworking3
- YH_FoundationKit
- YH_Analytics/Model (3.2.2):
- YH_AFNetworking3
- YH_FoundationKit
- YH_Analytics/OpenUDID (3.2.2):
- YH_AFNetworking3
- YH_FoundationKit
- YH_Analytics/Utils (3.2.2):
- YH_AFNetworking3
- YH_FoundationKit
- YH_FoundationKit (0.1.7)
DEPENDENCIES:
- YH_AFNetworking3 (from `http://git.yoho.cn/ios/YH_AFNetworking3.git`, tag `3.1.2`)
- YH_Analytics (from `../`)
EXTERNAL SOURCES:
YH_AFNetworking3:
:git: http://git.yoho.cn/ios/YH_AFNetworking3.git
:tag: 3.1.2
SPEC REPOS:
http://git.yoho.cn/ios/YHPodSpecs.git:
- YH_AFNetworking3
- YH_FoundationKit
CHECKOUT OPTIONS:
YH_AFNetworking3:
:git: http://git.yoho.cn/ios/YH_AFNetworking3.git
:tag: 3.1.2
EXTERNAL SOURCES:
YH_Analytics:
:path: "../"
SPEC CHECKSUMS:
YH_AFNetworking3: c445920bbb04de480a9c726709b7e714d71f88cc
YH_AFNetworking3: d488eddd8657d13d5d2bd23b24f91f98d03673d5
YH_Analytics: 73ecfeaff81ea1f475d0dcdfe367132c1dd729cc
YH_FoundationKit: dec596fc75984f13507ca8322ced09916c137b39
PODFILE CHECKSUM: f2c78ffec27094bdb5fd5b429d9ff577acf9c965
PODFILE CHECKSUM: a2c78d53ac03c2a682ced3554ca81073b94bb5c2
COCOAPODS: 1.2.0
COCOAPODS: 1.5.3
... ...
... ... @@ -7,8 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
047381071EADEE970007E850 /* JTSHardwareInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 047381061EADEE970007E850 /* JTSHardwareInfo.m */; };
0928E56C1E8D3824008FD4F3 /* YHPatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 0928E56B1E8D3824008FD4F3 /* YHPatch.m */; };
194EDC761A7F52D100421E6C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC751A7F52D100421E6C /* main.m */; };
194EDC791A7F52D100421E6C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC781A7F52D100421E6C /* AppDelegate.m */; };
194EDC7C1A7F52D100421E6C /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC7B1A7F52D100421E6C /* ViewController.m */; };
... ... @@ -16,9 +14,7 @@
194EDC811A7F52D100421E6C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 194EDC801A7F52D100421E6C /* Images.xcassets */; };
194EDC841A7F52D100421E6C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 194EDC821A7F52D100421E6C /* LaunchScreen.xib */; };
194EDC901A7F52D100421E6C /* YH_AnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC8F1A7F52D100421E6C /* YH_AnalyticsTests.m */; };
194EDC9C1A7F555800421E6C /* YH_Analytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC9B1A7F555800421E6C /* YH_Analytics.m */; };
B10A8EED55A3226B91CC803D /* libPods-YH_Analytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46590AE242F3394FB3B95EC4 /* libPods-YH_Analytics.a */; };
CA5FDA2A1AEE302F00F86398 /* YHNetworkService.m in Sources */ = {isa = PBXBuildFile; fileRef = CA5FDA291AEE302F00F86398 /* YHNetworkService.m */; };
308D3CBEAA0319FD10CC12EC /* Pods_YH_Analytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCD3604C6621E1CB72229F0D /* Pods_YH_Analytics.framework */; };
CA7AC7831ADE06F300F30791 /* YHCrashReporterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7821ADE06F300F30791 /* YHCrashReporterTests.m */; };
CA7AC7851ADE073200F30791 /* NSString+YHAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7841ADE073200F30791 /* NSString+YHAnalyticsTests.m */; };
CA7AC7891ADE078200F30791 /* YHAssemblyAssistantTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7881ADE078200F30791 /* YHAssemblyAssistantTests.m */; };
... ... @@ -39,19 +35,7 @@
CAA6BD371AE4E857006C3332 /* FakeLocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA6BD361AE4E857006C3332 /* FakeLocationManager.m */; };
CAA6BD3E1AE79ECC006C3332 /* YHAssemblyAssistantLogicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA6BD3D1AE79ECC006C3332 /* YHAssemblyAssistantLogicTests.m */; };
CABC32831AD7CEB8002A4260 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CABC32821AD7CEB8002A4260 /* libOCMock.a */; };
E79828121AA6A5120035137C /* YH_KeychainStore.m in Sources */ = {isa = PBXBuildFile; fileRef = E79828101AA6A5120035137C /* YH_KeychainStore.m */; };
E7A908731BB3C4B000E2EA39 /* YHPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = E7A908721BB3C4B000E2EA39 /* YHPerformance.m */; };
E7ADAE3B1AB946C100C9DD0B /* YHDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE341AB946C100C9DD0B /* YHDevice.m */; };
E7ADAE3C1AB946C100C9DD0B /* YHError.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE361AB946C100C9DD0B /* YHError.m */; };
E7ADAE3D1AB946C100C9DD0B /* YHEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE381AB946C100C9DD0B /* YHEvent.m */; };
E7ADAE3E1AB946C100C9DD0B /* YHStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE3A1AB946C100C9DD0B /* YHStatus.m */; };
E7ADAE461AB9487A00C9DD0B /* YHAnalyItemData.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE451AB9487A00C9DD0B /* YHAnalyItemData.m */; };
E7ADAE5B1AB95BC800C9DD0B /* YHAssemblyAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE5A1AB95BC800C9DD0B /* YHAssemblyAssistant.m */; };
E7B8DE221A81D68600102CC4 /* NSString+YHAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE211A81D68600102CC4 /* NSString+YHAnalytics.m */; };
E7B8DE461A81ED8F00102CC4 /* YHNetworkUserAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE451A81ED8F00102CC4 /* YHNetworkUserAgent.m */; };
E7B8DE4A1A81EE0A00102CC4 /* OpenUDID.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE491A81EE0A00102CC4 /* OpenUDID.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
E7B8DE4C1A81F25E00102CC4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE4B1A81F25E00102CC4 /* CoreGraphics.framework */; };
E7B8DE521A823EEB00102CC4 /* YHCrashReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE511A823EEB00102CC4 /* YHCrashReporter.m */; };
E7B8DE571A8343D200102CC4 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE561A8343D200102CC4 /* CoreLocation.framework */; };
E7B8DE5E1A836F8700102CC4 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE5D1A836F8700102CC4 /* CoreTelephony.framework */; };
E7B8DE621A838EC200102CC4 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE611A838EC200102CC4 /* AdSupport.framework */; };
... ... @@ -81,10 +65,6 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
047381051EADEE970007E850 /* JTSHardwareInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JTSHardwareInfo.h; sourceTree = "<group>"; };
047381061EADEE970007E850 /* JTSHardwareInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JTSHardwareInfo.m; sourceTree = "<group>"; };
0928E56A1E8D3824008FD4F3 /* YHPatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHPatch.h; sourceTree = "<group>"; };
0928E56B1E8D3824008FD4F3 /* YHPatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHPatch.m; sourceTree = "<group>"; };
194EDC701A7F52D100421E6C /* YH_Analytics.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YH_Analytics.app; sourceTree = BUILT_PRODUCTS_DIR; };
194EDC741A7F52D100421E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
194EDC751A7F52D100421E6C /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
... ... @@ -98,13 +78,8 @@
194EDC891A7F52D100421E6C /* YH_AnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YH_AnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
194EDC8E1A7F52D100421E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
194EDC8F1A7F52D100421E6C /* YH_AnalyticsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YH_AnalyticsTests.m; sourceTree = "<group>"; };
194EDC9A1A7F555800421E6C /* YH_Analytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YH_Analytics.h; sourceTree = "<group>"; };
194EDC9B1A7F555800421E6C /* YH_Analytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_Analytics.m; sourceTree = "<group>"; };
46590AE242F3394FB3B95EC4 /* libPods-YH_Analytics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-YH_Analytics.a"; sourceTree = BUILT_PRODUCTS_DIR; };
59B90AE11DA3729BE667911A /* Pods-YH_Analytics.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YH_Analytics.debug.xcconfig"; path = "Pods/Target Support Files/Pods-YH_Analytics/Pods-YH_Analytics.debug.xcconfig"; sourceTree = "<group>"; };
AEEE85263B2471099BB4F247 /* Pods-YH_Analytics.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YH_Analytics.release.xcconfig"; path = "Pods/Target Support Files/Pods-YH_Analytics/Pods-YH_Analytics.release.xcconfig"; sourceTree = "<group>"; };
CA5FDA281AEE302F00F86398 /* YHNetworkService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHNetworkService.h; sourceTree = "<group>"; };
CA5FDA291AEE302F00F86398 /* YHNetworkService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkService.m; sourceTree = "<group>"; };
CA7AC7821ADE06F300F30791 /* YHCrashReporterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHCrashReporterTests.m; sourceTree = "<group>"; };
CA7AC7841ADE073200F30791 /* NSString+YHAnalyticsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+YHAnalyticsTests.m"; sourceTree = "<group>"; };
CA7AC7881ADE078200F30791 /* YHAssemblyAssistantTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAssemblyAssistantTests.m; sourceTree = "<group>"; };
... ... @@ -121,7 +96,6 @@
CA7AC7A11ADE0C6600F30791 /* YHStatusFactoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHStatusFactoryTests.m; sourceTree = "<group>"; };
CA7AC7A31ADF9FCB00F30791 /* YH_AnalyticsLogicTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_AnalyticsLogicTests.m; sourceTree = "<group>"; };
CA873DA91AEF51AE008095A4 /* YHNetworkServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkServiceTests.m; sourceTree = "<group>"; };
CA873DAB1AEF7059008095A4 /* YHAnalyticsMacro.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YHAnalyticsMacro.h; sourceTree = "<group>"; };
CA873DAC1AEF7107008095A4 /* YH_Analytics-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YH_Analytics-Prefix.pch"; sourceTree = "<group>"; };
CA873DAD1AF08880008095A4 /* YH_AnalyticsTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YH_AnalyticsTests-Prefix.pch"; sourceTree = "<group>"; };
CA873DAE1AF0A4F4008095A4 /* ViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerTests.m; sourceTree = "<group>"; };
... ... @@ -138,31 +112,8 @@
CABC32801AD7CE40002A4260 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
CABC32811AD7CE40002A4260 /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = "<group>"; };
CABC32821AD7CEB8002A4260 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
E798280F1AA6A5120035137C /* YH_KeychainStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YH_KeychainStore.h; sourceTree = "<group>"; };
E79828101AA6A5120035137C /* YH_KeychainStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_KeychainStore.m; sourceTree = "<group>"; };
E7A908711BB3C4B000E2EA39 /* YHPerformance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHPerformance.h; sourceTree = "<group>"; };
E7A908721BB3C4B000E2EA39 /* YHPerformance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHPerformance.m; sourceTree = "<group>"; };
E7ADAE331AB946C100C9DD0B /* YHDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHDevice.h; sourceTree = "<group>"; };
E7ADAE341AB946C100C9DD0B /* YHDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHDevice.m; sourceTree = "<group>"; };
E7ADAE351AB946C100C9DD0B /* YHError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHError.h; sourceTree = "<group>"; };
E7ADAE361AB946C100C9DD0B /* YHError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHError.m; sourceTree = "<group>"; };
E7ADAE371AB946C100C9DD0B /* YHEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHEvent.h; sourceTree = "<group>"; };
E7ADAE381AB946C100C9DD0B /* YHEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHEvent.m; sourceTree = "<group>"; };
E7ADAE391AB946C100C9DD0B /* YHStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHStatus.h; sourceTree = "<group>"; };
E7ADAE3A1AB946C100C9DD0B /* YHStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHStatus.m; sourceTree = "<group>"; };
E7ADAE441AB9487A00C9DD0B /* YHAnalyItemData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHAnalyItemData.h; sourceTree = "<group>"; };
E7ADAE451AB9487A00C9DD0B /* YHAnalyItemData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAnalyItemData.m; sourceTree = "<group>"; };
E7ADAE591AB95BC800C9DD0B /* YHAssemblyAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHAssemblyAssistant.h; sourceTree = "<group>"; };
E7ADAE5A1AB95BC800C9DD0B /* YHAssemblyAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAssemblyAssistant.m; sourceTree = "<group>"; };
E7B8DE201A81D68600102CC4 /* NSString+YHAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+YHAnalytics.h"; path = "../NSString+YHAnalytics.h"; sourceTree = "<group>"; };
E7B8DE211A81D68600102CC4 /* NSString+YHAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+YHAnalytics.m"; path = "../NSString+YHAnalytics.m"; sourceTree = "<group>"; };
E7B8DE441A81ED8F00102CC4 /* YHNetworkUserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHNetworkUserAgent.h; sourceTree = "<group>"; };
E7B8DE451A81ED8F00102CC4 /* YHNetworkUserAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkUserAgent.m; sourceTree = "<group>"; };
E7B8DE481A81EE0A00102CC4 /* OpenUDID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenUDID.h; sourceTree = "<group>"; };
E7B8DE491A81EE0A00102CC4 /* OpenUDID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenUDID.m; sourceTree = "<group>"; };
CCD3604C6621E1CB72229F0D /* Pods_YH_Analytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YH_Analytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E7B8DE4B1A81F25E00102CC4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
E7B8DE501A823EEB00102CC4 /* YHCrashReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHCrashReporter.h; sourceTree = "<group>"; };
E7B8DE511A823EEB00102CC4 /* YHCrashReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHCrashReporter.m; sourceTree = "<group>"; };
E7B8DE561A8343D200102CC4 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
E7B8DE5A1A83551300102CC4 /* YH_Analytics.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = YH_Analytics.entitlements; sourceTree = "<group>"; };
E7B8DE5D1A836F8700102CC4 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
... ... @@ -178,7 +129,7 @@
E7B8DE5E1A836F8700102CC4 /* CoreTelephony.framework in Frameworks */,
E7B8DE571A8343D200102CC4 /* CoreLocation.framework in Frameworks */,
E7B8DE4C1A81F25E00102CC4 /* CoreGraphics.framework in Frameworks */,
B10A8EED55A3226B91CC803D /* libPods-YH_Analytics.a in Frameworks */,
308D3CBEAA0319FD10CC12EC /* Pods_YH_Analytics.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
... ... @@ -193,15 +144,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
047381041EADEE970007E850 /* JTSHardwareInfo */ = {
isa = PBXGroup;
children = (
047381051EADEE970007E850 /* JTSHardwareInfo.h */,
047381061EADEE970007E850 /* JTSHardwareInfo.m */,
);
path = JTSHardwareInfo;
sourceTree = "<group>";
};
194EDC671A7F52D100421E6C = {
isa = PBXGroup;
children = (
... ... @@ -228,7 +170,6 @@
isa = PBXGroup;
children = (
E7B8DE5A1A83551300102CC4 /* YH_Analytics.entitlements */,
194EDC991A7F553600421E6C /* YH_Analytics */,
194EDC771A7F52D100421E6C /* AppDelegate.h */,
194EDC781A7F52D100421E6C /* AppDelegate.m */,
194EDC7A1A7F52D100421E6C /* ViewController.h */,
... ... @@ -275,23 +216,10 @@
name = "Supporting Files";
sourceTree = "<group>";
};
194EDC991A7F553600421E6C /* YH_Analytics */ = {
isa = PBXGroup;
children = (
E7ADAE321AB946C100C9DD0B /* Model */,
E7B8DE431A81ED8F00102CC4 /* Utils */,
E7B8DE261A81DCBD00102CC4 /* YHAnalyticsDependencies */,
194EDC9A1A7F555800421E6C /* YH_Analytics.h */,
194EDC9B1A7F555800421E6C /* YH_Analytics.m */,
CA873DAB1AEF7059008095A4 /* YHAnalyticsMacro.h */,
);
path = YH_Analytics;
sourceTree = "<group>";
};
99A449088060DBE87FAE4D3E /* Frameworks */ = {
isa = PBXGroup;
children = (
46590AE242F3394FB3B95EC4 /* libPods-YH_Analytics.a */,
CCD3604C6621E1CB72229F0D /* Pods_YH_Analytics.framework */,
);
name = Frameworks;
sourceTree = "<group>";
... ... @@ -376,64 +304,6 @@
path = OCMock;
sourceTree = "<group>";
};
E7ADAE321AB946C100C9DD0B /* Model */ = {
isa = PBXGroup;
children = (
E7ADAE441AB9487A00C9DD0B /* YHAnalyItemData.h */,
E7ADAE451AB9487A00C9DD0B /* YHAnalyItemData.m */,
E7ADAE331AB946C100C9DD0B /* YHDevice.h */,
E7ADAE341AB946C100C9DD0B /* YHDevice.m */,
E7ADAE351AB946C100C9DD0B /* YHError.h */,
E7ADAE361AB946C100C9DD0B /* YHError.m */,
E7ADAE371AB946C100C9DD0B /* YHEvent.h */,
E7ADAE381AB946C100C9DD0B /* YHEvent.m */,
0928E56A1E8D3824008FD4F3 /* YHPatch.h */,
0928E56B1E8D3824008FD4F3 /* YHPatch.m */,
E7A908711BB3C4B000E2EA39 /* YHPerformance.h */,
E7A908721BB3C4B000E2EA39 /* YHPerformance.m */,
E7ADAE391AB946C100C9DD0B /* YHStatus.h */,
E7ADAE3A1AB946C100C9DD0B /* YHStatus.m */,
);
path = Model;
sourceTree = "<group>";
};
E7B8DE261A81DCBD00102CC4 /* YHAnalyticsDependencies */ = {
isa = PBXGroup;
children = (
047381041EADEE970007E850 /* JTSHardwareInfo */,
E7B8DE471A81EE0A00102CC4 /* OpenUDID */,
);
path = YHAnalyticsDependencies;
sourceTree = "<group>";
};
E7B8DE431A81ED8F00102CC4 /* Utils */ = {
isa = PBXGroup;
children = (
E7B8DE201A81D68600102CC4 /* NSString+YHAnalytics.h */,
E7B8DE211A81D68600102CC4 /* NSString+YHAnalytics.m */,
E7B8DE501A823EEB00102CC4 /* YHCrashReporter.h */,
E7B8DE511A823EEB00102CC4 /* YHCrashReporter.m */,
E7B8DE441A81ED8F00102CC4 /* YHNetworkUserAgent.h */,
E7B8DE451A81ED8F00102CC4 /* YHNetworkUserAgent.m */,
E7ADAE591AB95BC800C9DD0B /* YHAssemblyAssistant.h */,
E7ADAE5A1AB95BC800C9DD0B /* YHAssemblyAssistant.m */,
CA5FDA281AEE302F00F86398 /* YHNetworkService.h */,
CA5FDA291AEE302F00F86398 /* YHNetworkService.m */,
);
path = Utils;
sourceTree = "<group>";
};
E7B8DE471A81EE0A00102CC4 /* OpenUDID */ = {
isa = PBXGroup;
children = (
E7B8DE481A81EE0A00102CC4 /* OpenUDID.h */,
E7B8DE491A81EE0A00102CC4 /* OpenUDID.m */,
E798280F1AA6A5120035137C /* YH_KeychainStore.h */,
E79828101AA6A5120035137C /* YH_KeychainStore.m */,
);
path = OpenUDID;
sourceTree = "<group>";
};
E7B8DE631A839C7700102CC4 /* Framework */ = {
isa = PBXGroup;
children = (
... ... @@ -457,8 +327,7 @@
194EDC6D1A7F52D100421E6C /* Frameworks */,
194EDC6E1A7F52D100421E6C /* Resources */,
E7E311CB1A84C6DF004DB7DF /* Embed Frameworks */,
F010E50782901FA859C84CA5 /* [CP] Embed Pods Frameworks */,
CFE7AAB8C77E6363FDEAE73D /* [CP] Copy Pods Resources */,
ABA6D5B698AEEDF574A754A1 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
... ... @@ -498,7 +367,7 @@
TargetAttributes = {
194EDC6F1A7F52D100421E6C = {
CreatedOnToolsVersion = 6.1.1;
DevelopmentTeam = 825DU77BWH;
DevelopmentTeam = 6U82P566A4;
SystemCapabilities = {
com.apple.ApplicationGroups.iOS = {
enabled = 0;
... ... @@ -519,6 +388,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
... ... @@ -560,39 +430,38 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-YH_Analytics-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
CFE7AAB8C77E6363FDEAE73D /* [CP] Copy Pods Resources */ = {
ABA6D5B698AEEDF574A754A1 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YH_Analytics/Pods-YH_Analytics-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F010E50782901FA859C84CA5 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-YH_Analytics/Pods-YH_Analytics-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/YH_AFNetworking3/YH_AFNetworking3.framework",
"${BUILT_PRODUCTS_DIR}/YH_Analytics/YH_Analytics.framework",
"${BUILT_PRODUCTS_DIR}/YH_FoundationKit/YH_FoundationKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YH_AFNetworking3.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YH_Analytics.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YH_FoundationKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
... ... @@ -607,24 +476,8 @@
buildActionMask = 2147483647;
files = (
194EDC7C1A7F52D100421E6C /* ViewController.m in Sources */,
E7B8DE221A81D68600102CC4 /* NSString+YHAnalytics.m in Sources */,
E7B8DE4A1A81EE0A00102CC4 /* OpenUDID.m in Sources */,
E7ADAE3D1AB946C100C9DD0B /* YHEvent.m in Sources */,
194EDC9C1A7F555800421E6C /* YH_Analytics.m in Sources */,
CA5FDA2A1AEE302F00F86398 /* YHNetworkService.m in Sources */,
E7ADAE3E1AB946C100C9DD0B /* YHStatus.m in Sources */,
194EDC791A7F52D100421E6C /* AppDelegate.m in Sources */,
E7B8DE461A81ED8F00102CC4 /* YHNetworkUserAgent.m in Sources */,
E7B8DE521A823EEB00102CC4 /* YHCrashReporter.m in Sources */,
E7ADAE461AB9487A00C9DD0B /* YHAnalyItemData.m in Sources */,
E7A908731BB3C4B000E2EA39 /* YHPerformance.m in Sources */,
047381071EADEE970007E850 /* JTSHardwareInfo.m in Sources */,
E7ADAE3B1AB946C100C9DD0B /* YHDevice.m in Sources */,
E79828121AA6A5120035137C /* YH_KeychainStore.m in Sources */,
0928E56C1E8D3824008FD4F3 /* YHPatch.m in Sources */,
194EDC761A7F52D100421E6C /* main.m in Sources */,
E7ADAE5B1AB95BC800C9DD0B /* YHAssemblyAssistant.m in Sources */,
E7ADAE3C1AB946C100C9DD0B /* YHError.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
... ... @@ -767,8 +620,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = YH_Analytics/YH_Analytics.entitlements;
CODE_SIGN_IDENTITY = "iOS Development: Liu Cao (EX33S4LRW7)";
DEVELOPMENT_TEAM = 825DU77BWH;
CODE_SIGN_IDENTITY = "iPhone Developer: zhu xiaojun (B4EBXTP42C)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 6U82P566A4;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "YH_Analytics/YH_Analytics-Prefix.pch";
INFOPLIST_FILE = YH_Analytics/Info.plist;
... ... @@ -776,7 +630,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "13e30c3a-67d1-4e00-b10c-85696cf7575f";
PROVISIONING_PROFILE_SPECIFIER = EntDev;
PROVISIONING_PROFILE_SPECIFIER = "YohoTest:cn.yoho.test";
};
name = Debug;
};
... ... @@ -786,8 +640,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = YH_Analytics/YH_Analytics.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution: NewPower Co. (6U82P566A4)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: NewPower Co. (6U82P566A4)";
CODE_SIGN_IDENTITY = "iPhone Developer: zhu xiaojun (B4EBXTP42C)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: zhu xiaojun (B4EBXTP42C)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 6U82P566A4;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "YH_Analytics/YH_Analytics-Prefix.pch";
INFOPLIST_FILE = YH_Analytics/Info.plist;
... ... @@ -795,6 +651,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "YohoTest:cn.yoho.test";
};
name = Release;
};
... ...
... ... @@ -10,7 +10,10 @@
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
#import "OpenUDID.h"
#import "YHStatus.h"
#import "NSObject+YH_Foundation.h"
#import "YHAnalyticsMacro.h"
#define YHCarrierMCC @"460"
@interface YHStatus ()
... ... @@ -68,12 +71,9 @@
- (NSString *)ca
{
NSString *currentCa = kCarrierCodeChinaUnknown;
CTTelephonyNetworkInfo *netInfo = [[CTTelephonyNetworkInfo alloc] init];
CTCarrier *carrier = [netInfo subscriberCellularProvider];
NSString *const chinaMCC = @"460";
CTCarrier *carrier = [[CTTelephonyNetworkInfo yh_cachedInstance] subscriberCellularProvider];
if (carrier.mobileCountryCode) {
if ([carrier.mobileCountryCode isEqualToString:chinaMCC]) {
if ([carrier.mobileCountryCode isEqualToString:YHCarrierMCC]) {
NSArray *const chinaMobile = @[ @"00", @"02", @"07" , @"08"];// 中国移动
NSArray *const chinaUnicom = @[ @"01", @"06", @"09" ];// 中国联通
NSArray *const chinaTelecom = @[ @"03", @"05", @"11" ];// 中国电信
... ...
... ... @@ -27,10 +27,9 @@
- (NSString *)urlDecodedString
{
CFStringRef decodedCFString = CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
(__bridge CFStringRef) self,
CFSTR(""),
kCFStringEncodingUTF8);
CFStringRef decodedCFString = CFURLCreateStringByReplacingPercentEscapes(kCFAllocatorDefault,
(__bridge CFStringRef) self,
CFSTR(""));
// We need to replace "+" with " " because the CF method above doesn't do it
NSString *decodedString = [[NSString alloc] initWithString:(__bridge_transfer NSString*) decodedCFString];
... ...
... ... @@ -348,6 +348,7 @@ static dispatch_queue_t persisting_queue() {
if (itemData.dataType == YHItemDataTypeEvent) {
YHEvent *event = (YHEvent *)itemData;
if (event) {
[self updateImmediUploadDicStatus];
@synchronized(self.immediUploadItemDic) {
[self.immediUploadItemDic removeObjectForKey:JsonKeyDataTypePerfor];
[self.immediUploadItemDic removeObjectForKey:JsonKeyDataTypeErrors];
... ...