From ee4b3175e5026cb26e5c0c923b5eb744741b4398 Mon Sep 17 00:00:00 2001 From: Cao yang Date: Sat, 12 May 2018 20:30:44 +0800 Subject: [PATCH] commit --- ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 401395 -> 0 bytes ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 12 ++++++++++++ ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift | 16 ++++++++++------ ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift | 95 ++++++++++++++++++++++++++++++++++++----------------------------------------------------------- ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard | 58 ++++++++++++++++++++++++++++++++++++++++------------------ 5 files changed, 98 insertions(+), 83 deletions(-) diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 7f8ea23..a93191d 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.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ed9a9b4..e2573a5 100644 --- a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,4 +2,16 @@ + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift index 9275695..a6e0e85 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift @@ -225,12 +225,16 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{ appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) } case 3://我的孩子 - if AccountManager.shared.isOnline() { - let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController - self.navigationController?.pushViewController(vc, animated: true) - }else{ - appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) - } + + let vc = BindlingSuccessViewController() + self.navigationController?.pushViewController(vc, animated: true) + +// if AccountManager.shared.isOnline() { +// let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController +// self.navigationController?.pushViewController(vc, animated: true) +// }else{ +// appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) +// } case 5://意见与反馈 let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)" diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift index a2c87b4..0f5cd61 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift @@ -12,96 +12,75 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol var webView:UIWebView! var header:UIView! var webBrowserView:UIView! - var bindlingType:Int = 1 var bindlingSuccData = String() override func viewDidLoad() { super.viewDidLoad() - self.view.backgroundColor = UIColor.white + self.view.backgroundColor = backGroundColor - // Do any additional setup after loading the view. webView = UIWebView() webView.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: getScreenHeight()) webView.delegate = self; - webView.backgroundColor = UIColor.clear + webView.backgroundColor = UIColor.white self.view.addSubview(webView) + + let url = HOSTWAP+"/RecommendOrder.aspx?userid="+AccountManager.shared.userid let request = URLRequest(url: URL(string: url)!) webView.loadRequest(request) - SVProgressHUD.show() - if bindlingType == 0{ - header = UIView() - header.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: 80) - header.backgroundColor = UIColor.clear - let backView = UIView() - let image = UIImageView(frame: CGRect(x: 0, y: 0, width: 40, height: 40)) + + header = UIView() + header.frame = CGRect(x: 0, y: 0, width: getScreenWidth()-20, height: 100) + header.backgroundColor = UIColor.white + + webBrowserView = webView.scrollView.subviews[0] + var rect = self.webBrowserView.frame + rect.origin.y = header.frame.maxY + webBrowserView.frame = rect + + webView.scrollView.addSubview(header) + + webView.scrollView.addObserver(self, forKeyPath: "contentSize", options: NSKeyValueObservingOptions.new, context: nil) + + + let lineView = UIView.init(frame: CGRect.init(x: 0, y: 70, width: screenWidth, height: 10)) + lineView.backgroundColor = backGroundColor + header.addSubview(lineView) + + let localNew = AccountManager.shared.isNew() + + if localNew == 0{ + let image = UIImageView(frame: CGRect(x: screenWidth/2-60, y: 20, width: 30, height: 30)) image.image = #imageLiteral(resourceName: "my_icon_bindlingSuccess") - backView.addSubview(image) - let label = UILabel(frame: CGRect(x: 50, y: 10, width: header.frame.width - 20, height: 20)) + image.contentMode = .scaleAspectFit + let label = UILabel(frame: CGRect(x: screenWidth/2-20, y: 10, width: header.frame.width - 20, height: 20)) label.text = "绑定成功" label.numberOfLines = 0 label.textColor = UIColor.darkGray - label.font = UIFont.systemFont(ofSize: 15) + label.font = UIFont.systemFont(ofSize: 18) label.sizeToFit() - backView.addSubview(label) - backView.frame.size = CGSize(width: label.frame.maxX, height: 40) - backView.center.y = header.center.y - backView.center.x = header.center.x-10 + label.center.y = image.center.y + + header.addSubview(image) header.addSubview(label) }else{ - header = UIView() - header.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: 150) - header.backgroundColor = UIColor.clear let label = UILabel(frame: CGRect(x: 10, y: 10, width: header.frame.width - 20, height: 100)) if bindlingSuccData.count>0{ if let data = JSON.fromString(bindlingSuccData)?["data"].dictionary{ label.text = "生成孩子\"汇作业\"账号为:\(data["account"]?.stringValue ?? ""),\n初始密码为:\(data["passwprd"]?.stringValue ?? ""),\n孩子可以下载\"汇作业\"app进行使用,\n" } - }else{ - label.text = "孩子绑定成功" } label.numberOfLines = 0 label.textColor = UIColor.darkGray label.font = UIFont.systemFont(ofSize: 15) label.sizeToFit() header.addSubview(label) - - let backView = UIView() - let label2 = UILabel(frame: CGRect(x: 0, y: 5, width: header.frame.width - 20, height: 20)) - label2.text = "下载地址:" - label2.textColor = UIColor.darkGray - label2.font = UIFont.systemFont(ofSize: 15) - label2.sizeToFit() - backView.addSubview(label2) - let btn = UIButton(frame: CGRect(x: label2.frame.maxX, y: 0, width: 70, height: 30)) - - let str = NSMutableAttributedString(string: "汇作业") - let strRange = NSRange(location: 0, length: str.length) - str.addAttributes([NSAttributedStringKey.underlineStyle: NSNumber(integerLiteral: NSUnderlineStyle.styleSingle.rawValue), - NSAttributedStringKey.foregroundColor: Theme.topBarColor(), - NSAttributedStringKey.font: UIFont.systemFont(ofSize: 15)], - range: strRange) - btn.setAttributedTitle(str, for: .normal) - btn.addTarget(self, action: #selector(BindlingSuccessViewController.pushToAppStore), for: .touchUpInside) - backView.addSubview(btn) - backView.frame.size = CGSize(width: btn.frame.width+label2.frame.width+10, height: 30) - backView.center = CGPoint(x: header.center.x-10, y: label.frame.maxY+10) - header.frame.size.height = backView.frame.maxY + 10 - header.addSubview(backView) } - webBrowserView = webView.scrollView.subviews[0] - var rect = self.webBrowserView.frame - rect.origin.y = header.frame.maxY+10 - webBrowserView.frame = rect - - //添加 - webView.scrollView.addSubview(header) - webView.scrollView.addObserver(self, forKeyPath: "contentSize", options: NSKeyValueObservingOptions.new, context: nil) // Do any additional setup after loading the view. @@ -113,14 +92,12 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol self.navigationController?.popToRootViewController(animated: true) } + func webViewDidStartLoad(_ webView: UIWebView) { + SVProgressHUD.show() + } func webViewDidFinishLoad(_ webView: UIWebView) { SVProgressHUD.dismiss() } - - @objc func pushToAppStore(){ - - } - override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { webView.scrollView.removeObserver(self, forKeyPath: "contentSize") _ = self.view.viewWithTag(100) diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard index ea3cb70..277043b 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard @@ -26,19 +26,22 @@ - + - + - + - + - + @@ -278,7 +287,7 @@ - + @@ -417,7 +426,7 @@ -