筛选~

Author: cjddny

Coding_iOS/Controllers/RootControllers/Project_RootViewController.m

@@ -103,12 +103,16 @@ - (void)viewDidLoad
         });
     [self.navigationController.navigationBar addSubview:_mySearchBar];
 
+    __weak typeof(_myCarousel) weakCarousel = _myCarousel;
     //初始化过滤目录并加载数据
     _myFliterMenu = [[PopFliterMenu alloc] initWithFrame:kScreen_Bounds items:nil];
+    _myFliterMenu.clickBlock = ^(NSInteger pageIndex){
+        [weakCarousel scrollToItemAtIndex:pageIndex animated:NO];
+    };
+
     [_myFliterMenu refreshMenuDate];
 
     //添加滑块
-    __weak typeof(_myCarousel) weakCarousel = _myCarousel;
     _mySegmentControl = [[XTSegmentControl alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, kMySegmentControl_Height) Items:_segmentItems selectedBlock:^(NSInteger index) {
         if (index == _oldSelectedIndex) {
             return;
@@ -276,7 +280,6 @@ - (void)goToNewTweetVC{
                 [Tweet deleteSendData];//发送成功后删除草稿
             }
         }];
-        
     };
     UINavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:vc];
     [self.parentViewController presentViewController:nav animated:YES completion:nil];
@@ -307,9 +310,13 @@ - (void)goToMessageVC{
 
 #pragma mark fliter
 -(void)fliterClicked:(id)sender{
-    NSLog(@"show fliter");
-    [_myFliterMenu showMenuAtView:self.view];
-    
+//    NSLog(@"show fliter:%d",_myFliterMenu.showStatus);
+    if (_myFliterMenu.showStatus) {
+        [_myFliterMenu dismissMenu];
+    }else
+    {
+        [_myFliterMenu showMenuAtView:self.view];
+    }
 }
 
 

Coding_iOS/Launch Screen.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>

Coding_iOS/Models/Projects.h

@@ -33,6 +33,7 @@ typedef NS_ENUM(NSInteger, ProjectsType)
 
     ProjectsTypeTaProject,
     ProjectsTypeTaStared,
+    ProjectsTypeWatched,
 
 };
 

Coding_iOS/Models/Projects.m

@@ -53,6 +53,9 @@ - (NSString *)typeStr{
         case  ProjectsTypeTaStared:
             typeStr = @"stared";
             break;
+        case  ProjectsTypeWatched:
+            typeStr = @"watched";
+            break;
         default:
             typeStr = @"all";
             break;

Coding_iOS/Views/PopFliterMenu.h

@@ -9,6 +9,9 @@
 #import <UIKit/UIKit.h>
 
 @interface PopFliterMenu : UIView
+@property (assign) BOOL showStatus;
+@property (nonatomic , copy) void (^clickBlock)(NSInteger selectNum);
+@property (nonatomic,assign) NSInteger selectNum;  //选中数据
 - (instancetype)initWithFrame:(CGRect)frame items:(NSArray *)items;
 //将菜单显示到某个视图上
 - (void)showMenuAtView:(UIView *)containerView;

Coding_iOS/Views/PopFliterMenu.m

@@ -10,6 +10,7 @@
 #import "XHRealTimeBlur.h"
 #import "Coding_NetAPIManager.h"
 #import "ProjectCount.h"
+#import "Projects.h"
 
 @interface PopFliterMenu()<UITableViewDataSource,UITableViewDelegate>
 @property (nonatomic, strong) NSMutableArray *items;
@@ -26,6 +27,7 @@ - (id)initWithFrame:(CGRect)frame items:(NSArray *)items {
         // Initialization code
         self.items = @[@{@"all":@""},@{@"created":@""},@{@"joined":@""},@{@"watched":@""},@{@"stared":@""}];
         self.pCount=[ProjectCount new];
+        self.showStatus=FALSE;
         [self setup];
     }
     return self;
@@ -80,19 +82,20 @@ - (void)setup {
         tableview;
     });
     [self addSubview:_tableview];
-    _tableview.contentOffset=CGPointMake(0, 100);
+    _tableview.contentInset=UIEdgeInsetsMake(15, 0,0,0);
 
 }
 
-
 #pragma mark -- event & action
 - (void)showMenuAtView:(UIView *)containerView {
+    _showStatus=TRUE;
     [containerView addSubview:self];
     [_realTimeBlur showBlurViewAtView:self];
 }
 
 - (void)dismissMenu
 {
+    _showStatus=FALSE;
     [self removeFromSuperview];
 }
 
@@ -128,6 +131,33 @@ -(void)updateDateSource:(ProjectCount*)pCount
 }
 
 
+//转化为Projects类对应类型
+-(NSInteger)convertToProjectType
+{
+    switch (_selectNum) {
+        case 0:
+            return ProjectsTypeAll;
+            break;
+        case 1:
+            return ProjectsTypeCreated;
+            break;
+        case 2:
+            return ProjectsTypeJoined;
+            break;
+        case 3:
+            return ProjectsTypeWatched;
+            break;
+        case 4:
+            return ProjectsTypeTaStared;
+            break;
+        default:
+            NSLog(@"type error");
+            return ProjectsTypeAll;
+            break;
+    }
+}
+
+
 #pragma mark -- uitableviewdelegate & datasource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     return [_items count];
@@ -143,4 +173,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     return cell;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    _selectNum=indexPath.row;
+    [self dismissMenu];
+    _clickBlock([self convertToProjectType]);
+}
+
 @end