diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift index 7196306..d77f86e 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift @@ -108,6 +108,7 @@ class MainHomeTableViewController: UITableViewController { } */ override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + let user=AppDelegate.instance().accountManager if indexPath.row==0{ //排行 let vc = UIStoryboard(name: "HomePage", bundle: nil).instantiateViewController(withIdentifier: "RankingTableViewController") as! RankingTableViewController @@ -118,7 +119,11 @@ class MainHomeTableViewController: UITableViewController { self.tabBarController?.selectedIndex=2 }else if indexPath.row==2{ //资源 - self.tabBarController?.selectedIndex=1 + if user.isOnline() && (user.roletype()==1 || user.roletype()==2 || user.roletype()==6){ + self.tabBarController?.selectedIndex=1 + }else{ + AppDelegate.instance().window?.makeToast("无权限查看资源") + } }else{ //校园电视台 self.tabBarController?.selectedIndex=3 @@ -345,11 +350,15 @@ class HomeThirdTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollect } } func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + let user=AppDelegate.instance().accountManager //点击下载并打开资源文档 - let download = DownLoad.share - download.superVC = ((appRootViewController().childViewControllers[0] as! MViewController).selectedViewController as! UINavigationController).viewControllers[0] - download.downLoadWithUrl(url: dataSet[indexPath.row].f_ResourceUrl) - + if user.isOnline() && (user.roletype()==1 || user.roletype()==2 || user.roletype()==6){ + let download = DownLoad.share + download.superVC = ((appRootViewController().childViewControllers[0] as! MViewController).selectedViewController as! UINavigationController).viewControllers[0] + download.downLoadWithUrl(url: dataSet[indexPath.row].f_ResourceUrl) + }else{ + AppDelegate.instance().window?.makeToast("无权限查看资源") + } } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { return CGSize(width: (getScreenWidth()-40)/3, height: (getScreenWidth()-40)/3+105.5) diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/LeadViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/LeadViewController.swift index 589b7ef..92f3c95 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/LeadViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/LeadViewController.swift @@ -8,7 +8,8 @@ import UIKit -class LeadViewController: UIViewController { +class LeadViewController: UIViewController,UITabBarControllerDelegate { + let user=AppDelegate.instance().accountManager static var instance:LeadViewController! override func viewDidLoad() { super.viewDidLoad() @@ -20,9 +21,22 @@ class LeadViewController: UIViewController { // showLogin() // } } + func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool { + if user.isOnline() && (user.roletype()==1 || user.roletype()==2 || user.roletype()==6){ + return true + }else{ + if viewController.title=="资源"{ + AppDelegate.instance().window?.makeToast("无权限查看资源") + return false + }else{ + return true + } + } + } func showMain() { removeAll() - let vc=Story.instantiateViewControllerWithIdentifier("MViewController", storyName: "Main")! + let vc=Story.instantiateViewControllerWithIdentifier("MViewController", storyName: "Main") as! MViewController + vc.delegate=self displayContentController(content: vc) } func showLogin() { diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/MViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/MViewController.swift index a84126e..7115e8a 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/MViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/MViewController.swift @@ -22,7 +22,6 @@ class MViewController: UITabBarController { tabBar.barTintColor=UIColor.white tabBarController?.tabBar.isHidden=true } - override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() } -- libgit2 0.21.0