解决冲突

Example/GMPhobos/GMViewController.m

@@ -18,9 +18,19 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    
+
+#ifdef POD_CONFIGURATION_APP_STORE
+    NSString *url = @"http://log.gmei.com/log/collect";
+#elif POD_CONFIGURATION_UNIT_TEST
+    NSString *url = @"http://jaguar.gmei/log/collect";
+#else
+    NSString *url = @"http://log.test.gengmei.cc/log/collect";
+#endif
+
+    [Phobos sharedClient].serverAPI = url;
 }
 
+
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];

Example/Podfile.lock

 PODS:
   - GMCache (0.1.1):
     - TMCache (~> 2.1.0)
-  - GMPhobos (0.4.0):
+  - GMPhobos (0.4.1):
     - GMCache (~> 0.1.1)
   - TMCache (2.1.0)
 
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
-  GMPhobos: 911b4e3ee75b65dd1e3196a7d05e684134cee63d
+  GMPhobos: 2fd07df959c1c5f773a3e2355930fcbcf4ddf38c
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 PODFILE CHECKSUM: 281ed5ce2f0e8e2e49cc13b1e4726e6686ac6095

Example/Pods/Local Podspecs/GMPhobos.podspec.json

 {
   "name": "GMPhobos",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "summary": "GM statistic data sdk",
   "description": "GM event track sdk.",
   "homepage": "http://git.gengmei.cc/gengmeiios/GMPhobos",
@@ -10,7 +10,7 @@
   },
   "source": {
     "git": "git@git.gengmei.cc:gengmeiios/GMPhobos.git",
-    "tag": "0.4.0"
+    "tag": "0.4.1"
   },
   "platforms": {
     "ios": "8.0"

Example/Pods/Manifest.lock

 PODS:
   - GMCache (0.1.1):
     - TMCache (~> 2.1.0)
-  - GMPhobos (0.4.0):
+  - GMPhobos (0.4.1):
     - GMCache (~> 0.1.1)
   - TMCache (2.1.0)
 
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
-  GMPhobos: 911b4e3ee75b65dd1e3196a7d05e684134cee63d
+  GMPhobos: 2fd07df959c1c5f773a3e2355930fcbcf4ddf38c
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 PODFILE CHECKSUM: 281ed5ce2f0e8e2e49cc13b1e4726e6686ac6095

Example/Pods/Target Support Files/GMPhobos/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.4.0</string>
+  <string>0.4.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

GMPhobos.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "GMPhobos"
-  s.version          = "0.4.1"
+  s.version          = "0.4.2"
   s.summary          = "GM statistic data sdk"
 
   s.description      = <<-DESC

Pod/Classes/Phobos.h

@@ -76,6 +76,10 @@
  */
 @property (strong, nonatomic) NSMutableDictionary *userType;
 
+/**
+ 数据接收的服务器API
+ */
+@property (copy, nonatomic) NSString *serverAPI;
 #pragma mark - 事件采集
 
 /**

Pod/Classes/Phobos.m

@@ -52,6 +52,7 @@ static NSString *sdkVersion = @"110";
         _userId = 0;
         _netStatus = @"";
         _currentCityId = @"";
+        _serverAPI = @"";
         _userType = [[NSMutableDictionary alloc] initWithCapacity:0];
         _appVersion = [PhobosUtil getAppVersion];
         [self setupNotification];
@@ -156,8 +157,6 @@ static NSString *sdkVersion = @"110";
 /**
  *  @brief 应用打开时的处理
  *
- *  @param sender
- *
  *  @since 0.0.1
  */
 - (void)handleAppFinishLaunch:(id)sender{
@@ -169,8 +168,6 @@ static NSString *sdkVersion = @"110";
 /**
  *  @brief 应用进入前台的处理
  *
- *  @param sender
- *
  *  @since 0.0.1
  */
 - (void)handleAppInForeground:(id)sender{
@@ -183,9 +180,6 @@ static NSString *sdkVersion = @"110";
 
 /**
  *  @brief 应用进入后台的处理
- *
- *  @param sender
- *
  *  @since 0.0.1
  */
 - (void)handleAppInBackgound:(id)sender{
@@ -346,8 +340,6 @@ static NSString *sdkVersion = @"110";
 /**
  *  @brief 将埋点时间封装成词典数据
  *
- *  @return
- *
  *  @since 0.0.1
  */
 - (NSDictionary *)prepareDictionaryForEvent:(NSString *)eventId attributes:(NSDictionary *)attributes{
@@ -449,7 +441,7 @@ static NSString *sdkVersion = @"110";
  让sendArray方法负责发送，数据一旦转移到缓存区，就把原有的数据干掉。
  @author zhaiguojun 16-10-17 in (null)
  @param array 参数
- @param now   是否立即清楚缓存
+ @param clean 是否立即清楚缓存
  */
 - (void)sendArray:(NSArray *)array cleanCacheRightNow:(BOOL)clean {
     @try {

Pod/Classes/PhobosUtil.m

@@ -20,6 +20,7 @@
 #import <sys/sysctl.h>
 #import <mach/machine.h>
 #import "sys/utsname.h"
+#import "Phobos.h"
 
 #define IOS_CELLULAR    @"pdp_ip0"
 #define IOS_WIFI        @"en0"
@@ -112,15 +113,8 @@
 }
 
 + (void)sendData:(NSData *)data success:(SendDataSuccessBlock)success {
-#ifdef POD_CONFIGURATION_APP_STORE
-    NSString *url = @"http://log.gmei.com/log/collect";
-#elif POD_CONFIGURATION_UNIT_TEST
-    NSString *url = @"http://jaguar.gmei/log/collect";
-#else
-    NSString *url = @"http://log.test.gengmei.cc/log/collect";
-#endif
     @try {
-        NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:url]];
+        NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:[Phobos sharedClient].serverAPI]];
         [request setValue:@"gzip" forHTTPHeaderField:@"Content-Encoding"];
         request.HTTPBody = data;
         request.HTTPMethod = @"POST";

fastlane/report.xml

@@ -5,67 +5,67 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="00: Verifying required fastlane version" time="0.002012">
+      <testcase classname="fastlane.lanes" name="00: Verifying required fastlane version" time="0.001983">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.00172">
+      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001661">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="02: import_from_git" time="0.592732">
+      <testcase classname="fastlane.lanes" name="02: import_from_git" time="2.569052">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="03: git_pull" time="0.957899">
+      <testcase classname="fastlane.lanes" name="03: git_pull" time="4.603808">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="04: ensure_git_branch" time="0.01033">
+      <testcase classname="fastlane.lanes" name="04: ensure_git_branch" time="0.011">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="05: pod_install" time="22.882175">
+      <testcase classname="fastlane.lanes" name="05: pod_install" time="22.712397">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="06: pod_lib_lint" time="21.766492">
+      <testcase classname="fastlane.lanes" name="06: pod_lib_lint" time="31.332885">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="07: version_bump_podspec" time="0.002861">
+      <testcase classname="fastlane.lanes" name="07: version_bump_podspec" time="0.00276">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="08: git_commit_all" time="0.090588">
+      <testcase classname="fastlane.lanes" name="08: git_commit_all" time="0.107871">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="09: add_git_tag" time="0.019525">
+      <testcase classname="fastlane.lanes" name="09: add_git_tag" time="0.017011">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="10: push_to_git_remote" time="0.909969">
+      <testcase classname="fastlane.lanes" name="10: push_to_git_remote" time="2.787409">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="11: pod_push" time="8.571633">
+      <testcase classname="fastlane.lanes" name="11: pod_push" time="10.396381">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="12: pod_repo_update" time="9.360721">
+      <testcase classname="fastlane.lanes" name="12: pod_repo_update" time="9.979275">
         
       </testcase>