Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive

左丞
2 parents 7b40e261 fa0078e1
Showing 15 changed files with 652 additions and 63 deletions Show diff stats
YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/cb48.png
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/Contents.json
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/gou.png
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift
YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift
YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterViewController.swift
YouerLiveVideo/YouerLiveVideo/controllers/Resource/Resource.storyboard
YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift
YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.swift
YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.xib
@@ -150,6 +150,9 @@
 		BF7722F91ED3C3E900226D44 /* FilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7722F81ED3C3E900226D44 /* FilterView.swift */; };
 		BF7722FC1ED3C54B00226D44 /* FilterCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */; };
 		BF7722FD1ED3C54B00226D44 /* FilterCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */; };
+		BF7723011ED5660000226D44 /* FilterFootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7723001ED5660000226D44 /* FilterFootView.swift */; };
+		BF7723031ED5661F00226D44 /* FilterFootView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF7723021ED5661F00226D44 /* FilterFootView.xib */; };
+		BF7723051ED5667500226D44 /* FilterListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7723041ED5667500226D44 /* FilterListViewController.swift */; };
 		BF7B75961E305A6D0011D5C7 /* MJRefreshAutoFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7B756A1E305A6D0011D5C7 /* MJRefreshAutoFooter.m */; };
 		BF7B75971E305A6D0011D5C7 /* MJRefreshBackFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7B756C1E305A6D0011D5C7 /* MJRefreshBackFooter.m */; };
 		BF7B75981E305A6D0011D5C7 /* MJRefreshComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7B756E1E305A6D0011D5C7 /* MJRefreshComponent.m */; };
@@ -480,6 +483,9 @@
 		BF7722F81ED3C3E900226D44 /* FilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterView.swift; sourceTree = "<group>"; };
 		BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterCollectionViewCell.swift; sourceTree = "<group>"; };
 		BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterCollectionViewCell.xib; sourceTree = "<group>"; };
+		BF7723001ED5660000226D44 /* FilterFootView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterFootView.swift; sourceTree = "<group>"; };
+		BF7723021ED5661F00226D44 /* FilterFootView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterFootView.xib; sourceTree = "<group>"; };
+		BF7723041ED5667500226D44 /* FilterListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterListViewController.swift; sourceTree = "<group>"; };
 		BF7B75691E305A6D0011D5C7 /* MJRefreshAutoFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJRefreshAutoFooter.h; sourceTree = "<group>"; };
 		BF7B756A1E305A6D0011D5C7 /* MJRefreshAutoFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MJRefreshAutoFooter.m; sourceTree = "<group>"; };
 		BF7B756B1E305A6D0011D5C7 /* MJRefreshBackFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJRefreshBackFooter.h; sourceTree = "<group>"; };
@@ -643,6 +649,7 @@
 			children = (
 				5904FC471ECA8B8C00E631FF /* ResourceViewController.swift */,
 				BF7722F21ED283D400226D44 /* FilterViewController.swift */,
+				BF7723041ED5667500226D44 /* FilterListViewController.swift */,
 				59AE3DFA1ECECD7D003E2C62 /* LiveInforViewController.swift */,
 				59AE3DFC1ECED5B1003E2C62 /* MoivePlayerViewController.swift */,
 				597185B41ECA990C00D7F478 /* Resource.storyboard */,
@@ -1086,6 +1093,8 @@
 				BF7722F61ED3C3CD00226D44 /* FilterView.xib */,
 				BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */,
 				BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */,
+				BF7723001ED5660000226D44 /* FilterFootView.swift */,
+				BF7723021ED5661F00226D44 /* FilterFootView.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1462,6 +1471,7 @@
 				599B2CD51DE52F7E00B4F7FD /* TencentOpenApi_IOS_Bundle.bundle in Resources */,
 				BFBB83EA1ECC445D008B404B /* Login.storyboard in Resources */,
 				597185B51ECA990C00D7F478 /* Resource.storyboard in Resources */,
+				BF7723031ED5661F00226D44 /* FilterFootView.xib in Resources */,
 				BF25DFE61DDAA36A003EC0C1 /* Info.plist in Resources */,
 				BFF5F4771DD5AA5C00D33B89 /* 上传头像.png in Resources */,
 				5904FC501ECA8B8C00E631FF /* TVStation.storyboard in Resources */,
@@ -1566,6 +1576,7 @@
 				59AE3DFB1ECECD7D003E2C62 /* LiveInforViewController.swift in Sources */,
 				BF7B759B1E305A6D0011D5C7 /* MJRefreshAutoGifFooter.m in Sources */,
 				BF7B75A81E305A6D0011D5C7 /* UIScrollView+MJRefresh.m in Sources */,
+				BF7723011ED5660000226D44 /* FilterFootView.swift in Sources */,
 				BF25E0021DDAA36A003EC0C1 /* UIButton+WebCache.m in Sources */,
 				BF7B759E1E305A6D0011D5C7 /* MJRefreshBackGifFooter.m in Sources */,
 				59AE3DF91ECE8A90003E2C62 /* pinyin.c in Sources */,
@@ -1582,6 +1593,7 @@
 				BF25DFFF1DDAA36A003EC0C1 /* SDWebImageDownloaderOperation.m in Sources */,
 				59AE3DFD1ECED5B1003E2C62 /* MoivePlayerViewController.swift in Sources */,
 				BF25DFF01DDAA36A003EC0C1 /* SessionDelegate.swift in Sources */,
+				BF7723051ED5667500226D44 /* FilterListViewController.swift in Sources */,
 				BF25DFE31DDAA36A003EC0C1 /* Alamofire.swift in Sources */,
 				BF25DFEC1DDAA36A003EC0C1 /* Response.swift in Sources */,
 				BF7B75961E305A6D0011D5C7 /* MJRefreshAutoFooter.m in Sources */,
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "cb48.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "gou.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fhe-aI-EYq">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fhe-aI-EYq">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -179,7 +179,7 @@
                                     <constraint firstAttribute="height" constant="44" id="PWr-Wf-TcS"/>
                                 </constraints>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="vmV-r2-2pv">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" id="vmV-r2-2pv">
                                         <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vmV-r2-2pv" id="tft-RM-f2B">
@@ -1435,6 +1435,9 @@
                                         <state key="normal" title="筛选" image="starLive">
                                             <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
+                                        <connections>
+                                            <action selector="jumpFilterVCAction:" destination="VUr-8w-9Ht" eventType="touchUpInside" id="Po2-Wd-wOq"/>
+                                        </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T2j-JJ-ft5">
                                         <rect key="frame" x="245" y="14" width="57" height="22"/>
@@ -1573,7 +1576,7 @@
                                     <constraint firstAttribute="height" constant="44" id="s3i-TZ-HsX"/>
                                 </constraints>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="OoX-sY-EJ0">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" id="OoX-sY-EJ0">
                                         <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OoX-sY-EJ0" id="cE2-H1-hR9">
@@ -7,7 +7,7 @@
 //
 import UIKit
-
+import AVKit
 class MainHomeTableViewController: UITableViewController {
     @IBOutlet var tableHeaderView: UIView!
     let current=AppDelegate.instance().accountManager
@@ -113,6 +113,15 @@ class MainHomeTableViewController: UITableViewController {
             let vc = UIStoryboard(name: "HomePage", bundle: nil).instantiateViewController(withIdentifier: "RankingTableViewController") as! RankingTableViewController
             vc.openIndexAry=[0,4]
             self.navigationController?.pushViewController(vc, animated: true)
+        }else if indexPath.row==1{
+            //热门微课
+            self.tabBarController?.selectedIndex=2
+        }else if indexPath.row==2{
+            //资源
+            self.tabBarController?.selectedIndex=1
+        }else{
+            //校园电视台
+            self.tabBarController?.selectedIndex=3
         }
     }
