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
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 s.name = "YH_Analytics" 2 s.name = "YH_Analytics"
3 - s.version = "3.2.2" 3 + s.version = "3.2.3"
4 s.summary = "Analytics Kit" 4 s.summary = "Analytics Kit"
5 s.description = <<-DESC 5 s.description = <<-DESC
6 Analytics Kit 6 Analytics Kit
@@ -49,5 +49,6 @@ Pod::Spec.new do |s| @@ -49,5 +49,6 @@ Pod::Spec.new do |s|
49 end 49 end
50 50
51 s.frameworks = 'Foundation', 'CoreGraphics', 'UIKit' 51 s.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
52 - 52 + s.dependency 'YH_FoundationKit'
  53 + s.dependency 'YH_AFNetworking3'
53 end 54 end
1 platform :ios, '8.0' 1 platform :ios, '8.0'
2 inhibit_all_warnings! 2 inhibit_all_warnings!
3 -  
4 -pod 'YH_AFNetworking3', :git => 'http://git.yoho.cn/ios/YH_AFNetworking3.git', :tag => '3.1.2' 3 +use_frameworks!
  4 +source 'http://git.yoho.cn/ios/YHPodSpecs.git'
5 5
6 target 'YH_Analytics' do 6 target 'YH_Analytics' do
  7 + pod 'YH_Analytics', :path => '../'
7 8
8 end 9 end
1 PODS: 1 PODS:
2 - - YH_AFNetworking3 (3.1.2):  
3 - - YH_AFNetworking3/AFNetworking (= 3.1.2)  
4 - - YH_AFNetworking3/UIKit+AFNetworking (= 3.1.2)  
5 - - YH_AFNetworking3/Util (= 3.1.2)  
6 - - YH_AFNetworking3/AFNetworking (3.1.2)  
7 - - YH_AFNetworking3/UIKit+AFNetworking (3.1.2)  
8 - - YH_AFNetworking3/Util (3.1.2) 2 + - YH_AFNetworking3 (3.1.3):
  3 + - YH_AFNetworking3/AFNetworking (= 3.1.3)
  4 + - "YH_AFNetworking3/UIKit+AFNetworking (= 3.1.3)"
  5 + - YH_AFNetworking3/Util (= 3.1.3)
  6 + - YH_AFNetworking3/AFNetworking (3.1.3)
  7 + - "YH_AFNetworking3/UIKit+AFNetworking (3.1.3)":
  8 + - YH_AFNetworking3/AFNetworking
  9 + - YH_AFNetworking3/Util (3.1.3)
  10 + - YH_Analytics (3.2.2):
  11 + - YH_AFNetworking3
  12 + - YH_Analytics/Factory (= 3.2.2)
  13 + - YH_Analytics/JTSHardwareInfo (= 3.2.2)
  14 + - YH_Analytics/KeychainStore (= 3.2.2)
  15 + - YH_Analytics/Model (= 3.2.2)
  16 + - YH_Analytics/OpenUDID (= 3.2.2)
  17 + - YH_Analytics/Utils (= 3.2.2)
  18 + - YH_FoundationKit
  19 + - YH_Analytics/Factory (3.2.2):
  20 + - YH_AFNetworking3
  21 + - YH_FoundationKit
  22 + - YH_Analytics/JTSHardwareInfo (3.2.2):
  23 + - YH_AFNetworking3
  24 + - YH_FoundationKit
  25 + - YH_Analytics/KeychainStore (3.2.2):
  26 + - YH_AFNetworking3
  27 + - YH_FoundationKit
  28 + - YH_Analytics/Model (3.2.2):
  29 + - YH_AFNetworking3
  30 + - YH_FoundationKit
  31 + - YH_Analytics/OpenUDID (3.2.2):
  32 + - YH_AFNetworking3
  33 + - YH_FoundationKit
  34 + - YH_Analytics/Utils (3.2.2):
  35 + - YH_AFNetworking3
  36 + - YH_FoundationKit
  37 + - YH_FoundationKit (0.1.7)
9 38
10 DEPENDENCIES: 39 DEPENDENCIES:
11 - - YH_AFNetworking3 (from `http://git.yoho.cn/ios/YH_AFNetworking3.git`, tag `3.1.2`) 40 + - YH_Analytics (from `../`)
12 41
13 -EXTERNAL SOURCES:  
14 - YH_AFNetworking3:  
15 - :git: http://git.yoho.cn/ios/YH_AFNetworking3.git  
16 - :tag: 3.1.2 42 +SPEC REPOS:
  43 + http://git.yoho.cn/ios/YHPodSpecs.git:
  44 + - YH_AFNetworking3
  45 + - YH_FoundationKit
17 46
18 -CHECKOUT OPTIONS:  
19 - YH_AFNetworking3:  
20 - :git: http://git.yoho.cn/ios/YH_AFNetworking3.git  
21 - :tag: 3.1.2 47 +EXTERNAL SOURCES:
  48 + YH_Analytics:
  49 + :path: "../"
22 50
23 SPEC CHECKSUMS: 51 SPEC CHECKSUMS:
24 - YH_AFNetworking3: c445920bbb04de480a9c726709b7e714d71f88cc 52 + YH_AFNetworking3: d488eddd8657d13d5d2bd23b24f91f98d03673d5
  53 + YH_Analytics: 73ecfeaff81ea1f475d0dcdfe367132c1dd729cc
  54 + YH_FoundationKit: dec596fc75984f13507ca8322ced09916c137b39
