Skip to content

Commit 77cfe2a

Browse files
committed
update
1 parent 7291824 commit 77cfe2a

File tree

4 files changed

+211
-145
lines changed

4 files changed

+211
-145
lines changed

MYCardView/MYCardView/MYCardView.h

Lines changed: 31 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,93 +21,81 @@ typedef enum {
2121

2222
typedef enum {
2323

24-
MYCardViewDragByHandMode = 0 << 0,
25-
MYCardViewDragByClickMode = 1 << 0
24+
MYCardViewDragByClick = 0 << 0,
25+
MYCardViewDragByHand = 1 << 0
2626

2727
}MYCardViewDragMode;
2828

2929
@protocol MYCardViewDeletagte <NSObject>
30-
3130
@optional
3231

33-
3432
/**
35-
卡片成功滑动
36-
37-
@param cardView <#cardView description#>
33+
卡片开始滑动
34+
@param handleView <#handleView description#>
3835
@param direction <#direction description#>
3936
@param index <#index description#>
4037
@param dragMode <#dragMode description#>
4138
*/
42-
- (void)cardView:(MYCardView *)cardView effectiveDragDirection:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
43-
39+
- (void)handleView:(MYCardView *)handleView beginMoveDirection:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
40+
/**
41+
卡片成功滑动
42+
@param handleView <#handleView description#>
43+
@param direction <#direction description#>
44+
@param index <#index description#>
45+
*/
46+
- (void)handleView:(MYCardView *)handleView effectiveDragDirection:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
4447

4548
/**
4649
取消卡片滑动
47-
48-
@param cardView <#cardView description#>
50+
@param handleView <#handleView description#>
4951
@param direction <#direction description#>
5052
@param index <#index description#>
51-
@param dragMode <#dragMode description#>
5253
*/
53-
- (void)cardView:(MYCardView *)cardView cancelDrag:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
54-
55-
54+
- (void)handleView:(MYCardView *)handleView cancelDrag:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
5655
/**
5756
点击当前卡片
58-
59-
@param cardView <#cardView description#>
57+
@param handleView <#handleView description#>
6058
@param index <#index description#>
6159
*/
62-
- (void)cardView:(MYCardView *)cardView didClickItemAtIndex:(NSInteger)index;
63-
64-
60+
- (void)handleView:(MYCardView *)handleView didClickItemAtIndex:(NSInteger)index;
6561
/**
6662
卡片正在滑动
67-
68-
@param cardView <#cardView description#>
63+
@param handleView <#handleView description#>
6964
@param index <#index description#>
70-
@param dragMode <#dragMode description#>
7165
*/
72-
- (void)cardView:(MYCardView *)cardView cardDidSCroll:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
73-
74-
66+
- (void)handleView:(MYCardView *)handleView cardDidScroll:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
7567
/**
7668
卡片结束滑动
77-
78-
@param cardView <#cardView description#>
69+
@param handleView <#handleView description#>
7970
@param index <#index description#>
80-
@param dragMode <#dragMode description#>
8171
*/
82-
- (void)cardView:(MYCardView *)cardView cardEndScroll:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
72+
- (void)handleView:(MYCardView *)handleView cardEndScroll:(MYCardViewDragDirectionType)direction itemIndex:(NSInteger)index dragMode:(MYCardViewDragMode)dragMode;
8373
@end
8474

8575
@protocol MYCardViewDataSource <NSObject>
8676

8777
@required
8878

89-
9079
/**
9180
卡片Item
92-
93-
@param cardView <#cardView description#>
81+
82+
@param handleView <#handleView description#>
9483
@param index <#index description#>
9584
@return <#return value description#>
9685
*/
97-
- (__kindof MYCardViewItem *)cardView:(MYCardView *)cardView itemForIndex:(NSInteger)index;
98-
86+
- (__kindof MYCardViewItem *)handleView:(MYCardView *)handleView itemForIndex:(NSInteger)index;
9987

10088
/**
10189
数据源个数
102-
103-
@param cardView <#cardView description#>
90+
91+
@param handleView <#handleView description#>
10492
@return <#return value description#>
10593
*/
106-
- (NSInteger)cardViewPageCountForView:(MYCardView *)cardView;
94+
- (NSInteger)handleViewPageCountForView:(MYCardView *)handleView;
10795
@optional
10896

109-
- (CGSize)cardViewSizeForItem:(MYCardView *)cardView;
110-
- (CGFloat)cardViewTopInsetForItem:(MYCardView *)cardView;
97+
- (CGSize)handleViewSizeForItem:(MYCardView *)handleView;
98+
- (CGFloat)handleViewTopInsetForItem:(MYCardView *)handleView;
11199

112100
@end
113101

@@ -121,7 +109,7 @@ typedef enum {
121109

122110
/**
123111
手动滑动
124-
112+
125113
@param direction <#direction description#>
126114
*/
127115
- (void)excuteSlide:(MYCardViewDragDirectionType)direction;
@@ -132,7 +120,7 @@ typedef enum {
132120
/**
133121
当前索引
134122
*/
135-
@property (nonatomic, assign) NSInteger currentIndex;
136-
123+
@property (nonatomic, assign,readonly) NSInteger currentIndex;
124+
@property (nonatomic, assign) BOOL enable;
137125
@end
138126

0 commit comments

Comments
 (0)