@@ -209,8 +218,11 @@ class HomeSecondTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollec
         }
     }
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        //点击进入学校 appRootViewController()
-        NSLog("点击了****\(dataSet[indexPath.row])")
+        let url = URL(string:dataSet[indexPath.row].f_ResourceUrl)
+        let player = AVPlayerViewController()
+        player.player = AVPlayer(url: url!)
+        player.videoGravity = AVLayerVideoGravityResizeAspect
+        appRootViewController().present(player, animated: true, completion: nil)
     }
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         return CGSize(width: (getScreenWidth()-45)/2, height: ((getScreenWidth()-45)/2/33*16+67))
@@ -9,7 +9,7 @@
 import UIKit
 import AVKit
-class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableViewDataSource,UISearchControllerDelegate,UISearchResultsUpdating {
+class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableViewDataSource,UISearchControllerDelegate,UISearchResultsUpdating,UISearchBarDelegate{
     @IBOutlet var tableView: UITableView!
     @IBOutlet var grayView: UIView!
@@ -18,9 +18,10 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
     var searchController:UISearchController!
     var dataSetAry:[String]=["葛建军","张道峰","徐晓杰","左承","段合江"]
-    var searchAry:[String]=[]
+    var searchAry:[MicroCourseModel]=[]
     var currentPage:Int=1 //当前页数，每次取十个数据
     var resourceData:[MicroCourseModel]=[]
+    var parameter:Dictionary<String,AnyObject>?
     override func viewDidLoad() {
         super.viewDidLoad()
         self.configTheme()
@@ -31,11 +32,27 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
                 self.tableView.reloadData()
             }
         })
