From ac85ee8fc7f9696259bf61b2de10aebbf9965703 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Sun, 8 Apr 2018 17:10:53 +0800
Subject: [PATCH] 给network瘦身,添加德育报告和场景接口
---
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 122344 -> 0 bytes
ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift | 16 ++++++++++++++--
ParentAssistant/ParentAssistant/Classes/util/Macro.swift | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
ParentAssistant/ParentAssistant/Classes/util/network.swift | 126 +++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------
4 files changed, 115 insertions(+), 88 deletions(-)
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 03cbb7f..14f3093 100644
Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
index 0631f05..98eb76b 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
@@ -16,9 +16,21 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS
self.title = "德育报告"
tableView.delegate = self
tableView.dataSource = self
- // Do any additional setup after loading the view.
+
+
+ downLoadDataFromNet()
}
-
+
+ private func downLoadDataFromNet(){
+
+ let params = ["name":"sss"]
+ HTTPServer.shared.getEvaluationSceneAnalysis(parameters: params as [String : AnyObject]) { (backData, error) in
+
+ }
+ }
+
+
+
func numberOfSections(in tableView: UITableView) -> Int {
return 3
}
diff --git a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
index cedf420..ac9a9d2 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
@@ -8,12 +8,71 @@
import Foundation
import UIKit
-//全局变量
+
+//MARK: -------------------------- 全局常量 -----------------------------
let appDelegate = UIApplication.shared.delegate as! AppDelegate
let screenWidth = UIScreen.main.bounds.size.width
let screenHeight = UIScreen.main.bounds.size.height
+//MARK: -------------------------- 接口地址 ----------------------------
+let appsecret="sincere:3a530f39f99411b454e667d69693c127"
+var ReleaseHOST:String!="http://campus.myjxt.com"//正式网址
+var ReleaseHOSTWap:String!="http://parent.myjxt.com"
+var ReleaseHOSTImage:String!="http://manage.myjxt.com"
+var DebugHOST:String!="http://60.190.202.57:1000"//测试网址
+var DebugHOSTWap:String!="http://60.190.202.57:8101"
+var DebugHOSTImage:String!="http://60.190.202.57:8196"
+var HOST:String! = Debug.isFormal ? ReleaseHOST : DebugHOST
+var HOSTWAP:String! = Debug.isFormal ? ReleaseHOSTWap : DebugHOSTWap
+var HOSTImage:String! = Debug.isFormal ? ReleaseHOSTImage : DebugHOSTImage
+
+let URL_UPLOAD_FILE=HOST+"/api/Class/UploadFile" //上传图片
+
+var URL_GETHOSTURL:String! = "http://campus.myjxt.com/api/Common/GetListSchoolPrivate"
+
+let URL_OAUTH_TOKEN="/Token"
+let URL_CURRENT_INFO="/api/Account/CurrentInfo"
+let URL_CHANGE_PASSWORD="/api/Account/ChangePassword"
+let URL_CHANGE_INFO="/api/Account/ChangeInfo"
+let URL_CHANGEPHONECAPTCHA="/api/Account/ChangePhoneCaptcha"
+let URL_RESTPW="/api/Account/ReSetpass"
+let URL_SCANLOGINCODE = "/api/Account/ScanLogin"
+let URL_IDENTITYLIST = "/api/Account/IdentityList"
+let URL_IDENTITYCONFRIM = "/api/Account/IdentityConfrim"
+
+let URL_PARENTREGISTER = "/api/ParentHelper/ParentRegister"//家长注册
+let URL_CAPTCHA="/api/Account/ChangePhoneCaptcha"//获取注册验证码
+let URL_GETPARENTINFO = "/api/ParentHelper/GetParentInfo"//登录获取家长信息（包括关联的孩子信息区分绑定状态)
+let URL_UPDATEPARENTINFO = "/api/ParentHelper/UpdateParentInfo"//更新姓名和性别
+let URL_GETORDERLIST = "/api/ParentHelper/GetOrderList"//获取我的短信包列表
+let URL_UNBINDSTUDENT = "/api/ParentHelper/UnBindStudent"//解绑孩子
+
+let URL_GETAREASCHOOL = "/api/ParentHelper/GetAreaSchool"//根据选择的市获取该地区的学校或者根据关键字搜索学校
+let URL_GETCLASSORGRADE = "/api/ParentHelper/GetClassOrGrade"//获取该学校的年级或班级
+let URL_BINDLINGCHILDREN = "/api/ParentHelper/BindlingChildren"//绑定孩子信息(合作学校绑定返回null，非合作学校返回“汇作业”账号和密码)
+
+let URL_GETOPENADS="/api/Index/GetOpenAds" //获取开屏广告URL
+let URL_USER_MYLIVEREMIND="/api/User/MyLiveRemind" //我的课程提醒
+let URL_USER_USERINFO="/api/User/UserInfo" //更新本地个人信息
+let URL_USER_UPDATEPASSWORD="/api/User/UpdatePassword" //修改密码
+
+
+//MARK: ---- ParentService -----
+let URL_PARENTSERVICE_GETACTIVITYTOOL="/api/ParentService/GetActivityTool" //获取工具入口和活动
+let URL_PARENTSERVICE_GETCHANNELINFO="/api/ParentService/GetChannelInfo" //获取频道资讯
+let URL_PARENTSERVICE_GETINFORMATIONTOPIC="/api/ParentService/GetInformationTopic" //获取首页资讯话题/搜索资讯
+let URL_PARENTSERVICE_GETORDERSUBJECT="/api/ParentService/GetOrderSubject" //获取订购的报告或科目
+let URL_PARENTSERVICE_WORKREPORT="/api/ParentService/WorkReport" //获取报告列表
+let URL_PARENTSERVICE_WORKREPORTDETAILS="/api/ParentService/WorkReportDetails" //获取报告详情
+let URL_PARENTSERVICE_ORDERCENTER="/api/ParentService/OrderCenter" //订购信息
+let URL_PARENTSERVICE_ORDERSERVICEDETAILS="/api/ParentService/OrderServiceDetails" //查看订购详情
+let URL_PARENTSERVICE_GETADS="/api/ParentService/GetAds" //获取广告位信息 广告位置0-首次广告位1-开屏广告位2-资讯首页3-频道首页4-频道内容5-文章内容页
+//MARK: 量规评价
+/// 德育报告整体详情
+let URL_POST_EVALUATION_ANALYSIS = "/api/EvaluationStatistics/GetEvaluationAlalysis"
+/// 德育报告场景详情
+let URL_POST_EVALUATION_ANALYSIS_DETAILS = "/api/EvaluationLabel/GetSceneAnalysisDetails"
diff --git a/ParentAssistant/ParentAssistant/Classes/util/network.swift b/ParentAssistant/ParentAssistant/Classes/util/network.swift
index 3c67f27..d8ff50d 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/network.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/network.swift
@@ -34,7 +34,9 @@ final class KHttp{
// return (.CancelAuthenticationChallenge, nil)
// }
// }
- request(url, method: method, parameters: parameters, encoding: encoding, headers: headers).responseString { (response) -> Void in
+
+ let requestUrl = HOST + url
+ request(requestUrl, method: method, parameters: parameters, encoding: encoding, headers: headers).responseString { (response) -> Void in
let error=response.result.error
let str=response.result.value
if let er=error{
@@ -45,7 +47,7 @@ final class KHttp{
}else{
appDelegate.window!.makeToast("加载失败:\(er.localizedDescription)", duration: 1, position: CSToastPositionBottom)
}
- NSLog("ERROR: url:\(url),error:\(er)")
+ NSLog("ERROR: url:\(requestUrl),error:\(er)")
}
completionHandler(str,error as NSError?)
}
@@ -85,68 +87,15 @@ final class HTTPServer{
static let shared = HTTPServer()
init() {}
- let appsecret="sincere:3a530f39f99411b454e667d69693c127"
- static var ReleaseHOST:String!="http://campus.myjxt.com"//正式网址
- static var ReleaseHOSTWap:String!="http://parent.myjxt.com"
- static var ReleaseHOSTImage:String!="http://manage.myjxt.com"
- static var DebugHOST:String!="http://60.190.202.57:1000"//测试网址
- static var DebugHOSTWap:String!="http://60.190.202.57:8101"
- static var DebugHOSTImage:String!="http://60.190.202.57:8196"
- static var HOST:String! = Debug.isFormal ? ReleaseHOST : DebugHOST
- static var HOSTWAP:String! = Debug.isFormal ? ReleaseHOSTWap : DebugHOSTWap
- static var HOSTImage:String! = Debug.isFormal ? ReleaseHOSTImage : DebugHOSTImage
-
- static let URL_UPLOAD_FILE=HOST+"/api/Class/UploadFile" //上传图片
-
- static var URL_GETHOSTURL:String! = "http://campus.myjxt.com/api/Common/GetListSchoolPrivate"
-
- static var URL_OAUTH_TOKEN=HOST+"/Token"
- static var URL_CURRENT_INFO=HOST+"/api/Account/CurrentInfo"
- static var URL_CHANGE_PASSWORD=HOST+"/api/Account/ChangePassword"
- static var URL_CHANGE_INFO=HOST+"/api/Account/ChangeInfo"
- static var URL_CHANGEPHONECAPTCHA=HOST+"/api/Account/ChangePhoneCaptcha"
- static var URL_RESTPW=HOST+"/api/Account/ReSetpass"
- static var URL_SCANLOGINCODE = HOST+"/api/Account/ScanLogin"
- static var URL_IDENTITYLIST = HOST+"/api/Account/IdentityList"
- static var URL_IDENTITYCONFRIM = HOST+"/api/Account/IdentityConfrim"
-
- static var URL_PARENTREGISTER = HOST+"/api/ParentHelper/ParentRegister"//家长注册
- static var URL_CAPTCHA=HOST+"/api/Account/ChangePhoneCaptcha"//获取注册验证码
- static var URL_GETPARENTINFO = HOST+"/api/ParentHelper/GetParentInfo"//登录获取家长信息（包括关联的孩子信息区分绑定状态)
- static var URL_UPDATEPARENTINFO = HOST+"/api/ParentHelper/UpdateParentInfo"//更新姓名和性别
- static var URL_GETORDERLIST = HOST+"/api/ParentHelper/GetOrderList"//获取我的短信包列表
- static var URL_UNBINDSTUDENT = HOST+"/api/ParentHelper/UnBindStudent"//解绑孩子
-
- static var URL_GETAREASCHOOL = HOST+"/api/ParentHelper/GetAreaSchool"//根据选择的市获取该地区的学校或者根据关键字搜索学校
- static var URL_GETCLASSORGRADE = HOST+"/api/ParentHelper/GetClassOrGrade"//获取该学校的年级或班级
- static var URL_BINDLINGCHILDREN = HOST+"/api/ParentHelper/BindlingChildren"//绑定孩子信息(合作学校绑定返回null，非合作学校返回“汇作业”账号和密码)
-
- static let URL_GETOPENADS=HOST+"/api/Index/GetOpenAds" //获取开屏广告URL
- static let URL_USER_MYLIVEREMIND=HOST+"/api/User/MyLiveRemind" //我的课程提醒
- static let URL_USER_USERINFO=HOST+"/api/User/UserInfo" //更新本地个人信息
- static let URL_USER_UPDATEPASSWORD=HOST+"/api/User/UpdatePassword" //修改密码
-
-
- //MARK: ---- ParentService -----
- static let URL_PARENTSERVICE_GETACTIVITYTOOL=HOST+"/api/ParentService/GetActivityTool" //获取工具入口和活动
- static let URL_PARENTSERVICE_GETCHANNELINFO=HOST+"/api/ParentService/GetChannelInfo" //获取频道资讯
- static let URL_PARENTSERVICE_GETINFORMATIONTOPIC=HOST+"/api/ParentService/GetInformationTopic" //获取首页资讯话题/搜索资讯
- static let URL_PARENTSERVICE_GETORDERSUBJECT=HOST+"/api/ParentService/GetOrderSubject" //获取订购的报告或科目
- static let URL_PARENTSERVICE_WORKREPORT=HOST+"/api/ParentService/WorkReport" //获取报告列表
- static let URL_PARENTSERVICE_WORKREPORTDETAILS=HOST+"/api/ParentService/WorkReportDetails" //获取报告详情
- static let URL_PARENTSERVICE_ORDERCENTER=HOST+"/api/ParentService/OrderCenter" //订购信息
- static let URL_PARENTSERVICE_ORDERSERVICEDETAILS=HOST+"/api/ParentService/OrderServiceDetails" //查看订购详情
- static let URL_PARENTSERVICE_GETADS=HOST+"/api/ParentService/GetAds" //获取广告位信息 广告位置0-首次广告位1-开屏广告位2-资讯首页3-频道首页4-频道内容5-文章内容页
-
var token:String?{
return AccountManager.shared.token
}
-// var accountManager:AccountManager!
+
//上传图片
func uploadFile(file:NSURL,progress:((Int64, Int64, Int64) -> Void)? = nil,completionHandler: @escaping (String?, NSError?) -> Void){
upload(multipartFormData: { (multipartFormData) in
multipartFormData.append(file as URL, withName: "file")
- }, usingThreshold: SessionManager.multipartFormDataEncodingMemoryThreshold, to: HTTPServer.URL_UPLOAD_FILE, method: .post, headers: nil) { (encodingResult) in
+ }, usingThreshold: SessionManager.multipartFormDataEncodingMemoryThreshold, to: URL_UPLOAD_FILE, method: .post, headers: nil) { (encodingResult) in
switch encodingResult {
case .success(let upload, _, _):
upload.responseString(completionHandler: { (response) in
@@ -165,7 +114,7 @@ final class HTTPServer{
let time=timeFormatter.string(from: Date())+"\(arc4random()%10000)"
let appSecret="5d744518ac1c"
let authorization=(time.md5()+":"+(time.md5()+appSecret).md5()).data(using: String.Encoding.ascii)?.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0)) ?? ""
- KHttp.POST(url: HTTPServer.URL_OAUTH_TOKEN,parameters: ["grant_type":"password" as AnyObject,"username":phone as AnyObject,"password":password as AnyObject], encoding: URLEncoding.default,headers:["Authorization":"Basic "+authorization], completionHandler: completionHandler)
+ KHttp.POST(url: URL_OAUTH_TOKEN,parameters: ["grant_type":"password" as AnyObject,"username":phone as AnyObject,"password":password as AnyObject], encoding: URLEncoding.default,headers:["Authorization":"Basic "+authorization], completionHandler: completionHandler)
}
//更新token
func refreshToken(completionHandler:@escaping (String?, NSError?) -> Void,token refresh_token:String){
@@ -174,34 +123,34 @@ final class HTTPServer{
let time=timeFormatter.string(from: Date())+"\(arc4random()%10000)"
let appSecret="5d744518ac1c"
let authorization=(time.md5()+":"+(time.md5()+appSecret).md5()).data(using: String.Encoding.ascii)?.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0)) ?? ""
- KHttp.POST(url: HTTPServer.URL_OAUTH_TOKEN, parameters:["grant_type":"refresh_token" as AnyObject,"refresh_token":refresh_token as AnyObject], headers:["Authorization":"Basic "+authorization],completionHandler: completionHandler)
+ KHttp.POST(url: URL_OAUTH_TOKEN, parameters:["grant_type":"refresh_token" as AnyObject,"refresh_token":refresh_token as AnyObject], headers:["Authorization":"Basic "+authorization],completionHandler: completionHandler)
}
//获取开屏广告URL
func getOpenAds(completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_GETOPENADS,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_GETOPENADS,headers:["Authorization":token!], completionHandler: completionHandler)
}
//我的课程提醒
func getMyLiveRemind(completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_USER_MYLIVEREMIND, headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_USER_MYLIVEREMIND, headers:["Authorization":token!], completionHandler: completionHandler)
}
//更新本地个人信息
func uplocalUserInfo(completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_USER_USERINFO, headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_USER_USERINFO, headers:["Authorization":token!], completionHandler: completionHandler)
}
//修改密码
func updatePassword(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_USER_UPDATEPASSWORD, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_USER_UPDATEPASSWORD, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//家长注册
func parentRegister(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_PARENTREGISTER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_PARENTREGISTER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取注册验证码
func getCaptcha(_ mobile:String,completionHandler:@escaping (String?, NSError?) -> Void){
- KHttp.GET(url: HTTPServer.URL_CAPTCHA,parameters:["mobile":mobile as AnyObject],headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_CAPTCHA,parameters:["mobile":mobile as AnyObject],headers:["Authorization":token!], completionHandler: completionHandler)
}
//找回密码
func resetPassWord(_ mobile:String,pw:String?=nil,code:String,completionHandler:@escaping (String?, NSError?) -> Void){
@@ -213,88 +162,95 @@ final class HTTPServer{
}
//,headers:["Authorization":anonymousToken ?? ""]
- KHttp.GET(url: HTTPServer.URL_RESTPW,parameters:p! as [String : AnyObject], completionHandler: completionHandler)
+ KHttp.GET(url: URL_RESTPW,parameters:p! as [String : AnyObject], completionHandler: completionHandler)
}
//登录获取家长信息（包括关联的孩子信息区分绑定状态
func getParentInfo(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_GETPARENTINFO,parameters:parameters, headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_GETPARENTINFO,parameters:parameters, headers:["Authorization":token!], completionHandler: completionHandler)
}
//更新姓名和性别
func updateParentInfo(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_UPDATEPARENTINFO, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_UPDATEPARENTINFO, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取我的短信包列表
func getOrderList(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_GETORDERLIST,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_GETORDERLIST,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//解绑孩子
func getUnBindStudent(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_UNBINDSTUDENT,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_UNBINDSTUDENT,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//根据选择的市获取该地区的学校或者根据关键字搜索学校
func getAreaSchool(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- // var urlStr = HTTPServer.URL_GETAREASCHOOL+"?AreaName=\(getPercentEncodingString(str: parameters["AreaName"]! as! String))"
+ // var urlStr = URL_GETAREASCHOOL+"?AreaName=\(getPercentEncodingString(str: parameters["AreaName"]! as! String))"
// if let str = parameters["Keyword"]{
// urlStr = urlStr + "&Keyword=\(getPercentEncodingString(str: str as! String))"
// }
- KHttp.POST(url: HTTPServer.URL_GETAREASCHOOL, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_GETAREASCHOOL, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取该学校的年级或班级
func getClassOrGrade(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_GETCLASSORGRADE,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_GETCLASSORGRADE,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//MARK: ---- ParentService -----
//获取工具入口和活动
func getActivityTool(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_PARENTSERVICE_GETACTIVITYTOOL,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_PARENTSERVICE_GETACTIVITYTOOL,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//绑定孩子信息(合作学校绑定返回null，非合作学校返回“汇作业”账号和密码)
func bindlingChildren(parameters: [String : AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_BINDLINGCHILDREN, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_BINDLINGCHILDREN, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取频道资讯
func getChannelInfo(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_PARENTSERVICE_GETCHANNELINFO,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_PARENTSERVICE_GETCHANNELINFO,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取首页资讯话题/搜索资讯
func getInformationTopic(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_PARENTSERVICE_GETINFORMATIONTOPIC,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_PARENTSERVICE_GETINFORMATIONTOPIC,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取订购的报告或科目
func getOrderSubject(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_PARENTSERVICE_GETORDERSUBJECT,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_PARENTSERVICE_GETORDERSUBJECT,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取报告列表
func workReport(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_PARENTSERVICE_WORKREPORT, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_PARENTSERVICE_WORKREPORT, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
-
+ //MARK: - 量规评价
//获取报告详情
func workReportDetails(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_PARENTSERVICE_WORKREPORTDETAILS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_PARENTSERVICE_WORKREPORTDETAILS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ }
+ //获取德育报告-总体详情
+ func getEvaluationSceneAnalysis(parameters:[String:AnyObject]?,completionHandler:@escaping (String?,NSError?)->()){
+ KHttp.POST(url: URL_POST_EVALUATION_ANALYSIS, parameters: parameters, headers: ["Authorization":token!], completionHandler: completionHandler)
+ }
+ //获取德育报告-场景详情
+ func getEvaluationSceneAnalysisDetails(parameters:[String:AnyObject]?,completionHandler:@escaping (String?,NSError?)->()){
+ KHttp.POST(url: URL_POST_EVALUATION_ANALYSIS_DETAILS, parameters: parameters, headers: ["Authorization":token!], completionHandler: completionHandler)
}
-
//订购信息
func orderCenter(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.POST(url: HTTPServer.URL_PARENTSERVICE_ORDERCENTER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.POST(url: URL_PARENTSERVICE_ORDERCENTER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//查看订购详情
func orderServiceDetails(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_PARENTSERVICE_ORDERSERVICEDETAILS,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_PARENTSERVICE_ORDERSERVICEDETAILS,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
//获取广告位信息
func getAds(_ parameters:[String:AnyObject],completionHandler:@escaping (String?, NSError?) -> ()){
- KHttp.GET(url: HTTPServer.URL_PARENTSERVICE_GETADS,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+ KHttp.GET(url: URL_PARENTSERVICE_GETADS,parameters:parameters,headers:["Authorization":token!], completionHandler: completionHandler)
}
--
libgit2 0.21.0