From fa0078e1fd833bf3cfd11d7863c344fa6f02ed53 Mon Sep 17 00:00:00 2001 From: 葛建军 Date: Wed, 24 May 2017 16:59:23 +0800 Subject: [PATCH] 资源排序筛选界面教材,目录搭建及数据处理，资源搜索方法实现。 --- YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj | 12 ++++++++++++ YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/Contents.json | 6 ++++++ YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/Contents.json | 21 +++++++++++++++++++++ YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/cb48.png | Bin 0 -> 1985 bytes YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/Contents.json | 21 +++++++++++++++++++++ YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/gou.png | Bin 0 -> 2796 bytes YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard | 11 +++++++---- YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift | 18 +++++++++++++++--- YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterViewController.swift | 18 +++++++++--------- YouerLiveVideo/YouerLiveVideo/controllers/Resource/Resource.storyboard | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.swift | 25 +++++++++++++++++++++++++ YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.xib | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 652 insertions(+), 63 deletions(-) create mode 100644 YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/Contents.json create mode 100644 YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/Contents.json create mode 100644 YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/cb48.png create mode 100644 YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/Contents.json create mode 100644 YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/gou.png create mode 100644 YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift create mode 100644 YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.swift create mode 100644 YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.xib diff --git a/YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj b/YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj index f0f772d..3fc4eae 100644 --- a/YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj +++ b/YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj @@ -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 = ""; }; BF7722FA1ED3C54B00226D44 /* FilterCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterCollectionViewCell.swift; sourceTree = ""; }; BF7722FB1ED3C54B00226D44 /* FilterCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterCollectionViewCell.xib; sourceTree = ""; }; + BF7723001ED5660000226D44 /* FilterFootView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterFootView.swift; sourceTree = ""; }; + BF7723021ED5661F00226D44 /* FilterFootView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterFootView.xib; sourceTree = ""; }; + BF7723041ED5667500226D44 /* FilterListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterListViewController.swift; sourceTree = ""; }; BF7B75691E305A6D0011D5C7 /* MJRefreshAutoFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJRefreshAutoFooter.h; sourceTree = ""; }; BF7B756A1E305A6D0011D5C7 /* MJRefreshAutoFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MJRefreshAutoFooter.m; sourceTree = ""; }; BF7B756B1E305A6D0011D5C7 /* MJRefreshBackFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJRefreshBackFooter.h; sourceTree = ""; }; @@ -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 = ""; @@ -1462,6 +1471,7 @@ 599B2CD51DE52F7E00B4F7FD /* TencentOpenApi_IOS_Bundle.bundle in Resources */, BFBB83EA1ECC445D008B404B /* User.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 */, diff --git a/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/Contents.json b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/Contents.json b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/Contents.json new file mode 100644 index 0000000..2ae6895 --- /dev/null +++ b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/Contents.json @@ -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 diff --git a/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/cb48.png b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/cb48.png new file mode 100644 index 0000000..a69d1eb Binary files /dev/null and b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_diselect.imageset/cb48.png differ diff --git a/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/Contents.json b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/Contents.json new file mode 100644 index 0000000..48ddb35 --- /dev/null +++ b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/Contents.json @@ -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 diff --git a/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/gou.png b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/gou.png new file mode 100644 index 0000000..f281701 Binary files /dev/null and b/YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/Resource/resource_select.imageset/gou.png differ diff --git a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard index 4d9fa2d..4aa7581 100644 --- a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard +++ b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - - + + @@ -179,7 +179,7 @@ - + @@ -1430,6 +1430,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -372,6 +471,8 @@ + + diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift index 455bf2d..f304f4b 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift @@ -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? 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) + 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=["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=["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,completionHandler:@escaping (Bool) -> ()){ + func refreshLivesAction(isSearch:Bool=false,parameters:Dictionary,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) } - } diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.swift b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.swift new file mode 100644 index 0000000..8cf01c4 --- /dev/null +++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.swift @@ -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("以上筛选条件都必选") + } + } +} diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.xib b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.xib new file mode 100644 index 0000000..f44a26a --- /dev/null +++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/View/FilterFootView.xib @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- libgit2 0.21.0