+        NotificationCenter.default.addObserver(self, selector: #selector(ResourceViewController.reloadTableView), name: NSNotification.Name(rawValue: "FilterReloadTableView"), object: nil)
+    }
+    //筛选结束后刷新界面
+    func reloadTableView(noti:Notification){
+        let parameters=(noti.object as! Dictionary<String,AnyObject>)
+        if parameters["type"]?.int8Value==0{
+            parameter=parameters
+            currentPage=1
+            resourceData.removeAll()
+            refreshLivesAction(parameters: parameters, completionHandler: { (success) in
+                if success{
+                    self.tableView.reloadData()
+                }
+            })
+        }
     }
     func addSearchController(){
         self.definesPresentationContext=true
         searchController=UISearchController(searchResultsController: nil)
         searchController.delegate=self
+        searchController.searchBar.delegate=self
         searchController.searchResultsUpdater=self
         searchController.searchBar.barTintColor=UIColor.groupTableViewBackground
         searchController.searchBar.placeholder="搜索"
@@ -56,7 +73,11 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
             //下拉刷新
             self.currentPage=1
             self.resourceData.removeAll()
-            self.refreshLivesAction(parameters: ["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+            var p:Dictionary<String,AnyObject>=["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject]
+            if self.parameter != nil {
+                p=self.parameter!
+            }
+            self.refreshLivesAction(parameters: p, completionHandler: { (success) in
                 if success{
                     self.tableView.reloadData()
                 }
@@ -67,7 +88,11 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
         tableView.mj_header=header
         tableView.mj_footer=MJRefreshBackNormalFooter(refreshingBlock: {
             //上拉加载更多
-            self.refreshLivesAction(parameters: ["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+            var p:Dictionary<String,AnyObject>=["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject]
+            if self.parameter != nil {
+                p=self.parameter!
+            }
+            self.refreshLivesAction(parameters: p, completionHandler: { (success) in
                 if success{
                     self.tableView.reloadData()
                 }
@@ -76,17 +101,23 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
         })
     }
     // MARK: - 刷新数据接口
-    func refreshLivesAction(parameters:Dictionary<String,AnyObject>,completionHandler:@escaping (Bool) -> ()){
+    func refreshLivesAction(isSearch:Bool=false,parameters:Dictionary<String,AnyObject>,completionHandler:@escaping (Bool) -> ()){
         AppDelegate.instance().httpServer.postResourceList(parameters: parameters) { (str, error) in
             var success:Bool=true
             if error==nil {
                 if JSON.fromString(jsonString: str)!["status"].intValue == 1{
                     httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
-                        if JSON.fromString(jsonString: str)!["data"].arrayValue.count>0{
-                            self.currentPage+=1
-                        }
-                        for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
-                            self.resourceData.append(MicroCourseModel(j: item))
+                        if isSearch {
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.searchAry.append(MicroCourseModel(j: item))
+                            }
+                        }else{
+                            if JSON.fromString(jsonString: str)!["data"].arrayValue.count>0{
+                                self.currentPage+=1
+                            }
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.resourceData.append(MicroCourseModel(j: item))
+                            }
                         }
                         success=true
                     }, failHandler: { (error) in
@@ -104,6 +135,12 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
             completionHandler(success)
         }
     }
+    // MARK: - 跳转到筛选
+    @IBAction func jumpFilterVCAction(_ sender: UIButton) {
+        let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterViewController") as! FilterViewController
+        vc.type=FilterParameter(type: 0)
+        self.present(vc.wrapWithNavigationController(), animated: true, completion: nil)
+    }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView==searchTableView{
             return searchAry.count
@@ -114,7 +151,7 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if tableView==searchTableView {
             let cell=tableView.dequeueReusableCell(withIdentifier: "cell")
-            cell?.textLabel?.text=searchAry[indexPath.row]
+            cell?.textLabel?.text=searchAry[indexPath.row].f_Title
             return cell!
         }else{
             let cell=tableView.dequeueReusableCell(withIdentifier: "identifier") as! MicroCourseViewControllerTableViewCell
@@ -125,12 +162,12 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if tableView==searchTableView {
-            let vc = UIStoryboard(name: "HomePage", bundle: nil).instantiateViewController(withIdentifier: "RankingTableViewController") as! RankingTableViewController
-            self.navigationController?.pushViewController(vc, animated: true)
+            let url = URL(string:searchAry[indexPath.row].f_ResourceUrl)
+            let player = AVPlayerViewController()
+            player.player = AVPlayer(url: url!)
+            player.videoGravity = AVLayerVideoGravityResizeAspect
+            self.present(player, animated: true, completion: nil)
         }else{
-//            let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "LiveInforViewControllerVC") as! LiveInforViewController
-            
-//            self.navigationController?.pushViewController(vc, animated: true)
             let url = URL(string:resourceData[indexPath.row].f_ResourceUrl)
             let player = AVPlayerViewController()
             player.player = AVPlayer(url: url!)
@@ -140,6 +177,9 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
     }
     //取消键盘输入状态
     @IBAction func cancleSearchActivit(_ sender: UITapGestureRecognizer) {
+        self.searchAry.removeAll()
+        searchTableHeight.constant=44
+        self.searchTableView.reloadData()
         searchController.isActive=false
     }
     func willPresentSearchController(_ searchController: UISearchController) {
@@ -149,17 +189,37 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie
         searchTableHeight.constant=44
         grayView.isHidden=true
     }
+    //searchaBarDelegate
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        refreshLivesAction(isSearch: true,parameters: ["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":1 as AnyObject,"keyword":searchBar.text as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+            if success{
+                if CGFloat((self.searchAry.count+1)*44)>(getScreenHeight()-64){
+                    self.searchTableHeight.constant=getScreenHeight()-64
+                }else{
+                    self.searchTableHeight.constant=CGFloat((self.searchAry.count+1)*44)
+                }
+                self.searchTableView.reloadData()
+            }
+        })
+    }
+    func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
+        self.searchAry.removeAll()
+        searchTableHeight.constant=44
+        self.searchTableView.reloadData()
+        searchController.isActive=false
+    }
+    
     //谓词搜索过滤
     func updateSearchResults(for searchController: UISearchController) {
-        let searchString=searchController.searchBar.text
-        let predicate=NSPredicate(format: "SELF CONTAINS[c] %@", searchString!)
-        searchAry=(dataSetAry as NSArray).filtered(using: predicate) as! [String]
-        if CGFloat((searchAry.count+1)*44)>(getScreenHeight()-64){
-            searchTableHeight.constant=getScreenHeight()-64
-        }else{
-            searchTableHeight.constant=CGFloat((searchAry.count+1)*44)
-        }
-        searchTableView.reloadData()
+//        let searchString=searchController.searchBar.text
+//        let predicate=NSPredicate(format: "SELF CONTAINS[c] %@", searchString!)
+//        searchAry=(dataSetAry as NSArray).filtered(using: predicate) as! [String]
+//        if CGFloat((searchAry.count+1)*44)>(getScreenHeight()-64){
+//            searchTableHeight.constant=getScreenHeight()-64
+//        }else{
+//            searchTableHeight.constant=CGFloat((searchAry.count+1)*44)
+//        }
+//        searchTableView.reloadData()
     }
 }
@@ -0,0 +1,205 @@
+//
+//  FilterListViewController.swift
+//  YouerLiveVideo
+//
+//  Created by 葛建军 on 17/5/24.
+//  Copyright © 2017年 左丞. All rights reserved.
+//
+
+import UIKit
+
+class FilterListViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
+    var index:Int=0
+    var superVC:FilterViewController!
+    var dataSet:[filterListModel]=[]
+    var currentItem:filterListModel?    //记录当前页面是否可以返回
+    var selectItem:filterListModel?     //记录选中的目录
+    @IBOutlet var tableView: UITableView!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        getContentWithIndex()
+    }
+    func getContentWithIndex(){
+        switch index {
+        case 0:
+            AppDelegate.instance().httpServer.getWaveCatagory(parameters: ["waveId":superVC.type.materials as AnyObject]) { (str, error) in
+                if error==nil {
+                    if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                        httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.dataSet.append(filterListModel(j: item))
+                            }
+                            self.currentItem=filterListModel(array: self.dataSet)
+                            self.tableView.reloadData()
+                        }, failHandler: { (error) in
+                            self.view.makeToast("获取教材目录失败:\(error.localizedDescription)")
+                        })
+                    }else{
+                        self.view.makeToast("获取教材目录失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
+                    }
+                }else{
+                    self.view.makeToast("获取教材目录失败:\(error!.description)")
+                }
+            }
+        case 1:
+            AppDelegate.instance().httpServer.getTopicCatagory(parameters: ["waveId":superVC.type.materials as AnyObject]) { (str, error) in
+                if error==nil {
+                    if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                        httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.dataSet.append(filterListModel(j: item))
+                            }
+                        }, failHandler: { (error) in
+                            self.view.makeToast("获取知识点目录失败:\(error.localizedDescription)")
+                        })
+                    }else{
+                        self.view.makeToast("获取知识点目录失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
+                    }
+                }else{
+                    self.view.makeToast("获取知识点目录失败:\(error!.description)")
+                }
+            }
+        case 2:
+            AppDelegate.instance().httpServer.getTestCatagory(parameters: ["waveId":superVC.type.materials as AnyObject]) { (str, error) in
+                if error==nil {
+                    if JSON.fromString(jsonString: str)!["status"].intValue == 1{
+                        httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.dataSet.append(filterListModel(j: item))
+                            }
+                        }, failHandler: { (error) in
+                            self.view.makeToast("获取考点目录失败:\(error.localizedDescription)")
+                        })
+                    }else{
+                        self.view.makeToast("获取考点目录失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
+                    }
+                }else{
+                    self.view.makeToast("获取考点目录失败:\(error!.description)")
+                }
+            }
+        default:
+            break
+        }
+        
+    }
+    //MARK: - 返回和确定按钮
+    @IBAction func backAction(_ sender: UIBarButtonItem) {
+        if currentItem != nil {
+            if currentItem?.parentModel != nil {
+                //返回到上级界面
+                self.dataSet=currentItem!.parentModel!.children
+                self.tableView.reloadData()
+                currentItem=currentItem!.parentModel
+                if selectItem != nil {
+                    selectItem=nil
+                }
+            }else{
+                self.navigationController!.popViewController(animated: true)
+            }
+        }
+    }
+    @IBAction func onDoneAction(_ sender: UIBarButtonItem) {
+        if selectItem==nil {
+            self.view.makeToast("请选择目录")
+        }else{
+            //发送通知
+            var nameID:String=""
+            switch index {
+            case 0:
+                nameID="chapterId"
+            case 1:
+                nameID="topicId"
+            case 2:
+                nameID="testId"
+            default:
+                nameID="chapterId"
+            }
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "FilterReloadTableView"), object: ["type":superVC.type.type as AnyObject,
+                                                                                                                   "subjectId":superVC.type.subject as AnyObject,
+                                                                                                                   "schooltypeId":superVC.type.schoolSection as AnyObject,
+                                                                                                                   "gradeId":superVC.type.grade as AnyObject,
+                                                                                                                   "courseWaveId":superVC.type.materials as AnyObject,
+                                                                                                                   nameID:selectItem!.id as AnyObject,
+                                                                                                                   "orderby":1 as AnyObject,
+                                                                                                                   "pageIndex":1 as AnyObject,
+                                                                                                                   "pageSize":10 as AnyObject])
+            self.navigationController?.dismiss(animated: true, completion: nil)
+        }
+    }
+    
+    //MARK: - UITableViewDelegate,UITableViewDataSource
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return dataSet.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell=tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as! FilterListViewCell
+        let item=dataSet[indexPath.row]
+        cell.item=item
+        cell.superVC=self
+        cell.nameLabel.text=item.name
+        if selectItem != nil {
+            if item==selectItem {
+                cell.selectBtn.setImage(UIImage(named: "resource_select"), for: UIControlState.normal)
+            }else{
+                cell.selectBtn.setImage(UIImage(named: "resource_diselect"), for: UIControlState.normal)
+            }
+        }else{
+            cell.selectBtn.setImage(UIImage(named: "resource_diselect"), for: UIControlState.normal)
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let item=dataSet[indexPath.row]
+        if item.children.count>0{
+            self.currentItem=item
+            self.dataSet=item.children
+            self.tableView.reloadData()
+        }
+    }
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+}
+class filterListModel:NSObject{
+    var parentModel:filterListModel?
+    var id:String=""
+    var name:String=""
+    var text:String=""
+    var open:Bool=true
+    var children:[filterListModel]=[]
+    init(j:JSON) {
+        super.init()
+        id=j["id"].stringValue
+        name=j["name"].stringValue
+        text=j["text"].stringValue
+        open=j["open"].boolValue
+        for item in j["children"].arrayValue {
+            let model=filterListModel(j: item)
+            model.parentModel=self
+            children.append(model)
+        }
+    }
+    init(array:[filterListModel]) {
+        super.init()
+        for item in array {
+            item.parentModel=self
+            children.append(item)
+        }
+    }
+}
+class FilterListViewCell: UITableViewCell {
+    @IBOutlet var nameLabel: UILabel!
+    @IBOutlet var selectBtn: UIButton!
+    var superVC:FilterListViewController!
+    var item:filterListModel!
+    @IBAction func changeSelectAction(_ sender: UIButton) {
+        if superVC.selectItem==item {
+            superVC.selectItem=nil
+        }else{
+            superVC.selectItem=item
+        }
+        superVC.tableView.reloadData()
+    }
+    
+    
+}
@@ -14,14 +14,12 @@ class FilterViewController: UIViewController,FilterViewDelegate {
     var dataGrade:[Grade]=[]
     var dataSubject:[Subject]=[]
     var dataMaterials:[Material]=[]
-    var type=FilterParameter()
+    var type:FilterParameter!
     override func viewDidLoad() {
         super.viewDidLoad()
         self.configTheme()
         self.navigationItem.title="筛选"
         getSchoolSection()
-//        NotificationCenter.default.addObserver(self, selector: #selector(RegisterVC.keyboardWIllChange), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil)
-//        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "loginOutSuccess"), object: nil)
     }
     @IBAction func dismissAction(_ sender: UIBarButtonItem) {
@@ -117,6 +115,11 @@ class FilterViewController: UIViewController,FilterViewDelegate {
                 self.getGradeWithSchoolSectionID(id: self.dataSchoolSection[0].f_Id, index: 2)
             }
             self.getSubjects(index: 3)
+            let filterFootView=Bundle.main.loadNibNamed("FilterFootView", owner: nil, options: nil)![0] as! FilterFootView
+            self.scrollContentView.addArrangedSubview(filterFootView)
+            filterFootView.superVC=self
+            filterFootView.translatesAutoresizingMaskIntoConstraints=false
+            filterFootView.addConstraint(NSLayoutConstraint(item: filterFootView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1.0, constant: 50))
         }
     }
     func selectCurrentCount(index: Int,tag:Int) {
@@ -234,18 +237,15 @@ class FilterViewController: UIViewController,FilterViewDelegate {
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
     }
-    // MARK: - 销毁通知
-    deinit {
-        NotificationCenter.default.removeObserver(self)
-    }
 }
 class FilterParameter:NSObject {
     var schoolSection:String?  //学段
     var grade:String?          //年级
     var subject:String?        //学科
     var materials:String?      //教材
-    override init() {
-        
+    var type:Int=0             //0-微课，1-课件（资源），2-电视台 ,
+    init(type:Int) {
+        self.type=type
     }
 }
 class filterModel:NSObject{
@@ -6,6 +6,7 @@
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -77,7 +78,105 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-738.39999999999998" y="265.81709145427288"/>
+            <point key="canvasLocation" x="-1231" y="266"/>
+        </scene>
+        <!--Title-->
+        <scene sceneID="KE0-Ec-6BR">
+            <objects>
+                <viewController storyboardIdentifier="FilterListViewController" automaticallyAdjustsScrollViewInsets="NO" id="zHt-CL-DCL" customClass="FilterListViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="LdG-FX-62I"/>
+                        <viewControllerLayoutGuide type="bottom" id="VWt-bS-YTo"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="zL1-KT-WjN">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="0mu-k5-awJ">
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <view key="tableFooterView" contentMode="scaleToFill" id="Abq-Z2-9eV">
+                                    <rect key="frame" x="0.0" y="72" width="375" height="1"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                                </view>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="UVN-8r-w7w" customClass="FilterListViewCell" customModule="YouerLiveVideo" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UVN-8r-w7w" id="9FT-AK-CvV">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="liq-eO-Kb6">
+                                                    <rect key="frame" x="8" y="12.5" width="331" height="18"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="331" id="pSj-w8-k8O"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dl9-Wp-RkY">
+                                                    <rect key="frame" x="347" y="12" width="20" height="20"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="20" id="o5u-gy-UtC"/>
+                                                        <constraint firstAttribute="height" constant="20" id="wd6-fW-NOJ"/>
+                                                    </constraints>
+                                                    <state key="normal" image="resource_diselect"/>
+                                                    <connections>
+                                                        <action selector="changeSelectAction:" destination="UVN-8r-w7w" eventType="touchUpInside" id="A7s-9g-mY3"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="leadingMargin" secondItem="liq-eO-Kb6" secondAttribute="leading" id="L2j-lu-pe4"/>
+                                                <constraint firstItem="liq-eO-Kb6" firstAttribute="centerY" secondItem="9FT-AK-CvV" secondAttribute="centerY" id="Uo5-5W-S6e"/>
+                                                <constraint firstItem="Dl9-Wp-RkY" firstAttribute="centerY" secondItem="9FT-AK-CvV" secondAttribute="centerY" id="lwC-V7-fgU"/>
+                                                <constraint firstItem="Dl9-Wp-RkY" firstAttribute="leading" secondItem="liq-eO-Kb6" secondAttribute="trailing" constant="8" id="pMu-Vd-32m"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="Dl9-Wp-RkY" secondAttribute="trailing" id="vaR-5v-dX9"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="nameLabel" destination="liq-eO-Kb6" id="tdf-ix-PPl"/>
+                                            <outlet property="selectBtn" destination="Dl9-Wp-RkY" id="nmx-nz-3yj"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="zHt-CL-DCL" id="kiJ-ze-WHW"/>
+                                    <outlet property="delegate" destination="zHt-CL-DCL" id="QJr-Fr-9WG"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="0mu-k5-awJ" secondAttribute="trailing" id="3Sp-No-f5O"/>
+                            <constraint firstItem="0mu-k5-awJ" firstAttribute="top" secondItem="LdG-FX-62I" secondAttribute="bottom" id="CY4-QV-B2L"/>
+                            <constraint firstItem="VWt-bS-YTo" firstAttribute="top" secondItem="0mu-k5-awJ" secondAttribute="bottom" id="GUd-E0-zu2"/>
+                            <constraint firstItem="0mu-k5-awJ" firstAttribute="leading" secondItem="zL1-KT-WjN" secondAttribute="leading" id="P69-w1-xvo"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Title" id="Xi4-Cc-4Ao">
+                        <barButtonItem key="leftBarButtonItem" image="icon_back" id="TNR-MX-Haz">
+                            <connections>
+                                <action selector="backAction:" destination="zHt-CL-DCL" id="CeC-PY-JdX"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="确定" id="H1P-q9-ZPp">
+                            <connections>
+                                <action selector="onDoneAction:" destination="zHt-CL-DCL" id="NnE-RV-tBW"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="tableView" destination="0mu-k5-awJ" id="nrq-Fk-c3q"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="jgm-JW-7AL" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-600.79999999999995" y="265.81709145427288"/>
         </scene>
         <!--Live Infor View Controller-->
         <scene sceneID="QrF-a4-VNS">
@@ -372,6 +471,8 @@
     <resources>
         <image name="closeAlive" width="33" height="33"/>
         <image name="defphoto.png" width="256" height="256"/>
+        <image name="icon_back" width="12" height="21"/>
+        <image name="resource_diselect" width="24" height="24"/>
         <image name="screen_full" width="33" height="33"/>
         <image name="starLive" width="22" height="22"/>
     </resources>
@@ -8,7 +8,7 @@
 import UIKit
-class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDataSource,UISearchControllerDelegate,UISearchResultsUpdating {
+class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDataSource,UISearchControllerDelegate,UISearchResultsUpdating,UISearchBarDelegate {
     @IBOutlet var tableView: UITableView!
     @IBOutlet var grayView: UIView!
@@ -17,9 +17,10 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
     var searchController:UISearchController!
     var dataSetAry:[String]=["葛建军","张道峰","徐晓杰","左承","段合江"]
-    var searchAry:[String]=[]
+    var searchAry:[MicroCourseModel]=[]
     var currentPage:Int=1 //当前页数，每次取十个数据
     var resourceData:[MicroCourseModel]=[]
+    var parameter:Dictionary<String,AnyObject>?
     override func viewDidLoad() {
         super.viewDidLoad()
         self.configTheme()
@@ -30,11 +31,28 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
                 self.tableView.reloadData()
             }
         })
+        NotificationCenter.default.addObserver(self, selector: #selector(ResourceViewController.reloadTableView), name: NSNotification.Name(rawValue: "FilterReloadTableView"), object: nil)
+        
+    }
+    //筛选结束后刷新界面
+    func reloadTableView(noti:Notification){
+        let parameters=(noti.object as! Dictionary<String,AnyObject>)
+        if parameters["type"]?.int8Value==1{
+            parameter=parameters
+            currentPage=1
+            resourceData.removeAll()
+            refreshLivesAction(parameters: parameters, completionHandler: { (success) in
+                if success{
+                    self.tableView.reloadData()
+                }
+            })
+        }
     }
     func addSearchController(){
         self.definesPresentationContext=true
         searchController=UISearchController(searchResultsController: nil)
         searchController.delegate=self
+        searchController.searchBar.delegate=self
         searchController.searchResultsUpdater=self
         searchController.searchBar.barTintColor=UIColor.groupTableViewBackground
         searchController.searchBar.placeholder="搜索"
@@ -55,7 +73,11 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
             //下拉刷新
             self.currentPage=1
             self.resourceData.removeAll()
-            self.refreshLivesAction(parameters: ["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+            var p:Dictionary<String,AnyObject>=["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject]
+            if self.parameter != nil {
+                p=self.parameter!
+            }
+            self.refreshLivesAction(parameters: p, completionHandler: { (success) in
                 if success{
                     self.tableView.reloadData()
                 }
@@ -66,7 +88,11 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
         tableView.mj_header=header
         tableView.mj_footer=MJRefreshBackNormalFooter(refreshingBlock: {
             //上拉加载更多
-            self.refreshLivesAction(parameters: ["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+            var p:Dictionary<String,AnyObject>=["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject]
+            if self.parameter != nil {
+                p=self.parameter!
+            }
+            self.refreshLivesAction(parameters: p, completionHandler: { (success) in
                 if success{
                     self.tableView.reloadData()
                 }
@@ -75,17 +101,23 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
         })
     }
     // MARK: - 刷新数据接口
-    func refreshLivesAction(parameters:Dictionary<String,AnyObject>,completionHandler:@escaping (Bool) -> ()){
+    func refreshLivesAction(isSearch:Bool=false,parameters:Dictionary<String,AnyObject>,completionHandler:@escaping (Bool) -> ()){
         AppDelegate.instance().httpServer.postResourceList(parameters: parameters) { (str, error) in
             var success:Bool=true
             if error==nil {
                 if JSON.fromString(jsonString: str)!["status"].intValue == 1{
                     httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
-                        if JSON.fromString(jsonString: str)!["data"].arrayValue.count>0{
-                            self.currentPage+=1
-                        }
-                        for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
-                            self.resourceData.append(MicroCourseModel(j: item))
+                        if isSearch{
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.searchAry.append(MicroCourseModel(j: item))
+                            }
+                        }else{
+                            if JSON.fromString(jsonString: str)!["data"].arrayValue.count>0{
+                                self.currentPage+=1
+                            }
+                            for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
+                                self.resourceData.append(MicroCourseModel(j: item))
+                            }
                         }
                         success=true
                     }, failHandler: { (error) in
@@ -106,6 +138,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
     // MARK: - 跳转到筛选
     @IBAction func jumpFilterVCAction(_ sender: UIButton) {
         let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterViewController") as! FilterViewController
+        vc.type=FilterParameter(type: 1)
         self.present(vc.wrapWithNavigationController(), animated: true, completion: nil)
     }
@@ -119,7 +152,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if tableView==searchTableView {
             let cell=tableView.dequeueReusableCell(withIdentifier: "cell")
-            cell?.textLabel?.text=searchAry[indexPath.row]
+            cell?.textLabel?.text=searchAry[indexPath.row].f_Title
             return cell!
         }else{
             let cell=tableView.dequeueReusableCell(withIdentifier: "identifier") as! ResourceViewControllerTableViewCell
@@ -137,6 +170,9 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
     }
     //取消键盘输入状态
     @IBAction func cancleSearchActivit(_ sender: UITapGestureRecognizer) {
+        self.searchAry.removeAll()
+        searchTableHeight.constant=44
+        self.searchTableView.reloadData()
         searchController.isActive=false
     }
     func willPresentSearchController(_ searchController: UISearchController) {
@@ -146,19 +182,41 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
         searchTableHeight.constant=44
         grayView.isHidden=true
     }
+    //searchaBarDelegate
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        refreshLivesAction(isSearch: true,parameters: ["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":1 as AnyObject,"keyword":searchBar.text as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+            if success{
+                if CGFloat((self.searchAry.count+1)*44)>(getScreenHeight()-64){
+                    self.searchTableHeight.constant=getScreenHeight()-64
+                }else{
+                    self.searchTableHeight.constant=CGFloat((self.searchAry.count+1)*44)
+                }
+                self.searchTableView.reloadData()
+            }
+        })
+    }
+    func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
+        self.searchAry.removeAll()
+        searchTableHeight.constant=44
+        self.searchTableView.reloadData()
+        searchController.isActive=false
+    }
     //谓词搜索过滤
     func updateSearchResults(for searchController: UISearchController) {
-        let searchString=searchController.searchBar.text
-        let predicate=NSPredicate(format: "SELF CONTAINS[c] %@", searchString!)
-        searchAry=(dataSetAry as NSArray).filtered(using: predicate) as! [String]
-        if CGFloat((searchAry.count+1)*44)>(getScreenHeight()-64){
-            searchTableHeight.constant=getScreenHeight()-64
-        }else{
-            searchTableHeight.constant=CGFloat((searchAry.count+1)*44)
-        }
-        searchTableView.reloadData()
+//        let searchString=searchController.searchBar.text
+//        let predicate=NSPredicate(format: "SELF CONTAINS[c] %@", searchString!)
+//        searchAry=(dataSetAry as NSArray).filtered(using: predicate) as! [String]
+//        if CGFloat((searchAry.count+1)*44)>(getScreenHeight()-64){
+//            searchTableHeight.constant=getScreenHeight()-64
+//        }else{
+//            searchTableHeight.constant=CGFloat((searchAry.count+1)*44)
+//        }
+//        searchTableView.reloadData()
+    }
+    // MARK: - 销毁通知
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
-
 }
@@ -0,0 +1,25 @@
+//
+//  FilterFootView.swift
+//  YouerLiveVideo
+//
+//  Created by 葛建军 on 17/5/24.
+//  Copyright © 2017年 左丞. All rights reserved.
+//
+
+import UIKit
+
+class FilterFootView: UIView {
+    var superVC:FilterViewController!
+    var array:[String]=["教材目录","知识点目录","考点目录"]
+    @IBAction func pushListAction(_ sender: UIButton) {
+        if superVC.type.schoolSection != nil && superVC.type.materials != nil && superVC.type.grade != nil && superVC.type.subject != nil{
+            let vc=UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterListViewController") as! FilterListViewController
+            vc.superVC=superVC
+            vc.title=array[sender.tag]
+            vc.index=sender.tag
+            superVC.navigationController?.pushViewController(vc, animated: true)
+        }else{
+            superVC.view.makeToast("以上筛选条件都必选")
+        }
+    }
+}
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" restorationIdentifier="FilterFootView" id="iN0-l3-epB" customClass="FilterFootView" customModule="YouerLiveVideo" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="431" height="74"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qkY-Fg-R07">
+                    <rect key="frame" x="0.0" y="0.0" width="143.5" height="74"/>
+                    <state key="normal" title="教材目录">
+                        <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="pushListAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="pw6-rP-H1d"/>
+                    </connections>
+                </button>
+                <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9IP-30-ds0">
+                    <rect key="frame" x="144" y="0.0" width="143" height="74"/>
+                    <state key="normal" title="知识点目录">
+                        <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="pushListAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Gge-fr-oCB"/>
+                    </connections>
+                </button>
+                <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hSs-Ue-9q5">
+                    <rect key="frame" x="287.5" y="0.0" width="143.5" height="74"/>
+                    <state key="normal" title="考点目录">
+                        <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <connections>
+                        <action selector="pushListAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="FMb-2J-e1r"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="hSs-Ue-9q5" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="1:3" id="3ep-1I-NMw"/>
+                <constraint firstItem="qkY-Fg-R07" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="4MM-T2-3um"/>
+                <constraint firstAttribute="bottom" secondItem="9IP-30-ds0" secondAttribute="bottom" id="5M3-1d-KtT"/>
+                <constraint firstItem="hSs-Ue-9q5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="7KG-n9-ZZJ"/>
+                <constraint firstItem="9IP-30-ds0" firstAttribute="leading" secondItem="qkY-Fg-R07" secondAttribute="trailing" id="C6x-TT-ZGB"/>
+                <constraint firstAttribute="bottom" secondItem="hSs-Ue-9q5" secondAttribute="bottom" id="CLg-CF-ZXB"/>
+                <constraint firstItem="qkY-Fg-R07" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="1:3" id="R0D-P1-Z0B"/>
+                <constraint firstItem="9IP-30-ds0" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="RVd-2Y-GkH"/>
+                <constraint firstAttribute="trailing" secondItem="hSs-Ue-9q5" secondAttribute="trailing" id="TWF-ru-PiJ"/>
+                <constraint firstItem="qkY-Fg-R07" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="dPN-9C-qEw"/>
+                <constraint firstAttribute="bottom" secondItem="qkY-Fg-R07" secondAttribute="bottom" id="izw-3e-8LX"/>
+                <constraint firstItem="hSs-Ue-9q5" firstAttribute="leading" secondItem="9IP-30-ds0" secondAttribute="trailing" id="pqu-rt-gFv"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="-26.5" y="-714"/>
+        </view>
+    </objects>
+</document>
	@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
		1	+{
		2	+ "info" : {
		3	+ "version" : 1,
		4	+ "author" : "xcode"
		5	+ }
		6	+}
0	\ No newline at end of file	7	\ No newline at end of file
	@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
		1	+{
		2	+ "images" : [
		3	+ {
		4	+ "idiom" : "universal",
		5	+ "scale" : "1x"
		6	+ },
		7	+ {
		8	+ "idiom" : "universal",
		9	+ "filename" : "cb48.png",
		10	+ "scale" : "2x"
		11	+ },
		12	+ {
		13	+ "idiom" : "universal",
		14	+ "scale" : "3x"
		15	+ }
		16	+ ],
		17	+ "info" : {
		18	+ "version" : 1,
		19	+ "author" : "xcode"
		20	+ }
		21	+}
0	\ No newline at end of file	22	\ No newline at end of file
@@ -0,0 +1,205 @@		@@ -0,0 +1,205 @@
	1	+//
	2	+// FilterListViewController.swift
	3	+// YouerLiveVideo
	4	+//
	5	+// Created by 葛建军 on 17/5/24.
	6	+// Copyright © 2017年左丞. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class FilterListViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
	12	+ var index:Int=0
	13	+ var superVC:FilterViewController!
	14	+ var dataSet:[filterListModel]=[]
	15	+ var currentItem:filterListModel? //记录当前页面是否可以返回
	16	+ var selectItem:filterListModel? //记录选中的目录
	17	+ @IBOutlet var tableView: UITableView!
	18	+ override func viewDidLoad() {
	19	+ super.viewDidLoad()
	20	+ getContentWithIndex()
	21	+ }
	22	+ func getContentWithIndex(){
	23	+ switch index {
	24	+ case 0:
	25	+ AppDelegate.instance().httpServer.getWaveCatagory(parameters: ["waveId":superVC.type.materials as AnyObject]) { (str, error) in
	26	+ if error==nil {
	27	+ if JSON.fromString(jsonString: str)!["status"].intValue == 1{
	28	+ httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
	29	+ for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
	30	+ self.dataSet.append(filterListModel(j: item))
	31	+ }
	32	+ self.currentItem=filterListModel(array: self.dataSet)
	33	+ self.tableView.reloadData()
	34	+ }, failHandler: { (error) in
	35	+ self.view.makeToast("获取教材目录失败:\(error.localizedDescription)")
	36	+ })
	37	+ }else{
	38	+ self.view.makeToast("获取教材目录失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
	39	+ }
	40	+ }else{
	41	+ self.view.makeToast("获取教材目录失败:\(error!.description)")
	42	+ }
	43	+ }
	44	+ case 1:
	45	+ AppDelegate.instance().httpServer.getTopicCatagory(parameters: ["waveId":superVC.type.materials as AnyObject]) { (str, error) in
	46	+ if error==nil {
	47	+ if JSON.fromString(jsonString: str)!["status"].intValue == 1{
	48	+ httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
	49	+ for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
	50	+ self.dataSet.append(filterListModel(j: item))
	51	+ }
	52	+ }, failHandler: { (error) in
	53	+ self.view.makeToast("获取知识点目录失败:\(error.localizedDescription)")
	54	+ })
	55	+ }else{
	56	+ self.view.makeToast("获取知识点目录失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
	57	+ }
	58	+ }else{
	59	+ self.view.makeToast("获取知识点目录失败:\(error!.description)")
	60	+ }
	61	+ }
	62	+ case 2:
	63	+ AppDelegate.instance().httpServer.getTestCatagory(parameters: ["waveId":superVC.type.materials as AnyObject]) { (str, error) in
	64	+ if error==nil {
	65	+ if JSON.fromString(jsonString: str)!["status"].intValue == 1{
	66	+ httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
	67	+ for item in JSON.fromString(jsonString: str)!["data"].arrayValue {
	68	+ self.dataSet.append(filterListModel(j: item))
	69	+ }
	70	+ }, failHandler: { (error) in
	71	+ self.view.makeToast("获取考点目录失败:\(error.localizedDescription)")
	72	+ })
	73	+ }else{
	74	+ self.view.makeToast("获取考点目录失败:\(JSON.fromString(jsonString: str)!["message"].stringValue)")
	75	+ }
	76	+ }else{
	77	+ self.view.makeToast("获取考点目录失败:\(error!.description)")
	78	+ }
	79	+ }
	80	+ default:
	81	+ break
	82	+ }
	83	+
	84	+ }
	85	+ //MARK: - 返回和确定按钮
	86	+ @IBAction func backAction(_ sender: UIBarButtonItem) {
	87	+ if currentItem != nil {
	88	+ if currentItem?.parentModel != nil {
	89	+ //返回到上级界面
	90	+ self.dataSet=currentItem!.parentModel!.children
	91	+ self.tableView.reloadData()
	92	+ currentItem=currentItem!.parentModel
	93	+ if selectItem != nil {
	94	+ selectItem=nil
	95	+ }
	96	+ }else{
	97	+ self.navigationController!.popViewController(animated: true)
	98	+ }
	99	+ }
	100	+ }
	101	+ @IBAction func onDoneAction(_ sender: UIBarButtonItem) {
	102	+ if selectItem==nil {
	103	+ self.view.makeToast("请选择目录")
	104	+ }else{
	105	+ //发送通知
	106	+ var nameID:String=""
	107	+ switch index {
	108	+ case 0:
	109	+ nameID="chapterId"
	110	+ case 1:
	111	+ nameID="topicId"
	112	+ case 2:
	113	+ nameID="testId"
	114	+ default:
	115	+ nameID="chapterId"
	116	+ }
	117	+ NotificationCenter.default.post(name: NSNotification.Name(rawValue: "FilterReloadTableView"), object: ["type":superVC.type.type as AnyObject,
	118	+ "subjectId":superVC.type.subject as AnyObject,
	119	+ "schooltypeId":superVC.type.schoolSection as AnyObject,
	120	+ "gradeId":superVC.type.grade as AnyObject,
	121	+ "courseWaveId":superVC.type.materials as AnyObject,
	122	+ nameID:selectItem!.id as AnyObject,
	123	+ "orderby":1 as AnyObject,
	124	+ "pageIndex":1 as AnyObject,
	125	+ "pageSize":10 as AnyObject])
	126	+ self.navigationController?.dismiss(animated: true, completion: nil)
	127	+ }
	128	+ }
	129	+
	130	+ //MARK: - UITableViewDelegate,UITableViewDataSource
	131	+ func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
	132	+ return dataSet.count
	133	+ }
	134	+ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
	135	+ let cell=tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as! FilterListViewCell
	136	+ let item=dataSet[indexPath.row]
	137	+ cell.item=item
	138	+ cell.superVC=self
	139	+ cell.nameLabel.text=item.name
	140	+ if selectItem != nil {
	141	+ if item==selectItem {
	142	+ cell.selectBtn.setImage(UIImage(named: "resource_select"), for: UIControlState.normal)
	143	+ }else{
	144	+ cell.selectBtn.setImage(UIImage(named: "resource_diselect"), for: UIControlState.normal)
	145	+ }
	146	+ }else{
	147	+ cell.selectBtn.setImage(UIImage(named: "resource_diselect"), for: UIControlState.normal)
	148	+ }
	149	+ return cell
	150	+ }
	151	+ func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
	152	+ let item=dataSet[indexPath.row]
	153	+ if item.children.count>0{
	154	+ self.currentItem=item
	155	+ self.dataSet=item.children
	156	+ self.tableView.reloadData()
	157	+ }
	158	+ }
	159	+ override func didReceiveMemoryWarning() {
	160	+ super.didReceiveMemoryWarning()
	161	+ }
	162	+}
	163	+class filterListModel:NSObject{
	164	+ var parentModel:filterListModel?
	165	+ var id:String=""
	166	+ var name:String=""
	167	+ var text:String=""
	168	+ var open:Bool=true
	169	+ var children:[filterListModel]=[]
	170	+ init(j:JSON) {
	171	+ super.init()
	172	+ id=j["id"].stringValue
	173	+ name=j["name"].stringValue
	174	+ text=j["text"].stringValue
	175	+ open=j["open"].boolValue
	176	+ for item in j["children"].arrayValue {
	177	+ let model=filterListModel(j: item)
	178	+ model.parentModel=self
	179	+ children.append(model)
	180	+ }
	181	+ }
	182	+ init(array:[filterListModel]) {
	183	+ super.init()
	184	+ for item in array {
	185	+ item.parentModel=self
	186	+ children.append(item)
	187	+ }
	188	+ }
	189	+}
	190	+class FilterListViewCell: UITableViewCell {
	191	+ @IBOutlet var nameLabel: UILabel!
	192	+ @IBOutlet var selectBtn: UIButton!
	193	+ var superVC:FilterListViewController!
	194	+ var item:filterListModel!
	195	+ @IBAction func changeSelectAction(_ sender: UIButton) {
	196	+ if superVC.selectItem==item {
	197	+ superVC.selectItem=nil
	198	+ }else{
	199	+ superVC.selectItem=item
	200	+ }
	201	+ superVC.tableView.reloadData()
	202	+ }
	203	+
	204	+
	205	+}
	@@ -6,6 +6,7 @@		@@ -6,6 +6,7 @@
