From 3a28258d7a8fb68a5dfc9111f7359df71e213533 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Tue, 17 Apr 2018 17:52:21 +0800
Subject: [PATCH] 优化代码和 注册页面
---
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 256839 -> 0 bytes
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift | 2 +-
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift | 2 +-
ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift | 1 -
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard | 526 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift | 3 +--
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
ParentAssistant/ParentAssistant/MainViewController.swift | 2 ++
8 files changed, 342 insertions(+), 280 deletions(-)
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 0e47914..a969573 100644
Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
index b283b34..a6172b7 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
@@ -46,7 +46,6 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
override func viewDidLoad() {
super.viewDidLoad()
- navigationBarHeight = self.navigationController?.navigationBar.frame.height
titleArr = ["应用","报告"]
//设置导航栏标题
self.navigationItem.titleView = titleView
@@ -99,6 +98,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
// rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown)
self.rightBtn = UIBarButtonItem.init(customView: rightView)
+
//设置顶部样式
self.configTheme()
}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
index 1df5efd..19cfed3 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
@@ -17,7 +17,7 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
override func viewDidLoad() {
super.viewDidLoad()
self.configTheme()
-
+
if isFirstviewController{
self.navigationItem.title = ""
addLeftBarBtn()
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift
index 2e3acae..31a65f5 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift
@@ -14,7 +14,6 @@ class TabBarController: UITabBarController {
super.viewDidLoad()
updataVersion()
}
-
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
index e36be9b..71dcff6 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
@@ -14,257 +14,287 @@
</dependencies>
<scenes>
<!--Register View Controller-->
- <scene sceneID="WHr-Tz-UMB">
+ <scene sceneID="k1p-jr-UBw">
<objects>
- <viewController storyboardIdentifier="RegisterViewController" id="Uds-ft-2AX" customClass="RegisterViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
- <view key="view" contentMode="scaleToFill" id="iDq-et-uKv">
+ <tableViewController storyboardIdentifier="RegisterViewController" id="hjy-iv-Li4" customClass="RegisterViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Y23-T2-9DP">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a5f-wj-3dN">
- <rect key="frame" x="0.0" y="181" width="375" height="325"/>
- <subviews>
- <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto" translatesAutoresizingMaskIntoConstraints="NO" id="gLu-cN-6Yp">
- <rect key="frame" x="157.5" y="0.0" width="60" height="60"/>
- <constraints>
- <constraint firstAttribute="width" constant="60" id="AhV-UG-PjF"/>
- <constraint firstAttribute="width" secondItem="gLu-cN-6Yp" secondAttribute="height" multiplier="1:1" id="WaH-kd-pcc"/>
- </constraints>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
- <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
- <integer key="value" value="30"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- </imageView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f1m-2i-gPe">
- <rect key="frame" x="0.0" y="110" width="375" height="118"/>
- <subviews>
- <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="jfl-9w-lKS">
- <rect key="frame" x="8" y="0.0" width="359" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="hRq-wk-ReW"/>
- </constraints>
- <nil key="textColor"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <textInputTraits key="textInputTraits" returnKeyType="done"/>
- <connections>
- <outlet property="delegate" destination="Uds-ft-2AX" id="88D-Rm-Odl"/>
- </connections>
- </textField>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zvv-rs-bho">
- <rect key="frame" x="8" y="38" width="359" height="1"/>
- <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
- <constraints>
- <constraint firstAttribute="height" constant="1" id="ItX-p1-WOS"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
- <nil key="highlightedColor"/>
- </label>
- <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="rvv-oi-8mr">
- <rect key="frame" x="8" y="39" width="298" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="WX4-Ng-MbQ"/>
- </constraints>
- <nil key="textColor"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <textInputTraits key="textInputTraits" returnKeyType="done"/>
- <connections>
- <outlet property="delegate" destination="Uds-ft-2AX" id="Cav-vO-4v4"/>
- </connections>
- </textField>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cYh-XE-Dq0">
- <rect key="frame" x="314" y="46.5" width="45" height="22"/>
- <constraints>
- <constraint firstAttribute="width" constant="45" id="dUI-S5-O1I"/>
- </constraints>
- <state key="normal" title="获取">
- <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
- <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
- <integer key="value" value="5"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="getCodeAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="6oJ-Hr-g7D"/>
- </connections>
- </button>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AEB-fa-1Al">
- <rect key="frame" x="8" y="77" width="359" height="1"/>
- <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
- <constraints>
- <constraint firstAttribute="height" constant="1" id="GTU-5P-gwm"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请设置密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="8GI-NJ-wDi">
- <rect key="frame" x="8" y="78" width="298" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="QEV-IS-NQn"/>
- </constraints>
- <nil key="textColor"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
- <connections>
- <outlet property="delegate" destination="Uds-ft-2AX" id="Zom-EE-UvB"/>
- </connections>
- </textField>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pGX-GI-ezi">
- <rect key="frame" x="314" y="85.5" width="45" height="22"/>
- <constraints>
- <constraint firstAttribute="width" constant="45" id="T2S-BG-WER"/>
- <constraint firstAttribute="height" constant="22" id="gru-Fe-yKa"/>
- </constraints>
- <state key="normal" image="my_password_unlook">
- <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
- </state>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
- <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
- <integer key="value" value="5"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="passwordHiddenAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="Yeu-dh-B9o"/>
- </connections>
- </button>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WbG-m1-9YX">
- <rect key="frame" x="8" y="116" width="359" height="1"/>
- <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
- <constraints>
- <constraint firstAttribute="height" constant="1" id="Sxp-bb-YZI"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstItem="WbG-m1-9YX" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="38i-TS-h9L"/>
- <constraint firstItem="8GI-NJ-wDi" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="5Gj-3U-qF0"/>
- <constraint firstItem="zvv-rs-bho" firstAttribute="top" secondItem="jfl-9w-lKS" secondAttribute="bottom" constant="8" id="9Qb-y4-ZSe"/>
- <constraint firstItem="jfl-9w-lKS" firstAttribute="top" secondItem="f1m-2i-gPe" secondAttribute="top" id="9tZ-tV-qGE"/>
- <constraint firstItem="AEB-fa-1Al" firstAttribute="top" secondItem="cYh-XE-Dq0" secondAttribute="bottom" constant="8" id="CMa-6S-Buy"/>
- <constraint firstAttribute="trailing" secondItem="jfl-9w-lKS" secondAttribute="trailing" constant="8" id="Fpd-ok-3mu"/>
- <constraint firstItem="zvv-rs-bho" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="H4n-nC-du4"/>
- <constraint firstAttribute="trailing" secondItem="pGX-GI-ezi" secondAttribute="trailing" constant="16" id="K6b-x2-HnW"/>
- <constraint firstItem="cYh-XE-Dq0" firstAttribute="leading" secondItem="rvv-oi-8mr" secondAttribute="trailing" constant="8" id="LPQ-o4-vN3"/>
- <constraint firstItem="jfl-9w-lKS" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="P12-Cy-KAt"/>
- <constraint firstItem="AEB-fa-1Al" firstAttribute="top" secondItem="rvv-oi-8mr" secondAttribute="bottom" constant="8" id="Pxz-xB-jA9"/>
- <constraint firstAttribute="trailing" secondItem="WbG-m1-9YX" secondAttribute="trailing" constant="8" id="Rcf-KS-YkS"/>
- <constraint firstAttribute="trailing" secondItem="cYh-XE-Dq0" secondAttribute="trailing" constant="16" id="Sjn-wH-anM"/>
- <constraint firstItem="jfl-9w-lKS" firstAttribute="top" secondItem="f1m-2i-gPe" secondAttribute="top" id="TF4-d7-cXB"/>
- <constraint firstItem="8GI-NJ-wDi" firstAttribute="top" secondItem="AEB-fa-1Al" secondAttribute="bottom" id="V2V-TP-6wc"/>
- <constraint firstAttribute="height" constant="118" id="VBr-NZ-aUb"/>
- <constraint firstAttribute="trailing" secondItem="jfl-9w-lKS" secondAttribute="trailing" constant="8" id="Z9i-Qo-CkC"/>
- <constraint firstAttribute="trailing" secondItem="zvv-rs-bho" secondAttribute="trailing" constant="8" id="d5g-FD-0bq"/>
- <constraint firstAttribute="trailing" secondItem="AEB-fa-1Al" secondAttribute="trailing" constant="8" id="fys-IW-mNw"/>
- <constraint firstItem="cYh-XE-Dq0" firstAttribute="top" secondItem="zvv-rs-bho" secondAttribute="bottom" constant="8" id="lYD-Wx-ed5"/>
- <constraint firstItem="rvv-oi-8mr" firstAttribute="top" secondItem="zvv-rs-bho" secondAttribute="bottom" id="n2T-jV-WLR"/>
- <constraint firstItem="WbG-m1-9YX" firstAttribute="top" secondItem="8GI-NJ-wDi" secondAttribute="bottom" constant="8" id="nwq-3Y-tUh"/>
- <constraint firstItem="pGX-GI-ezi" firstAttribute="leading" secondItem="8GI-NJ-wDi" secondAttribute="trailing" constant="8" id="odU-Jk-1Kr"/>
- <constraint firstItem="AEB-fa-1Al" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="ol2-0w-V8S"/>
- <constraint firstItem="jfl-9w-lKS" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="sEE-5L-z2T"/>
- <constraint firstItem="rvv-oi-8mr" firstAttribute="leading" secondItem="f1m-2i-gPe" secondAttribute="leading" constant="8" id="tKj-nG-R3e"/>
- <constraint firstItem="pGX-GI-ezi" firstAttribute="top" secondItem="AEB-fa-1Al" secondAttribute="bottom" constant="8" id="xfk-vW-weV"/>
- </constraints>
- </view>
- <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2tN-SQ-L3b">
- <rect key="frame" x="8" y="236" width="359" height="40"/>
- <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstAttribute="height" constant="40" id="y2X-Wd-k77"/>
- </constraints>
- <state key="normal" title="注册">
- <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- </state>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
- <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
- <integer key="value" value="5"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="registerAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="TUE-84-nbV"/>
- </connections>
- </button>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3No-8C-Khf">
- <rect key="frame" x="8" y="306" width="359" height="19"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已注册，直接登录" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TUw-vF-sIc">
- <rect key="frame" x="0.0" y="0.0" width="114.5" height="19"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
- <nil key="highlightedColor"/>
- </label>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YZ4-eP-Zus">
- <rect key="frame" x="123" y="0.0" width="236" height="19"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <state key="normal" title="登录"/>
- <connections>
- <action selector="loginAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="chl-4g-qOJ"/>
- </connections>
- </button>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstAttribute="height" constant="19" id="6xe-Im-rue"/>
- <constraint firstAttribute="bottom" secondItem="YZ4-eP-Zus" secondAttribute="bottom" id="9fU-TJ-3nM"/>
- <constraint firstItem="TUw-vF-sIc" firstAttribute="leading" secondItem="3No-8C-Khf" secondAttribute="leading" id="Pxw-ua-3ch"/>
- <constraint firstItem="TUw-vF-sIc" firstAttribute="top" secondItem="3No-8C-Khf" secondAttribute="top" id="Q23-ca-Ct3"/>
- <constraint firstAttribute="trailing" secondItem="YZ4-eP-Zus" secondAttribute="trailing" id="StK-wf-UFf"/>
- <constraint firstItem="YZ4-eP-Zus" firstAttribute="top" secondItem="3No-8C-Khf" secondAttribute="top" id="csH-Mm-TFr"/>
- <constraint firstItem="YZ4-eP-Zus" firstAttribute="leading" secondItem="TUw-vF-sIc" secondAttribute="trailing" constant="8" id="dUi-pP-48X"/>
- <constraint firstAttribute="bottom" secondItem="TUw-vF-sIc" secondAttribute="bottom" id="etM-WV-v9B"/>
- </constraints>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstAttribute="height" constant="325" id="4T1-gt-Ok6"/>
- <constraint firstItem="2tN-SQ-L3b" firstAttribute="leading" secondItem="a5f-wj-3dN" secondAttribute="leading" constant="8" id="CCs-mf-Fjl"/>
- <constraint firstItem="gLu-cN-6Yp" firstAttribute="centerX" secondItem="a5f-wj-3dN" secondAttribute="centerX" id="Lv4-Uv-ruo"/>
- <constraint firstAttribute="trailing" secondItem="3No-8C-Khf" secondAttribute="trailing" constant="8" id="R5o-hJ-nFc"/>
- <constraint firstItem="f1m-2i-gPe" firstAttribute="top" secondItem="gLu-cN-6Yp" secondAttribute="bottom" constant="50" id="XNa-pn-6Ku"/>
- <constraint firstItem="f1m-2i-gPe" firstAttribute="leading" secondItem="a5f-wj-3dN" secondAttribute="leading" id="XRd-TB-wMH"/>
- <constraint firstItem="3No-8C-Khf" firstAttribute="leading" secondItem="a5f-wj-3dN" secondAttribute="leading" constant="8" id="bqx-lg-STd"/>
- <constraint firstItem="gLu-cN-6Yp" firstAttribute="top" secondItem="a5f-wj-3dN" secondAttribute="top" id="iYy-iw-5AG"/>
- <constraint firstAttribute="trailing" secondItem="2tN-SQ-L3b" secondAttribute="trailing" constant="8" id="o7Z-oO-iYl"/>
- <constraint firstItem="3No-8C-Khf" firstAttribute="top" secondItem="2tN-SQ-L3b" secondAttribute="bottom" constant="30" id="pWJ-FG-G1s"/>
- <constraint firstAttribute="trailing" secondItem="f1m-2i-gPe" secondAttribute="trailing" id="q2t-co-Rog"/>
- <constraint firstItem="2tN-SQ-L3b" firstAttribute="top" secondItem="f1m-2i-gPe" secondAttribute="bottom" constant="8" id="xg4-n6-CW9"/>
- </constraints>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstItem="a5f-wj-3dN" firstAttribute="trailing" secondItem="b5A-wq-3uy" secondAttribute="trailing" id="OyY-Kq-fpe"/>
- <constraint firstItem="a5f-wj-3dN" firstAttribute="centerX" secondItem="b5A-wq-3uy" secondAttribute="centerX" id="iVd-sy-zmb"/>
- <constraint firstItem="a5f-wj-3dN" firstAttribute="top" secondItem="b5A-wq-3uy" secondAttribute="top" constant="161" id="lBa-xc-AUJ"/>
- <constraint firstItem="a5f-wj-3dN" firstAttribute="leading" secondItem="b5A-wq-3uy" secondAttribute="leading" id="tx4-Fh-ncS"/>
- </constraints>
- <viewLayoutGuide key="safeArea" id="b5A-wq-3uy"/>
- </view>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <sections>
+ <tableViewSection id="9Ko-Lb-MGt">
+ <cells>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="166" id="VOi-K1-JFP">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="166"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VOi-K1-JFP" id="eyO-DI-Ze1">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="166"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto" translatesAutoresizingMaskIntoConstraints="NO" id="xkr-1t-VH1">
+ <rect key="frame" x="157" y="53" width="60" height="60"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="60" id="U6L-t3-gkk"/>
+ <constraint firstAttribute="width" constant="60" id="x1R-P8-ITq"/>
+ </constraints>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+ <integer key="value" value="30"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ </imageView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="xkr-1t-VH1" firstAttribute="centerX" secondItem="eyO-DI-Ze1" secondAttribute="centerX" id="83K-u2-UHU"/>
+ <constraint firstItem="xkr-1t-VH1" firstAttribute="centerY" secondItem="eyO-DI-Ze1" secondAttribute="centerY" id="doo-AN-Tav"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="cRT-ym-o62">
+ <rect key="frame" x="0.0" y="166" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cRT-ym-o62" id="B1b-9e-Tdo">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="NtL-m0-FBa">
+ <rect key="frame" x="8" y="12.5" width="359" height="19"/>
+ <nil key="textColor"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done"/>
+ <connections>
+ <outlet property="delegate" destination="hjy-iv-Li4" id="tsv-bf-xfq"/>
+ </connections>
+ </textField>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiC-if-MCe">
+ <rect key="frame" x="8" y="43" width="359" height="1"/>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="1" id="oEn-dp-kdM"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="eiC-if-MCe" secondAttribute="trailing" constant="8" id="8h6-ym-uS2"/>
+ <constraint firstItem="NtL-m0-FBa" firstAttribute="centerY" secondItem="B1b-9e-Tdo" secondAttribute="centerY" id="BqN-ez-hl9"/>
+ <constraint firstItem="eiC-if-MCe" firstAttribute="bottom" secondItem="B1b-9e-Tdo" secondAttribute="bottom" id="BsM-xG-LIP"/>
+ <constraint firstItem="NtL-m0-FBa" firstAttribute="leading" secondItem="B1b-9e-Tdo" secondAttribute="leading" constant="8" id="CVb-B0-ise"/>
+ <constraint firstItem="eiC-if-MCe" firstAttribute="leading" secondItem="B1b-9e-Tdo" secondAttribute="leading" constant="8" id="Pvs-ED-LNh"/>
+ <constraint firstAttribute="trailing" secondItem="NtL-m0-FBa" secondAttribute="trailing" constant="8" id="j3J-ph-41h"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="YYN-hH-B6O">
+ <rect key="frame" x="0.0" y="210" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YYN-hH-B6O" id="u1s-vJ-wOd">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="dST-Mc-S49">
+ <rect key="frame" x="8" y="12.5" width="301" height="19"/>
+ <nil key="textColor"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <textInputTraits key="textInputTraits" returnKeyType="done"/>
+ <connections>
+ <outlet property="delegate" destination="hjy-iv-Li4" id="yBN-1g-9v0"/>
+ </connections>
+ </textField>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e2r-r7-Pyq">
+ <rect key="frame" x="8" y="43" width="301" height="1"/>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="1" id="GwK-OG-cFe"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ffT-Tz-Ydl">
+ <rect key="frame" x="317" y="7" width="50" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="ZGc-dO-oQc"/>
+ <constraint firstAttribute="width" constant="50" id="zHs-83-6ZB"/>
+ </constraints>
+ <state key="normal" title="获取">
+ <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+ <integer key="value" value="5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="getCodeAction:" destination="hjy-iv-Li4" eventType="touchUpInside" id="NCb-Nm-Cj2"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="dST-Mc-S49" firstAttribute="centerY" secondItem="u1s-vJ-wOd" secondAttribute="centerY" id="BWb-4b-ndn"/>
+ <constraint firstItem="dST-Mc-S49" firstAttribute="leading" secondItem="u1s-vJ-wOd" secondAttribute="leading" constant="8" id="RRc-Uh-KH1"/>
+ <constraint firstItem="ffT-Tz-Ydl" firstAttribute="leading" secondItem="dST-Mc-S49" secondAttribute="trailing" constant="8" id="YNl-ac-uMS"/>
+ <constraint firstItem="e2r-r7-Pyq" firstAttribute="bottom" secondItem="u1s-vJ-wOd" secondAttribute="bottom" id="haY-IO-EwV"/>
+ <constraint firstItem="ffT-Tz-Ydl" firstAttribute="trailing" secondItem="u1s-vJ-wOd" secondAttribute="trailing" constant="-8" id="kWr-9x-EXC"/>
+ <constraint firstItem="ffT-Tz-Ydl" firstAttribute="leading" secondItem="e2r-r7-Pyq" secondAttribute="trailing" constant="8" id="pfu-FN-5bi"/>
+ <constraint firstItem="e2r-r7-Pyq" firstAttribute="leading" secondItem="u1s-vJ-wOd" secondAttribute="leading" constant="8" id="rmz-Mg-oto"/>
+ <constraint firstItem="ffT-Tz-Ydl" firstAttribute="centerY" secondItem="u1s-vJ-wOd" secondAttribute="centerY" id="vaB-fa-im8"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="iYw-xo-BdJ">
+ <rect key="frame" x="0.0" y="254" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="iYw-xo-BdJ" id="tDs-Cp-H8z">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请设置密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="X93-bX-ic8">
+ <rect key="frame" x="8" y="12.5" width="301" height="19"/>
+ <nil key="textColor"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+ <connections>
+ <outlet property="delegate" destination="hjy-iv-Li4" id="iCf-GX-Y2k"/>
+ </connections>
+ </textField>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4mi-QR-JYE">
+ <rect key="frame" x="8" y="43" width="301" height="1"/>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="1" id="No4-Pv-LmL"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="1" id="rq7-7P-XkV"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jwV-U0-9x4">
+ <rect key="frame" x="317" y="7" width="50" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="dii-X8-ZQm"/>
+ <constraint firstAttribute="width" constant="50" id="kty-Wj-y4c"/>
+ </constraints>
+ <state key="normal" image="my_password_unlook">
+ <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+ <integer key="value" value="5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="passwordHiddenAction:" destination="hjy-iv-Li4" eventType="touchUpInside" id="Iy0-VN-8SH"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="jwV-U0-9x4" secondAttribute="trailing" constant="8" id="3ot-WL-E8E"/>
+ <constraint firstItem="4mi-QR-JYE" firstAttribute="leading" secondItem="tDs-Cp-H8z" secondAttribute="leading" constant="8" id="B4H-FW-KPr"/>
+ <constraint firstItem="jwV-U0-9x4" firstAttribute="leading" secondItem="X93-bX-ic8" secondAttribute="trailing" constant="8" id="Jje-Zx-hJw"/>
+ <constraint firstItem="4mi-QR-JYE" firstAttribute="bottom" secondItem="tDs-Cp-H8z" secondAttribute="bottom" id="Kzh-6z-wXJ"/>
+ <constraint firstItem="jwV-U0-9x4" firstAttribute="leading" secondItem="4mi-QR-JYE" secondAttribute="trailing" constant="8" id="fK5-le-dTK"/>
+ <constraint firstItem="X93-bX-ic8" firstAttribute="leading" secondItem="tDs-Cp-H8z" secondAttribute="leading" constant="8" id="iqj-7v-XfS"/>
+ <constraint firstItem="jwV-U0-9x4" firstAttribute="centerY" secondItem="tDs-Cp-H8z" secondAttribute="centerY" id="qjv-Nj-JFE"/>
+ <constraint firstItem="X93-bX-ic8" firstAttribute="centerY" secondItem="tDs-Cp-H8z" secondAttribute="centerY" id="vFQ-E9-azc"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="dbD-E8-VUR">
+ <rect key="frame" x="0.0" y="298" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dbD-E8-VUR" id="j0F-mr-xia">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3sg-8Q-GYa">
+ <rect key="frame" x="8" y="2" width="359" height="40"/>
+ <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="40" id="HmK-xk-zdX"/>
+ </constraints>
+ <state key="normal" title="注册">
+ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </state>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+ <integer key="value" value="5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="registerAction:" destination="hjy-iv-Li4" eventType="touchUpInside" id="kvl-ow-qG1"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="3sg-8Q-GYa" firstAttribute="centerY" secondItem="j0F-mr-xia" secondAttribute="centerY" id="EGa-u0-Rkf"/>
+ <constraint firstItem="3sg-8Q-GYa" firstAttribute="leading" secondItem="j0F-mr-xia" secondAttribute="leading" constant="8" id="JF1-0k-unY"/>
+ <constraint firstAttribute="trailing" secondItem="3sg-8Q-GYa" secondAttribute="trailing" constant="8" id="fMu-e0-jqi"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Xhd-iu-9ZF">
+ <rect key="frame" x="0.0" y="342" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Xhd-iu-9ZF" id="P1c-Ns-CBR">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NBj-lL-p1W">
+ <rect key="frame" x="133" y="2" width="50" height="40"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="40" id="V6f-Da-UZO"/>
+ <constraint firstAttribute="width" constant="50" id="bZt-RW-dVQ"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <state key="normal" title="登录"/>
+ <connections>
+ <action selector="loginAction:" destination="hjy-iv-Li4" eventType="touchUpInside" id="TZH-CI-fGT"/>
+ </connections>
+ </button>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已注册，直接登录" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cwV-As-GSs">
+ <rect key="frame" x="8" y="13.5" width="115" height="17"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <constraints>
+ <constraint firstItem="NBj-lL-p1W" firstAttribute="leading" secondItem="cwV-As-GSs" secondAttribute="trailing" constant="10" id="5iO-WV-AJ1"/>
+ <constraint firstItem="NBj-lL-p1W" firstAttribute="centerY" secondItem="P1c-Ns-CBR" secondAttribute="centerY" id="R16-mv-zzU"/>
+ <constraint firstItem="cwV-As-GSs" firstAttribute="centerY" secondItem="P1c-Ns-CBR" secondAttribute="centerY" id="RZZ-vI-VFL"/>
+ <constraint firstItem="cwV-As-GSs" firstAttribute="leading" secondItem="P1c-Ns-CBR" secondAttribute="leading" constant="8" id="bB2-tw-jWM"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
+ </cells>
+ </tableViewSection>
+ </sections>
+ <connections>
+ <outlet property="dataSource" destination="hjy-iv-Li4" id="SNE-O9-Jad"/>
+ <outlet property="delegate" destination="hjy-iv-Li4" id="Rq2-1Y-CcB"/>
+ </connections>
+ </tableView>
<connections>
- <outlet property="codeTextField" destination="rvv-oi-8mr" id="Awn-PW-dIC"/>
- <outlet property="getCodeBtn" destination="cYh-XE-Dq0" id="2Ka-NJ-f51"/>
- <outlet property="passwordHiddenBtn" destination="pGX-GI-ezi" id="3Nr-CX-Tpc"/>
- <outlet property="passwordTextField" destination="8GI-NJ-wDi" id="rHD-h6-QWB"/>
- <outlet property="personIconImageView" destination="gLu-cN-6Yp" id="9of-fG-wPb"/>
- <outlet property="phoneTextField" destination="jfl-9w-lKS" id="TTe-fp-SyY"/>
- <outlet property="registerBtn" destination="2tN-SQ-L3b" id="fjg-a4-fOV"/>
- <outlet property="topView" destination="lBa-xc-AUJ" id="G0v-j1-VoK"/>
+ <outlet property="codeTextField" destination="dST-Mc-S49" id="pto-dn-lfv"/>
+ <outlet property="getCodeBtn" destination="ffT-Tz-Ydl" id="JSl-l8-R9J"/>
+ <outlet property="passwordHiddenBtn" destination="jwV-U0-9x4" id="XKG-zZ-cdb"/>
+ <outlet property="passwordTextField" destination="X93-bX-ic8" id="tr7-7m-wjD"/>
+ <outlet property="personIconImageView" destination="xkr-1t-VH1" id="lD0-Mc-cWV"/>
+ <outlet property="phoneTextField" destination="NtL-m0-FBa" id="5eT-Y9-r44"/>
+ <outlet property="registerBtn" destination="3sg-8Q-GYa" id="tXa-Rx-YbN"/>
+ <outlet property="rootTableView" destination="Y23-T2-9DP" id="zb5-8l-GNh"/>
</connections>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="ebc-9u-7ih" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </tableViewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="JT6-75-zX0" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-1308" y="-70.614692653673174"/>
+ <point key="canvasLocation" x="-2700" y="-420.53973013493254"/>
</scene>
<!--修改密码-->
<scene sceneID="3yG-jT-RDd">
@@ -342,7 +372,6 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
- <action selector="getCodeAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="Rtz-la-4UT"/>
<action selector="getCodeAction:" destination="oIO-Z6-lAw" eventType="touchUpInside" id="cLG-ip-MvN"/>
</connections>
</button>
@@ -385,7 +414,6 @@
</userDefinedRuntimeAttributes>
<connections>
<action selector="passwordHiddenAction:" destination="oIO-Z6-lAw" eventType="touchUpInside" id="Prs-oE-nl7"/>
- <action selector="passwordHiddenAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="YsD-8q-T11"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NTl-8I-jOx">
@@ -426,7 +454,6 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
- <action selector="passwordHiddenAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="eoQ-V7-vQ2"/>
<action selector="passwordTwoHiddenAction:" destination="oIO-Z6-lAw" eventType="touchUpInside" id="2w6-mK-v5X"/>
</connections>
</button>
@@ -585,7 +612,6 @@
</userDefinedRuntimeAttributes>
<connections>
<action selector="loginAction:" destination="UG5-bJ-YrY" eventType="touchUpInside" id="iFr-Mi-Wiq"/>
- <action selector="registerAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="WOZ-cY-Gu9"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X9h-K7-0bg">
@@ -623,7 +649,6 @@
<state key="normal" title="忘记密码"/>
<connections>
<action selector="getPasswordAction:" destination="UG5-bJ-YrY" eventType="touchUpInside" id="EJR-6a-h6E"/>
- <action selector="loginAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="WkS-hX-ran"/>
</connections>
</button>
</subviews>
@@ -702,7 +727,6 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
- <action selector="passwordHiddenAction:" destination="Uds-ft-2AX" eventType="touchUpInside" id="1FY-6X-4Gt"/>
<action selector="passwordHiddenAction:" destination="UG5-bJ-YrY" eventType="touchUpInside" id="cXT-ig-6a6"/>
</connections>
</button>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
index 3349649..bce6c47 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
@@ -27,8 +27,7 @@ class MyViewController: UIViewController {
}
// MARK: - 设置控件属性
func layoutSubViews(){
-// let backImage = UIImage(named: "navigationBar_backgrounImage")
-// self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
+
self.configTheme()
// MARK: - 是否是iPhoneX顶部刘海
if UIApplication.shared.statusBarFrame.size.height>20 {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
index d85cb8c..d495f27 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift
@@ -8,8 +8,9 @@
import UIKit
//注册
-class RegisterViewController: UIViewController,UITextFieldDelegate {
- @IBOutlet var topView: NSLayoutConstraint!
+class RegisterViewController: UITableViewController,UITextFieldDelegate {
+
+ @IBOutlet var rootTableView: UITableView!
@IBOutlet var personIconImageView: UIImageView!//系统头像
@IBOutlet var phoneTextField: UITextField!//电话号码
@IBOutlet var codeTextField: UITextField!//验证码
@@ -19,10 +20,12 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
@IBOutlet var registerBtn: UIButton!//注册按钮
-
override func viewDidLoad() {
super.viewDidLoad()
+
+ self.rootTableView.tableFooterView = UIView.init()
layoutSubViews()
+
}
// MARK: - 设置控件属性
func layoutSubViews(){
@@ -30,18 +33,70 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
self.navigationItem.title = "注册"
getCodeBtn.layer.borderWidth = 1.0
getCodeBtn.layer.borderColor = UIColor.lightGray.cgColor
- topView.constant = (getScreenHeight()-325)/3
+
passwordHiddenBtn.setImage(UIImage(named: "my_password_look"), for: UIControlState.selected)
+ //键盘监听
NotificationCenter.default.addObserver(self, selector: #selector(RegisterViewController.keyboardWIllChange(_:)), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil)
+ //监听按钮状态
+ phoneTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged)
+ codeTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged)
+ passwordTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged)
+
+ }
+
+ //MARK: - 用户拖拽 关闭键盘
+ override func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+ phoneTextField.resignFirstResponder()
+ codeTextField.resignFirstResponder()
+ passwordTextField.resignFirstResponder()
}
+
+ //return 关闭键盘
+ func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+ return textField.resignFirstResponder()
+ }
+
// MARK: - 根据键盘调整高度
@objc func keyboardWIllChange(_ noti: Notification){
let userInfo:NSDictionary=noti.userInfo! as NSDictionary
let endFrame=(userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue
+
+ print(self.rootTableView.frame)
+ let y = navigationBarHeight! + statusBarHeight
if endFrame?.origin.y == getScreenHeight() {
- topView.constant = (getScreenHeight()-325)/3
+ UIView.animate(withDuration: 0.5) {
+
+ self.rootTableView.frame = CGRect.init(x: 0, y: y, width: screenWidth, height:screenHeight)
+ }
}else{
- topView.constant = (endFrame?.origin.y)!-375
+ UIView.animate(withDuration: 0.5) {
+ self.rootTableView.frame = CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight)
+ }
+ }
+ }
+
+ override func numberOfSections(in tableView: UITableView) -> Int {
+ return 1
+ }
+ override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+ return 6
+ }
+ override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+ if indexPath.row == 0 {
+ return 200
+ }
+ else{
+ return 50
+ }
+ }
+ //MARK: - 监听输入长度,显示登录按钮状态
+ @objc func textFieldChange(){
+ if (phoneTextField.text?.count)!>0 && (passwordTextField.text?.count)!>0 && (codeTextField.text?.count)!>0 {
+ registerBtn.isUserInteractionEnabled = true
+ registerBtn.backgroundColor = navigationColor
+ }else{
+ registerBtn.isUserInteractionEnabled = false
+ registerBtn.backgroundColor = UIColor.lightGray
}
}
// MARK: - 获取验证码
@@ -71,24 +126,7 @@ class RegisterViewController: UIViewController,UITextFieldDelegate {
passwordHiddenBtn.isSelected = !selected
passwordTextField.isSecureTextEntry = selected
}
- // MARK: - 设置键盘消失
- override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
- self.view.endEditing(true)
- }
- // MARK: - UITextFieldDelegate
- func textFieldDidEndEditing(_ textField: UITextField) {
- if textField==passwordTextField && phoneTextField.text! != "" && codeTextField.text! != "" && passwordTextField.text! != ""{
- registerBtn.isUserInteractionEnabled = true
- registerBtn.backgroundColor = UIColorFromRGB(0xC5DAFF)
- }else{
- registerBtn.isUserInteractionEnabled = false
- registerBtn.backgroundColor = UIColor.lightGray
- }
- }
- func textFieldShouldReturn(_ textField: UITextField) -> Bool {
- self.view.endEditing(true)
- return true
- }
+
func isMobilePhoneNumber(_ mobile:String)->Bool {
let str="^1[0-9]{10}"
return NSPredicate(format: "SELF MATCHES %@", str).evaluate(with: mobile)
diff --git a/ParentAssistant/ParentAssistant/MainViewController.swift b/ParentAssistant/ParentAssistant/MainViewController.swift
index 117b148..a281def 100644
--- a/ParentAssistant/ParentAssistant/MainViewController.swift
+++ b/ParentAssistant/ParentAssistant/MainViewController.swift
@@ -13,6 +13,8 @@ class MainViewController: UINavigationController {
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = UIColor.white
+ //获取导航栏高度
+ navigationBarHeight = self.navigationBar.frame.height
// Do any additional setup after loading the view.
}
--
libgit2 0.21.0