From 4241f816657f09d837376e5f04141a95051f90ab Mon Sep 17 00:00:00 2001 From: 葛建军 Date: Fri, 26 May 2017 15:46:48 +0800 Subject: [PATCH] no message --- YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift | 27 +++++++++++++++++---------- YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift | 1 + YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift | 48 ++++++++++++++++++++++++++++-------------------- YouerLiveVideo/YouerLiveVideo/util/DownLoad.swift | 6 +++--- 4 files changed, 49 insertions(+), 33 deletions(-) diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift index 5030b87..a850ef4 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift @@ -374,18 +374,25 @@ class HomeThirdTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollect let item=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) - AppDelegate.instance().httpServer.updateDownloadSum(parameters: ["f_id":item.f_Id as AnyObject]) { (str, error) in - if error==nil { - if JSON.fromString(jsonString: str)!["status"].intValue == 1{ - //更新下载量成功刷新页面 - self.getHotCourseList() + let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] + let dicULR = documentsURL.appendingPathComponent(AppDelegate.instance().accountManager.id()).appendingPathComponent(item.f_Id) + let path=dicULR.path+(item.f_ResourceUrl as NSString).components(separatedBy: "/Resource")[1] + if FileManager.default.fileExists(atPath: path) { + download.openIt(name: path) + }else{ + download.downLoadWithUrl(item: item) + AppDelegate.instance().httpServer.updateDownloadSum(parameters: ["f_id":item.f_Id as AnyObject]) { (str, error) in + if error==nil { + if JSON.fromString(jsonString: str)!["status"].intValue == 1{ + //更新下载量成功刷新页面 + self.getHotCourseList() + } } } - } - AppDelegate.instance().httpServer.addHistoryView(parameters: ["f_ViewType":1 as AnyObject, - "f_ViewId":item.f_Id as AnyObject, - "f_ViewName":item.f_Title as AnyObject]) { (str, error) in + AppDelegate.instance().httpServer.addHistoryView(parameters: ["f_ViewType":1 as AnyObject, + "f_ViewId":item.f_Id as AnyObject, + "f_ViewName":item.f_Title as AnyObject]) { (str, error) in + } } }else{ AppDelegate.instance().window?.makeToast("无权限查看资源") diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift index 1f5c570..a42f000 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/MicroCourse/MicroCourseViewController.swift @@ -185,6 +185,7 @@ class MicroCourseViewController: UIViewController,UITableViewDelegate,UITableVie self.parameter!.updateValue(self.currentPage as AnyObject, forKey: "pageIndex") p=self.parameter! } + self.tableView.reloadData() self.refreshLivesAction(parameters: p, completionHandler: { (success) in if success{ self.tableView.reloadData() diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift index ebe9afe..39fa778 100644 --- a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift +++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift @@ -167,30 +167,38 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa item=resourceData[indexPath.row] } let download = DownLoad.share + let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] + let dicULR = documentsURL.appendingPathComponent(AppDelegate.instance().accountManager.id()).appendingPathComponent(item.f_Id) + let path=dicULR.path+(item.f_ResourceUrl as NSString).components(separatedBy: "/Resource")[1] download.superVC = self - download.downLoadWithUrl(url: item.f_ResourceUrl) - AppDelegate.instance().httpServer.updateDownloadSum(parameters: ["f_id":item.f_Id as AnyObject]) { (str, error) in - if error==nil { - if JSON.fromString(jsonString: str)!["status"].intValue == 1{ - //更新下载量成功刷新页面 - self.currentPage=1 - self.resourceData.removeAll() - var p:Dictionary=["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject] - if self.parameter != nil { - self.parameter!.updateValue(self.currentPage as AnyObject, forKey: "pageIndex") - p=self.parameter! - } - self.refreshLivesAction(parameters: p, completionHandler: { (success) in - if success{ - self.tableView.reloadData() + if FileManager.default.fileExists(atPath: path) { + download.openIt(name: path) + }else{ + download.downLoadWithUrl(item: item) + AppDelegate.instance().httpServer.updateDownloadSum(parameters: ["f_id":item.f_Id as AnyObject]) { (str, error) in + if error==nil { + if JSON.fromString(jsonString: str)!["status"].intValue == 1{ + //更新下载量成功刷新页面 + self.currentPage=1 + self.resourceData.removeAll() + var p:Dictionary=["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":self.currentPage as AnyObject,"pageSize":10 as AnyObject] + if self.parameter != nil { + self.parameter!.updateValue(self.currentPage as AnyObject, forKey: "pageIndex") + p=self.parameter! } - }) + self.tableView.reloadData() + self.refreshLivesAction(parameters: p, completionHandler: { (success) in + if success{ + self.tableView.reloadData() + } + }) + } } } - } - AppDelegate.instance().httpServer.addHistoryView(parameters: ["f_ViewType":1 as AnyObject, - "f_ViewId":item.f_Id as AnyObject, - "f_ViewName":item.f_Title as AnyObject]) { (str, error) in + AppDelegate.instance().httpServer.addHistoryView(parameters: ["f_ViewType":1 as AnyObject, + "f_ViewId":item.f_Id as AnyObject, + "f_ViewName":item.f_Title as AnyObject]) { (str, error) in + } } } //取消键盘输入状态 diff --git a/YouerLiveVideo/YouerLiveVideo/util/DownLoad.swift b/YouerLiveVideo/YouerLiveVideo/util/DownLoad.swift index 12fa54e..7cf91e6 100644 --- a/YouerLiveVideo/YouerLiveVideo/util/DownLoad.swift +++ b/YouerLiveVideo/YouerLiveVideo/util/DownLoad.swift @@ -13,17 +13,17 @@ class DownLoad :NSObject,QLPreviewControllerDataSource { var superVC:UIViewController! static let share=DownLoad() private override init() {} - func downLoadWithUrl(url:String){ + func downLoadWithUrl(item:MicroCourseModel){ SVProgressHUD.show(withStatus: "下载中...") SVProgressHUD.setDefaultMaskType(.black) let destination: DownloadRequest.DownloadFileDestination = { _, response in let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] - let dicULR = documentsURL.appendingPathComponent(self.ID) + let dicULR = documentsURL.appendingPathComponent(self.ID).appendingPathComponent(item.f_Id) let fileURL = dicULR.appendingPathComponent(response.suggestedFilename!) //两个参数表示如果有同名文件则会覆盖，如果路径中文件夹不存在则会自动创建 return (fileURL, [.removePreviousFile, .createIntermediateDirectories]) } - download(url, to: destination) + download(item.f_ResourceUrl, to: destination) .response { response in SVProgressHUD.dismiss() if response.error==nil{ -- libgit2 0.21.0