6	<dependencies>	6	<dependencies>
7	<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>	7	<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
8	<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>	8	<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
		9	+ <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
9	<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>	10	<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10	</dependencies>	11	</dependencies>
11	<scenes>	12	<scenes>
	@@ -77,7 +78,105 @@		@@ -77,7 +78,105 @@
77	</viewController>	78	</viewController>
78	<placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/>	79	<placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/>
79	</objects>	80	</objects>
80	- <point key="canvasLocation" x="-738.39999999999998" y="265.81709145427288"/>	81	+ <point key="canvasLocation" x="-1231" y="266"/>
		82	+ </scene>
		83	+ <!--Title-->
		84	+ <scene sceneID="KE0-Ec-6BR">
		85	+ <objects>
		86	+ <viewController storyboardIdentifier="FilterListViewController" automaticallyAdjustsScrollViewInsets="NO" id="zHt-CL-DCL" customClass="FilterListViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
		87	+ <layoutGuides>
		88	+ <viewControllerLayoutGuide type="top" id="LdG-FX-62I"/>
		89	+ <viewControllerLayoutGuide type="bottom" id="VWt-bS-YTo"/>
		90	+ </layoutGuides>
		91	+ <view key="view" contentMode="scaleToFill" id="zL1-KT-WjN">
		92	+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
		93	+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
		94	+ <subviews>
		95	+ <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="0mu-k5-awJ">
		96	+ <rect key="frame" x="0.0" y="64" width="375" height="603"/>
		97	+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
		98	+ <view key="tableFooterView" contentMode="scaleToFill" id="Abq-Z2-9eV">
		99	+ <rect key="frame" x="0.0" y="72" width="375" height="1"/>
		100	+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
		101	+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
		102	+ </view>
		103	+ <prototypes>
		104	+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="UVN-8r-w7w" customClass="FilterListViewCell" customModule="YouerLiveVideo" customModuleProvider="target">
		105	+ <rect key="frame" x="0.0" y="28" width="375" height="44"/>
		106	+ <autoresizingMask key="autoresizingMask"/>
		107	+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UVN-8r-w7w" id="9FT-AK-CvV">
		108	+ <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
		109	+ <autoresizingMask key="autoresizingMask"/>
		110	+ <subviews>
		111	+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="liq-eO-Kb6">
		112	+ <rect key="frame" x="8" y="12.5" width="331" height="18"/>
		113	+ <constraints>
		114	+ <constraint firstAttribute="width" constant="331" id="pSj-w8-k8O"/>
		115	+ </constraints>
		116	+ <fontDescription key="fontDescription" type="system" pointSize="15"/>
		117	+ <nil key="textColor"/>
		118	+ <nil key="highlightedColor"/>
		119	+ </label>
		120	+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dl9-Wp-RkY">
		121	+ <rect key="frame" x="347" y="12" width="20" height="20"/>
		122	+ <constraints>
		123	+ <constraint firstAttribute="width" constant="20" id="o5u-gy-UtC"/>
		124	+ <constraint firstAttribute="height" constant="20" id="wd6-fW-NOJ"/>
		125	+ </constraints>
		126	+ <state key="normal" image="resource_diselect"/>
		127	+ <connections>
		128	+ <action selector="changeSelectAction:" destination="UVN-8r-w7w" eventType="touchUpInside" id="A7s-9g-mY3"/>
		129	+ </connections>
		130	+ </button>
		131	+ </subviews>
		132	+ <constraints>
		133	+ <constraint firstAttribute="leadingMargin" secondItem="liq-eO-Kb6" secondAttribute="leading" id="L2j-lu-pe4"/>
		134	+ <constraint firstItem="liq-eO-Kb6" firstAttribute="centerY" secondItem="9FT-AK-CvV" secondAttribute="centerY" id="Uo5-5W-S6e"/>
		135	+ <constraint firstItem="Dl9-Wp-RkY" firstAttribute="centerY" secondItem="9FT-AK-CvV" secondAttribute="centerY" id="lwC-V7-fgU"/>
		136	+ <constraint firstItem="Dl9-Wp-RkY" firstAttribute="leading" secondItem="liq-eO-Kb6" secondAttribute="trailing" constant="8" id="pMu-Vd-32m"/>
		137	+ <constraint firstAttribute="trailingMargin" secondItem="Dl9-Wp-RkY" secondAttribute="trailing" id="vaR-5v-dX9"/>
		138	+ </constraints>
		139	+ </tableViewCellContentView>
		140	+ <connections>
		141	+ <outlet property="nameLabel" destination="liq-eO-Kb6" id="tdf-ix-PPl"/>
		142	+ <outlet property="selectBtn" destination="Dl9-Wp-RkY" id="nmx-nz-3yj"/>
		143	+ </connections>
		144	+ </tableViewCell>
		145	+ </prototypes>
		146	+ <connections>
		147	+ <outlet property="dataSource" destination="zHt-CL-DCL" id="kiJ-ze-WHW"/>
		148	+ <outlet property="delegate" destination="zHt-CL-DCL" id="QJr-Fr-9WG"/>
		149	+ </connections>
		150	+ </tableView>
		151	+ </subviews>
		152	+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
		153	+ <constraints>
		154	+ <constraint firstAttribute="trailing" secondItem="0mu-k5-awJ" secondAttribute="trailing" id="3Sp-No-f5O"/>
		155	+ <constraint firstItem="0mu-k5-awJ" firstAttribute="top" secondItem="LdG-FX-62I" secondAttribute="bottom" id="CY4-QV-B2L"/>
		156	+ <constraint firstItem="VWt-bS-YTo" firstAttribute="top" secondItem="0mu-k5-awJ" secondAttribute="bottom" id="GUd-E0-zu2"/>
		157	+ <constraint firstItem="0mu-k5-awJ" firstAttribute="leading" secondItem="zL1-KT-WjN" secondAttribute="leading" id="P69-w1-xvo"/>
		158	+ </constraints>
		159	+ </view>
		160	+ <navigationItem key="navigationItem" title="Title" id="Xi4-Cc-4Ao">
		161	+ <barButtonItem key="leftBarButtonItem" image="icon_back" id="TNR-MX-Haz">
		162	+ <connections>
		163	+ <action selector="backAction:" destination="zHt-CL-DCL" id="CeC-PY-JdX"/>
		164	+ </connections>
		165	+ </barButtonItem>
		166	+ <barButtonItem key="rightBarButtonItem" title="确定" id="H1P-q9-ZPp">
		167	+ <connections>
		168	+ <action selector="onDoneAction:" destination="zHt-CL-DCL" id="NnE-RV-tBW"/>
		169	+ </connections>
		170	+ </barButtonItem>
		171	+ </navigationItem>
		172	+ <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
		173	+ <connections>
		174	+ <outlet property="tableView" destination="0mu-k5-awJ" id="nrq-Fk-c3q"/>
		175	+ </connections>
		176	+ </viewController>
		177	+ <placeholder placeholderIdentifier="IBFirstResponder" id="jgm-JW-7AL" userLabel="First Responder" sceneMemberID="firstResponder"/>
		178	+ </objects>
		179	+ <point key="canvasLocation" x="-600.79999999999995" y="265.81709145427288"/>
