From 684fa2de94987ab140305aa5f951cf22ea3c48f6 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Sun, 8 Apr 2018 17:55:57 +0800
Subject: [PATCH] 调试接口,优化接口地址
---
ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist | 2 +-
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 128421 -> 0 bytes
ParentAssistant/ParentAssistant/AppDelegate.swift | 4 ++--
ParentAssistant/ParentAssistant/Classes/controllers/Information/ChannelViewController.swift | 6 +++---
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift | 10 +++++-----
ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift | 8 ++++----
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift | 2 +-
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift | 6 +++---
ParentAssistant/ParentAssistant/Classes/controllers/my/View/OrderDetailTableViewCell.swift | 2 +-
ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift | 14 ++++++++++++--
ParentAssistant/ParentAssistant/Classes/util/Macro.swift | 2 +-
ParentAssistant/ParentAssistant/Classes/util/utils.swift | 8 ++++----
ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist | 2 +-
13 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
index 51a860c..d073d4a 100644
--- a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
<key>ParentAssistant.xcscheme</key>
<dict>
<key>orderHint</key>
- <integer>0</integer>
+ <integer>1</integer>
</dict>
</dict>
</dict>
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 14f3093..99fa620 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/AppDelegate.swift b/ParentAssistant/ParentAssistant/AppDelegate.swift
index e8a4921..0eb2c0d 100644
--- a/ParentAssistant/ParentAssistant/AppDelegate.swift
+++ b/ParentAssistant/ParentAssistant/AppDelegate.swift
@@ -74,7 +74,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
if json["status"] == 1 && error == nil{
if json.contentData().arrayValue.count>0 {
let imageResource = ZLaunchAdImageResourceConfigure()
- imageResource.imageNameOrImageURL = HTTPServer.HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+ imageResource.imageNameOrImageURL = HOSTImage+json.contentData().arrayValue[0]["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
imageResource.imageDuration = 5
imageResource.imageFrame = UIScreen.main.bounds
adView.setImageResource(imageResource, action: {
@@ -101,7 +101,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var images:[String] = []
if json.contentData().arrayValue.count>0 {
for item in json.contentData().arrayValue {
- images.append(HTTPServer.HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
+ images.append(HOSTImage+item["fileSrc"].stringValue.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
}
LaunchIntroductionView.shared(withImages: images, buttonImage: "icon_getin", buttonFrame: CGRect(x: getScreenWidth()/2-551/4, y: getScreenHeight()-150, width: 551/2, height: 45))
}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/ChannelViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Information/ChannelViewController.swift
index 1e1bbac..916918c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/ChannelViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/ChannelViewController.swift
@@ -182,7 +182,7 @@ extension ChannelViewController:UICollectionViewDataSource,UICollectionViewDeleg
cell.option.text = item.content
cell.optionNum.text = "\(item.talkNum)"
cell.shareNum.text = "\(item.forwardingNum)"
- cell.picture.sd_setImage(with: URL(string: (HTTPServer.HOSTImage+item.image).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "navigationBar_backgrounImage"))
+ cell.picture.sd_setImage(with: URL(string: (HOSTImage+item.image).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "navigationBar_backgrounImage"))
return cell
// }else{
// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "adiouPlayerCell", for: indexPath) as! AdiouPlayerCell
@@ -200,7 +200,7 @@ extension ChannelViewController:UICollectionViewDataSource,UICollectionViewDeleg
break
default:
let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
- vcs.webURL = "\(HTTPServer.HOSTWAP!)/ParentOrderCenter.aspx?userid=\(AccountManager.shared.id())"
+ vcs.webURL = "\(HOSTWAP!)/ParentOrderCenter.aspx?userid=\(AccountManager.shared.id())"
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}
}
@@ -248,7 +248,7 @@ extension ChannelViewControllerCell:UICollectionViewDataSource,UICollectionViewD
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "channelcell", for: indexPath) as! ChannelSelectViewCollectionViewCell
- cell.image.sd_setImage(with: URL(string: (HTTPServer.HOSTImage+SubchannelList[indexPath.row].channelImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: #imageLiteral(resourceName: "Information_bar_icon"))
+ cell.image.sd_setImage(with: URL(string: (HOSTImage+SubchannelList[indexPath.row].channelImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: #imageLiteral(resourceName: "Information_bar_icon"))
cell.channelName.text = SubchannelList[indexPath.row].channelName
return cell
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
index 8cea45e..0aa7a1d 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
@@ -190,7 +190,7 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
if data.channelContent[index].url != "" {
vcs.webURL = data.channelContent[index].url
}else{
- vcs.webURL = (HTTPServer.HOSTWAP+"/InformationDetail.aspx?id="+"\(data.channelContent[index].id)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+ vcs.webURL = (HOSTWAP+"/InformationDetail.aspx?id="+"\(data.channelContent[index].id)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
}
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}
@@ -253,7 +253,7 @@ extension InformationViewController:UICollectionViewDataSource,UICollectionViewD
if topADs.count > 0 {
var arr:[String]=[]
for item in topADs{
- arr.append(HTTPServer.HOSTImage+item.fileSrc)
+ arr.append(HOSTImage+item.fileSrc)
}
cell.headerImageView.imageArray = arr
}
@@ -272,7 +272,7 @@ extension InformationViewController:UICollectionViewDataSource,UICollectionViewD
cell.option.text = item.content
cell.optionNum.text = "\(item.lookNum)"
cell.shareNum.text = "\(item.forwardingNum)"
- cell.picture.sd_setImage(with: URL(string: (HTTPServer.HOSTImage+item.image).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "navigationBar_backgrounImage"))
+ cell.picture.sd_setImage(with: URL(string: (HOSTImage+item.image).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "navigationBar_backgrounImage"))
return cell
// }else{
// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "adiouPlayerCell", for: indexPath) as! AdiouPlayerCell
@@ -294,7 +294,7 @@ extension InformationViewController:UICollectionViewDataSource,UICollectionViewD
if data.channelContent[indexPath.row].url != "" {
vcs.webURL = data.channelContent[indexPath.row].url
}else{
- vcs.webURL = (HTTPServer.HOSTWAP+"/InformationDetail.aspx?id="+"\(data.channelContent[indexPath.row].id)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+ vcs.webURL = (HOSTWAP+"/InformationDetail.aspx?id="+"\(data.channelContent[indexPath.row].id)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
}
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
@@ -361,7 +361,7 @@ extension ChannelSelectView:UICollectionViewDataSource,UICollectionViewDelegateF
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "channelcell", for: indexPath) as! ChannelSelectViewCollectionViewCell
- cell.image.sd_setImage(with: URL(string: (HTTPServer.HOSTImage+SubchannelList[indexPath.row].channelImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "evaluation_icon_highSchoolEnter"))
+ cell.image.sd_setImage(with: URL(string: (HOSTImage+SubchannelList[indexPath.row].channelImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "evaluation_icon_highSchoolEnter"))
cell.channelName.text = SubchannelList[indexPath.row].channelName
return cell
}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
index 59a3c7e..a061c52 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
@@ -66,7 +66,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
if index > 2{
return
}
- courseImage[index].sd_setImage(with: URL(string: (HTTPServer.HOSTImage+item.toolImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "navigationBar_backgrounImage"))
+ courseImage[index].sd_setImage(with: URL(string: (HOSTImage+item.toolImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "navigationBar_backgrounImage"))
courseLabel[index].text = item.toolName
}
}
@@ -234,7 +234,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
if activityArr[sender.tag-3000].toolUrl != "" {
vcs.webURL = activityArr[sender.tag-3000].toolUrl
}else{
- vcs.webURL = (HTTPServer.HOSTWAP+"/InformationDetail.aspx?id="+"\(activityArr[sender.tag-3000].toolId)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+ vcs.webURL = (HOSTWAP+"/InformationDetail.aspx?id="+"\(activityArr[sender.tag-3000].toolId)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
}
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}
@@ -266,7 +266,7 @@ extension EvaluationViewController:UICollectionViewDataSource,UICollectionViewDe
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "channelcell", for: indexPath) as! ChannelSelectViewCollectionViewCell
- cell.image.sd_setImage(with: URL(string: (HTTPServer.HOSTImage+toolArr[indexPath.row].toolImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "evaluation_icon_highSchoolEnter"))
+ cell.image.sd_setImage(with: URL(string: (HOSTImage+toolArr[indexPath.row].toolImage).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!), placeholderImage: UIImage(named: "evaluation_icon_highSchoolEnter"))
cell.channelName.text = toolArr[indexPath.row].toolName
return cell
}
@@ -276,7 +276,7 @@ extension EvaluationViewController:UICollectionViewDataSource,UICollectionViewDe
if toolArr[indexPath.row].toolUrl != "" {
vcs.webURL = toolArr[indexPath.row].toolUrl
}else{
- vcs.webURL = (HTTPServer.HOSTWAP+"/InformationDetail.aspx?id="+"\(toolArr[indexPath.row].toolId)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+ vcs.webURL = (HOSTWAP+"/InformationDetail.aspx?id="+"\(toolArr[indexPath.row].toolId)"+"&areaname="+AccountManager.shared.address).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
}
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
index fed9ef1..27d8576 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
@@ -43,7 +43,7 @@ class MyChildrenViewController: UIViewController{
// MARK: - 我的孩子去订购点击事件
@IBAction func orderBuyAction(_ sender: UIButton) {
let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
- vcs.webURL = "\(HTTPServer.HOSTWAP!)/ParentOrderCenter.aspx?userid=\(AccountManager.shared.id())"
+ vcs.webURL = "\(HOSTWAP!)/ParentOrderCenter.aspx?userid=\(AccountManager.shared.id())"
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
index eea3d05..f9aca43 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
@@ -214,7 +214,7 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
if AccountManager.shared.isOnline() {
let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
vcs.borderline = true
- vcs.webURL = "\(HTTPServer.HOSTWAP!)/ParentOrderCenter.aspx?userid=\(AccountManager.shared.id())"
+ vcs.webURL = "\(HOSTWAP!)/ParentOrderCenter.aspx?userid=\(AccountManager.shared.id())"
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}else{
appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
@@ -228,13 +228,13 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
}
case 5://意见与反馈
let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
- vcs.webURL = HTTPServer.HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)"
+ vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)"
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
case 6://清除缓存
clearCache()
case 7://关于
let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
- vcs.webURL = HTTPServer.HOSTWAP+"/About.html"
+ vcs.webURL = HOSTWAP+"/About.html"
self.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
default:
break
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/View/OrderDetailTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/View/OrderDetailTableViewCell.swift
index f6191db..88b5f9a 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/View/OrderDetailTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/View/OrderDetailTableViewCell.swift
@@ -50,7 +50,7 @@ extension OrderDetailTableViewCell: UICollectionViewDelegate,UICollectionViewDat
}
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
- vcs.webURL = "\(HTTPServer.HOSTWAP!)/OrderDetail.aspx?orderid=\(dataSet[indexPath.row].id)"
+ vcs.webURL = "\(HOSTWAP!)/OrderDetail.aspx?orderid=\(dataSet[indexPath.row].id)"
self.superVC.navigationController?.present(vcs.wrapWithNavigationController(), animated: true, completion: nil)
}
}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
index 98eb76b..6894850 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
@@ -11,6 +11,7 @@ import UIKit
class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
@IBOutlet weak var tableView: UITableView!
+ var data = Array<JSON>()
override func viewDidLoad() {
super.viewDidLoad()
self.title = "德育报告"
@@ -23,9 +24,18 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS
private func downLoadDataFromNet(){
- let params = ["name":"sss"]
+
+ let params = ["screenId":1,"startDate":"2018-03-08","endDate":"2018-04-08","classId":"70","schoolId":1] as [String : Any]
+
HTTPServer.shared.getEvaluationSceneAnalysis(parameters: params as [String : AnyObject]) { (backData, error) in
-
+ print(backData!)
+ if error == nil && JSON.fromString(backData)!["status"].intValue == 1 {
+
+// self.data = SceneEvaluate(j: JSON.fromString(backData)!.contentData())
+// if self.data != nil{
+// print(self.data)
+// }
+ }
}
}
diff --git a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
index ac9a9d2..a39067d 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
@@ -72,7 +72,7 @@ let URL_PARENTSERVICE_GETADS="/api/ParentService/GetAds" //获取广告位�
//MARK: 量规评价
/// 德育报告整体详情
-let URL_POST_EVALUATION_ANALYSIS = "/api/EvaluationStatistics/GetEvaluationAlalysis"
+let URL_POST_EVALUATION_ANALYSIS = "/api/EvaluationLabel/GetStatisticalAnalysis"
/// 德育报告场景详情
let URL_POST_EVALUATION_ANALYSIS_DETAILS = "/api/EvaluationLabel/GetSceneAnalysisDetails"
diff --git a/ParentAssistant/ParentAssistant/Classes/util/utils.swift b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
index 94afb9f..52b32f0 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/utils.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
@@ -12,7 +12,7 @@ import Photos
//MARK: - 服务器和log打印设置
class Debug{
static let enable=false//是否打印log
- static let isFormal=true//是否是正式服务器
+ static let isFormal=false//是否是正式服务器
class func log(_ msg:String){
if(!Debug.enable){
return
@@ -109,14 +109,14 @@ class Setting{
class func saveUserInfo(_ info:String?)->Bool{
if let ret=info{
- UserDefaults.standard.set(ret, forKey: HTTPServer.URL_CURRENT_INFO)
+ UserDefaults.standard.set(ret, forKey: URL_CURRENT_INFO)
}else{
- UserDefaults.standard.set(nil, forKey: HTTPServer.URL_CURRENT_INFO)
+ UserDefaults.standard.set(nil, forKey: URL_CURRENT_INFO)
}
return UserDefaults.standard.synchronize()
}
class func getUserInfo()->JSON?{
- let ob = UserDefaults.standard.string(forKey: HTTPServer.URL_CURRENT_INFO)
+ let ob = UserDefaults.standard.string(forKey: URL_CURRENT_INFO)
return JSON.fromString(ob)
}
diff --git a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
index d1b4da5..1e7f9aa 100644
--- a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
<key>Alamofire.xcscheme</key>
<dict>
<key>orderHint</key>
- <integer>1</integer>
+ <integer>0</integer>
</dict>
<key>DZNEmptyDataSet.xcscheme</key>
<dict>
--
libgit2 0.21.0