解决冲突

Example/Podfile.lock

@@ -35,7 +35,7 @@ PODS:
   - GMKit/Protocol (1.1.3):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMPhobos (1.2.3):
+  - GMPhobos (1.2.6):
     - GMCache (= 0.2.3)
     - GMKit (= 1.1.3)
   - Masonry (1.1.0)
@@ -63,7 +63,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   GMCache: 09a3029c96fe130e3a21faef70b3d9d2ce92d639
   GMKit: 35f788243cceeddf3e13c5226b3ea0b5e08e2117
-  GMPhobos: 01cc63ee852d13a1fb8a9bea3608e60bcd5af5b8
+  GMPhobos: d30e6cfb275bc5d4c8dba2d8907403e7d14863a1
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed

GMPhobos.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "GMPhobos"
-  s.version          = "1.2.3"
+  s.version          = "1.2.6"
   s.summary          = "GM statistic data sdk"
 
   s.description      = <<-DESC
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.source_files = 'GMPhobos/Classes/*.{h,m}'
   s.dependency 'GMCache', '0.2.3'
-  s.dependency 'GMKit', '1.1.3'
+  s.dependency 'GMKit',   '1.1.3'
   s.library   = 'z'
 
 end

GMPhobos/Classes/Phobos.h

@@ -96,10 +96,15 @@ typedef NS_ENUM (NSInteger, PhobosSigningType) {
 @property (copy, nonatomic) NSString *serverAPI;
 
 /**
- 当前APP请求接口的 APIHOST（GMServerDomains.apiHost）
+ 当前APP请求接口的 APIHOST（GMServerDomains.apiHost 主要用于flutter AppDelegate 中初始化需要传值
  */
 @property (nonatomic, copy) NSString *apiHost;
 
+/**
+ 当前APP请求接口的 cookie(主要用于flutter) 获取到cookie 的时候穿过来 或者cookie 有变化的时候传过来
+ */
+@property (nonatomic, copy) NSString *cookie;
+
 /**
  灰度组, since 7.7.65
  */

fastlane/report.xml

@@ -5,57 +5,57 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.008349">
+      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.006026">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001262">
+      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001105">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="02: git_pull" time="0.986183">
+      <testcase classname="fastlane.lanes" name="02: git_pull" time="0.920089">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="0.848219">
+      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="0.840428">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="24.363336">
+      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="7.604026">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.004865">
+      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.00219">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.024734">
+      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.017031">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.011739">
+      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.011304">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.936331">
+      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.883801">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="09: pod_push" time="10.145008">
+      <testcase classname="fastlane.lanes" name="09: pod_push" time="9.547004">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="0.864007">
+      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="0.806126">
         
       </testcase>