Commit ee4b3175e5026cb26e5c0c923b5eb744741b4398

Authored by Cao yang
1 parent 41dcae0a
Exists in parentassistant

commit

ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,16 @@ @@ -2,4 +2,16 @@
2 <Bucket 2 <Bucket
3 type = "0" 3 type = "0"
4 version = "2.0"> 4 version = "2.0">
  5 + <Breakpoints>
  6 + <BreakpointProxy
  7 + BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
  8 + <BreakpointContent
  9 + shouldBeEnabled = "Yes"
  10 + ignoreCount = "0"
  11 + continueAfterRunningActions = "No"
  12 + scope = "0"
  13 + stopOnStyle = "0">
  14 + </BreakpointContent>
  15 + </BreakpointProxy>
  16 + </Breakpoints>
5 </Bucket> 17 </Bucket>
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
@@ -225,12 +225,16 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{ @@ -225,12 +225,16 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
225 appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) 225 appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
226 } 226 }
227 case 3://我的孩子 227 case 3://我的孩子
228 - if AccountManager.shared.isOnline() {  
229 - let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController  
230 - self.navigationController?.pushViewController(vc, animated: true)  
231 - }else{  
232 - appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)  
233 - } 228 +
  229 + let vc = BindlingSuccessViewController()
  230 + self.navigationController?.pushViewController(vc, animated: true)
  231 +
  232 +// if AccountManager.shared.isOnline() {
  233 +// let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController
  234 +// self.navigationController?.pushViewController(vc, animated: true)
  235 +// }else{
  236 +// appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
  237 +// }
234 case 5://意见与反馈 238 case 5://意见与反馈
235 let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController 239 let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
236 vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)" 240 vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)"
ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift
@@ -12,96 +12,75 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -12,96 +12,75 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol
12 var webView:UIWebView! 12 var webView:UIWebView!
13 var header:UIView! 13 var header:UIView!
14 var webBrowserView:UIView! 14 var webBrowserView:UIView!
15 - var bindlingType:Int = 1  
16 15
17 var bindlingSuccData = String() 16 var bindlingSuccData = String()
18 17
19 override func viewDidLoad() { 18 override func viewDidLoad() {
20 super.viewDidLoad() 19 super.viewDidLoad()
21 - self.view.backgroundColor = UIColor.white 20 + self.view.backgroundColor = backGroundColor
22 21
23 22
24 -  
25 // Do any additional setup after loading the view. 23 // Do any additional setup after loading the view.
26 webView = UIWebView() 24 webView = UIWebView()
27 webView.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: getScreenHeight()) 25 webView.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: getScreenHeight())
28 webView.delegate = self; 26 webView.delegate = self;
29 - webView.backgroundColor = UIColor.clear 27 + webView.backgroundColor = UIColor.white
30 self.view.addSubview(webView) 28 self.view.addSubview(webView)
  29 +
  30 +
