Commit 41dcae0ab53651435d04aa78b23ab2a8c2740816

Authored by Cao yang
1 parent a313df9c
Exists in parentassistant

绑定孩子逻辑修复

ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift
@@ -55,21 +55,21 @@ class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDat @@ -55,21 +55,21 @@ class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDat
55 55
56 override func viewWillAppear(_ animated: Bool) { 56 override func viewWillAppear(_ animated: Bool) {
57 57
58 -// let array = AccountManager.shared.getChildClassInfo()  
59 - if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {  
60 - self.view.addSubview(self.empty)  
61 - self.tableView.isHidden = true  
62 - }else{  
63 - self.empty.removeFromSuperview()  
64 - self.tableView.isHidden = false  
65 - }  
66 -// if array.isEmpty { 58 + let array = AccountManager.shared.getChildClassInfo()
  59 +// if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
67 // self.view.addSubview(self.empty) 60 // self.view.addSubview(self.empty)
68 // self.tableView.isHidden = true 61 // self.tableView.isHidden = true
69 // }else{ 62 // }else{
70 // self.empty.removeFromSuperview() 63 // self.empty.removeFromSuperview()
71 // self.tableView.isHidden = false 64 // self.tableView.isHidden = false
72 // } 65 // }
  66 + if array.isEmpty {
  67 + self.view.addSubview(self.empty)
  68 + self.tableView.isHidden = true
  69 + }else{
  70 + self.empty.removeFromSuperview()
  71 + self.tableView.isHidden = false
  72 + }
73 } 73 }
74 74
75 75
ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BaseCityChooseSchoolViewController.swift
@@ -99,23 +99,28 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate { @@ -99,23 +99,28 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
99 return 99 return
100 } 100 }
101 101
  102 + //非合作学校
102 if school!.isNew == 1{ 103 if school!.isNew == 1{
103 let vc = Story.instantiateViewControllerWithIdentifier("BindingViewControllerVC", storyName: "UserCenter") as! BindingViewController 104 let vc = Story.instantiateViewControllerWithIdentifier("BindingViewControllerVC", storyName: "UserCenter") as! BindingViewController
104 vc.from = .select 105 vc.from = .select
105 vc.school = school! 106 vc.school = school!
106 self.navigationController?.pushViewController(vc, animated: true) 107 self.navigationController?.pushViewController(vc, animated: true)
107 - }else{  
108 - if AccountManager.shared.isNew() == 1{ 108 + //合作学校
  109 + }else if school?.isNew == 0{
  110 + //判断该校该家长是否有孩子
  111 + let localNew = AccountManager.shared.isNew()
  112 + //添加邀请码显示孩子
  113 + if localNew == 1 {
  114 + let vc = Story.instantiateViewControllerWithIdentifier("InvitationCodeVerificationViewControllerVC", storyName: "UserCenter") as! InvitationCodeVerificationViewController
  115 + vc.school = school!
  116 + self.navigationController?.pushViewController(vc, animated: true)
  117 + //家长有孩子信息 直接显示
  118 + }else if localNew == 0 {
109 let vc = Story.instantiateViewControllerWithIdentifier("BindingViewControllerVC", storyName: "UserCenter") as! BindingViewController 119 let vc = Story.instantiateViewControllerWithIdentifier("BindingViewControllerVC", storyName: "UserCenter") as! BindingViewController
110 vc.from = .unReserved 120 vc.from = .unReserved
111 vc.school = school! 121 vc.school = school!
112 self.navigationController?.pushViewController(vc, animated: true) 122 self.navigationController?.pushViewController(vc, animated: true)
113 - return  
114 } 123 }
115 - let vc = Story.instantiateViewControllerWithIdentifier("InvitationCodeVerificationViewControllerVC", storyName: "UserCenter") as! InvitationCodeVerificationViewController  
116 - vc.school = school!  
117 - self.navigationController?.pushViewController(vc, animated: true)  
118 -  
119 } 124 }
120 } 125 }
121 126
ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/BindlingSuccessViewController.swift
@@ -12,7 +12,6 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -12,7 +12,6 @@ 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 urlStr:String="http://60.190.202.57:8101/RecommendOrder.aspx?userid="  
16 var bindlingType:Int = 1 15 var bindlingType:Int = 1
17 16
18 var bindlingSuccData = String() 17 var bindlingSuccData = String()
@@ -29,10 +28,10 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -29,10 +28,10 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol
29 webView.delegate = self; 28 webView.delegate = self;
30 webView.backgroundColor = UIColor.clear 29 webView.backgroundColor = UIColor.clear
31 self.view.addSubview(webView) 30 self.view.addSubview(webView)
32 -  
33 - let request = URLRequest(url: URL(string: urlStr)!) 31 + let url = HOSTWAP+"/RecommendOrder.aspx?userid="+AccountManager.shared.userid
  32 + let request = URLRequest(url: URL(string: url)!)
