fix bug

zhoon · zhoon · commit 60d384b308ff · 2022-04-05T14:09:40.000+08:00
diff --git a/ZHIntersectionObserver.podspec b/ZHIntersectionObserver.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "ZHIntersectionObserver"
-  spec.version      = "0.0.3"
+  spec.version      = "0.0.4"
   spec.summary      = "Intersection Observer for iOS."
 
   # This description is used to generate tags and improve search results.
diff --git a/ZHIntersectionObserver/Example/Pages/ZHExample2ViewController.m b/ZHIntersectionObserver/Example/Pages/ZHExample2ViewController.m
@@ -34,11 +34,9 @@ - (void)viewDidLoad {
     self.view.backgroundColor = [UIColor whiteColor];
     self.tableView.rowHeight = 100;
     
-    /*
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self.tableView reloadData];
     });
-    */
 }
 
 - (void)updateNavigationItem {
diff --git a/ZHIntersectionObserver/Example/ZHExampleTableViewController.m b/ZHIntersectionObserver/Example/ZHExampleTableViewController.m
@@ -19,7 +19,7 @@ @implementation ZHExampleTableViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
-    self.tableView.rowHeight = 80;
+    self.tableView.rowHeight = 96;
     self.title = @"ZHIntersectionObsever";
 }
 
@@ -42,7 +42,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     cell.detailTextLabel.numberOfLines = 0;
     
     if (indexPath.row == 0) {
-        cell.textLabel.text = @"基础功能体验";
+        cell.textLabel.text = @"基础功能体验 - 1";
         cell.detailTextLabel.text = @"设置和更新容器大小，设置曝光临界点，动态检测曝光";
     }
     
diff --git a/ZHIntersectionObserver/Source/IntersectionObserver.m b/ZHIntersectionObserver/Source/IntersectionObserver.m
@@ -40,9 +40,11 @@ - (BOOL)addTargetOptions:(UIView *)target options:(IntersectionObserverTargetOpt
                 return YES;
             }
         } else {
-            // view 不复用，但是 dataKey 一样，这个时候需要移除旧的 options
+            // view 不复用，但是 dataKey 一样，这个时候需要移除旧的 options，并且同步旧 options 的 preXXX 属性到新 options 上
             UIView *existTarget = [self isTargetDataKeyExisted:options.dataKey];
+            IntersectionObserverTargetOptions *oldOptions = [self.targetOptions objectForKey:existTarget];
             if (existTarget && target != existTarget) {
+                [IntersectionObserverMeasure updateOptionsPreProperties:options fromOldOptions:oldOptions];
                 [self.targetOptions removeObjectForKey:existTarget];
             }
             [self.targetOptions setObject:options forKey:target];
diff --git a/ZHIntersectionObserver/Source/IntersectionObserverMeasure.h b/ZHIntersectionObserver/Source/IntersectionObserverMeasure.h
@@ -27,6 +27,10 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)isTargetOptions:(IntersectionObserverTargetOptions *)options1
         sameWithOptions:(IntersectionObserverTargetOptions *)options2;
 
+/// 更新 view 不复用但是 dataKey 相同的场景下的 options，对齐其 preXXX 属性，避免判断错误
++ (void)updateOptionsPreProperties:(IntersectionObserverTargetOptions *)options
+                    fromOldOptions:(IntersectionObserverTargetOptions *)oldOptions;
+
 @end
 
 
diff --git a/ZHIntersectionObserver/Source/IntersectionObserverMeasure.m b/ZHIntersectionObserver/Source/IntersectionObserverMeasure.m
@@ -324,31 +324,32 @@ + (BOOL)canReportWithRatio:(CGFloat)ratio
     BOOL isDataKeyVisible = targetOptions.dataKey ? [[IntersectionObserverReuseManager shareInstance] isDataKeyVisible:targetOptions.dataKey inScope:containerOptions.scope] : NO;
     
     // 生命周期发生变化
