fix: 修复ios11以下tableview的xpath不正确bug，修改page无法找到vc时，取当前vc

growingio · Dec 10, 2020 · cdac988 · cdac988
1 parent 40e2cba
commit cdac988
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/GrowingAutotrackerCore/GrowingNode/Category/UIView+GrowingNode.m b/GrowingAutotrackerCore/GrowingNode/Category/UIView+GrowingNode.m
@@ -95,7 +95,7 @@ - (NSString *)growingNodeSubPath {
      UITableViewWrapperView 为 iOS11 以下 UITableView 与 cell 之间的 view
      */
     if ([NSStringFromClass(self.class) isEqualToString:@"UITableViewWrapperView"]) {
-        return @"";
+        return nil;
     }
     //如果手动标识了该view,返回标识
     if (self.growingUniqueTag.length > 0) {

diff --git a/GrowingAutotrackerCore/GrowingNode/GrowingNodeHelper.m b/GrowingAutotrackerCore/GrowingNode/GrowingNodeHelper.m
@@ -62,10 +62,12 @@ + (NSString *)xPathForView:(UIView *)view similar:(BOOL)isSimilar {
 
     while (node && [node isKindOfClass:[UIView class]]) {
         if (isSimilar) {
-            [viewPathArray addObject:node.growingNodeSubSimilarPath];
-            isSimilar = NO;
+            if (node.growingNodeSubSimilarPath.length > 0) {
+                [viewPathArray addObject:node.growingNodeSubSimilarPath];
+                isSimilar = NO;
+            }
         }else {
-            [viewPathArray addObject:node.growingNodeSubPath];
+            if (node.growingNodeSubPath.length > 0) [viewPathArray addObject:node.growingNodeSubPath];
         }
         node = node.growingNodeParent;
     }

diff --git a/GrowingAutotrackerCore/GrowingNode/GrowingViewNode.m b/GrowingAutotrackerCore/GrowingNode/GrowingViewNode.m
@@ -71,12 +71,14 @@ - (GrowingViewNode *)appendNode:(UIView *)view isRecalculate:(BOOL)recalculate {
     }
     NSString *parentXPath = self.view.growingNodeUserInteraction ? self.xPath : self.clickableParentXPath;
     NSString *content = view.growingNodeContent;
+    NSString *xpath = view.growingNodeSubSimilarPath.length > 0 ? [self.originXPath stringByAppendingFormat:@"/%@",view.growingNodeSubSimilarPath] : nil;
+    NSString *originXPath = view.growingNodeSubPath.length > 0 ? [self.originXPath stringByAppendingFormat:@"/%@",view.growingNodeSubPath] : nil;
 
     return GrowingViewNode.builder
     .setView(view)
     .setIndex(index)
-    .setXPath([self.originXPath stringByAppendingFormat:@"/%@",view.growingNodeSubSimilarPath])
-    .setOriginXPath([self.originXPath stringByAppendingFormat:@"/%@",view.growingNodeSubPath])
+    .setXPath(xpath)
+    .setOriginXPath(originXPath)
     .setClickableParentXPath(parentXPath)
     .setHasListParent(haslistParent)
     .setViewContent(content?[content growingHelper_safeSubStringWithLength:50]:nil)

diff --git a/GrowingAutotrackerCore/Page/GrowingPageManager.m b/GrowingAutotrackerCore/Page/GrowingPageManager.m
@@ -281,6 +281,9 @@ - (GrowingPageGroup *)findPageByViewController:(UIViewController *)current {
 
 - (GrowingPageGroup *)findPageByView:(UIView *)view {
     UIViewController *current = [view growingHelper_viewController];
+    if (!current) {
+        current = self.currentViewController;
+    }
     return  [self findPageByViewController:current];
 }
 

diff --git a/GrowingTrackerCore/Menu/GrowingStatusBar.m b/GrowingTrackerCore/Menu/GrowingStatusBar.m
@@ -52,7 +52,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    self.statusLable.frame = CGRectMake(0,0,self.bounds.size.width, 20);
+    self.statusLable.frame = CGRectMake(0,0,self.bounds.size.width, [[UIApplication sharedApplication] statusBarFrame].size.height);
     self.btn.frame = self.statusLable.bounds;
 }