命名优化

MussaCharles · Aug 25, 2021 · 8f45da3 · 8f45da3
1 parent b93746a
commit 8f45da3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/BOTransition/BOTransitionConfig.h b/BOTransition/BOTransitionConfig.h
@@ -115,7 +115,7 @@ FOUNDATION_EXTERN BOTransitionEffect const BOTransitionEffectFade;
  附着在本config所属的vc上的手势转场，一个NSDictionary代表一个手势方向和对应的事件（比如弹出页面，或者弹出页面）
  direction: UISwipeGestureRecognizerDirection(NSUInteger) //触发的方向
  margin: @(YES/NO) nil=NO //是否必须在边缘开始, YES时会优先其他scrollView进行相应
- allowBeganWithOtherSVBounces: @(YES/NO)
+ allowBeganWithSVBounces: @(YES/NO)
  act: @(1/2) 1moveout(把当前vc关闭)  2movein（从当前vc弹出一个新vc）
  */
 @property (nonatomic, readonly, nullable) NSMutableArray<NSDictionary *> *gesInfoAr;

diff --git a/BOTransition/BOTransitionPanGesture.h b/BOTransition/BOTransitionPanGesture.h
@@ -87,7 +87,7 @@ typedef struct BOTransitionPanGestureBrief {
 //BOTransitionGesDirection array
 @property (nonatomic, readonly) NSSet<NSNumber *> *otherSVRespondedDirectionRecord;
 @property (nonatomic, readonly) BOOL delayTrigger;
-@property (nonatomic, readonly) BOOL beganWithOtherSVBounces;
+@property (nonatomic, readonly) BOOL beganWithSVBounces;
 
 @property (nonatomic, readonly) UIGestureRecognizerState transitionGesState;
 

diff --git a/BOTransition/BOTransitionPanGesture.m b/BOTransition/BOTransitionPanGesture.m
@@ -35,7 +35,7 @@ @interface BOTransitionPanGesture () <UIGestureRecognizerDelegate>
 //保存正在响应手势的UIScrollView，对它们的状态进行检测来判断是否应该开始dismiss
 @property (nonatomic, strong) NSMutableArray<UIScrollView *> *currPanScrollVAr;
 @property (nonatomic, strong) NSMutableArray<NSValue *> *currPanScrollVSavOffsetAr;
-@property (nonatomic, assign) BOOL beganWithOtherSVBounces;
+@property (nonatomic, assign) BOOL beganWithSVBounces;
 
 @property (nonatomic, assign) BOTransitionPanGestureBrief lastGesBrief;
 @property (nonatomic, assign) BOOL needsRecoverWhenTouchDown;
@@ -147,7 +147,7 @@ - (void)innerReset {
     //这个不用频繁释放了吧
     //    _otherGesWillExecSimultaneouslyStrategy = nil;
 
-    _beganWithOtherSVBounces = NO;
+    _beganWithSVBounces = NO;
     [self clearCurrSVRecord];
 
     if (_careOtherDic) {
@@ -174,7 +174,7 @@ - (void)makeGesStateCanceledButCanRetryBegan {
     [_currPanScrollVSavOffsetAr removeAllObjects];
     [_otherSVRespondedDirectionRecord removeAllObjects];
     _delayTrigger = NO;
-    _beganWithOtherSVBounces = NO;
+    _beganWithSVBounces = NO;
 }
 
 - (BOOL)canBePreventedByGestureRecognizer:(UIGestureRecognizer *)preventingGestureRecognizer {
@@ -271,7 +271,7 @@ - (void)touchesDidChange:(NSSet<UITouch *> *)touches
                 }];
 
                 if ([self currPanSVInBounces]) {
-                    _beganWithOtherSVBounces = YES;
+                    _beganWithSVBounces = YES;
                 }
             } else {
                 return;

diff --git a/BOTransition/BOTransitioning.m b/BOTransition/BOTransitioning.m
@@ -1321,10 +1321,10 @@ - (NSNumber *)boTransitionGesShouldAndWillBegin:(BOTransitionPanGesture *)ges
                 2 != otherSVResponseval.integerValue) {
                 //没有其他scrollview相应，或者响应到底或者bounces了，可以实施其他手势了
 
-                BOOL allowBeganWithOtherSVBounces = NO;
-                NSNumber *allowBeganWithOtherSVBouncesnum = [gesinfo objectForKey:@"allowBeganWithOtherSVBounces"];
-                if (nil != allowBeganWithOtherSVBouncesnum) {
-                    allowBeganWithOtherSVBounces = allowBeganWithOtherSVBouncesnum.boolValue;
+                BOOL allowBeganWithSVBounces = NO;
+                NSNumber *allowBeganWithSVBouncesnum = [gesinfo objectForKey:@"allowBeganWithSVBounces"];
+                if (nil != allowBeganWithSVBouncesnum) {
+                    allowBeganWithSVBounces = allowBeganWithSVBouncesnum.boolValue;
                 }
 
                 UISwipeGestureRecognizerDirection verd =\
@@ -1337,8 +1337,8 @@ - (NSNumber *)boTransitionGesShouldAndWillBegin:(BOTransitionPanGesture *)ges
                  方向相符
                  起始横竖和触发横竖相符
                  */
-                if ((!ges.beganWithOtherSVBounces
-                     || allowBeganWithOtherSVBounces)
+                if ((!ges.beganWithSVBounces
+                     || allowBeganWithSVBounces)
                     && (ges.triggerDirectionInfo.mainDirection & regdirection) > 0
                     && initialisVertical == triggerisVertical) {