Skip to content

Commit 470ac07

Browse files
author
ShengYong Guo
committed
修改用xib创建Cell和初始化重合的BUG
1 parent 71fd48d commit 470ac07

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

GXCardView.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
Pod::Spec.new do |s|
1010

1111
s.name = "GXCardView"
12-
s.version = "0.0.3"
12+
s.version = "0.0.6"
1313
s.summary = "一个卡片式布局,类似(探探附近/QQ颜值匹配)等..."
1414
s.homepage = "https://github.com/gsyhei/GXCardView"
1515
s.license = "MIT"
1616
s.author = { "Gin" => "279694479@qq.com" }
1717
s.platform = :ios, "7.0"
18-
s.source = { :git => "https://github.com/gsyhei/GXCardView.git", :tag => "0.0.3" }
18+
s.source = { :git => "https://github.com/gsyhei/GXCardView.git", :tag => "0.0.6" }
1919
s.requires_arc = true
2020
s.source_files = "GXCardView/GXCardView*.{h,m}"
2121
s.frameworks = "Foundation","UIKit"

GXCardView/GXCardView.m

+6-14
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ @interface GXCardViewCell()
3131
@property (nonatomic, assign) CGFloat maxAngle;
3232
@property (nonatomic, assign) CGFloat maxRemoveDistance;
3333
@property (nonatomic, assign) CGPoint currentPoint;
34-
@property (nonatomic, weak) id<GXCardViewCellDelagate> delegate;
34+
@property (nonatomic, weak) id<GXCardViewCellDelagate> cell_delegate;
3535

3636
- (void)addCellSnapshotView;
3737
- (void)removeCellSnapshotView;
@@ -45,14 +45,6 @@ - (void)awakeFromNib {
4545
[self setupView];
4646
}
4747

48-
- (instancetype)initWithCoder:(NSCoder *)coder {
49-
self = [super initWithCoder:coder];
50-
if (self) {
51-
[self setupView];
52-
}
53-
return self;
54-
}
55-
5648
- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier {
5749
self = [super init];
5850
if (self) {
@@ -108,8 +100,8 @@ - (void)panGestureRecognizer:(UIPanGestureRecognizer*)pan {
108100
CGAffineTransform transRotation = CGAffineTransformMakeRotation(angle);
109101
self.transform = CGAffineTransformTranslate(transRotation, self.currentPoint.x, self.currentPoint.y);
110102

111-
if (self.delegate && [self.delegate respondsToSelector:@selector(cardViewCellDidMoveFromSuperView:forMovePoint:)]) {
112-
[self.delegate cardViewCellDidMoveFromSuperView:self forMovePoint:self.currentPoint];
103+
if (self.cell_delegate && [self.cell_delegate respondsToSelector:@selector(cardViewCellDidMoveFromSuperView:forMovePoint:)]) {
104+
[self.cell_delegate cardViewCellDidMoveFromSuperView:self forMovePoint:self.currentPoint];
113105
}
114106
[pan setTranslation:CGPointZero inView:pan.view];
115107
}
@@ -181,8 +173,8 @@ - (void)restoreCellLocation {
181173
- (void)didCellRemoveFromSuperview {
182174
self.transform = CGAffineTransformIdentity;
183175
[self removeFromSuperview];
184-
if ([self.delegate respondsToSelector:@selector(cardViewCellDidRemoveFromSuperView:)]) {
185-
[self.delegate cardViewCellDidRemoveFromSuperView:self];
176+
if ([self.cell_delegate respondsToSelector:@selector(cardViewCellDidRemoveFromSuperView:)]) {
177+
[self.cell_delegate cardViewCellDidRemoveFromSuperView:self];
186178
}
187179
}
188180

@@ -316,7 +308,7 @@ - (void)createCardViewCellWithIndex:(NSInteger)index {
316308
cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
317309
cell.maxRemoveDistance = self.maxRemoveDistance;
318310
cell.maxAngle = self.maxAngle;
319-
cell.delegate = self;
311+
cell.cell_delegate = self;
320312
cell.userInteractionEnabled = NO;
321313
NSInteger showCount = self.visibleCount - 1;
322314
CGFloat width = self.frame.size.width;

0 commit comments

Comments
 (0)