81	</scene>	180	</scene>
82	<!--Live Infor View Controller-->	181	<!--Live Infor View Controller-->
83	<scene sceneID="QrF-a4-VNS">	182	<scene sceneID="QrF-a4-VNS">
	@@ -372,6 +471,8 @@		@@ -372,6 +471,8 @@
372	<resources>	471	<resources>
373	<image name="closeAlive" width="33" height="33"/>	472	<image name="closeAlive" width="33" height="33"/>
374	<image name="defphoto.png" width="256" height="256"/>	473	<image name="defphoto.png" width="256" height="256"/>
		474	+ <image name="icon_back" width="12" height="21"/>
		475	+ <image name="resource_diselect" width="24" height="24"/>
375	<image name="screen_full" width="33" height="33"/>	476	<image name="screen_full" width="33" height="33"/>
376	<image name="starLive" width="22" height="22"/>	477	<image name="starLive" width="22" height="22"/>
377	</resources>	478	</resources>
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+//
	2	+// FilterFootView.swift
	3	+// YouerLiveVideo
	4	+//
	5	+// Created by 葛建军 on 17/5/24.
	6	+// Copyright © 2017年左丞. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class FilterFootView: UIView {
	12	+ var superVC:FilterViewController!
	13	+ var array:[String]=["教材目录","知识点目录","考点目录"]
	14	+ @IBAction func pushListAction(_ sender: UIButton) {
	15	+ if superVC.type.schoolSection != nil && superVC.type.materials != nil && superVC.type.grade != nil && superVC.type.subject != nil{
	16	+ let vc=UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "FilterListViewController") as! FilterListViewController
	17	+ vc.superVC=superVC
	18	+ vc.title=array[sender.tag]
	19	+ vc.index=sender.tag
	20	+ superVC.navigationController?.pushViewController(vc, animated: true)
	21	+ }else{
	22	+ superVC.view.makeToast("以上筛选条件都必选")
	23	+ }
	24	+ }
	25	+}