-    if (containerOptions.measureWhenAppStateChanged) {
+    if (containerOptions.measureWhenAppStateChanged && targetOptions.dataKey) {
         UIApplicationState prevApplicationState = [IntersectionObserverManager shareInstance].previousApplicationState;
         if (prevApplicationState != UIApplicationStateActive &&
             UIApplication.sharedApplication.applicationState == UIApplicationStateActive) {
-            // TODO: 先直接返回 YES，这样导致那些那些一开始没曝光的 item 会发送多 isInsecting = NO 的通知
-            // TODO: 如果改为 isInsecting != targetOptions.preInsecting 会导致 cell 不复用的情况切换前后台无法触发事件
-            return YES; // isInsecting != targetOptions.preInsecting;
+            // 重新计算，只要是 isInsecting 即可发送事件。如果没有设置 dataKey，回到前台会多发送一次曝光事件，所以屏蔽一下。
+            if (targetOptions.dataKey) {
+                return isInsecting;
+            }
+            return NO;
         }
         if (prevApplicationState != UIApplicationStateBackground &&
             UIApplication.sharedApplication.applicationState == UIApplicationStateBackground) {
-            // TODO: 先直接返回 YES，这样导致那些那些一开始没曝光的 item 会发送多 isInsecting = NO 的通知
-            // TODO: 如果改为 isInsecting != targetOptions.preInsecting 会导致 cell 不复用的情况切换前后台无法触发事件
-            return YES; // isInsecting != targetOptions.preInsecting;
+            // 直接返回 YES 会导致那些那些一开始没曝光的 item 会发送多 isInsecting = NO 的通知
+            // 如果改为 isInsecting != targetOptions.preInsecting 会导致 cell 不复用的情况切换前后台无法触发事件，所以需要通过 updateOptionsPreProperties:fromOldOptions 同步一下 options，但是还是会存在之前非曝光过的被复用到曝光的时候，isInsecting != targetOptions.preInsecting 为 NO（isInsecting 必定为 NO，没曝光的 item 的 targetOptions.preInsecting 也是 NO），导致当前没有发送 isInsecting = NO 事件，所以最后改成 isDataKeyVisible，但是要求设置 dataKey 才能生效。
+            return [[IntersectionObserverReuseManager shareInstance] isDataKeyVisible:targetOptions.dataKey inScope:containerOptions.scope];
         }
     }
     
-    // TODO: 可视状态发生变化
-    /*
-    if (containerOptions.measureWhenVisibilityChanged) {
+    // 可视状态发生变化
+    if (containerOptions.measureWhenVisibilityChanged && targetOptions.dataKey) {
         BOOL targetViewVisible = [self isTargetViewVisible:targetOptions.targetView inContainerView:containerOptions.containerView];
         BOOL containerViewVisible = [self isContainerViewVisible:containerOptions.containerView];
         if (targetViewVisible != targetOptions.preVisible || containerViewVisible != containerOptions.preVisible) {
-            return isInsecting != targetOptions.preInsecting;
+            return isInsecting != targetOptions.preInsecting && ![[IntersectionObserverReuseManager shareInstance] isDataKeyVisible:targetOptions.dataKey inScope:containerOptions.scope];
         }
-    }*/
+    }
     
     // 数据发生变化（或者复用）
     if (targetOptions.dataKey && targetOptions.dataKey.length > 0 && ![targetOptions.dataKey isEqualToString:targetOptions.preDataKey]) {
@@ -460,6 +461,19 @@ + (BOOL)isCGRectValidated:(CGRect)rect {
     return !CGRectIsNull(rect) && !CGRectIsInfinite(rect) && !isCGRectNaN && !isCGRectInf;
 }
 
++ (void)updateOptionsPreProperties:(IntersectionObserverTargetOptions *)options
+                    fromOldOptions:(IntersectionObserverTargetOptions *)oldOptions {
+    if (options && oldOptions) {
+        options.preRatio = oldOptions.preRatio;
+        options.preInsecting = oldOptions.preInsecting;
+        options.preVisible = oldOptions.preVisible;
+        options.preDataKey = oldOptions.preDataKey;
+        options.preData = oldOptions.preData;
+        options.preDataKey = oldOptions.preDataKey;
+        options.preReuseInsecting = oldOptions.preReuseInsecting;
+    }
+}
+
 @end
 
 
diff --git a/ZHIntersectionObserver/Source/IntersectionObserverOptions.h b/ZHIntersectionObserver/Source/IntersectionObserverOptions.h
@@ -26,10 +26,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 节流参数，频率限制，默认 100 ms。需要搭配 intersectionDuration 一起使用，不宜设置太大，否则 intersectionDuration 效果会不明显。
 @property(nonatomic, assign, readonly) NSTimeInterval throttle;
 
-/// measure when appState changed, default YES.
+/// appState 发生变化是否重新检测曝光，默认 YES。这个属性只有当设置了 dataKey 才会生效。
 @property(nonatomic, assign, readonly) BOOL measureWhenAppStateChanged;
 
-/// measure when containerView visibility changed, default YES.
+/// 可视状态发生变化是否重新检测曝光， 默认 YES。这个属性只有当设置了 dataKey 才会生效。
 @property(nonatomic, assign, readonly) BOOL measureWhenVisibilityChanged;
 
 /// 触发 intersection 事件之后经过 duration 时长再检查一次如果两次结果一样，才会 callback 给业务。可以理解为曝光时长，用于解决快速滚动或者本地数据被网络数据覆盖的场景，默认为 600 ms

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ Pod::Spec.new do \|spec\|`
`16`	`16`	`#`
`17`	`17`
`18`	`18`	`spec.name = "ZHIntersectionObserver"`
`19`		`- spec.version = "0.0.3"`
	`19`	`+ spec.version = "0.0.4"`
`20`	`20`	`spec.summary = "Intersection Observer for iOS."`
`21`	`21`
`22`	`22`	`# This description is used to generate tags and improve search results.`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ @implementation ZHExampleTableViewController`
`19`	`19`	`- (void)viewDidLoad {`
`20`	`20`	`[super viewDidLoad];`
`21`	`21`	`self.view.backgroundColor = [UIColor whiteColor];`
`22`		`- self.tableView.rowHeight = 80;`
	`22`	`+ self.tableView.rowHeight = 96;`
`23`	`23`	`self.title = @"ZHIntersectionObsever";`
`24`	`24`	`}`
`25`	`25`
`@@ -42,7 +42,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`42`	`42`	`cell.detailTextLabel.numberOfLines = 0;`
`43`	`43`
`44`	`44`	`if (indexPath.row == 0) {`
`45`		`- cell.textLabel.text = @"基础功能体验";`
	`45`	`+ cell.textLabel.text = @"基础功能体验 - 1";`
`46`	`46`	`cell.detailTextLabel.text = @"设置和更新容器大小，设置曝光临界点，动态检测曝光";`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,11 @@ - (BOOL)addTargetOptions:(UIView *)target options:(IntersectionObserverTargetOpt`
`40`	`40`	`return YES;`
`41`	`41`	`}`
`42`	`42`	`} else {`
`43`		`- // view 不复用，但是 dataKey 一样，这个时候需要移除旧的 options`
	`43`	`+ // view 不复用，但是 dataKey 一样，这个时候需要移除旧的 options，并且同步旧 options 的 preXXX 属性到新 options 上`
`44`	`44`	`UIView *existTarget = [self isTargetDataKeyExisted:options.dataKey];`
	`45`	`+ IntersectionObserverTargetOptions *oldOptions = [self.targetOptions objectForKey:existTarget];`
`45`	`46`	`if (existTarget && target != existTarget) {`
	`47`	`+ [IntersectionObserverMeasure updateOptionsPreProperties:options fromOldOptions:oldOptions];`
`46`	`48`	`[self.targetOptions removeObjectForKey:existTarget];`
`47`	`49`	`}`
`48`	`50`	`[self.targetOptions setObject:options forKey:target];`