标签调整问题修正

emilyZhouwm · emilyZhouwm · commit 26a6630f2bb1 · 2015-04-28T10:41:20.000+08:00
diff --git a/Coding_iOS/Views/ProjectTopicsView.m b/Coding_iOS/Views/ProjectTopicsView.m
@@ -170,6 +170,9 @@ - (void)openList:(NSInteger)segmentIndex
                                                           defaultIndex:[_totalIndex[segmentIndex] integerValue]
                                                          selectedBlock:^(NSInteger index) {
                                                              [weakSelf changeIndex:index withSegmentIndex:segmentIndex];
+                                                         }
+                                                             hideBlock:^() {
+                                                             [weakSelf.mySegmentControl selectIndex:-1];
                                                          }];
         listView.tag = 9898;
         [self addSubview:listView];
@@ -189,11 +192,12 @@ - (void)openList:(NSInteger)segmentIndex
                    defaultIndex:[_totalIndex[segmentIndex] integerValue]
                   selectedBlock:^(NSInteger index) {
                        [weakSelf changeIndex:index withSegmentIndex:segmentIndex];
-                   }];
+                   }
+                      hideBlock:^() {
+                          [weakSelf.mySegmentControl selectIndex:-1];
+                      }];
     } else {
         // 隐藏
-        [self.mySegmentControl selectIndex:-1];
-
         [lView hideBtnView];
     }
 }
diff --git a/Coding_iOS/Views/TopicListView.h b/Coding_iOS/Views/TopicListView.h
@@ -9,18 +9,21 @@
 #import <UIKit/UIKit.h>
 
 typedef void(^TopicListViewBlock)(NSInteger index);
+typedef void(^TopicListViewHideBlock)();
 
 @interface TopicListView : UIView
 
 - (id)initWithFrame:(CGRect)frame
              titles:(NSArray *)titles
             numbers:(NSArray *)numbers
        defaultIndex:(NSInteger)index
-      selectedBlock:(TopicListViewBlock)selectedHandle;
+      selectedBlock:(TopicListViewBlock)selectedHandle
+          hideBlock:(TopicListViewHideBlock)hideHandle;
 - (void)changeWithTitles:(NSArray *)titles
                  numbers:(NSArray *)numbers
             defaultIndex:(NSInteger)index
-           selectedBlock:(TopicListViewBlock)selectedHandle;
+           selectedBlock:(TopicListViewBlock)selectedHandle
+               hideBlock:(TopicListViewHideBlock)hideHandle;
 
 - (void)showBtnView;
 - (void)hideBtnView;
diff --git a/Coding_iOS/Views/TopicListView.m b/Coding_iOS/Views/TopicListView.m
@@ -18,6 +18,7 @@ @interface TopicListView ()
 }
 
 @property (nonatomic , copy) TopicListViewBlock block;
+@property (nonatomic , copy) TopicListViewHideBlock hideBlock;
 
 @end
 
@@ -28,11 +29,13 @@ - (id)initWithFrame:(CGRect)frame
             numbers:(NSArray *)numbers
        defaultIndex:(NSInteger)index
       selectedBlock:(TopicListViewBlock)selectedHandle
+          hideBlock:(TopicListViewHideBlock)hideHandle
 {
     self = [super initWithFrame:frame];
     if (self) {
         self.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.4];
         self.block = selectedHandle;
+        self.hideBlock = hideHandle;
         self.clipsToBounds = YES;
         
         _baseBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, self.frame.size.height)];
@@ -80,9 +83,11 @@ - (void)changeWithTitles:(NSArray *)titles
                  numbers:(NSArray *)numbers
             defaultIndex:(NSInteger)index
            selectedBlock:(TopicListViewBlock)selectedHandle
+               hideBlock:(TopicListViewHideBlock)hideHandle
 {
     self.block = selectedHandle;
-    
+    self.hideBlock = hideHandle;
+   
     CGRect frame = _baseView.frame;
     frame.origin.y = -frame.size.height;
     [UIView animateWithDuration:0.2 delay:0.0 options:UIViewAnimationOptionCurveLinear animations:^{
@@ -144,7 +149,10 @@ - (void)hideBtnView
     [UIView animateWithDuration:0.3 delay:0.0 options:UIViewAnimationOptionCurveLinear animations:^{
         _baseView.frame = frame;
     } completion:^(BOOL finished) {
-        [UIView animateWithDuration:0.1 animations:^{
+        if (self.hideBlock) {
+            self.hideBlock();
+        }
+        [UIView animateWithDuration:0.2 animations:^{
             self.alpha = 0;
         } completion:^(BOOL finished) {
             [self removeFromSuperview];
