Merge branch 'dev' into 'master'

refereredId自动获取



See merge request !8

Pod/Classes/Phobos.m

@@ -281,6 +281,7 @@ static NSString *sdkVersion = @"110";
 - (void)onPVStart:(UIResponder<PhobosPVProtocol> *)page {
     // 必须在此处调用一下referer，因为onControllerStart
     [page initReferer];
+    [page initReferrerIdIfNil   ];
     page.inTime = [PhobosUtil currentTime];
 }
 

Pod/Classes/UIResponder+PhobosPV.h

@@ -14,4 +14,9 @@
  只适用于controller自动初始化referer
  */
 - (void)initReferer;
+
+/**
+ 此方法在onPvStart时调用，如果发现已经有值了，不会给referrerId再次赋值
+ */
+- (void)initReferrerIdIfNil;
 @end

Pod/Classes/UIResponder+PhobosPV.m

@@ -72,26 +72,26 @@
     return inTime;
 }
 
+- (void)initReferrerIdIfNil {
+    if (self.referrerId == nil && [self isKindOfClass:[UIViewController class]]) {
+        NSArray *navigationPool = ((UIViewController *)self).navigationController.viewControllers;
+        NSInteger refererIdIndex = navigationPool.count - 2;
+        if (refererIdIndex < 0) {
+            objc_setAssociatedObject(self, @selector(referrerId), @"", OBJC_ASSOCIATION_COPY);
+        } else {
+            UIViewController *controller = navigationPool[refererIdIndex];
+            NSString *preBusinessId = controller.businessId;
+            objc_setAssociatedObject(self, @selector(referrerId), preBusinessId, OBJC_ASSOCIATION_COPY);
+        }
+    }
+}
+
 - (void)setReferrerId:(NSString *)referrerId {
     objc_setAssociatedObject(self, @selector(referrerId), referrerId, OBJC_ASSOCIATION_COPY);
 }
 
 - (NSString *)referrerId {
     NSString *referrerId = objc_getAssociatedObject(self, @selector(referrerId));
-    if (referrerId == nil) {
-        if ([self isKindOfClass:[UIViewController class]]) {
-            NSArray *navigationPool = ((UIViewController *)self).navigationController.viewControllers;
-            NSInteger refererIdIndex = navigationPool.count - 2;
-            if (refererIdIndex < 0) {
-                return @"";
-            } else {
-                UIViewController *controller = navigationPool[refererIdIndex];
-                NSString *preBusinessId = controller.businessId;
-                objc_setAssociatedObject(self, @selector(referrerId), preBusinessId, OBJC_ASSOCIATION_COPY);
-                return preBusinessId;
-            }
-        }
-    }
     return referrerId;
 }