Skip to content

Commit a4df164

Browse files
committed
手势位置修改
1 parent 4d90000 commit a4df164

45 files changed

Lines changed: 582 additions & 203 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

GKPhotoBrowser.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "GKPhotoBrowser"
3-
s.version = "2.2.0"
3+
s.version = "2.2.1"
44
s.summary = "iOS自定义图片浏览器,支持CocoaPods"
55
s.homepage = "https://github.com/QuintGao/GKPhotoBrowser"
66
s.license = "MIT"

GKPhotoBrowser/Core/GKPhotoBrowser.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -522,19 +522,19 @@ - (void)addGestureRecognizer {
522522
singleTap.numberOfTapsRequired = 1;
523523
singleTap.delaysTouchesEnded = NO;
524524
singleTap.delegate = self;
525-
[self.view addGestureRecognizer:singleTap];
525+
[self.photoScrollView addGestureRecognizer:singleTap];
526526

527527
// 双击手势
528528
UITapGestureRecognizer *doubleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleDoubleTap:)];
529529
doubleTap.numberOfTapsRequired = 2;
530530
doubleTap.delaysTouchesEnded = NO;
531531
doubleTap.delegate = self;
532-
[self.view addGestureRecognizer:doubleTap];
532+
[self.photoScrollView addGestureRecognizer:doubleTap];
533533
[singleTap requireGestureRecognizerToFail:doubleTap];
534534

535535
// 长按手势
536536
UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
537-
[self.view addGestureRecognizer:longPress];
537+
[self.photoScrollView addGestureRecognizer:longPress];
538538

539539
// 拖拽手势
540540
[self addPanGesture:YES];
@@ -545,18 +545,18 @@ - (void)addPanGesture:(BOOL)isFirst {
545545
[self removePanGesture];
546546
}else {
547547
if (isFirst || self.isScreenRotateDisabled) { // 第一次进入或禁止处理屏幕旋转,直接添加手势
548-
[self.view addGestureRecognizer:self.panGesture];
548+
[self.photoScrollView addGestureRecognizer:self.panGesture];
549549
}else {
550550
if (self.currentOrientation == UIDeviceOrientationPortrait) {
551-
[self.view addGestureRecognizer:self.panGesture];
551+
[self.photoScrollView addGestureRecognizer:self.panGesture];
552552
}
553553
}
554554
}
555555
}
556556

557557
- (void)removePanGesture {
558-
if ([self.view.gestureRecognizers containsObject:self.panGesture]) {
559-
[self.view removeGestureRecognizer:self.panGesture];
558+
if ([self.photoScrollView.gestureRecognizers containsObject:self.panGesture]) {
559+
[self.photoScrollView removeGestureRecognizer:self.panGesture];
560560
}
561561
}
562562

GKPhotoBrowserDemo/GKPhotoBrowserDemo/Classes/Main/GKTest02ViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
180180
browser.failStyle = GKPhotoBrowserFailStyleCustom;
181181
}
182182
}
183-
browser.loadStyle = GKLoadingStyleDeterminate;
183+
browser.loadStyle = GKPhotoBrowserLoadStyleDeterminate;
184184
// browser.failStyle = GKPhotoBrowserFailStyleOnlyImage;
185185
browser.failureText = @"图片加载失败了,555";
186186
browser.failureImage = [UIImage imageNamed:@"error"];

GKPhotoBrowserDemo/GKPhotoBrowserDemo/Classes/Main/WeChat/GKTimeLineViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ - (void)photoBrowser:(GKPhotoBrowser *)browser willLayoutSubViews:(NSInteger)ind
248248
}
249249

250250
- (void)photoBrowser:(GKPhotoBrowser *)browser onDeciceChangedWithIndex:(NSInteger)index isLandscape:(BOOL)isLandscape {
251-
[GKCover hideCover];
251+
[GKCover hideCoverWithoutAnimation];
252252
}
253253

254254
- (void)photoBrowser:(GKPhotoBrowser *)browser didDisappearAtIndex:(NSInteger)index {

GKPhotoBrowserDemo/Podfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ PODS:
1414
- AFNetworking/Serialization (4.0.1)
1515
- AFNetworking/UIKit (4.0.1):
1616
- AFNetworking/NSURLSession
17-
- GKCover (2.5.5)
18-
- GKNavigationBar (1.5.0):
19-
- GKNavigationBar/GestureHandle (= 1.5.0)
20-
- GKNavigationBar/NavigationBar (= 1.5.0)
21-
- GKNavigationBar/GestureHandle (1.5.0)
22-
- GKNavigationBar/NavigationBar (1.5.0)
17+
- GKCover (2.6.1)
18+
- GKNavigationBar (1.5.3):
19+
- GKNavigationBar/GestureHandle (= 1.5.3)
20+
- GKNavigationBar/NavigationBar (= 1.5.3)
21+
- GKNavigationBar/GestureHandle (1.5.3)
22+
- GKNavigationBar/NavigationBar (1.5.3)
2323
- SDAutoLayout (2.2.1)
24-
- SDWebImage (5.10.4):
25-
- SDWebImage/Core (= 5.10.4)
26-
- SDWebImage/Core (5.10.4)
24+
- SDWebImage (5.11.1):
25+
- SDWebImage/Core (= 5.11.1)
26+
- SDWebImage/Core (5.11.1)
2727
- SVProgressHUD (2.2.5)
28-
- TZImagePickerController (3.5.8)
28+
- TZImagePickerController (3.6.0)
2929
- YYCache (1.0.4)
3030
- YYImage (1.0.4):
3131
- YYImage/Core (= 1.0.4)
@@ -62,12 +62,12 @@ SPEC REPOS:
6262

6363
SPEC CHECKSUMS:
6464
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
65-
GKCover: 54663b6ee16ea0b4c0e203a0ffd5a0622223af6e
66-
GKNavigationBar: d5c8f2c0d95b8d54c4a8cd39340731d1c5394048
65+
GKCover: 62c29b9db8ff38b854d2f128f1043f2a4edd9f96
66+
GKNavigationBar: 0febff2220b0902171fc551352fea37336c6fb1e
6767
SDAutoLayout: 8bf6b3bbc8b01f775d4defbb4fda2ace805461be
68-
SDWebImage: c666b97e1fa9c64b4909816a903322018f0a9c84
68+
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
6969
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
70-
TZImagePickerController: 7fd9702897ef8c0b7c951e5463f4bcf398296f9e
70+
TZImagePickerController: a37d7eec87c54436e896a67947033ad2178d498b
7171
YYCache: 8105b6638f5e849296c71f331ff83891a4942952
7272
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
7373
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30

GKPhotoBrowserDemo/Pods/GKCover/GKCover/GKCover.h

Lines changed: 20 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GKPhotoBrowserDemo/Pods/GKCover/GKCover/GKCover.m

Lines changed: 41 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GKPhotoBrowserDemo/Pods/GKCover/README.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GKPhotoBrowserDemo/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKNavigationInteractiveTransition.m

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GKPhotoBrowserDemo/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/UIViewController+GKGestureHandle.h

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)