fix: 后退手势的支持漏洞。

didi · Dec 21, 2020 · 6686b9f · 6686b9f
1 parent 5042a8e
commit 6686b9f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/iOS/DiDiPrism/Src/Core/Instruction/Generator/PrismEdgePanInstructionGenerator.m b/iOS/DiDiPrism/Src/Core/Instruction/Generator/PrismEdgePanInstructionGenerator.m
@@ -31,14 +31,7 @@ + (NSString*)getInstructionOfEdgePanGesture:(UIScreenEdgePanGestureRecognizer*)e
     }
 
     NSString *responseChainInfo = [PrismInstructionResponseChainUtil getResponseChainInfoWithElement:view];
-    // 获取响应链的方法本身有个问题，就是如果self.view为viewController.view的话，并不会统计到这个viewController。
-    // 但是这一点对于后退滑动手势来说必须修复，所以先在这里修复。其他地方目前运行良好就不做改动（只是回放遍历的时候要多遍历一些）
-    UIViewController *lastViewController = nil;
-    UIResponder* nextResponder = [view nextResponder];
-    if ([nextResponder isKindOfClass:[UIViewController class]]) {
-        lastViewController = (UIViewController*)nextResponder;
-    }
-    view.autoDotFinalMark = [NSString stringWithFormat:@"%@%@%@%@", kBeginOfViewMotionFlag, kViewMotionEdgePanGestureFlag, responseChainInfo, lastViewController ? NSStringFromClass([lastViewController class]) : @""];
+    view.autoDotFinalMark = [NSString stringWithFormat:@"%@%@%@", kBeginOfViewMotionFlag, kViewMotionEdgePanGestureFlag, responseChainInfo];
     return view.autoDotFinalMark;
 }
 

diff --git a/iOS/DiDiPrism/Src/Core/Instruction/Parser/PrismBaseInstructionParser+Protected.m b/iOS/DiDiPrism/Src/Core/Instruction/Parser/PrismBaseInstructionParser+Protected.m
@@ -25,12 +25,7 @@ - (UIResponder*)searchRootResponderWithClassName:(NSString*)className {
     [[keyWindow subviews] enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         if ([obj isKindOfClass:NSClassFromString(@"UITransitionView")] && [[obj subviews] count]) {
             UIView *aimView = (UIView*)[obj subviews][0];
-            if ([[aimView nextResponder] isKindOfClass:[UIViewController class]]) {
-                presentedVC = (UIViewController*)[aimView nextResponder];
-            }
-            else {
-                presentedVC = [((UIView*)[obj subviews][0]) prism_viewController];
-            }
+            presentedVC = [[aimView nextResponder] isKindOfClass:[UIViewController class]] ? (UIViewController*)[aimView nextResponder] : [aimView prism_viewController];
             *stop = YES;
         }
     }];

diff --git a/iOS/DiDiPrism/Src/Core/Instruction/Parser/PrismEdgePanGestureInstructionParser.m b/iOS/DiDiPrism/Src/Core/Instruction/Parser/PrismEdgePanGestureInstructionParser.m
@@ -9,6 +9,7 @@
 // Category
 #import "PrismBaseInstructionParser+Protected.h"
 #import "NSArray+PrismExtends.h"
+#import "UIView+PrismExtends.h"
 
 @interface PrismEdgePanGestureInstructionParser()
 
@@ -25,6 +26,9 @@ - (PrismInstructionParseResult)parseWithFormatter:(PrismInstructionFormatter *)f
     if (!responder) {
         return PrismInstructionParseResultFail;
     }
+    if (!viewPathArray.lastObject.length) {
+        viewPathArray = [viewPathArray subarrayWithRange:NSMakeRange(0, viewPathArray.count - 1)];
+    }
     NSInteger index = 2;
     for (; index < viewPathArray.count; index++) {
         Class class = NSClassFromString(viewPathArray[index]);
@@ -41,11 +45,21 @@ - (PrismInstructionParseResult)parseWithFormatter:(PrismInstructionFormatter *)f
         return PrismInstructionParseResultError;
     }
 
-    UIViewController *targetViewController = (UIViewController*)responder;
+    UIViewController *targetViewController = nil;
+    if ([responder isKindOfClass:[UIView class]]) {
+        UIView *view = (UIView*)responder;
+        targetViewController = [[view nextResponder] isKindOfClass:[UIViewController class]] ? (UIViewController*)[view nextResponder] : [view prism_viewController];
+    }
+    else {
+        targetViewController = (UIViewController*)responder;
+    }
     UIView *targetView = targetViewController.view;
     UIScreenEdgePanGestureRecognizer *edgePanGesture = [self searchEdgePanGestureFromSuperView:targetView];
     if (edgePanGesture) {
-        if (targetViewController.navigationController) {
+        if ([targetViewController isKindOfClass:[UINavigationController class]]) {
+            [(UINavigationController*)targetViewController popViewControllerAnimated:YES];
+        }
+        else if (targetViewController.navigationController) {
             [targetViewController.navigationController popViewControllerAnimated:YES];
         }
         else if (targetViewController.parentViewController.presentingViewController) {

diff --git a/iOS/DiDiPrism/Src/Core/Instruction/Util/PrismInstructionResponseChainUtil.m b/iOS/DiDiPrism/Src/Core/Instruction/Util/PrismInstructionResponseChainUtil.m
@@ -44,7 +44,7 @@ + (NSString*)getResponseChainInfoWithElement:(UIView*)element {
 #pragma mark - private method
 + (NSArray<UIViewController*>*)getParentViewControllersOfView:(UIView*)view {
     NSMutableArray<UIViewController*> *viewControllers = [NSMutableArray array];
-    UIViewController *viewController = view.prism_viewController;
+    UIViewController *viewController = [view prism_viewController];
     if (viewController) {
         [viewControllers addObject:viewController];
         while (viewController.parentViewController) {

diff --git a/iOS/DiDiPrism/Src/Core/Intercept/UIScreenEdgePanGestureRecognizer+PrismIntercept.m b/iOS/DiDiPrism/Src/Core/Intercept/UIScreenEdgePanGestureRecognizer+PrismIntercept.m
@@ -60,7 +60,7 @@ - (void)autoDot_edgePanAction:(UIScreenEdgePanGestureRecognizer*)edgePanGestureR
     }
 
     if (edgePanGestureRecognizer.state == UIGestureRecognizerStateBegan) {
-        UIViewController *viewController = self.view.prism_viewController;
+        UIViewController *viewController = [[self.view nextResponder] isKindOfClass:[UIViewController class]] ? (UIViewController*)[self.view nextResponder] : [self.view prism_viewController];
         UINavigationController *navigationController = [viewController isKindOfClass:[UINavigationController class]] ? (UINavigationController*)viewController : viewController.navigationController;
         [self setAutoDotNavigationController:navigationController];
         NSInteger viewControllerCount = navigationController.viewControllers.count;