diff --git a/YouerLiveVideo/YouerLiveVideo/util/network.swift b/YouerLiveVideo/YouerLiveVideo/util/network.swift
index 429ac07..6fef9fc 100644
--- a/YouerLiveVideo/YouerLiveVideo/util/network.swift
+++ b/YouerLiveVideo/YouerLiveVideo/util/network.swift
@@ -93,6 +93,7 @@ final class HTTPServer{
static let URL_OAUTH_TOKEN=HOST+"/OAuth/Token" //登录
+ //MARK:-Account(url)
static let URL_ACCOUNTPHONECAPTCHA=HOST+"/api/Account/PhoneCaptcha" //获取验证码
static let URL_ACCOUNTCREATEUSER=HOST+"/api/Account/CreateUser" //游客注册
static let URL_ACCOUNTUPDATEPASSWORD=HOST+"/api/Account/UpdatePassword" //重设密码
@@ -101,6 +102,7 @@ final class HTTPServer{
static let URL_ACCOUNTUPDATEUSER=HOST+"/api/Account/Updateuser" //修改用户信息
static let URL_ACCOUNTADDUSER=HOST+"/api/Account/AddUser" //
+ //MARK:-Common(url)
static let URL_COMMONGETCOURSEWAREVERSIONS=HOST+"/api/Common/GetCourseWareVersions" //获取所有的教材版本
static let URL_COMMONGETSUBJECTS=HOST+"/api/Common/GetSubjects" //获取学科
static let URL_COMMONGETSCHOOLTYPES=HOST+"/api/Common/GetSchoolTypes" //获取学段
@@ -109,6 +111,7 @@ final class HTTPServer{
static let URL_COMMONGETCOURSEWAVES=HOST+"/api/Common/GetCourseWaves" //获取教材
static let URL_UPLOAD_FILE=HOST+"/api/Common/UploadFile" //文件上传接口，接受图片(gif,jpg,jpeg,png,bmp)、视频(flv,mp4)、音频(mp3,aac)
+ //MARK:-Course(url)
static let URL_COURSEGETHOTRESCOURSE=HOST+"/api/Course/GetHotRescourse" //获取热门微课/课件/电视台节目
static let URL_COURSEGETRESOURCECOUNT=HOST+"/api/Course/GetResourceCount" //获取微课/课件/电视台节目的总数量
static let URL_COURSEGETTOPTENSCHOOL=HOST+"/api/Course/GetTopTenSchool" //获取十佳校园电视台
@@ -121,6 +124,31 @@ final class HTTPServer{
static let URL_COURSEGETTESTCATAGORY=HOST+"/api/Course/GetTestCatagory" //获取考点目录（已初始化成ztree所要求的格式）
static let URL_COURSEGETTELEVISIONSTATIONCATAGORY=HOST+"/api/Course/GetTelevisionStationCatagory" //获取电视台目录
+ //MARK:-DataStatistics(url)
+ static let URL_DATASTATISTICGETSCHOOLGENERAL=HOST+"/api/DataStatistics/GetSchoolGeneral" //获取前十学校的综合排行
+ static let URL_DATASTATISTICGETSCHOOLPV=HOST+"/api/DataStatistics/GetSchoolPv" //获取前十学校的阅读量排行
+ static let URL_DATASTATISTICGETSCHOOLDOWNLOADS=HOST+"/api/DataStatistics/GetSchoolDownloads" //获取排行前十学校的下载量
+ static let URL_DATASTATISTICGETSCHOOLUPLOAD=HOST+"/api/DataStatistics/GetSchoolUpload" //获取排行前十学校的上传数
+ static let URL_DATASTATISTICGETTEACHERGENERALS=HOST+"/api/DataStatistics/GetTeacherGenerals" //获取排行前十的教师的综合数
+ static let URL_DATASTATISTICGETTEACHERPVS=HOST+"/api/DataStatistics/GetTeacherPvs" //获取排名前十的教师发的资源的阅读量
+ static let URL_DATASTATISTICGETTEACHERDOWNLOAD=HOST+"/api/DataStatistics/GetTeacherDownload" //获取排名前十的资源的下载量
+ static let URL_DATASTATISTICGETTEACHERUPLOAD=HOST+"/api/DataStatistics/GetTeacherUpload" //获取排名前十的教师的上传量
+ static let URL_DATASTATISTICGETGETRANKSBYPAGE=HOST+"/api/DataStatistics/GetRanksByPage" //分页获取排行榜
+
+ //MARK:-UserCenter(url)
+ static let URL_USERCENTERGETMYALLRESOURCES=HOST+"/api/UserCenter/GetMyAllResources" //获取我的资源
+ static let URL_USERCENTERGETALLRESOURCES=HOST+"/api/UserCenter/GetAllResources" //获取校本资源
+ static let URL_USERCENTERGETADDRESOURCE=HOST+"/api/UserCenter/AddResource" //上传资源/微课/校园电视台
+ static let URL_USERCENTERGETUPDATERESOURCE=HOST+"/api/UserCenter/UpdateResource" //修改资源/微课/校园电视台
+ static let URL_USERCENTERGETEXAMINERESOURCE=HOST+"/api/UserCenter/ExamineResource" //审核资源/微课/校园电视台
+ static let URL_USERCENTERGETDELETERESOURCE=HOST+"/api/UserCenter/DeleteResource" //删除资源/微课/校园电视台
+ static let URL_USERCENTERGETHIDERESOURCE=HOST+"/api/UserCenter/HideResource" //隐藏资源/微课/校园电视台
+ static let URL_USERCENTERGETUPDATEDOWNLOADSUM=HOST+"/api/UserCenter/UpdateDownloadSum" //资源下载时更新下载量
+ static let URL_USERCENTERGETGETHISTORYVIEW=HOST+"/api/UserCenter/GetHistroyView" //历史记录
+ static let URL_USERCENTERGETADDHISTORYVIEW=HOST+"/api/UserCenter/AddHistoryView" //添加历史记录
+ static let URL_USERCENTERGETGETMYUSER=HOST+"/api/UserCenter/GetMyUser" //已开设账号
+ static let URL_USERCENTERGETADDUSER=HOST+"/api/UserCenter/AddUser" //开设学生账号
+
var token:String?{
return accountManager.token
@@ -261,9 +289,116 @@ final class HTTPServer{
func getTelevisionStationCatagory(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
KHttp.GET(url: HTTPServer.URL_COURSEGETTELEVISIONSTATIONCATAGORY, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
+
+
//MARK:-DataStatistics
+ //获取前十学校的综合排行
+ func getSchoolGeneral(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETSCHOOLGENERAL, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取前十学校的阅读量排行
+ func getSchoolPv(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETSCHOOLPV, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取排行前十学校的下载量
+ func getSchoolDownloads(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETSCHOOLDOWNLOADS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取排行前十学校的上传数
+ func getSchoolUpload(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETSCHOOLUPLOAD, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取排行前十的教师的综合数
+ func getTeacherGenerals(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETTEACHERGENERALS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取排名前十的教师发的资源的阅读量
+ func getTeacherPvs(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETTEACHERPVS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取排名前十的资源的下载量
+ func getTeacherDownload(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETTEACHERDOWNLOAD, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取排名前十的教师的上传量
+ func getTeacherUpload(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_DATASTATISTICGETTEACHERUPLOAD, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //分页获取排行榜
+ func getRanksByPage(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_DATASTATISTICGETGETRANKSBYPAGE, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+
//MARK:-UserCenter
-
+ //获取我的资源
+ func getMyAllResources(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETMYALLRESOURCES, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //获取校本资源
+ func getAllResources(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETALLRESOURCES, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //上传资源/微课/校园电视台
+ func addResource(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETADDRESOURCE, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //修改资源/微课/校园电视台
+ func updateResource(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETUPDATERESOURCE, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //审核资源/微课/校园电视台
+ func examineResource(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_USERCENTERGETEXAMINERESOURCE, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //删除资源/微课/校园电视台
+ func deleteResource(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_USERCENTERGETDELETERESOURCE, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //隐藏资源/微课/校园电视台
+ func hideResource(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_USERCENTERGETHIDERESOURCE, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //资源下载时更新下载量
+ func updateDownloadSum(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.GET(url: HTTPServer.URL_USERCENTERGETUPDATEDOWNLOADSUM, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //历史记录
+ func getHistroyView(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETGETHISTORYVIEW, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //添加历史记录
+ func addHistoryView(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETADDHISTORYVIEW, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //已开设账号
+ func getMyUser(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETGETMYUSER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
+ //开设学生账号
+ func addUser(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+ KHttp.POST(url: HTTPServer.URL_USERCENTERGETADDUSER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+
}
let SERVER_MESSAGE=393939
--
libgit2 0.21.0