34 webView.loadRequest(request) 33 webView.loadRequest(request)
35 - 34 + SVProgressHUD.show()
36 if bindlingType == 0{ 35 if bindlingType == 0{
37 header = UIView() 36 header = UIView()
38 header.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: 80) 37 header.frame = CGRect(x: 10, y: 0, width: getScreenWidth()-20, height: 80)
@@ -61,6 +60,8 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -61,6 +60,8 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol
61 if let data = JSON.fromString(bindlingSuccData)?["data"].dictionary{ 60 if let data = JSON.fromString(bindlingSuccData)?["data"].dictionary{
62 label.text = "生成孩子\"汇作业\"账号为:\(data["account"]?.stringValue ?? ""),\n初始密码为:\(data["passwprd"]?.stringValue ?? ""),\n孩子可以下载\"汇作业\"app进行使用,\n" 61 label.text = "生成孩子\"汇作业\"账号为:\(data["account"]?.stringValue ?? ""),\n初始密码为:\(data["passwprd"]?.stringValue ?? ""),\n孩子可以下载\"汇作业\"app进行使用,\n"
63 } 62 }
  63 + }else{
  64 + label.text = "孩子绑定成功"
64 } 65 }
65 label.numberOfLines = 0 66 label.numberOfLines = 0
66 label.textColor = UIColor.darkGray 67 label.textColor = UIColor.darkGray
@@ -89,7 +90,7 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -89,7 +90,7 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol
89 backView.frame.size = CGSize(width: btn.frame.width+label2.frame.width+10, height: 30) 90 backView.frame.size = CGSize(width: btn.frame.width+label2.frame.width+10, height: 30)
90 backView.center = CGPoint(x: header.center.x-10, y: label.frame.maxY+10) 91 backView.center = CGPoint(x: header.center.x-10, y: label.frame.maxY+10)
91 header.frame.size.height = backView.frame.maxY + 10 92 header.frame.size.height = backView.frame.maxY + 10
92 -// header.addSubview(backView) 93 + header.addSubview(backView)
93 } 94 }
94 95
95 webBrowserView = webView.scrollView.subviews[0] 96 webBrowserView = webView.scrollView.subviews[0]
@@ -103,6 +104,17 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol @@ -103,6 +104,17 @@ class BindlingSuccessViewController: UIViewController ,UIWebViewDelegate,UIScrol
103 webView.scrollView.addObserver(self, forKeyPath: "contentSize", options: NSKeyValueObservingOptions.new, context: nil) 104 webView.scrollView.addObserver(self, forKeyPath: "contentSize", options: NSKeyValueObservingOptions.new, context: nil)
104 105
105 // Do any additional setup after loading the view. 106 // Do any additional setup after loading the view.
  107 +
  108 + let rightBtn = UIBarButtonItem.init(title: "关闭", style: UIBarButtonItemStyle.done, target: self, action: #selector(backButtonAction))
  109 + self.navigationItem.rightBarButtonItem = rightBtn
  110 + }
  111 +
  112 + @objc func backButtonAction(){
  113 + self.navigationController?.popToRootViewController(animated: true)
  114 + }
  115 +
  116 + func webViewDidFinishLoad(_ webView: UIWebView) {
  117 + SVProgressHUD.dismiss()
106 } 118 }
107 119
108 @objc func pushToAppStore(){ 120 @objc func pushToAppStore(){
ParentAssistant/ParentAssistant/Classes/controllers/my/userCenter/UserCenter.storyboard
@@ -227,10 +227,10 @@ @@ -227,10 +227,10 @@
227 </constraints> 227 </constraints>
228 </view> 228 </view>
229 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FqV-SD-Mvm"> 229 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FqV-SD-Mvm">
230 - <rect key="frame" x="112.5" y="285" width="150" height="33"/> 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"/> 231 <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
232 <constraints> 232 <constraints>
233 - <constraint firstAttribute="width" constant="150" id="UyA-XG-HPW"/> 233 + <constraint firstAttribute="height" constant="40" id="1ZJ-Rh-Rwm"/>
234 </constraints> 234 </constraints>
235 <fontDescription key="fontDescription" type="system" pointSize="17"/> 235 <fontDescription key="fontDescription" type="system" pointSize="17"/>
236 <state key="normal" title="确定"> 236 <state key="normal" title="确定">
@@ -240,16 +240,15 @@ @@ -240,16 +240,15 @@
240 <action selector="confirmBtnClcik:" destination="SC7-Z5-TUk" eventType="touchUpInside" id="dYC-uT-Vwc"/> 240 <action selector="confirmBtnClcik:" destination="SC7-Z5-TUk" eventType="touchUpInside" id="dYC-uT-Vwc"/>
241 </connections> 241 </connections>
242 </button> 242 </button>
243 - <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" 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="156" y="335" width="135" height="152"/>  
245 - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 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">
  244 + <rect key="frame" x="20" y="375" width="335" height="272"/>
246 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 245 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
247 <prototypes> 246 <prototypes>
248 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="ScH-T2-JbL"> 247 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" id="ScH-T2-JbL">
249 - <rect key="frame" x="0.0" y="28" width="135" height="44"/> 248 + <rect key="frame" x="0.0" y="28" width="335" height="44"/>
250 <autoresizingMask key="autoresizingMask"/> 249 <autoresizingMask key="autoresizingMask"/>
251 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ScH-T2-JbL" id="Vdf-3J-cd1"> 250 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ScH-T2-JbL" id="Vdf-3J-cd1">
252 - <rect key="frame" x="0.0" y="0.0" width="135" height="43.5"/> 251 + <rect key="frame" x="0.0" y="0.0" width="335" height="43.5"/>
253 <autoresizingMask key="autoresizingMask"/> 252 <autoresizingMask key="autoresizingMask"/>
254 </tableViewCellContentView> 253 </tableViewCellContentView>
255 </tableViewCell> 254 </tableViewCell>
@@ -268,20 +267,26 @@ @@ -268,20 +267,26 @@
268 <constraint firstItem="Lry-ZD-jrQ" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="GdP-6p-9L5"/> 267 <constraint firstItem="Lry-ZD-jrQ" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="GdP-6p-9L5"/>
269 <constraint firstItem="kxt-bL-oiI" firstAttribute="top" secondItem="Lry-ZD-jrQ" secondAttribute="bottom" constant="8" id="HxB-x6-iZq"/> 268 <constraint firstItem="kxt-bL-oiI" firstAttribute="top" secondItem="Lry-ZD-jrQ" secondAttribute="bottom" constant="8" id="HxB-x6-iZq"/>
270 <constraint firstItem="1j1-yS-AS0" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="Jd3-q2-0X8"/> 269 <constraint firstItem="1j1-yS-AS0" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="Jd3-q2-0X8"/>
271 - <constraint firstItem="FqV-SD-Mvm" firstAttribute="top" secondItem="hR4-GJ-ZLd" secondAttribute="bottom" constant="20" id="M0T-AR-guZ"/> 270 + <constraint firstItem="FqV-SD-Mvm" firstAttribute="top" secondItem="hR4-GJ-ZLd" secondAttribute="bottom" constant="40" id="M0T-AR-guZ"/>
272 <constraint firstItem="O93-Li-jET" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="M5S-H4-w8q"/> 271 <constraint firstItem="O93-Li-jET" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="M5S-H4-w8q"/>
273 <constraint firstItem="FqV-SD-Mvm" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="OFC-XX-Wzn"/> 272 <constraint firstItem="FqV-SD-Mvm" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="OFC-XX-Wzn"/>
274 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="top" secondItem="O93-Li-jET" secondAttribute="bottom" constant="8" id="Ou1-72-F83"/> 273 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="top" secondItem="O93-Li-jET" secondAttribute="bottom" constant="8" id="Ou1-72-F83"/>
275 <constraint firstItem="O93-Li-jET" firstAttribute="top" secondItem="kxt-bL-oiI" secondAttribute="bottom" constant="8" id="Sy6-4q-XeH"/> 274 <constraint firstItem="O93-Li-jET" firstAttribute="top" secondItem="kxt-bL-oiI" secondAttribute="bottom" constant="8" id="Sy6-4q-XeH"/>
276 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="T4F-hh-BOa"/> 275 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="T4F-hh-BOa"/>
277 <constraint firstItem="kxt-bL-oiI" firstAttribute="height" secondItem="Lry-ZD-jrQ" secondAttribute="height" id="WJy-dT-EXy"/> 276 <constraint firstItem="kxt-bL-oiI" firstAttribute="height" secondItem="Lry-ZD-jrQ" secondAttribute="height" id="WJy-dT-EXy"/>
  277 + <constraint firstItem="fmZ-BK-cei" firstAttribute="top" secondItem="FqV-SD-Mvm" secondAttribute="bottom" constant="30" id="WmK-ZD-NV3"/>
278 <constraint firstAttribute="height" constant="667" id="aXb-ZO-UyB"/> 278 <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"/> 279 <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"/> 280 <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"/> 281 <constraint firstItem="Lry-ZD-jrQ" firstAttribute="top" secondItem="1j1-yS-AS0" secondAttribute="bottom" constant="20" id="geU-1c-IfY"/>
  282 + <constraint firstAttribute="trailing" secondItem="fmZ-BK-cei" secondAttribute="trailing" constant="20" id="hsw-R1-NDi"/>
282 <constraint firstItem="kxt-bL-oiI" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="jdh-cw-zpa"/> 283 <constraint firstItem="kxt-bL-oiI" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="jdh-cw-zpa"/>
283 <constraint firstItem="kxt-bL-oiI" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="mGE-8p-MQY"/> 284 <constraint firstItem="kxt-bL-oiI" firstAttribute="width" secondItem="Lry-ZD-jrQ" secondAttribute="width" id="mGE-8p-MQY"/>
  285 + <constraint firstItem="FqV-SD-Mvm" firstAttribute="leading" secondItem="XNG-cS-DCX" secondAttribute="leading" constant="10" id="mf3-I6-5sp"/>
  286 + <constraint firstAttribute="bottom" secondItem="fmZ-BK-cei" secondAttribute="bottom" constant="20" id="qYN-JF-sXl"/>
  287 + <constraint firstAttribute="trailing" secondItem="FqV-SD-Mvm" secondAttribute="trailing" constant="10" id="rqq-j7-egO"/>
284 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="rxP-pl-3Um"/> 288 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="rxP-pl-3Um"/>
  289 + <constraint firstItem="fmZ-BK-cei" firstAttribute="leading" secondItem="XNG-cS-DCX" secondAttribute="leading" constant="20" id="tY5-Nh-MQo"/>
285 <constraint firstItem="O93-Li-jET" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="uyt-7c-LZX"/> 290 <constraint firstItem="O93-Li-jET" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="uyt-7c-LZX"/>
286 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="height" secondItem="Lry-ZD-jrQ" secondAttribute="height" id="wJT-yt-hLC"/> 291 <constraint firstItem="hR4-GJ-ZLd" firstAttribute="height" secondItem="Lry-ZD-jrQ" secondAttribute="height" id="wJT-yt-hLC"/>
287 <constraint firstItem="REL-rO-sBE" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="xV9-gg-n1L"/> 292 <constraint firstItem="REL-rO-sBE" firstAttribute="centerX" secondItem="XNG-cS-DCX" secondAttribute="centerX" id="xV9-gg-n1L"/>
@@ -338,7 +343,7 @@ @@ -338,7 +343,7 @@
338 </connections> 343 </connections>
339 </tapGestureRecognizer> 344 </tapGestureRecognizer>
340 </objects> 345 </objects>
341 - <point key="canvasLocation" x="-146" y="107"/> 346 + <point key="canvasLocation" x="-146.40000000000001" y="106.59670164917542"/>
342 </scene> 347 </scene>
343 <!--选择孩子学校--> 348 <!--选择孩子学校-->
344 <scene sceneID="jXC-xr-pan"> 349 <scene sceneID="jXC-xr-pan">
@@ -351,8 +356,9 @@ @@ -351,8 +356,9 @@
351 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fO6-Ah-i0n"> 356 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fO6-Ah-i0n">
352 <rect key="frame" x="0.0" y="64" width="375" height="40"/> 357 <rect key="frame" x="0.0" y="64" width="375" height="40"/>
353 <subviews> 358 <subviews>
354 - <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="l2p-Iw-hkv">  
355 - <rect key="frame" x="40" y="0.0" width="335" height="40"/> 359 + <searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="l2p-Iw-hkv">
  360 + <rect key="frame" x="100" y="0.0" width="275" height="40"/>
  361 + <color key="barTintColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
356 <textInputTraits key="textInputTraits"/> 362 <textInputTraits key="textInputTraits"/>
357 <scopeButtonTitles> 363 <scopeButtonTitles>
358 <string>Title</string> 364 <string>Title</string>
@@ -363,30 +369,31 @@ @@ -363,30 +369,31 @@
363 </connections> 369 </connections>
364 </searchBar> 370 </searchBar>
365 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DOI-gH-jce"> 371 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DOI-gH-jce">
366 - <rect key="frame" x="0.0" y="0.0" width="40" height="40"/> 372 + <rect key="frame" x="0.0" y="0.0" width="100" height="40"/>
367 <subviews> 373 <subviews>
368 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5U5-yq-C0i">  
369 - <rect key="frame" x="8" y="20.5" width="0.0" height="0.0"/>  
370 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
371 - <nil key="textColor"/>  
372 - <nil key="highlightedColor"/>  
373 - </label>  
374 - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_pushDown" translatesAutoresizingMaskIntoConstraints="NO" id="orB-P1-43H">  
375 - <rect key="frame" x="16" y="15.5" width="16" height="9"/> 374 + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="report_pull" translatesAutoresizingMaskIntoConstraints="NO" id="Pv0-CH-lcO">
  375 + <rect key="frame" x="79" y="15.5" width="16" height="9"/>
376 <constraints> 376 <constraints>
377 - <constraint firstAttribute="width" constant="16" id="16l-ae-SRY"/>  
378 - <constraint firstAttribute="width" secondItem="orB-P1-43H" secondAttribute="height" multiplier="16:9" id="LTF-6F-1BK"/> 377 + <constraint firstAttribute="width" constant="16" id="SKA-vw-S5i"/>
  378 + <constraint firstAttribute="height" constant="9" id="vrY-vp-CNi"/>
379 </constraints> 379 </constraints>
380 </imageView> 380 </imageView>
  381 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5U5-yq-C0i">
  382 + <rect key="frame" x="0.0" y="20" width="80" height="0.0"/>
  383 + <fontDescription key="fontDescription" type="system" pointSize="16"/>
  384 + <nil key="textColor"/>
  385 + <nil key="highlightedColor"/>
  386 + </label>
381 </subviews> 387 </subviews>
382 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 388 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
383 <gestureRecognizers/> 389 <gestureRecognizers/>
384 <constraints> 390 <constraints>
385 - <constraint firstItem="orB-P1-43H" firstAttribute="centerY" secondItem="DOI-gH-jce" secondAttribute="centerY" id="9zk-rO-Bal"/>  
386 - <constraint firstAttribute="trailing" secondItem="orB-P1-43H" secondAttribute="trailing" constant="8" id="BzP-Md-pmS"/>  
387 - <constraint firstItem="5U5-yq-C0i" firstAttribute="centerY" secondItem="DOI-gH-jce" secondAttribute="centerY" id="XUR-oK-Eac"/>  
388 - <constraint firstItem="5U5-yq-C0i" firstAttribute="leading" secondItem="DOI-gH-jce" secondAttribute="leading" constant="8" id="jlC-4X-vmT"/>  
389 - <constraint firstItem="orB-P1-43H" firstAttribute="leading" secondItem="5U5-yq-C0i" secondAttribute="trailing" constant="8" id="pIv-Pk-p8P"/> 391 + <constraint firstItem="Pv0-CH-lcO" firstAttribute="trailing" secondItem="DOI-gH-jce" secondAttribute="trailing" constant="-5" id="2mX-1u-APW"/>
  392 + <constraint firstAttribute="width" constant="100" id="Cu8-Qd-8os"/>
  393 + <constraint firstItem="Pv0-CH-lcO" firstAttribute="centerY" secondItem="DOI-gH-jce" secondAttribute="centerY" id="KG2-ig-HLk"/>
  394 + <constraint firstItem="5U5-yq-C0i" firstAttribute="leading" secondItem="DOI-gH-jce" secondAttribute="leading" id="NpX-Ul-Uem"/>
  395 + <constraint firstAttribute="trailing" secondItem="5U5-yq-C0i" secondAttribute="trailing" constant="20" id="XbL-nf-ccl"/>
  396 + <constraint firstItem="5U5-yq-C0i" firstAttribute="centerY" secondItem="DOI-gH-jce" secondAttribute="centerY" id="dhJ-FI-z4t"/>
390 </constraints> 397 </constraints>
391 <connections> 398 <connections>
392 <outletCollection property="gestureRecognizers" destination="bwD-zo-BfW" appends="YES" id="lGg-fA-w9g"/> 399 <outletCollection property="gestureRecognizers" destination="bwD-zo-BfW" appends="YES" id="lGg-fA-w9g"/>
@@ -395,28 +402,28 @@ @@ -395,28 +402,28 @@
395 </subviews> 402 </subviews>
396 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 403 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
397 <constraints> 404 <constraints>
398 - <constraint firstItem="DOI-gH-jce" firstAttribute="top" secondItem="fO6-Ah-i0n" secondAttribute="top" id="0Hd-29-n1m"/>  
399 - <constraint firstAttribute="bottom" secondItem="DOI-gH-jce" secondAttribute="bottom" id="0io-Qu-M8N"/>  
400 <constraint firstAttribute="bottom" secondItem="l2p-Iw-hkv" secondAttribute="bottom" id="27M-dQ-JQa"/> 405 <constraint firstAttribute="bottom" secondItem="l2p-Iw-hkv" secondAttribute="bottom" id="27M-dQ-JQa"/>
401 - <constraint firstItem="DOI-gH-jce" firstAttribute="leading" secondItem="fO6-Ah-i0n" secondAttribute="leading" id="E9W-AB-f3d"/>  
402 - <constraint firstItem="l2p-Iw-hkv" firstAttribute="leading" secondItem="DOI-gH-jce" secondAttribute="trailing" id="PBH-yX-Ii2"/> 406 + <constraint firstItem="DOI-gH-jce" firstAttribute="leading" secondItem="fO6-Ah-i0n" secondAttribute="leading" id="U26-zj-Pdx"/>
  407 + <constraint firstAttribute="bottom" secondItem="DOI-gH-jce" secondAttribute="bottom" id="bNb-ZW-RQw"/>
403 <constraint firstAttribute="height" constant="40" id="cB5-m3-OT4"/> 408 <constraint firstAttribute="height" constant="40" id="cB5-m3-OT4"/>
404 <constraint firstAttribute="trailing" secondItem="l2p-Iw-hkv" secondAttribute="trailing" id="mxk-0g-vX5"/> 409 <constraint firstAttribute="trailing" secondItem="l2p-Iw-hkv" secondAttribute="trailing" id="mxk-0g-vX5"/>
  410 + <constraint firstItem="l2p-Iw-hkv" firstAttribute="leading" secondItem="DOI-gH-jce" secondAttribute="trailing" id="nCq-3n-gsT"/>
405 <constraint firstItem="l2p-Iw-hkv" firstAttribute="top" secondItem="fO6-Ah-i0n" secondAttribute="top" id="q7F-zS-lRk"/> 411 <constraint firstItem="l2p-Iw-hkv" firstAttribute="top" secondItem="fO6-Ah-i0n" secondAttribute="top" id="q7F-zS-lRk"/>
  412 + <constraint firstItem="DOI-gH-jce" firstAttribute="top" secondItem="fO6-Ah-i0n" secondAttribute="top" id="vpj-rD-rc8"/>
406 </constraints> 413 </constraints>
407 </view> 414 </view>
408 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K6J-Tc-LTg"> 415 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K6J-Tc-LTg">
409 <rect key="frame" x="0.0" y="617" width="375" height="50"/> 416 <rect key="frame" x="0.0" y="617" width="375" height="50"/>
410 <subviews> 417 <subviews>
411 - <button opaque="NO" alpha="0.60000002384185791" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0O9-fu-b9g">  
412 - <rect key="frame" x="8" y="12" width="359" height="30"/> 418 + <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"/>
413 <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 420 <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
414 <state key="normal" title="下一步"> 421 <state key="normal" title="下一步">
415 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> 422 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
416 </state> 423 </state>
417 <userDefinedRuntimeAttributes> 424 <userDefinedRuntimeAttributes>
418 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 425 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
419 - <integer key="value" value="10"/> 426 + <integer key="value" value="5"/>
420 </userDefinedRuntimeAttribute> 427 </userDefinedRuntimeAttribute>
421 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 428 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
422 </userDefinedRuntimeAttributes> 429 </userDefinedRuntimeAttributes>
@@ -427,10 +434,11 @@ @@ -427,10 +434,11 @@
427 </subviews> 434 </subviews>
428 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 435 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
429 <constraints> 436 <constraints>
  437 + <constraint firstItem="0O9-fu-b9g" firstAttribute="top" secondItem="K6J-Tc-LTg" secondAttribute="top" constant="5" id="08T-oJ-KOT"/>
430 <constraint firstAttribute="height" constant="50" id="BQ4-Si-bXm"/> 438 <constraint firstAttribute="height" constant="50" id="BQ4-Si-bXm"/>
431 - <constraint firstItem="0O9-fu-b9g" firstAttribute="leading" secondItem="K6J-Tc-LTg" secondAttribute="leading" constant="8" id="ifw-4f-Jpr"/>  
432 - <constraint firstAttribute="trailing" secondItem="0O9-fu-b9g" secondAttribute="trailing" constant="8" id="isL-T7-Qmd"/>  
433 - <constraint firstAttribute="bottom" secondItem="0O9-fu-b9g" secondAttribute="bottom" constant="8" id="nFg-EW-rQa"/> 439 + <constraint firstItem="0O9-fu-b9g" firstAttribute="leading" secondItem="K6J-Tc-LTg" secondAttribute="leading" constant="10" id="ifw-4f-Jpr"/>
  440 + <constraint firstAttribute="trailing" secondItem="0O9-fu-b9g" secondAttribute="trailing" constant="10" id="isL-T7-Qmd"/>
  441 + <constraint firstAttribute="bottom" secondItem="0O9-fu-b9g" secondAttribute="bottom" constant="5" id="nFg-EW-rQa"/>
434 </constraints> 442 </constraints>
435 </view> 443 </view>
436 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="PtW-3t-0kg"> 444 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="PtW-3t-0kg">
@@ -521,14 +529,13 @@ @@ -521,14 +529,13 @@
521 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 529 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
522 <subviews> 530 <subviews>
523 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="exA-el-IFq"> 531 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="exA-el-IFq">
524 - <rect key="frame" x="0.0" y="108.5" width="375" height="250"/> 532 + <rect key="frame" x="0.0" y="183.5" width="375" height="300"/>
525 <subviews> 533 <subviews>
526 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1fW-dv-WoM"> 534 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1fW-dv-WoM">
527 - <rect key="frame" x="112.5" y="77" width="150" height="30"/>  
528 - <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 535 + <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"/>
529 <constraints> 537 <constraints>
530 - <constraint firstAttribute="height" constant="30" id="5hq-lI-iLz"/>  
531 - <constraint firstAttribute="width" constant="150" id="BGF-TZ-RcW"/> 538 + <constraint firstAttribute="height" constant="40" id="5hq-lI-iLz"/>
532 </constraints> 539 </constraints>
533 <state key="normal" title="下一步"> 540 <state key="normal" title="下一步">
534 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 541 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -538,7 +545,7 @@ @@ -538,7 +545,7 @@
538 </connections> 545 </connections>
539 </button> 546 </button>
540 <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"> 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">
541 - <rect key="frame" x="8" y="137" width="359" height="51"/> 548 + <rect key="frame" x="8" y="167" width="359" height="51"/>
542 <fontDescription key="fontDescription" name=".PingFangSC-Regular" family=".PingFang SC" pointSize="17"/> 549 <fontDescription key="fontDescription" name=".PingFangSC-Regular" family=".PingFang SC" pointSize="17"/>
543 <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 550 <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
544 <nil key="highlightedColor"/> 551 <nil key="highlightedColor"/>
@@ -565,6 +572,7 @@ @@ -565,6 +572,7 @@
565 </subviews> 572 </subviews>
566 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 573 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
567 <constraints> 574 <constraints>
  575 + <constraint firstItem="1fW-dv-WoM" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="10" id="42f-K7-iZf"/>
568 <constraint firstItem="vQA-t4-Eci" firstAttribute="top" secondItem="exA-el-IFq" secondAttribute="top" constant="8" id="5Uu-Sy-vu0"/> 576 <constraint firstItem="vQA-t4-Eci" firstAttribute="top" secondItem="exA-el-IFq" secondAttribute="top" constant="8" id="5Uu-Sy-vu0"/>
569 <constraint firstItem="aPt-HX-Yq3" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="7Ln-yD-VaY"/> 577 <constraint firstItem="aPt-HX-Yq3" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="7Ln-yD-VaY"/>
570 <constraint firstItem="vQA-t4-Eci" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="7M5-Vx-2Cz"/> 578 <constraint firstItem="vQA-t4-Eci" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="7M5-Vx-2Cz"/>
@@ -572,11 +580,12 @@ @@ -572,11 +580,12 @@
572 <constraint firstItem="1fW-dv-WoM" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="EMs-fL-FZD"/> 580 <constraint firstItem="1fW-dv-WoM" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="EMs-fL-FZD"/>
573 <constraint firstItem="cMY-Ua-Fom" firstAttribute="top" secondItem="1fW-dv-WoM" secondAttribute="bottom" constant="30" id="Riq-Xq-a0K"/> 581 <constraint firstItem="cMY-Ua-Fom" firstAttribute="top" secondItem="1fW-dv-WoM" secondAttribute="bottom" constant="30" id="Riq-Xq-a0K"/>
574 <constraint firstItem="vQA-t4-Eci" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="db8-a4-dQ5"/> 582 <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"/>
575 <constraint firstItem="cMY-Ua-Fom" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="pdC-1A-R0A"/> 584 <constraint firstItem="cMY-Ua-Fom" firstAttribute="leading" secondItem="exA-el-IFq" secondAttribute="leading" constant="8" id="pdC-1A-R0A"/>
576 - <constraint firstItem="1fW-dv-WoM" firstAttribute="top" secondItem="aPt-HX-Yq3" secondAttribute="bottom" constant="30" id="qW5-M9-wDD"/> 585 + <constraint firstItem="1fW-dv-WoM" firstAttribute="top" secondItem="aPt-HX-Yq3" secondAttribute="bottom" constant="50" id="qW5-M9-wDD"/>
577 <constraint firstAttribute="trailing" secondItem="aPt-HX-Yq3" secondAttribute="trailing" constant="8" id="uG6-EB-i2d"/> 586 <constraint firstAttribute="trailing" secondItem="aPt-HX-Yq3" secondAttribute="trailing" constant="8" id="uG6-EB-i2d"/>
578 <constraint firstItem="cMY-Ua-Fom" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="uJO-jO-ou4"/> 587 <constraint firstItem="cMY-Ua-Fom" firstAttribute="centerX" secondItem="exA-el-IFq" secondAttribute="centerX" id="uJO-jO-ou4"/>
579 - <constraint firstAttribute="height" constant="250" id="xqy-Zc-vv1"/> 588 + <constraint firstAttribute="height" constant="300" id="xqy-Zc-vv1"/>
580 </constraints> 589 </constraints>
581 </view> 590 </view>
582 </subviews> 591 </subviews>
@@ -584,7 +593,7 @@ @@ -584,7 +593,7 @@
584 <constraints> 593 <constraints>
585 <constraint firstItem="exA-el-IFq" firstAttribute="leading" secondItem="fXU-yt-T3m" secondAttribute="leading" id="1HS-GB-jkp"/> 594 <constraint firstItem="exA-el-IFq" firstAttribute="leading" secondItem="fXU-yt-T3m" secondAttribute="leading" id="1HS-GB-jkp"/>
586 <constraint firstItem="exA-el-IFq" firstAttribute="centerX" secondItem="AKW-ZX-X2g" secondAttribute="centerX" id="Auy-9z-eRw"/> 595 <constraint firstItem="exA-el-IFq" firstAttribute="centerX" secondItem="AKW-ZX-X2g" secondAttribute="centerX" id="Auy-9z-eRw"/>
587 - <constraint firstItem="exA-el-IFq" firstAttribute="centerY" secondItem="AKW-ZX-X2g" secondAttribute="centerY" constant="-100" id="XKh-ba-xKc"/> 596 + <constraint firstItem="exA-el-IFq" firstAttribute="centerY" secondItem="AKW-ZX-X2g" secondAttribute="centerY" id="XKh-ba-xKc"/>
588 </constraints> 597 </constraints>
589 <viewLayoutGuide key="safeArea" id="fXU-yt-T3m"/> 598 <viewLayoutGuide key="safeArea" id="fXU-yt-T3m"/>
590 </view> 599 </view>
@@ -602,5 +611,6 @@ @@ -602,5 +611,6 @@
602 <resources> 611 <resources>
603 <image name="evaluation_icon_pushDown" width="178" height="100"/> 612 <image name="evaluation_icon_pushDown" width="178" height="100"/>
604 <image name="my_icon_confirmBtn" width="21" height="19"/> 613 <image name="my_icon_confirmBtn" width="21" height="19"/>
  614 + <image name="report_pull" width="16" height="9"/>
605 </resources> 615 </resources>
606 </document> 616 </document>