31 let url = HOSTWAP+"/RecommendOrder.aspx?userid="+AccountManager.shared.userid 31 let url = HOSTWAP+"/RecommendOrder.aspx?userid="+AccountManager.shared.userid
32 let request = URLRequest(url: URL(string: url)!) 32 let request = URLRequest(url: URL(string: url)!)
33 webView.loadRequest(request) 33 webView.loadRequest(request)
34 - SVProgressHUD.show()  
35 - if bindlingType == 0{  
36 - header = UIView()  
37 - header.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: 80)  
38 - header.backgroundColor = UIColor.clear  
39 - let backView = UIView()  
40 - let image = UIImageView(frame: CGRect(x: 0, y: 0, width: 40, height: 40)) 34 +
  35 + header = UIView()
  36 + header.frame = CGRect(x: 0, y: 0, width: getScreenWidth()-20, height: 100)
  37 + header.backgroundColor = UIColor.white
  38 +
  39 + webBrowserView = webView.scrollView.subviews[0]
  40 + var rect = self.webBrowserView.frame
  41 + rect.origin.y = header.frame.maxY
  42 + webBrowserView.frame = rect
  43 +
  44 + webView.scrollView.addSubview(header)
  45 +
  46 + webView.scrollView.addObserver(self, forKeyPath: "contentSize", options: NSKeyValueObservingOptions.new, context: nil)
  47 +
  48 +
  49 + let lineView = UIView.init(frame: CGRect.init(x: 0, y: 70, width: screenWidth, height: 10))
  50 + lineView.backgroundColor = backGroundColor
  51 + header.addSubview(lineView)
  52 +
  53 + let localNew = AccountManager.shared.isNew()
  54 +
  55 + if localNew == 0{
  56 + let image = UIImageView(frame: CGRect(x: screenWidth/2-60, y: 20, width: 30, height: 30))
41 image.image = #imageLiteral(resourceName: "my_icon_bindlingSuccess") 57 image.image = #imageLiteral(resourceName: "my_icon_bindlingSuccess")
42 - backView.addSubview(image)  
43 - let label = UILabel(frame: CGRect(x: 50, y: 10, width: header.frame.width - 20, height: 20)) 58 + image.contentMode = .scaleAspectFit
  59 + let label = UILabel(frame: CGRect(x: screenWidth/2-20, y: 10, width: header.frame.width - 20, height: 20))
44 label.text = "绑定成功" 60 label.text = "绑定成功"
45 label.numberOfLines = 0 61 label.numberOfLines = 0
46 label.textColor = UIColor.darkGray 62 label.textColor = UIColor.darkGray
47 - label.font = UIFont.systemFont(ofSize: 15) 63 + label.font = UIFont.systemFont(ofSize: 18)
48 label.sizeToFit() 64 label.sizeToFit()
49 - backView.addSubview(label)  
50 - backView.frame.size = CGSize(width: label.frame.maxX, height: 40)  
51 - backView.center.y = header.center.y  
52 - backView.center.x = header.center.x-10 65 + label.center.y = image.center.y
  66 +
  67 + header.addSubview(image)
53 header.addSubview(label) 68 header.addSubview(label)
54 }else{ 69 }else{
55 - header = UIView()  
56 - header.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: 150)  
57 - header.backgroundColor = UIColor.clear  
58 let label = UILabel(frame: CGRect(x: 10, y: 10, width: header.frame.width - 20, height: 100)) 70 let label = UILabel(frame: CGRect(x: 10, y: 10, width: header.frame.width - 20, height: 100))
59 if bindlingSuccData.count>0{ 71 if bindlingSuccData.count>0{
60 if let data = JSON.fromString(bindlingSuccData)?["data"].dictionary{ 72 if let data = JSON.fromString(bindlingSuccData)?["data"].dictionary{
61 label.text = "生成孩子\"汇作业\"账号为:\(data["account"]?.stringValue ?? ""),\n初始密码为:\(data["passwprd"]?.stringValue ?? ""),\n孩子可以下载\"汇作业\"app进行使用,\n" 73 label.text = "生成孩子\"汇作业\"账号为:\(data["account"]?.stringValue ?? ""),\n初始密码为:\(data["passwprd"]?.stringValue ?? ""),\n孩子可以下载\"汇作业\"app进行使用,\n"
62 } 74 }
63 - }else{  
64 - label.text = "孩子绑定成功"  
65 } 75 }
66 label.numberOfLines = 0 76 label.numberOfLines = 0
67 label.textColor = UIColor.darkGray 77 label.textColor = UIColor.darkGray
68 label.font = UIFont.systemFont(ofSize: 15) 78 label.font = UIFont.systemFont(ofSize: 15)
69 label.sizeToFit() 79 label.sizeToFit()
70 header.addSubview(label) 80 header.addSubview(label)
71 -  
72 - let backView = UIView()  
73 - let label2 = UILabel(frame: CGRect(x: 0, y: 5, width: header.frame.width - 20, height: 20))  
74 - label2.text = "下载地址:"  
75 - label2.textColor = UIColor.darkGray  
76 - label2.font = UIFont.systemFont(ofSize: 15)  
77 - label2.sizeToFit()  
78 - backView.addSubview(label2)  
79 - let btn = UIButton(frame: CGRect(x: label2.frame.maxX, y: 0, width: 70, height: 30))  
80 -  
81 - let str = NSMutableAttributedString(string: "汇作业")  
82 - let strRange = NSRange(location: 0, length: str.length)  
83 - str.addAttributes([NSAttributedStringKey.underlineStyle: NSNumber(integerLiteral: NSUnderlineStyle.styleSingle.rawValue),  
84 - NSAttributedStringKey.foregroundColor: Theme.topBarColor(),  
85 - NSAttributedStringKey.font: UIFont.systemFont(ofSize: 15)],  
86 - range: strRange)  
87 - btn.setAttributedTitle(str, for: .normal)  
88 - btn.addTarget(self, action: #selector(BindlingSuccessViewController.pushToAppStore), for: .touchUpInside)  
89 - backView.addSubview(btn)  
90 - backView.frame.size = CGSize(width: btn.frame.width+label2.frame.width+10, height: 30)  
91 - backView.center = CGPoint(x: header.center.x-10, y: label.frame.maxY+10)  
92 - header.frame.size.height = backView.frame.maxY + 10  
93 - header.addSubview(backView)  
94 } 81 }
95 82
96 - webBrowserView = webView.scrollView.subviews[0]  
97 - var rect = self.webBrowserView.frame  
98 - rect.origin.y = header.frame.maxY+10  
99 - webBrowserView.frame = rect  
100 -  
101 - //添加  
102 - webView.scrollView.addSubview(header)  
103 83
104 - webView.scrollView.addObserver(self, forKeyPath: "contentSize", options: NSKeyValueObservingOptions.new, context: nil)  
105 84
106 // Do any additional setup after loading the view. 85 // Do any additional setup after loading the view.
107 86
@@ -113,14 +92,12 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -113,14 +92,12 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol
113 self.navigationController?.popToRootViewController(animated: true) 92 self.navigationController?.popToRootViewController(animated: true)
114 } 93 }
115 94
  95 + func webViewDidStartLoad(_ webView: UIWebView) {
  96 + SVProgressHUD.show()
  97 + }
