tab策略调整，字号调整

emilyZhouwm · emilyZhouwm · commit fbe7930e919b · 2015-04-27T19:45:01.000+08:00
diff --git a/Coding_iOS/Images.xcassets/tag/tag_list_down.imageset/Contents.json b/Coding_iOS/Images.xcassets/tag/tag_list_down.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "tag_list_down@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Coding_iOS/Images.xcassets/tag/tag_list_down.imageset/tag_list_down@2x.png b/Coding_iOS/Images.xcassets/tag/tag_list_down.imageset/tag_list_down@2x.png
diff --git a/Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m b/Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m
@@ -62,7 +62,8 @@ - (id)initWithFrame:(CGRect)frame title:(NSString *)title type:(XTSegmentControl
             {
                 _titleLabel = ({
                     UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), CGRectGetHeight(self.bounds))];
-                    label.font = [UIFont systemFontOfSize:XTSegmentControlItemFont - 2];
+                    
+                    label.font = [UIFont systemFontOfSize:(kDevice_Is_iPhone6Plus) ? (XTSegmentControlItemFont + 1) : (kDevice_Is_iPhone6 ? XTSegmentControlItemFont : XTSegmentControlItemFont - 2)];
                     label.textAlignment = NSTextAlignmentCenter;
                     label.text = title;
                     label.textColor = [UIColor colorWithHexString:@"0x222222"];
@@ -120,7 +121,7 @@ - (void)setSelected:(BOOL)selected
                 [_titleLabel setTextColor:(selected ? [UIColor colorWithHexString:@"0x3bbd79"]:[UIColor colorWithHexString:@"0x222222"])];
             }
             if (_titleIconView) {
-                [_titleIconView setImage:[UIImage imageNamed: selected ? @"tag_list_up_s" : @"tag_list_up"]];
+                [_titleIconView setImage:[UIImage imageNamed: selected ? @"tag_list_down" : @"tag_list_up"]];
             }
         }
             break;
@@ -291,7 +292,7 @@ - (void)initItemsWithTitleArray:(NSArray *)titleArray withIcon:(BOOL)isIcon
             NSString *title = titleArray[i];
             XTSegmentControlItem *item = [[XTSegmentControlItem alloc] initWithFrame:rect title:title type: isIcon ?
                                                                                    XTSegmentControlItemTypeTitleAndIcon : XTSegmentControlItemTypeTitle];
-            if (i == 0) {
+            if (!isIcon && i == 0) {
                 [item setSelected:YES];
             }
             [_items addObject:item];
@@ -333,6 +334,7 @@ - (void)initItemsWithTitleArray:(NSArray *)titleArray withIcon:(BOOL)isIcon
     self.currentIndex = 0;
     [self selectIndex:0];
     if (isIcon) {
+        [self selectIndex:-1];
         for (int i=1; i<_itemFrames.count; i++) {
             CGRect rect = [_itemFrames[i] CGRectValue];
             
@@ -374,21 +376,37 @@ - (void)setTitle:(NSString *)title withIndex:(NSInteger)index
 - (void)selectIndex:(NSInteger)index
 {
     [self addRedLine];
-    if (index != _currentIndex) {
-        XTSegmentControlItem *curItem = [_items objectAtIndex:index];
-        CGRect rect = [_itemFrames[index] CGRectValue];
-        CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
-        [UIView animateWithDuration:XTSegmentControlAnimationTime animations:^{
-            _lineView.frame = lineRect;
-        } completion:^(BOOL finished) {
-            [_items enumerateObjectsUsingBlock:^(XTSegmentControlItem *item, NSUInteger idx, BOOL *stop) {
-                [item setSelected:NO];
-            }];
-            [curItem setSelected:YES];
-            _currentIndex = index;
-        }];
+    if (index < 0) {
+        _currentIndex = -1;
+        _lineView.hidden = TRUE;
+        for (XTSegmentControlItem *curItem in _items) {
+            [curItem setSelected:NO];
+        }
+    } else {
+        _lineView.hidden = FALSE;
+    
+        if (index != _currentIndex) {
+            XTSegmentControlItem *curItem = [_items objectAtIndex:index];
+            CGRect rect = [_itemFrames[index] CGRectValue];
+            CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
+            if (_currentIndex < 0) {
+                _lineView.frame = lineRect;
+                [curItem setSelected:YES];
+                _currentIndex = index;
+            } else {
+                [UIView animateWithDuration:XTSegmentControlAnimationTime animations:^{
+                    _lineView.frame = lineRect;
+                } completion:^(BOOL finished) {
+                    [_items enumerateObjectsUsingBlock:^(XTSegmentControlItem *item, NSUInteger idx, BOOL *stop) {
+                        [item setSelected:NO];
+                    }];
+                    [curItem setSelected:YES];
+                    _currentIndex = index;
+                }];
+            }
+        }
+        [self setScrollOffset:index];
     }
-    [self setScrollOffset:index];
 }
 
 - (void)moveIndexWithProgress:(float)progress
@@ -427,7 +445,7 @@ - (void)moveIndexWithProgress:(float)progress
         moveRect.size = CGSizeMake(CGRectGetWidth(origionLineRect) + delta * (CGRectGetWidth(lineRect) - CGRectGetWidth(origionLineRect)), CGRectGetHeight(lineRect));
         moveRect.origin = CGPointMake(CGRectGetMidX(origionLineRect) + delta * (CGRectGetMidX(lineRect) - CGRectGetMidX(origionLineRect)) - CGRectGetMidX(moveRect), CGRectGetMidY(origionLineRect) - CGRectGetMidY(moveRect));
         _lineView.frame = moveRect;
-    }else if (delta < 0){
+    } else if (delta < 0){
         
         if (_currentIndex == 0) {
             return;
@@ -444,7 +462,8 @@ - (void)moveIndexWithProgress:(float)progress
     }    
 }
 
-- (void)setCurrentIndex:(NSInteger)currentIndex{
+- (void)setCurrentIndex:(NSInteger)currentIndex
+{
     currentIndex = MAX(0, MIN(currentIndex, _items.count));
     
     if (currentIndex != _currentIndex) {
diff --git a/Coding_iOS/Views/ProjectTopicsView.m b/Coding_iOS/Views/ProjectTopicsView.m
@@ -154,6 +154,7 @@ - (void)openList:(NSInteger)segmentIndex
 {
     TopicListView *lView = (TopicListView *)[self viewWithTag:9898];
     if (!lView) {
+        // 显示
         _segIndex = segmentIndex;
         NSArray *lists = (NSArray *)_total[segmentIndex];
         CGRect rect = CGRectMake(0, kMySegmentControl_Height, kScreen_Width, self.frame.size.height - kMySegmentControl_Height);
@@ -174,6 +175,7 @@ - (void)openList:(NSInteger)segmentIndex
         [self addSubview:listView];
         [listView showBtnView];
     } else if (_segIndex != segmentIndex) {
+        // 另展示
         _segIndex = segmentIndex;
         
         NSArray *nAry = nil;
@@ -189,6 +191,9 @@ - (void)openList:(NSInteger)segmentIndex
                        [weakSelf changeIndex:index withSegmentIndex:segmentIndex];
                    }];
     } else {
+        // 隐藏
+        [self.mySegmentControl selectIndex:-1];
+
         [lView hideBtnView];
     }
 }