@@ -0,0 +1,65 @@		@@ -0,0 +1,65 @@
	1	+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
	2	+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
	3	+ <device id="retina4_7" orientation="portrait">
	4	+ <adaptation id="fullscreen"/>
	5	+ </device>
	6	+ <dependencies>
	7	+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
	8	+ <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
	9	+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
	10	+ </dependencies>
	11	+ <objects>
	12	+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
	13	+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
	14	+ <view contentMode="scaleToFill" restorationIdentifier="FilterFootView" id="iN0-l3-epB" customClass="FilterFootView" customModule="YouerLiveVideo" customModuleProvider="target">
	15	+ <rect key="frame" x="0.0" y="0.0" width="431" height="74"/>
	16	+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
	17	+ <subviews>
	18	+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qkY-Fg-R07">
	19	+ <rect key="frame" x="0.0" y="0.0" width="143.5" height="74"/>
	20	+ <state key="normal" title="教材目录">
	21	+ <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
	22	+ </state>
	23	+ <connections>
	24	+ <action selector="pushListAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="pw6-rP-H1d"/>
	25	+ </connections>
	26	+ </button>
	27	+ <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9IP-30-ds0">
	28	+ <rect key="frame" x="144" y="0.0" width="143" height="74"/>
	29	+ <state key="normal" title="知识点目录">
	30	+ <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
	31	+ </state>
	32	+ <connections>
	33	+ <action selector="pushListAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Gge-fr-oCB"/>
	34	+ </connections>
	35	+ </button>
	36	+ <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hSs-Ue-9q5">
	37	+ <rect key="frame" x="287.5" y="0.0" width="143.5" height="74"/>
	38	+ <state key="normal" title="考点目录">
	39	+ <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
	40	+ </state>
	41	+ <connections>
	42	+ <action selector="pushListAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="FMb-2J-e1r"/>
	43	+ </connections>
	44	+ </button>
	45	+ </subviews>
	46	+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
	47	+ <constraints>
	48	+ <constraint firstItem="hSs-Ue-9q5" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="1:3" id="3ep-1I-NMw"/>
	49	+ <constraint firstItem="qkY-Fg-R07" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="4MM-T2-3um"/>
	50	+ <constraint firstAttribute="bottom" secondItem="9IP-30-ds0" secondAttribute="bottom" id="5M3-1d-KtT"/>
	51	+ <constraint firstItem="hSs-Ue-9q5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="7KG-n9-ZZJ"/>
	52	+ <constraint firstItem="9IP-30-ds0" firstAttribute="leading" secondItem="qkY-Fg-R07" secondAttribute="trailing" id="C6x-TT-ZGB"/>
	53	+ <constraint firstAttribute="bottom" secondItem="hSs-Ue-9q5" secondAttribute="bottom" id="CLg-CF-ZXB"/>
	54	+ <constraint firstItem="qkY-Fg-R07" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="1:3" id="R0D-P1-Z0B"/>
	55	+ <constraint firstItem="9IP-30-ds0" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="RVd-2Y-GkH"/>
	56	+ <constraint firstAttribute="trailing" secondItem="hSs-Ue-9q5" secondAttribute="trailing" id="TWF-ru-PiJ"/>
	57	+ <constraint firstItem="qkY-Fg-R07" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="dPN-9C-qEw"/>
	58	+ <constraint firstAttribute="bottom" secondItem="qkY-Fg-R07" secondAttribute="bottom" id="izw-3e-8LX"/>
	59	+ <constraint firstItem="hSs-Ue-9q5" firstAttribute="leading" secondItem="9IP-30-ds0" secondAttribute="trailing" id="pqu-rt-gFv"/>
	60	+ </constraints>
	61	+ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
	62	+ <point key="canvasLocation" x="-26.5" y="-714"/>
	63	+ </view>
	64	+ </objects>
	65	+</document>