116 func webViewDidFinishLoad(_ webView: UIWebView) { 98 func webViewDidFinishLoad(_ webView: UIWebView) {
117 SVProgressHUD.dismiss() 99 SVProgressHUD.dismiss()
118 } 100 }
119 -  
120 - @objc func pushToAppStore(){  
121 -  
122 - }  
123 -  
124 override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { 101 override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
125 webView.scrollView.removeObserver(self, forKeyPath: "contentSize") 102 webView.scrollView.removeObserver(self, forKeyPath: "contentSize")
126 _ = self.view.viewWithTag(100) 103 _ = self.view.viewWithTag(100)
ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard
@@ -26,19 +26,22 @@ @@ -26,19 +26,22 @@
26 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> 26 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
27 <subviews> 27 <subviews>
28 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绑定手机号码为" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="REL-rO-sBE"> 28 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绑定手机号码为" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="REL-rO-sBE">
29 - <rect key="frame" x="126.5" y="20" width="121.5" height="21"/> 29 + <rect key="frame" x="126.5" y="30" width="121.5" height="21"/>
30 <fontDescription key="fontDescription" type="system" pointSize="17"/> 30 <fontDescription key="fontDescription" type="system" pointSize="17"/>
31 <nil key="textColor"/> 31 <nil key="textColor"/>
32 <nil key="highlightedColor"/> 32 <nil key="highlightedColor"/>
33 </label> 33 </label>
34 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1j1-yS-AS0"> 34 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1j1-yS-AS0">
35 - <rect key="frame" x="187.5" y="61" width="0.0" height="0.0"/> 35 + <rect key="frame" x="187.5" y="71" width="0.0" height="20"/>
  36 + <constraints>
  37 + <constraint firstAttribute="height" constant="20" id="Qj5-eM-lL5"/>
  38 + </constraints>
36 <fontDescription key="fontDescription" type="system" pointSize="17"/> 39 <fontDescription key="fontDescription" type="system" pointSize="17"/>
37 <color key="textColor" red="0.95294117649999999" green="0.044139709020000001" blue="0.0" alpha="0.90402160229999995" colorSpace="calibratedRGB"/> 40 <color key="textColor" red="0.95294117649999999" green="0.044139709020000001" blue="0.0" alpha="0.90402160229999995" colorSpace="calibratedRGB"/>
38 <nil key="highlightedColor"/> 41 <nil key="highlightedColor"/>
39 </label> 42 </label>
40 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lry-ZD-jrQ"> 43 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lry-ZD-jrQ">
41 - <rect key="frame" x="67.5" y="81" width="240" height="40"/> 44 + <rect key="frame" x="67.5" y="141" width="240" height="40"/>
42 <subviews> 45 <subviews>
43 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="孩子姓名:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SzI-3b-VyZ"> 46 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="孩子姓名:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SzI-3b-VyZ">
44 <rect key="frame" x="8" y="9.5" width="75" height="21"/> 47 <rect key="frame" x="8" y="9.5" width="75" height="21"/>
@@ -69,7 +72,7 @@ @@ -69,7 +72,7 @@
69 </constraints> 72 </constraints>
70 </view> 73 </view>
71 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kxt-bL-oiI"> 74 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kxt-bL-oiI">
72 - <rect key="frame" x="67.5" y="129" width="240" height="40"/> 75 + <rect key="frame" x="67.5" y="189" width="240" height="40"/>
73 <subviews> 76 <subviews>
74 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性 别:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gRs-dx-ci7"> 77 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性 别:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gRs-dx-ci7">
75 <rect key="frame" x="8" y="10" width="75" height="21"/> 78 <rect key="frame" x="8" y="10" width="75" height="21"/>
@@ -122,7 +125,7 @@ @@ -122,7 +125,7 @@
122 </constraints> 125 </constraints>
123 </view> 126 </view>
124 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O93-Li-jET"> 127 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O93-Li-jET">
125 - <rect key="frame" x="67.5" y="177" width="240" height="40"/> 128 + <rect key="frame" x="67.5" y="237" width="240" height="40"/>
126 <subviews> 129 <subviews>
127 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="年 级:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yBZ-0b-pQ9"> 130 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="年 级:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yBZ-0b-pQ9">
128 <rect key="frame" x="8" y="10" width="75" height="21"/> 131 <rect key="frame" x="8" y="10" width="75" height="21"/>
@@ -174,7 +177,7 @@ @@ -174,7 +177,7 @@
174 </constraints> 177 </constraints>
175 </view> 178 </view>
176 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hR4-GJ-ZLd"> 179 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hR4-GJ-ZLd">
177 - <rect key="frame" x="67.5" y="225" width="240" height="40"/> 180 + <rect key="frame" x="67.5" y="285" width="240" height="40"/>
178 <subviews> 181 <subviews>
179 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="班 级:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qFh-7U-p8J"> 182 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="班 级:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qFh-7U-p8J">
180 <rect key="frame" x="8" y="10" width="75" height="21"/> 183 <rect key="frame" x="8" y="10" width="75" height="21"/>
@@ -227,8 +230,8 @@ @@ -227,8 +230,8 @@
227 </constraints> 230 </constraints>
228 </view> 231 </view>
229 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FqV-SD-Mvm"> 232 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FqV-SD-Mvm">
230 - <rect key="frame" x="10" y="305" width="355" height="40"/>  
231 - <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 233 + <rect key="frame" x="10" y="365" width="355" height="40"/>
  234 + <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
232 <constraints> 235 <constraints>
233 <constraint firstAttribute="height" constant="40" id="1ZJ-Rh-Rwm"/> 236 <constraint firstAttribute="height" constant="40" id="1ZJ-Rh-Rwm"/>
234 </constraints> 237 </constraints>
@@ -236,12 +239,18 @@ @@ -236,12 +239,18 @@
236 <state key="normal" title="确定"> 239 <state key="normal" title="确定">
237 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> 240 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
238 </state> 241 </state>
  242 + <userDefinedRuntimeAttributes>
  243 + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
  244 + <integer key="value" value="5"/>
  245 + </userDefinedRuntimeAttribute>
  246 + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
  247 + </userDefinedRuntimeAttributes>
239 <connections> 248 <connections>
240 <action selector="confirmBtnClcik:" destination="SC7-Z5-TUk" eventType="touchUpInside" id="dYC-uT-Vwc"/> 249 <action selector="confirmBtnClcik:" destination="SC7-Z5-TUk" eventType="touchUpInside" id="dYC-uT-Vwc"/>
241 </connections> 250 </connections>
242 </button> 251 </button>
243 <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fmZ-BK-cei"> 252 <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fmZ-BK-cei">
244 - <rect key="frame" x="20" y="375" width="335" height="272"/> 253 + <rect key="frame" x="20" y="435" width="335" height="212"/>
245 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 254 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
246 <prototypes> 255 <prototypes>
247 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="ScH-T2-JbL"> 256 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="ScH-T2-JbL">
@@ -261,7 +270,7 @@ @@ -261,7 +270,7 @@
261 </subviews> 270 </subviews>
262 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> 271 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
263 <constraints> 272 <constraints>
264 - <constraint firstItem="REL-rO-sBE" firstAttribute="top" secondItem="XNG-cS-DCX" secondAttribute="top" constant="20" id="5ZV-2a-Qo0"/> 273 + <constraint firstItem="REL-rO-sBE" firstAttribute="top" secondItem="XNG-cS-DCX" secondAttribute="top" constant="30" id="5ZV-2a-Qo0"/>
265 <constraint firstItem="1j1-yS-AS0" firstAttribute="top" secondItem="REL-rO-sBE" secondAttribute="bottom" constant="20" id="5gv-QF-b7B"/> 274 <constraint firstItem="1j1-yS-AS0" firstAttribute="top" secondItem="REL-rO-sBE" secondAttribute="bottom" constant="20" id="5gv-QF-b7B"/>
266 <constraint firstItem="O93-Li-jET" firstAttribute="height" secondItem="Lry-ZD-jrQ" secondAttribute="height" id="BJw-Fi-zqe"/> 275 <constraint firstItem="O93-Li-jET" firstAttribute="height" secondItem="Lry-ZD-jrQ" secondAttribute="height" id="BJw-Fi-zqe"/>
267 <constraint firstItem="Lry-ZD-jrQ" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="GdP-6p-9L5"/> 276 <constraint firstItem="Lry-ZD-jrQ" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="GdP-6p-9L5"/>
@@ -278,7 +287,7 @@ @@ -278,7 +287,7 @@
278 <constraint firstAttribute="height" constant="667" id="aXb-ZO-UyB"/> 287 <constraint firstAttribute="height" constant="667" id="aXb-ZO-UyB"/>
279 <constraint firstItem="t7C-GZ-zMI" firstAttribute="width" secondItem="u8y-wv-95T" secondAttribute="width" id="be8-xa-5G9"/> 288 <constraint firstItem="t7C-GZ-zMI" firstAttribute="width" secondItem="u8y-wv-95T" secondAttribute="width" id="be8-xa-5G9"/>
280 <constraint firstItem="sBB-lz-j4M" firstAttribute="width" secondItem="u8y-wv-95T" secondAttribute="width" id="eDv-01-DiQ"/> 289 <constraint firstItem="sBB-lz-j4M" firstAttribute="width" secondItem="u8y-wv-95T" secondAttribute="width" id="eDv-01-DiQ"/>
281 - <constraint firstItem="Lry-ZD-jrQ" firstAttribute="top" secondItem="1j1-yS-AS0" secondAttribute="bottom" constant="20" id="geU-1c-IfY"/> 290 + <constraint firstItem="Lry-ZD-jrQ" firstAttribute="top" secondItem="1j1-yS-AS0" secondAttribute="bottom" constant="50" id="geU-1c-IfY"/>
282 <constraint firstAttribute="trailing" secondItem="fmZ-BK-cei" secondAttribute="trailing" constant="20" id="hsw-R1-NDi"/> 291 <constraint firstAttribute="trailing" secondItem="fmZ-BK-cei" secondAttribute="trailing" constant="20" id="hsw-R1-NDi"/>
283 <constraint firstItem="kxt-bL-oiI" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="jdh-cw-zpa"/> 292 <constraint firstItem="kxt-bL-oiI" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="jdh-cw-zpa"/>
284 <constraint firstItem="kxt-bL-oiI" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="mGE-8p-MQY"/> 293 <constraint firstItem="kxt-bL-oiI" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="mGE-8p-MQY"/>
@@ -417,7 +426,7 @@ @@ -417,7 +426,7 @@
417 <subviews> 426 <subviews>
418 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0O9-fu-b9g"> 427 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0O9-fu-b9g">
419 <rect key="frame" x="10" y="5" width="355" height="40"/> 428 <rect key="frame" x="10" y="5" width="355" height="40"/>
420 - <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 429 + <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
421 <state key="normal" title="下一步"> 430 <state key="normal" title="下一步">
422 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> 431 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
423 </state> 432 </state>
@@ -533,21 +542,34 @@ @@ -533,21 +542,34 @@
533 <subviews> 542 <subviews>
534 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1fW-dv-WoM"> 543 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1fW-dv-WoM">
535 <rect key="frame" x="10" y="97" width="355" height="40"/> 544 <rect key="frame" x="10" y="97" width="355" height="40"/>
536 - <color key="backgroundColor" red="0.0" green="0.48234318617150063" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 545 + <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
537 <constraints> 546 <constraints>
538 <constraint firstAttribute="height" constant="40" id="5hq-lI-iLz"/> 547 <constraint firstAttribute="height" constant="40" id="5hq-lI-iLz"/>
539 </constraints> 548 </constraints>
540 <state key="normal" title="下一步"> 549 <state key="normal" title="下一步">
541 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 550 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
542 </state> 551 </state>
  552 + <userDefinedRuntimeAttributes>
  553 + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
  554 + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
  555 + <integer key="value" value="5"/>
  556 + </userDefinedRuntimeAttribute>
  557 + </userDefinedRuntimeAttributes>
543 <connections> 558 <connections>
544 <action selector="nextBtnClick:" destination="R3o-G2-oUv" eventType="touchUpInside" id="F9Y-Wo-UFn"/> 559 <action selector="nextBtnClick:" destination="R3o-G2-oUv" eventType="touchUpInside" id="F9Y-Wo-UFn"/>
545 </connections> 560 </connections>
546 </button> 561 </button>
547 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注:填写需要绑定的孩子的邀请码(非合作学校无邀请码.请更换手机号码的方式验证) 如不知道邀请码请拨打电话: 400-123456进行查询" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cMY-Ua-Fom">  
548 - <rect key="frame" x="8" y="167" width="359" height="51"/>  
549 - <fontDescription key="fontDescription" name=".PingFangSC-Regular" family=".PingFang SC" pointSize="17"/>  
550 - <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 562 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cMY-Ua-Fom">
  563 + <rect key="frame" x="15" y="167" width="345" height="82"/>
  564 + <attributedString key="attributedText">
  565 + <fragment content="注:填写需要绑定的孩子的邀请码(非合作学校无邀请码.请更换手机号码的方式验证) 如不知道邀请码请拨打电话: 400-123456进行查询">
  566 + <attributes>
  567 + <color key="NSColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  568 + <font key="NSFont" size="17" name=".PingFangSC-Regular"/>
  569 + <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" lineHeightMultiple="1.2" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
  570 + </attributes>
  571 + </fragment>
  572 + </attributedString>
551 <nil key="highlightedColor"/> 573 <nil key="highlightedColor"/>
552 </label> 574 </label>
553 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="填写邀请码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vQA-t4-Eci"> 575 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="填写邀请码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vQA-t4-Eci">
@@ -581,7 +603,7 @@ @@ -581,7 +603,7 @@
581 <constraint firstItem="cMY-Ua-Fom" firstAttribute="top" secondItem="1fW-dv-WoM" secondAttribute="bottom" constant="30" id="Riq-Xq-a0K"/> 603 <constraint firstItem="cMY-Ua-Fom" firstAttribute="top" secondItem="1fW-dv-WoM" secondAttribute="bottom" constant="30" id="Riq-Xq-a0K"/>
582 <constraint firstItem="vQA-t4-Eci" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="db8-a4-dQ5"/> 604 <constraint firstItem="vQA-t4-Eci" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="db8-a4-dQ5"/>
583 <constraint firstAttribute="trailing" secondItem="1fW-dv-WoM" secondAttribute="trailing" constant="10" id="n1Z-CC-IwU"/> 605 <constraint firstAttribute="trailing" secondItem="1fW-dv-WoM" secondAttribute="trailing" constant="10" id="n1Z-CC-IwU"/>
584 - <constraint firstItem="cMY-Ua-Fom" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="pdC-1A-R0A"/> 606 + <constraint firstItem="cMY-Ua-Fom" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="15" id="pdC-1A-R0A"/>
585 <constraint firstItem="1fW-dv-WoM" firstAttribute="top" secondItem="aPt-HX-Yq3" secondAttribute="bottom" constant="50" id="qW5-M9-wDD"/> 607 <constraint firstItem="1fW-dv-WoM" firstAttribute="top" secondItem="aPt-HX-Yq3" secondAttribute="bottom" constant="50" id="qW5-M9-wDD"/>
586 <constraint firstAttribute="trailing" secondItem="aPt-HX-Yq3" secondAttribute="trailing" constant="8" id="uG6-EB-i2d"/> 608 <constraint firstAttribute="trailing" secondItem="aPt-HX-Yq3" secondAttribute="trailing" constant="8" id="uG6-EB-i2d"/>
587 <constraint firstItem="cMY-Ua-Fom" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="uJO-jO-ou4"/> 609 <constraint firstItem="cMY-Ua-Fom" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="uJO-jO-ou4"/>