25 55
26 -PODFILE CHECKSUM: f2c78ffec27094bdb5fd5b429d9ff577acf9c965 56 +PODFILE CHECKSUM: a2c78d53ac03c2a682ced3554ca81073b94bb5c2
27 57
28 -COCOAPODS: 1.2.0 58 +COCOAPODS: 1.5.3
@@ -7,8 +7,6 @@ @@ -7,8 +7,6 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 - 047381071EADEE970007E850 /* JTSHardwareInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 047381061EADEE970007E850 /* JTSHardwareInfo.m */; };  
11 - 0928E56C1E8D3824008FD4F3 /* YHPatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 0928E56B1E8D3824008FD4F3 /* YHPatch.m */; };  
12 194EDC761A7F52D100421E6C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC751A7F52D100421E6C /* main.m */; }; 10 194EDC761A7F52D100421E6C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC751A7F52D100421E6C /* main.m */; };
13 194EDC791A7F52D100421E6C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC781A7F52D100421E6C /* AppDelegate.m */; }; 11 194EDC791A7F52D100421E6C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC781A7F52D100421E6C /* AppDelegate.m */; };
14 194EDC7C1A7F52D100421E6C /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC7B1A7F52D100421E6C /* ViewController.m */; }; 12 194EDC7C1A7F52D100421E6C /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC7B1A7F52D100421E6C /* ViewController.m */; };
@@ -16,9 +14,7 @@ @@ -16,9 +14,7 @@
16 194EDC811A7F52D100421E6C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 194EDC801A7F52D100421E6C /* Images.xcassets */; }; 14 194EDC811A7F52D100421E6C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 194EDC801A7F52D100421E6C /* Images.xcassets */; };
17 194EDC841A7F52D100421E6C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 194EDC821A7F52D100421E6C /* LaunchScreen.xib */; }; 15 194EDC841A7F52D100421E6C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 194EDC821A7F52D100421E6C /* LaunchScreen.xib */; };
18 194EDC901A7F52D100421E6C /* YH_AnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC8F1A7F52D100421E6C /* YH_AnalyticsTests.m */; }; 16 194EDC901A7F52D100421E6C /* YH_AnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC8F1A7F52D100421E6C /* YH_AnalyticsTests.m */; };
19 - 194EDC9C1A7F555800421E6C /* YH_Analytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 194EDC9B1A7F555800421E6C /* YH_Analytics.m */; };  
20 - B10A8EED55A3226B91CC803D /* libPods-YH_Analytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46590AE242F3394FB3B95EC4 /* libPods-YH_Analytics.a */; };  
21 - CA5FDA2A1AEE302F00F86398 /* YHNetworkService.m in Sources */ = {isa = PBXBuildFile; fileRef = CA5FDA291AEE302F00F86398 /* YHNetworkService.m */; }; 17 + 308D3CBEAA0319FD10CC12EC /* Pods_YH_Analytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCD3604C6621E1CB72229F0D /* Pods_YH_Analytics.framework */; };
22 CA7AC7831ADE06F300F30791 /* YHCrashReporterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7821ADE06F300F30791 /* YHCrashReporterTests.m */; }; 18 CA7AC7831ADE06F300F30791 /* YHCrashReporterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7821ADE06F300F30791 /* YHCrashReporterTests.m */; };
23 CA7AC7851ADE073200F30791 /* NSString+YHAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7841ADE073200F30791 /* NSString+YHAnalyticsTests.m */; }; 19 CA7AC7851ADE073200F30791 /* NSString+YHAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7841ADE073200F30791 /* NSString+YHAnalyticsTests.m */; };
24 CA7AC7891ADE078200F30791 /* YHAssemblyAssistantTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7881ADE078200F30791 /* YHAssemblyAssistantTests.m */; }; 20 CA7AC7891ADE078200F30791 /* YHAssemblyAssistantTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7AC7881ADE078200F30791 /* YHAssemblyAssistantTests.m */; };
@@ -39,19 +35,7 @@ @@ -39,19 +35,7 @@
39 CAA6BD371AE4E857006C3332 /* FakeLocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA6BD361AE4E857006C3332 /* FakeLocationManager.m */; }; 35 CAA6BD371AE4E857006C3332 /* FakeLocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA6BD361AE4E857006C3332 /* FakeLocationManager.m */; };
40 CAA6BD3E1AE79ECC006C3332 /* YHAssemblyAssistantLogicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA6BD3D1AE79ECC006C3332 /* YHAssemblyAssistantLogicTests.m */; }; 36 CAA6BD3E1AE79ECC006C3332 /* YHAssemblyAssistantLogicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA6BD3D1AE79ECC006C3332 /* YHAssemblyAssistantLogicTests.m */; };
41 CABC32831AD7CEB8002A4260 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CABC32821AD7CEB8002A4260 /* libOCMock.a */; }; 37 CABC32831AD7CEB8002A4260 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CABC32821AD7CEB8002A4260 /* libOCMock.a */; };
42 - E79828121AA6A5120035137C /* YH_KeychainStore.m in Sources */ = {isa = PBXBuildFile; fileRef = E79828101AA6A5120035137C /* YH_KeychainStore.m */; };  
43 - E7A908731BB3C4B000E2EA39 /* YHPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = E7A908721BB3C4B000E2EA39 /* YHPerformance.m */; };  
44 - E7ADAE3B1AB946C100C9DD0B /* YHDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE341AB946C100C9DD0B /* YHDevice.m */; };  
45 - E7ADAE3C1AB946C100C9DD0B /* YHError.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE361AB946C100C9DD0B /* YHError.m */; };  
46 - E7ADAE3D1AB946C100C9DD0B /* YHEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE381AB946C100C9DD0B /* YHEvent.m */; };  
47 - E7ADAE3E1AB946C100C9DD0B /* YHStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE3A1AB946C100C9DD0B /* YHStatus.m */; };  
48 - E7ADAE461AB9487A00C9DD0B /* YHAnalyItemData.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE451AB9487A00C9DD0B /* YHAnalyItemData.m */; };  
49 - E7ADAE5B1AB95BC800C9DD0B /* YHAssemblyAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ADAE5A1AB95BC800C9DD0B /* YHAssemblyAssistant.m */; };  
50 - E7B8DE221A81D68600102CC4 /* NSString+YHAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE211A81D68600102CC4 /* NSString+YHAnalytics.m */; };  
51 - E7B8DE461A81ED8F00102CC4 /* YHNetworkUserAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE451A81ED8F00102CC4 /* YHNetworkUserAgent.m */; };  
52 - E7B8DE4A1A81EE0A00102CC4 /* OpenUDID.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE491A81EE0A00102CC4 /* OpenUDID.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };  
53 E7B8DE4C1A81F25E00102CC4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE4B1A81F25E00102CC4 /* CoreGraphics.framework */; }; 38 E7B8DE4C1A81F25E00102CC4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE4B1A81F25E00102CC4 /* CoreGraphics.framework */; };
54 - E7B8DE521A823EEB00102CC4 /* YHCrashReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B8DE511A823EEB00102CC4 /* YHCrashReporter.m */; };  
55 E7B8DE571A8343D200102CC4 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE561A8343D200102CC4 /* CoreLocation.framework */; }; 39 E7B8DE571A8343D200102CC4 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE561A8343D200102CC4 /* CoreLocation.framework */; };
56 E7B8DE5E1A836F8700102CC4 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE5D1A836F8700102CC4 /* CoreTelephony.framework */; }; 40 E7B8DE5E1A836F8700102CC4 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE5D1A836F8700102CC4 /* CoreTelephony.framework */; };
57 E7B8DE621A838EC200102CC4 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE611A838EC200102CC4 /* AdSupport.framework */; }; 41 E7B8DE621A838EC200102CC4 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B8DE611A838EC200102CC4 /* AdSupport.framework */; };
@@ -81,10 +65,6 @@ @@ -81,10 +65,6 @@
81 /* End PBXCopyFilesBuildPhase section */ 65 /* End PBXCopyFilesBuildPhase section */
82 66
83 /* Begin PBXFileReference section */ 67 /* Begin PBXFileReference section */
84 - 047381051EADEE970007E850 /* JTSHardwareInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JTSHardwareInfo.h; sourceTree = "<group>"; };  
85 - 047381061EADEE970007E850 /* JTSHardwareInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JTSHardwareInfo.m; sourceTree = "<group>"; };  
86 - 0928E56A1E8D3824008FD4F3 /* YHPatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHPatch.h; sourceTree = "<group>"; };  
87 - 0928E56B1E8D3824008FD4F3 /* YHPatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHPatch.m; sourceTree = "<group>"; };  
88 194EDC701A7F52D100421E6C /* YH_Analytics.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YH_Analytics.app; sourceTree = BUILT_PRODUCTS_DIR; }; 68 194EDC701A7F52D100421E6C /* YH_Analytics.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YH_Analytics.app; sourceTree = BUILT_PRODUCTS_DIR; };
89 194EDC741A7F52D100421E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 69 194EDC741A7F52D100421E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
90 194EDC751A7F52D100421E6C /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 70 194EDC751A7F52D100421E6C /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -98,13 +78,8 @@ @@ -98,13 +78,8 @@
98 194EDC891A7F52D100421E6C /* YH_AnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YH_AnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 78 194EDC891A7F52D100421E6C /* YH_AnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YH_AnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
99 194EDC8E1A7F52D100421E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 79 194EDC8E1A7F52D100421E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
100 194EDC8F1A7F52D100421E6C /* YH_AnalyticsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YH_AnalyticsTests.m; sourceTree = "<group>"; }; 80 194EDC8F1A7F52D100421E6C /* YH_AnalyticsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YH_AnalyticsTests.m; sourceTree = "<group>"; };
101 - 194EDC9A1A7F555800421E6C /* YH_Analytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YH_Analytics.h; sourceTree = "<group>"; };  
102 - 194EDC9B1A7F555800421E6C /* YH_Analytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_Analytics.m; sourceTree = "<group>"; };  
103 - 46590AE242F3394FB3B95EC4 /* libPods-YH_Analytics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-YH_Analytics.a"; sourceTree = BUILT_PRODUCTS_DIR; };  
104 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>"; }; 81 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>"; };
105 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>"; }; 82 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>"; };
106 - CA5FDA281AEE302F00F86398 /* YHNetworkService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHNetworkService.h; sourceTree = "<group>"; };  
107 - CA5FDA291AEE302F00F86398 /* YHNetworkService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkService.m; sourceTree = "<group>"; };  
108 CA7AC7821ADE06F300F30791 /* YHCrashReporterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHCrashReporterTests.m; sourceTree = "<group>"; }; 83 CA7AC7821ADE06F300F30791 /* YHCrashReporterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHCrashReporterTests.m; sourceTree = "<group>"; };
109 CA7AC7841ADE073200F30791 /* NSString+YHAnalyticsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+YHAnalyticsTests.m"; sourceTree = "<group>"; }; 84 CA7AC7841ADE073200F30791 /* NSString+YHAnalyticsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+YHAnalyticsTests.m"; sourceTree = "<group>"; };
110 CA7AC7881ADE078200F30791 /* YHAssemblyAssistantTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAssemblyAssistantTests.m; sourceTree = "<group>"; }; 85 CA7AC7881ADE078200F30791 /* YHAssemblyAssistantTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAssemblyAssistantTests.m; sourceTree = "<group>"; };
@@ -121,7 +96,6 @@ @@ -121,7 +96,6 @@
121 CA7AC7A11ADE0C6600F30791 /* YHStatusFactoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHStatusFactoryTests.m; sourceTree = "<group>"; }; 96 CA7AC7A11ADE0C6600F30791 /* YHStatusFactoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHStatusFactoryTests.m; sourceTree = "<group>"; };
122 CA7AC7A31ADF9FCB00F30791 /* YH_AnalyticsLogicTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_AnalyticsLogicTests.m; sourceTree = "<group>"; }; 97 CA7AC7A31ADF9FCB00F30791 /* YH_AnalyticsLogicTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_AnalyticsLogicTests.m; sourceTree = "<group>"; };
123 CA873DA91AEF51AE008095A4 /* YHNetworkServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkServiceTests.m; sourceTree = "<group>"; }; 98 CA873DA91AEF51AE008095A4 /* YHNetworkServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkServiceTests.m; sourceTree = "<group>"; };
124 - CA873DAB1AEF7059008095A4 /* YHAnalyticsMacro.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YHAnalyticsMacro.h; sourceTree = "<group>"; };  
125 CA873DAC1AEF7107008095A4 /* YH_Analytics-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YH_Analytics-Prefix.pch"; sourceTree = "<group>"; }; 99 CA873DAC1AEF7107008095A4 /* YH_Analytics-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YH_Analytics-Prefix.pch"; sourceTree = "<group>"; };
126 CA873DAD1AF08880008095A4 /* YH_AnalyticsTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YH_AnalyticsTests-Prefix.pch"; sourceTree = "<group>"; }; 100 CA873DAD1AF08880008095A4 /* YH_AnalyticsTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YH_AnalyticsTests-Prefix.pch"; sourceTree = "<group>"; };
127 CA873DAE1AF0A4F4008095A4 /* ViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerTests.m; sourceTree = "<group>"; }; 101 CA873DAE1AF0A4F4008095A4 /* ViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerTests.m; sourceTree = "<group>"; };
@@ -138,31 +112,8 @@ @@ -138,31 +112,8 @@
138 CABC32801AD7CE40002A4260 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; }; 112 CABC32801AD7CE40002A4260 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
139 CABC32811AD7CE40002A4260 /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = "<group>"; }; 113 CABC32811AD7CE40002A4260 /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = "<group>"; };
140 CABC32821AD7CEB8002A4260 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; }; 114 CABC32821AD7CEB8002A4260 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
141 - E798280F1AA6A5120035137C /* YH_KeychainStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YH_KeychainStore.h; sourceTree = "<group>"; };  
142 - E79828101AA6A5120035137C /* YH_KeychainStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YH_KeychainStore.m; sourceTree = "<group>"; };  
143 - E7A908711BB3C4B000E2EA39 /* YHPerformance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHPerformance.h; sourceTree = "<group>"; };  
144 - E7A908721BB3C4B000E2EA39 /* YHPerformance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHPerformance.m; sourceTree = "<group>"; };  
145 - E7ADAE331AB946C100C9DD0B /* YHDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHDevice.h; sourceTree = "<group>"; };  
146 - E7ADAE341AB946C100C9DD0B /* YHDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHDevice.m; sourceTree = "<group>"; };  
147 - E7ADAE351AB946C100C9DD0B /* YHError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHError.h; sourceTree = "<group>"; };  
148 - E7ADAE361AB946C100C9DD0B /* YHError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHError.m; sourceTree = "<group>"; };  
149 - E7ADAE371AB946C100C9DD0B /* YHEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHEvent.h; sourceTree = "<group>"; };  
150 - E7ADAE381AB946C100C9DD0B /* YHEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHEvent.m; sourceTree = "<group>"; };  
151 - E7ADAE391AB946C100C9DD0B /* YHStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHStatus.h; sourceTree = "<group>"; };  
152 - E7ADAE3A1AB946C100C9DD0B /* YHStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHStatus.m; sourceTree = "<group>"; };  
153 - E7ADAE441AB9487A00C9DD0B /* YHAnalyItemData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHAnalyItemData.h; sourceTree = "<group>"; };  
154 - E7ADAE451AB9487A00C9DD0B /* YHAnalyItemData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAnalyItemData.m; sourceTree = "<group>"; };  
155 - E7ADAE591AB95BC800C9DD0B /* YHAssemblyAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHAssemblyAssistant.h; sourceTree = "<group>"; };  
156 - E7ADAE5A1AB95BC800C9DD0B /* YHAssemblyAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHAssemblyAssistant.m; sourceTree = "<group>"; };  
157 - E7B8DE201A81D68600102CC4 /* NSString+YHAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+YHAnalytics.h"; path = "../NSString+YHAnalytics.h"; sourceTree = "<group>"; };  
158 - E7B8DE211A81D68600102CC4 /* NSString+YHAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+YHAnalytics.m"; path = "../NSString+YHAnalytics.m"; sourceTree = "<group>"; };  
159 - E7B8DE441A81ED8F00102CC4 /* YHNetworkUserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHNetworkUserAgent.h; sourceTree = "<group>"; };  
160 - E7B8DE451A81ED8F00102CC4 /* YHNetworkUserAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHNetworkUserAgent.m; sourceTree = "<group>"; };  
161 - E7B8DE481A81EE0A00102CC4 /* OpenUDID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenUDID.h; sourceTree = "<group>"; };  
162 - E7B8DE491A81EE0A00102CC4 /* OpenUDID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenUDID.m; sourceTree = "<group>"; }; 115 + CCD3604C6621E1CB72229F0D /* Pods_YH_Analytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YH_Analytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
163 E7B8DE4B1A81F25E00102CC4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 116 E7B8DE4B1A81F25E00102CC4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
164 - E7B8DE501A823EEB00102CC4 /* YHCrashReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YHCrashReporter.h; sourceTree = "<group>"; };  
165 - E7B8DE511A823EEB00102CC4 /* YHCrashReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YHCrashReporter.m; sourceTree = "<group>"; };  
166 E7B8DE561A8343D200102CC4 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 117 E7B8DE561A8343D200102CC4 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
167 E7B8DE5A1A83551300102CC4 /* YH_Analytics.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = YH_Analytics.entitlements; sourceTree = "<group>"; }; 118 E7B8DE5A1A83551300102CC4 /* YH_Analytics.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = YH_Analytics.entitlements; sourceTree = "<group>"; };
168 E7B8DE5D1A836F8700102CC4 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; 119 E7B8DE5D1A836F8700102CC4 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
@@ -178,7 +129,7 @@ @@ -178,7 +129,7 @@
178 E7B8DE5E1A836F8700102CC4 /* CoreTelephony.framework in Frameworks */, 129 E7B8DE5E1A836F8700102CC4 /* CoreTelephony.framework in Frameworks */,
179 E7B8DE571A8343D200102CC4 /* CoreLocation.framework in Frameworks */, 130 E7B8DE571A8343D200102CC4 /* CoreLocation.framework in Frameworks */,
180 E7B8DE4C1A81F25E00102CC4 /* CoreGraphics.framework in Frameworks */, 131 E7B8DE4C1A81F25E00102CC4 /* CoreGraphics.framework in Frameworks */,
181 - B10A8EED55A3226B91CC803D /* libPods-YH_Analytics.a in Frameworks */, 132 + 308D3CBEAA0319FD10CC12EC /* Pods_YH_Analytics.framework in Frameworks */,
182 ); 133 );
183 runOnlyForDeploymentPostprocessing = 0; 134 runOnlyForDeploymentPostprocessing = 0;
184 }; 135 };
@@ -193,15 +144,6 @@ @@ -193,15 +144,6 @@
193 /* End PBXFrameworksBuildPhase section */ 144 /* End PBXFrameworksBuildPhase section */
194 145
195 /* Begin PBXGroup section */ 146 /* Begin PBXGroup section */
196 - 047381041EADEE970007E850 /* JTSHardwareInfo */ = {  
197 - isa = PBXGroup;  
198 - children = (  
199 - 047381051EADEE970007E850 /* JTSHardwareInfo.h */,  
200 - 047381061EADEE970007E850 /* JTSHardwareInfo.m */,  
201 - );  
202 - path = JTSHardwareInfo;  
203 - sourceTree = "<group>";  
204 - };  
205 194EDC671A7F52D100421E6C = { 147 194EDC671A7F52D100421E6C = {
206 isa = PBXGroup; 148 isa = PBXGroup;
207 children = ( 149 children = (
@@ -228,7 +170,6 @@ @@ -228,7 +170,6 @@
228 isa = PBXGroup; 170 isa = PBXGroup;
229 children = ( 171 children = (
230 E7B8DE5A1A83551300102CC4 /* YH_Analytics.entitlements */, 172 E7B8DE5A1A83551300102CC4 /* YH_Analytics.entitlements */,
231 - 194EDC991A7F553600421E6C /* YH_Analytics */,  
232 194EDC771A7F52D100421E6C /* AppDelegate.h */, 173 194EDC771A7F52D100421E6C /* AppDelegate.h */,
233 194EDC781A7F52D100421E6C /* AppDelegate.m */, 174 194EDC781A7F52D100421E6C /* AppDelegate.m */,
234 194EDC7A1A7F52D100421E6C /* ViewController.h */, 175 194EDC7A1A7F52D100421E6C /* ViewController.h */,
@@ -275,23 +216,10 @@ @@ -275,23 +216,10 @@
275 name = "Supporting Files"; 216 name = "Supporting Files";
276 sourceTree = "<group>"; 217 sourceTree = "<group>";
277 }; 218 };
278 - 194EDC991A7F553600421E6C /* YH_Analytics */ = {  
279 - isa = PBXGroup;  
280 - children = (  
281 - E7ADAE321AB946C100C9DD0B /* Model */,  
282 - E7B8DE431A81ED8F00102CC4 /* Utils */,  
283 - E7B8DE261A81DCBD00102CC4 /* YHAnalyticsDependencies */,  
284 - 194EDC9A1A7F555800421E6C /* YH_Analytics.h */,  
285 - 194EDC9B1A7F555800421E6C /* YH_Analytics.m */,  
286 - CA873DAB1AEF7059008095A4 /* YHAnalyticsMacro.h */,  
287 - );  
288 - path = YH_Analytics;  
289 - sourceTree = "<group>";  
290 - };  
291 99A449088060DBE87FAE4D3E /* Frameworks */ = { 219 99A449088060DBE87FAE4D3E /* Frameworks */ = {
292 isa = PBXGroup; 220 isa = PBXGroup;
293 children = ( 221 children = (
294 - 46590AE242F3394FB3B95EC4 /* libPods-YH_Analytics.a */, 222 + CCD3604C6621E1CB72229F0D /* Pods_YH_Analytics.framework */,
295 ); 223 );
296 name = Frameworks; 224 name = Frameworks;
297 sourceTree = "<group>"; 225 sourceTree = "<group>";
@@ -376,64 +304,6 @@ @@ -376,64 +304,6 @@
376 path = OCMock; 304 path = OCMock;
377 sourceTree = "<group>"; 305 sourceTree = "<group>";
378 }; 306 };
379 - E7ADAE321AB946C100C9DD0B /* Model */ = {  
380 - isa = PBXGroup;  
381 - children = (  
382 - E7ADAE441AB9487A00C9DD0B /* YHAnalyItemData.h */,  
383 - E7ADAE451AB9487A00C9DD0B /* YHAnalyItemData.m */,  
384 - E7ADAE331AB946C100C9DD0B /* YHDevice.h */,  
385 - E7ADAE341AB946C100C9DD0B /* YHDevice.m */,  
386 - E7ADAE351AB946C100C9DD0B /* YHError.h */,  
387 - E7ADAE361AB946C100C9DD0B /* YHError.m */,  
388 - E7ADAE371AB946C100C9DD0B /* YHEvent.h */,  
389 - E7ADAE381AB946C100C9DD0B /* YHEvent.m */,  
390 - 0928E56A1E8D3824008FD4F3 /* YHPatch.h */,  
391 - 0928E56B1E8D3824008FD4F3 /* YHPatch.m */,  
392 - E7A908711BB3C4B000E2EA39 /* YHPerformance.h */,  
393 - E7A908721BB3C4B000E2EA39 /* YHPerformance.m */,  
394 - E7ADAE391AB946C100C9DD0B /* YHStatus.h */,  
395 - E7ADAE3A1AB946C100C9DD0B /* YHStatus.m */,  
396 - );  
397 - path = Model;  
398 - sourceTree = "<group>";  
399 - };  
400 - E7B8DE261A81DCBD00102CC4 /* YHAnalyticsDependencies */ = {  
401 - isa = PBXGroup;  
402 - children = (  
403 - 047381041EADEE970007E850 /* JTSHardwareInfo */,  
404 - E7B8DE471A81EE0A00102CC4 /* OpenUDID */,  
405 - );  
406 - path = YHAnalyticsDependencies;  
407 - sourceTree = "<group>";  
408 - };  
409 - E7B8DE431A81ED8F00102CC4 /* Utils */ = {  
410 - isa = PBXGroup;  
411 - children = (  
412 - E7B8DE201A81D68600102CC4 /* NSString+YHAnalytics.h */,  
413 - E7B8DE211A81D68600102CC4 /* NSString+YHAnalytics.m */,  
414 - E7B8DE501A823EEB00102CC4 /* YHCrashReporter.h */,  
415 - E7B8DE511A823EEB00102CC4 /* YHCrashReporter.m */,  
416 - E7B8DE441A81ED8F00102CC4 /* YHNetworkUserAgent.h */,  
417 - E7B8DE451A81ED8F00102CC4 /* YHNetworkUserAgent.m */,  
418 - E7ADAE591AB95BC800C9DD0B /* YHAssemblyAssistant.h */,  
419 - E7ADAE5A1AB95BC800C9DD0B /* YHAssemblyAssistant.m */,  
420 - CA5FDA281AEE302F00F86398 /* YHNetworkService.h */,  
421 - CA5FDA291AEE302F00F86398 /* YHNetworkService.m */,  
422 - );  
423 - path = Utils;  
424 - sourceTree = "<group>";  
425 - };  
426 - E7B8DE471A81EE0A00102CC4 /* OpenUDID */ = {  
427 - isa = PBXGroup;  
428 - children = (  
429 - E7B8DE481A81EE0A00102CC4 /* OpenUDID.h */,  
430 - E7B8DE491A81EE0A00102CC4 /* OpenUDID.m */,  
431 - E798280F1AA6A5120035137C /* YH_KeychainStore.h */,  
432 - E79828101AA6A5120035137C /* YH_KeychainStore.m */,  
433 - );  
434 - path = OpenUDID;  
435 - sourceTree = "<group>";  
436 - };  
437 E7B8DE631A839C7700102CC4 /* Framework */ = { 307 E7B8DE631A839C7700102CC4 /* Framework */ = {
438 isa = PBXGroup; 308 isa = PBXGroup;
439 children = ( 309 children = (
@@ -457,8 +327,7 @@ @@ -457,8 +327,7 @@
457 194EDC6D1A7F52D100421E6C /* Frameworks */, 327 194EDC6D1A7F52D100421E6C /* Frameworks */,
458 194EDC6E1A7F52D100421E6C /* Resources */, 328 194EDC6E1A7F52D100421E6C /* Resources */,
459 E7E311CB1A84C6DF004DB7DF /* Embed Frameworks */, 329 E7E311CB1A84C6DF004DB7DF /* Embed Frameworks */,
460 - F010E50782901FA859C84CA5 /* [CP] Embed Pods Frameworks */,  
461 - CFE7AAB8C77E6363FDEAE73D /* [CP] Copy Pods Resources */, 330 + ABA6D5B698AEEDF574A754A1 /* [CP] Embed Pods Frameworks */,
462 ); 331 );
463 buildRules = ( 332 buildRules = (
464 ); 333 );
@@ -498,7 +367,7 @@ @@ -498,7 +367,7 @@
498 TargetAttributes = { 367 TargetAttributes = {
499 194EDC6F1A7F52D100421E6C = { 368 194EDC6F1A7F52D100421E6C = {
500 CreatedOnToolsVersion = 6.1.1; 369 CreatedOnToolsVersion = 6.1.1;
501 - DevelopmentTeam = 825DU77BWH; 370 + DevelopmentTeam = 6U82P566A4;
502 SystemCapabilities = { 371 SystemCapabilities = {
503 com.apple.ApplicationGroups.iOS = { 372 com.apple.ApplicationGroups.iOS = {
504 enabled = 0; 373 enabled = 0;
@@ -519,6 +388,7 @@ @@ -519,6 +388,7 @@
519 developmentRegion = English; 388 developmentRegion = English;
520 hasScannedForEncodings = 0; 389 hasScannedForEncodings = 0;
521 knownRegions = ( 390 knownRegions = (
  391 + English,
522 en, 392 en,
523 Base, 393 Base,
524 ); 394 );
@@ -560,39 +430,38 @@ @@ -560,39 +430,38 @@
560 files = ( 430 files = (
561 ); 431 );
562 inputPaths = ( 432 inputPaths = (
  433 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  434 + "${PODS_ROOT}/Manifest.lock",
563 ); 435 );
564 name = "[CP] Check Pods Manifest.lock"; 436 name = "[CP] Check Pods Manifest.lock";
565 outputPaths = ( 437 outputPaths = (
  438 + "$(DERIVED_FILE_DIR)/Pods-YH_Analytics-checkManifestLockResult.txt",
566 ); 439 );
567 runOnlyForDeploymentPostprocessing = 0; 440 runOnlyForDeploymentPostprocessing = 0;
568 shellPath = /bin/sh; 441 shellPath = /bin/sh;
569 - 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"; 442 + 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";
570 showEnvVarsInLog = 0; 443 showEnvVarsInLog = 0;
571 }; 444 };
572 - CFE7AAB8C77E6363FDEAE73D /* [CP] Copy Pods Resources */ = { 445 + ABA6D5B698AEEDF574A754A1 /* [CP] Embed Pods Frameworks */ = {
573 isa = PBXShellScriptBuildPhase; 446 isa = PBXShellScriptBuildPhase;
574 buildActionMask = 2147483647; 447 buildActionMask = 2147483647;
575 files = ( 448 files = (
576 ); 449 );
577 - inputPaths = (  
578 - );  
579 - name = "[CP] Copy Pods Resources";  
580 - outputPaths = (  
581 - );  
582 - runOnlyForDeploymentPostprocessing = 0;  
583 - shellPath = /bin/sh;  
584 - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YH_Analytics/Pods-YH_Analytics-resources.sh\"\n";  
585 - showEnvVarsInLog = 0;  
586 - };  
587 - F010E50782901FA859C84CA5 /* [CP] Embed Pods Frameworks */ = {  
588 - isa = PBXShellScriptBuildPhase;  
589 - buildActionMask = 2147483647;  
590 - files = ( 450 + inputFileListPaths = (
591 ); 451 );
592 inputPaths = ( 452 inputPaths = (
  453 + "${SRCROOT}/Pods/Target Support Files/Pods-YH_Analytics/Pods-YH_Analytics-frameworks.sh",
  454 + "${BUILT_PRODUCTS_DIR}/YH_AFNetworking3/YH_AFNetworking3.framework",
  455 + "${BUILT_PRODUCTS_DIR}/YH_Analytics/YH_Analytics.framework",
  456 + "${BUILT_PRODUCTS_DIR}/YH_FoundationKit/YH_FoundationKit.framework",
593 ); 457 );
594 name = "[CP] Embed Pods Frameworks"; 458 name = "[CP] Embed Pods Frameworks";
  459 + outputFileListPaths = (
  460 + );
595 outputPaths = ( 461 outputPaths = (
  462 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YH_AFNetworking3.framework",
  463 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YH_Analytics.framework",
  464 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YH_FoundationKit.framework",
596 ); 465 );
597 runOnlyForDeploymentPostprocessing = 0; 466 runOnlyForDeploymentPostprocessing = 0;
598 shellPath = /bin/sh; 467 shellPath = /bin/sh;
@@ -607,24 +476,8 @@ @@ -607,24 +476,8 @@
607 buildActionMask = 2147483647; 476 buildActionMask = 2147483647;
608 files = ( 477 files = (
609 194EDC7C1A7F52D100421E6C /* ViewController.m in Sources */, 478 194EDC7C1A7F52D100421E6C /* ViewController.m in Sources */,
610 - E7B8DE221A81D68600102CC4 /* NSString+YHAnalytics.m in Sources */,  
611 - E7B8DE4A1A81EE0A00102CC4 /* OpenUDID.m in Sources */,  
612 - E7ADAE3D1AB946C100C9DD0B /* YHEvent.m in Sources */,  
613 - 194EDC9C1A7F555800421E6C /* YH_Analytics.m in Sources */,  
614 - CA5FDA2A1AEE302F00F86398 /* YHNetworkService.m in Sources */,  
615 - E7ADAE3E1AB946C100C9DD0B /* YHStatus.m in Sources */,  
616 194EDC791A7F52D100421E6C /* AppDelegate.m in Sources */, 479 194EDC791A7F52D100421E6C /* AppDelegate.m in Sources */,
617 - E7B8DE461A81ED8F00102CC4 /* YHNetworkUserAgent.m in Sources */,  
618 - E7B8DE521A823EEB00102CC4 /* YHCrashReporter.m in Sources */,  
619 - E7ADAE461AB9487A00C9DD0B /* YHAnalyItemData.m in Sources */,  
620 - E7A908731BB3C4B000E2EA39 /* YHPerformance.m in Sources */,  
621 - 047381071EADEE970007E850 /* JTSHardwareInfo.m in Sources */,  
622 - E7ADAE3B1AB946C100C9DD0B /* YHDevice.m in Sources */,  
623 - E79828121AA6A5120035137C /* YH_KeychainStore.m in Sources */,  
624 - 0928E56C1E8D3824008FD4F3 /* YHPatch.m in Sources */,  
625 194EDC761A7F52D100421E6C /* main.m in Sources */, 480 194EDC761A7F52D100421E6C /* main.m in Sources */,
626 - E7ADAE5B1AB95BC800C9DD0B /* YHAssemblyAssistant.m in Sources */,  
627 - E7ADAE3C1AB946C100C9DD0B /* YHError.m in Sources */,  
628 ); 481 );
629 runOnlyForDeploymentPostprocessing = 0; 482 runOnlyForDeploymentPostprocessing = 0;
630 }; 483 };
@@ -767,8 +620,9 @@ @@ -767,8 +620,9 @@
767 buildSettings = { 620 buildSettings = {
768 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 621 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
769 CODE_SIGN_ENTITLEMENTS = YH_Analytics/YH_Analytics.entitlements; 622 CODE_SIGN_ENTITLEMENTS = YH_Analytics/YH_Analytics.entitlements;
770 - CODE_SIGN_IDENTITY = "iOS Development: Liu Cao (EX33S4LRW7)";  
771 - DEVELOPMENT_TEAM = 825DU77BWH; 623 + CODE_SIGN_IDENTITY = "iPhone Developer: zhu xiaojun (B4EBXTP42C)";
  624 + DEBUG_INFORMATION_FORMAT = dwarf;
  625 + DEVELOPMENT_TEAM = 6U82P566A4;
772 GCC_PRECOMPILE_PREFIX_HEADER = YES; 626 GCC_PRECOMPILE_PREFIX_HEADER = YES;
773 GCC_PREFIX_HEADER = "YH_Analytics/YH_Analytics-Prefix.pch"; 627 GCC_PREFIX_HEADER = "YH_Analytics/YH_Analytics-Prefix.pch";
774 INFOPLIST_FILE = YH_Analytics/Info.plist; 628 INFOPLIST_FILE = YH_Analytics/Info.plist;
@@ -776,7 +630,7 @@ @@ -776,7 +630,7 @@
776 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 630 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
777 PRODUCT_NAME = "$(TARGET_NAME)"; 631 PRODUCT_NAME = "$(TARGET_NAME)";
778 PROVISIONING_PROFILE = "13e30c3a-67d1-4e00-b10c-85696cf7575f"; 632 PROVISIONING_PROFILE = "13e30c3a-67d1-4e00-b10c-85696cf7575f";
779 - PROVISIONING_PROFILE_SPECIFIER = EntDev; 633 + PROVISIONING_PROFILE_SPECIFIER = "YohoTest:cn.yoho.test";
780 }; 634 };
781 name = Debug; 635 name = Debug;
782 }; 636 };
@@ -786,8 +640,10 @@ @@ -786,8 +640,10 @@
786 buildSettings = { 640 buildSettings = {
787 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 641 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
788 CODE_SIGN_ENTITLEMENTS = YH_Analytics/YH_Analytics.entitlements; 642 CODE_SIGN_ENTITLEMENTS = YH_Analytics/YH_Analytics.entitlements;
789 - CODE_SIGN_IDENTITY = "iPhone Distribution: NewPower Co. (6U82P566A4)";  
790 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: NewPower Co. (6U82P566A4)"; 643 + CODE_SIGN_IDENTITY = "iPhone Developer: zhu xiaojun (B4EBXTP42C)";
  644 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: zhu xiaojun (B4EBXTP42C)";
  645 + DEBUG_INFORMATION_FORMAT = dwarf;
  646 + DEVELOPMENT_TEAM = 6U82P566A4;
791 GCC_PRECOMPILE_PREFIX_HEADER = YES; 647 GCC_PRECOMPILE_PREFIX_HEADER = YES;
792 GCC_PREFIX_HEADER = "YH_Analytics/YH_Analytics-Prefix.pch"; 648 GCC_PREFIX_HEADER = "YH_Analytics/YH_Analytics-Prefix.pch";
793 INFOPLIST_FILE = YH_Analytics/Info.plist; 649 INFOPLIST_FILE = YH_Analytics/Info.plist;
@@ -795,6 +651,7 @@ @@ -795,6 +651,7 @@
795 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 651 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
796 PRODUCT_NAME = "$(TARGET_NAME)"; 652 PRODUCT_NAME = "$(TARGET_NAME)";
797 PROVISIONING_PROFILE = ""; 653 PROVISIONING_PROFILE = "";
  654 + PROVISIONING_PROFILE_SPECIFIER = "YohoTest:cn.yoho.test";
798 }; 655 };
799 name = Release; 656 name = Release;
800 }; 657 };
@@ -10,7 +10,10 @@ @@ -10,7 +10,10 @@
10 #import <CoreTelephony/CTTelephonyNetworkInfo.h> 10 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
11 #import "OpenUDID.h" 11 #import "OpenUDID.h"
12 #import "YHStatus.h" 12 #import "YHStatus.h"
  13 +#import "NSObject+YH_Foundation.h"
  14 +#import "YHAnalyticsMacro.h"
13 15
  16 +#define YHCarrierMCC @"460"
14 17
15 @interface YHStatus () 18 @interface YHStatus ()
16 19
@@ -68,12 +71,9 @@ @@ -68,12 +71,9 @@
68 - (NSString *)ca 71 - (NSString *)ca
69 { 72 {
70 NSString *currentCa = kCarrierCodeChinaUnknown; 73 NSString *currentCa = kCarrierCodeChinaUnknown;
71 - CTTelephonyNetworkInfo *netInfo = [[CTTelephonyNetworkInfo alloc] init];  
72 - CTCarrier *carrier = [netInfo subscriberCellularProvider];  
73 - NSString *const chinaMCC = @"460";  
74 - 74 + CTCarrier *carrier = [[CTTelephonyNetworkInfo yh_cachedInstance] subscriberCellularProvider];
75 if (carrier.mobileCountryCode) { 75 if (carrier.mobileCountryCode) {
76 - if ([carrier.mobileCountryCode isEqualToString:chinaMCC]) { 76 + if ([carrier.mobileCountryCode isEqualToString:YHCarrierMCC]) {
77 NSArray *const chinaMobile = @[ @"00", @"02", @"07" , @"08"];// 中国移动 77 NSArray *const chinaMobile = @[ @"00", @"02", @"07" , @"08"];// 中国移动
78 NSArray *const chinaUnicom = @[ @"01", @"06", @"09" ];// 中国联通 78 NSArray *const chinaUnicom = @[ @"01", @"06", @"09" ];// 中国联通
79 NSArray *const chinaTelecom = @[ @"03", @"05", @"11" ];// 中国电信 79 NSArray *const chinaTelecom = @[ @"03", @"05", @"11" ];// 中国电信
@@ -27,10 +27,9 @@ @@ -27,10 +27,9 @@
27 27
28 - (NSString *)urlDecodedString 28 - (NSString *)urlDecodedString
29 { 29 {
30 - CFStringRef decodedCFString = CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,  
31 - (__bridge CFStringRef) self,  
32 - CFSTR(""),  
33 - kCFStringEncodingUTF8); 30 + CFStringRef decodedCFString = CFURLCreateStringByReplacingPercentEscapes(kCFAllocatorDefault,
  31 + (__bridge CFStringRef) self,
  32 + CFSTR(""));
34 33
35 // We need to replace "+" with " " because the CF method above doesn't do it 34 // We need to replace "+" with " " because the CF method above doesn't do it
36 NSString *decodedString = [[NSString alloc] initWithString:(__bridge_transfer NSString*) decodedCFString]; 35 NSString *decodedString = [[NSString alloc] initWithString:(__bridge_transfer NSString*) decodedCFString];
@@ -348,6 +348,7 @@ static dispatch_queue_t persisting_queue() { @@ -348,6 +348,7 @@ static dispatch_queue_t persisting_queue() {
348 if (itemData.dataType == YHItemDataTypeEvent) { 348 if (itemData.dataType == YHItemDataTypeEvent) {
349 YHEvent *event = (YHEvent *)itemData; 349 YHEvent *event = (YHEvent *)itemData;
350 if (event) { 350 if (event) {
  351 + [self updateImmediUploadDicStatus];
351 @synchronized(self.immediUploadItemDic) { 352 @synchronized(self.immediUploadItemDic) {
352 [self.immediUploadItemDic removeObjectForKey:JsonKeyDataTypePerfor]; 353 [self.immediUploadItemDic removeObjectForKey:JsonKeyDataTypePerfor];
353 [self.immediUploadItemDic removeObjectForKey:JsonKeyDataTypeErrors]; 354 [self.immediUploadItemDic removeObjectForKey:JsonKeyDataTypeErrors];