Merge branch 'master' into lym/phobos

* master:
  Bump version to 2.0.7
  修改崩溃
  添加参数

# Conflicts:
#	GMPhobos.podspec
#	GMPhobos/Classes/Exposure/GMExposureManager.h

Example/Podfile.lock

 PODS:
   - GMCache (1.0.1):
     - TMCache (= 2.1.0)
-  - GMPhobos (2.0.6):
+  - GMPhobos (2.0.7):
     - GMCache
     - MagicalRecord
     - MJExtension
@@ -28,11 +28,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
-  GMPhobos: e70f78a492eca95a5c5152620deda65e49f4e216
+  GMPhobos: 115e2608cdebcccf445bf95766fee25a4b62153d
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

GMPhobos.podspec

@@ -8,11 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "GMPhobos"
-<<<<<<< HEAD
-  s.version          = "2.0.5"
-=======
-  s.version          = "2.0.6"
->>>>>>> master
+  s.version          = "2.0.7"
   s.summary          = "GM statistic data sdk"
 
   s.description      = <<-DESC

GMPhobos/Classes/PhobosUtil.m

@@ -214,6 +214,9 @@
     if (!string) {
         return NO;
     }
+    if (![string isKindOfClass:[NSString class]]) {
+        string = [NSString stringWithFormat:@"%@", string];
+    }
     NSMutableCharacterSet *emptyStringSet = [[NSMutableCharacterSet alloc] init];
     [emptyStringSet formUnionWithCharacterSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
     [emptyStringSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"　"]];

fastlane/report.xml

@@ -5,57 +5,57 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.006756">
+      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.00891">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.00161">
+      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001263">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="02: git_pull" time="1.473714">
+      <testcase classname="fastlane.lanes" name="02: git_pull" time="1.22629">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="1.628077">
+      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="1.785333">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="10.35343">
+      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="34.634979">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.002677">
+      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.002126">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.027839">
+      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.020202">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.012609">
+      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.012076">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.951956">
+      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="1.006393">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="09: pod_push" time="9.592703">
+      <testcase classname="fastlane.lanes" name="09: pod_push" time="9.815923">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="1.328229">
+      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="1.440818">
         
       </testcase>