diff --git a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard index 1ab759b..cd92dde 100644 --- a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard +++ b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard @@ -24,29 +24,29 @@ - + - - + - + @@ -1418,29 +1424,29 @@ - + - - + - + diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift index 6e1f5f5..80807ed 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift @@ -343,8 +343,11 @@ class HomeThirdTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollect } } func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - //点击进入学校 appRootViewController() - NSLog("点击了****\(dataSet[indexPath.row])") + //点击下载并打开资源文档 + let download = DownLoad.share + download.superVC = ((appRootViewController().childViewControllers[0] as! MViewController).selectedViewController as! UINavigationController).viewControllers[0] + download.downLoadWithUrl(url: dataSet[indexPath.row].f_ResourceUrl) + } 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/MicroCourse/MicroCourseViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift index b271ebf..9970d4c 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift @@ -161,6 +161,9 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie } } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { +// let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "LiveInforViewControllerVC") as! LiveInforViewController +// vc.item=item +// self.superVC.navigationController!.pushViewController(vc, animated: true) if tableView==searchTableView { let url = URL(string:searchAry[indexPath.row].f_ResourceUrl) let player = AVPlayerViewController() @@ -237,12 +240,17 @@ class MicroCourseViewControllerTableViewCell:UITableViewCell{ iconImageView.sd_setImage(with: URL(string: item.f_Img), placeholderImage: UIImage(named: "icon_course_placeholder")) titleLabel.text=item.f_Title updateTeacherLabel.text="上传者：\(item.f_CreatorName) 老师" - timeLabel.text=item.f_CreatorTime + timeLabel.text=setDateToString(date:dateFromISO8601(dateString: item.f_CreatorTime)) downLoadCountLabel.text="\(item.f_DownloadSum)" } @IBAction func pushDetailVC(_ sender: UIButton) { - let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "LiveInforViewControllerVC") as! LiveInforViewController - vc.item=item - self.superVC.navigationController!.pushViewController(vc, animated: true) +// let vc = UIStoryboard(name: "Resource", bundle: nil).instantiateViewController(withIdentifier: "LiveInforViewControllerVC") as! LiveInforViewController +// vc.item=item +// self.superVC.navigationController!.pushViewController(vc, animated: true) + let url = URL(string:item.f_ResourceUrl) + let player = AVPlayerViewController() + player.player = AVPlayer(url: url!) + player.videoGravity = AVLayerVideoGravityResizeAspect + self.superVC.present(player, animated: true, completion: nil) } } diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift index 0f81e41..aeae9b5 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterListViewController.swift @@ -96,6 +96,9 @@ class FilterListViewController: UIViewController,UITableViewDelegate,UITableView }else{ self.navigationController!.popViewController(animated: true) } + }else{ + //数据为空 + self.navigationController!.popViewController(animated: true) } } @IBAction func onDoneAction(_ sender: UIBarButtonItem) { diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift index 32d79bd..4207818 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift @@ -248,7 +248,7 @@ class ResourceViewControllerTableViewCell:UITableViewCell{ iconImageView.sd_setImage(with: URL(string: item.f_Img), placeholderImage: UIImage(named: "icon_course_placeholder")) titleLabel.text=item.f_Title updateTeacherLabel.text="上传者：\(item.f_CreatorName) 老师" - timeLabel.text=item.f_CreatorTime + timeLabel.text=setDateToString(date:dateFromISO8601(dateString: item.f_CreatorTime)) downLoadCountLabel.text="\(item.f_DownloadSum)" } } -- libgit2 0.21.0