Merge branch 'jz/master' into 'master'

Jz/master

See merge request !75

GMPhobos.podspec

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

GMPhobos/Classes/PhobosDevice.m

@@ -9,6 +9,7 @@
 #import <AdSupport/ASIdentifierManager.h>
 #import <SAMKeychain/SAMKeychain.h>
 #import <GMCache/GMCache.h>
+#import "PhobosUtil.h"
 //#import <AppTrackingTransparency/AppTrackingTransparency.h>
 
 NSString *const KprivatePolicyNotification = @"gm_popup_private_policy_notification";
@@ -21,6 +22,9 @@ NSString *const IDFA = @"idfa";
 // 默认获取不到的idfa
 NSString *defaultIDFA = @"00000000-0000-0000-0000-000000000000";
 
+
+static dispatch_queue_t queue;
+
 @implementation PhobosDevice
 
 #pragma mark - getIDFA
@@ -139,8 +143,18 @@ NSString *defaultIDFA = @"00000000-0000-0000-0000-000000000000";
 
 #pragma mark - 钥匙串封装
 + (void)saveKeyChainWithValue:(NSString *)value service:(NSString *)service account:(NSString *)account {
-    [SAMKeychain setPassword:value forService:service account:account];
-    [SAMKeychain setAccessibilityType:kSecAttrAccessibleAlwaysThisDeviceOnly];
+    //避免在重复相同的key 重复设置
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        queue = dispatch_queue_create("com.device.idfa.serial.queue", DISPATCH_QUEUE_SERIAL);
+    });
+    
+    if (queue && [PhobosUtil isNonEmpty:service] && ![self checkIdfaIsNull:value]) {
+        dispatch_sync(queue, ^{
+            [SAMKeychain setPassword:value forService:service account:account];
+            [SAMKeychain setAccessibilityType:kSecAttrAccessibleAlwaysThisDeviceOnly];
+        });
+    }
 }
 
 //根据 service 与账户keyChain 获取存储的值
@@ -151,4 +165,5 @@ NSString *defaultIDFA = @"00000000-0000-0000-0000-000000000000";
 + (BOOL)showPrivatePolicy {
     return [GMCache fetchObjectAtDocumentPathWithkey:KprivatePolicyNotification];
 }
+
 @end

fastlane/report.xml

@@ -5,57 +5,44 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.031666">
+      <testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.031043">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.008788">
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.009155">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="02: git_pull" time="1.192475">
+      <testcase classname="fastlane.lanes" name="2: git_pull" time="1.30613">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="2.756108">
+      <testcase classname="fastlane.lanes" name="3: pod_repo_update" time="2.363665">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="11.35025">
+      <testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="41.183058">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.00651">
+      <testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.027194">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.02439">
+      <testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.02455">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.015272">
+      <testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.01735">
         
-      </testcase>
-    
-      
-      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.700408">
-        
-      </testcase>
-    
-      
-      <testcase classname="fastlane.lanes" name="09: pod_push" time="9.60056">
-        
-      </testcase>
-    
-      
-      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="1.755684">
+          <failure message="/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/actions/actions_helper.rb:48:in `execute_action'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:255:in `block in execute_action'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:229:in `chdir'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:229:in `execute_action'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing'&#10;Fastfile:55:in `block (2 levels) in parsing_binding'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:49:in `block in execute'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:45:in `chdir'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/runner.rb:45:in `execute'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/lane_manager.rb:47:in `cruise_lane'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/commands_generator.rb:108:in `block (2 levels) in run'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:178:in `call'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:153:in `run'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/runner.rb:476:in `run_active_command'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:76:in `run!'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/delegates.rb:15:in `run!'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/commands_generator.rb:352:in `run'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/commands_generator.rb:41:in `start'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/fastlane/lib/fastlane/cli_tools_distributor.rb:119:in `take_off'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.160.0/bin/fastlane:23:in `&lt;top (required)&gt;'&#10;/Users/gm/.rvm/gems/ruby-2.6.0-preview2/bin/fastlane:23:in `load'&#10;/Users/gm/.rvm/gems/ruby-2.6.0-preview2/bin/fastlane:23:in `&lt;main&gt;'&#10;&#10;Exit status of command 'git tag -am 3.0.3\ \(fastlane\) 3.0.3' was 128 instead of 0.&#10;fatal: tag '3.0.3' already exists&#10;" />
         
       </testcase>