修改版本号、解决冲突

Example/GMPhobos/GMViewController.m

@@ -80,7 +80,6 @@ NSString      *const MockCityId       = @"beijing";
     [Phobos track:@"test3" attributes:dict sendNow:YES];
     [Phobos track:@"test4" attributes:dict sendNow:YES];
 //    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
-    
 }
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {

Example/Podfile.lock

 PODS:
   - GMCache (1.0.1):
     - TMCache (= 2.1.0)
-  - GMPhobos (1.4.0):
+  - GMPhobos (2.0.0):
     - GMCache
     - MagicalRecord
     - MJExtension
@@ -28,11 +28,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
-  GMPhobos: d077fae9c149cf1b9658589a3fb9c26566066ad6
+  GMPhobos: 3cad92cfa28da2b719ccef040a8fb4e33012b1ad
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
-PODFILE CHECKSUM: abbb682362e2d6dbd228843955b17f6796b958b0
+PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad
 
 COCOAPODS: 1.9.0

Example/Tests/GMPhotoTest.m

@@ -237,6 +237,12 @@ NSString      *const MockCityId       = @"beijing";
     XCTAssertTrue([keys containsObject:@"user_id"], @"Missing user_id");
     XCTAssertTrue([keys containsObject:@"create_at"], @"Missing create_at");
     XCTAssertTrue([keys containsObject:@"params"], @"Missing params");
+    XCTAssertTrue([keys containsObject:@"absolute_time"], @"Missing absolute_time");
+    XCTAssertTrue([keys containsObject:@"create_at_millis"], @"Missing create_at_millis");
+    XCTAssertTrue([keys containsObject:@"nano_time"], @"Missing nano_time");
+    XCTAssertTrue([[dict[@"params"] allKeys] containsObject:@"referrer_link"],@"Missing referrer_link");
+    
+    XCTAssertTrue((dict[@"params"][@"referrer_link"] != nil || ![dict[@"params"][@"referrer_link"] isEqual:@{}] || dict[@"params"][@"referrer_link"] != NULL), @"referrer_link至少使用默认的[]");
 }
 
 - (void)testCatchNullInAttributes {
@@ -284,6 +290,9 @@ NSString      *const MockCityId       = @"beijing";
     XCTAssertTrue(dic[@"page_name"] != nil, @"page_name至少使用默认的空字符串");
     XCTAssertTrue([dic[@"referer"] integerValue] >= 0, @"referer至少使用默认的空字符串");
     XCTAssertTrue(dic[@"business_id"] != nil, @"business_id至少使用默认的空字符串");
+    XCTAssertTrue(dic[@"in_time_millis"] != nil, @"in_time_millis至少使用默认的空字符串");
+    XCTAssertTrue(dic[@"out_time_millis"] != nil, @"out_time_millis至少使用默认的空字符串");
+    XCTAssertTrue((dic[@"referrer_link"] != nil || ![dic[@"referrer_link"] isEqual:@{}] || dic[@"referrer_link"] != NULL), @"referrer_link至少使用默认的[]");
 }
 
 #pragma mark - 属性test

GMPhobos/Classes/UIResponder+PhobosPV.m

@@ -152,7 +152,6 @@
     objc_setAssociatedObject(self, @selector(inTime), inTime, OBJC_ASSOCIATION_COPY);
 }
 
-
 /**
  这个地方inTime的值为nil的情况不做考虑,因为Phobos不会发送。inTime必须在controller viewWillAppear时赋值
  */
@@ -262,5 +261,4 @@
     PhobosUpdatePVBlock updatePVBlock = objc_getAssociatedObject(self, @selector(updatePVEndBlock));
     return updatePVBlock;
 }
-
 @end