diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
index d073d4a..51a860c 100644
--- a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
<key>ParentAssistant.xcscheme</key>
<dict>
<key>orderHint</key>
- <integer>1</integer>
+ <integer>0</integer>
</dict>
</dict>
</dict>
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 2fcc234..0e47914 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/my/Controller/LoginViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
index cea9bd4..7d37f45 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift
@@ -8,31 +8,49 @@
import UIKit
//登录
-class LoginViewController: UIViewController,UITextFieldDelegate {
- @IBOutlet var topView: NSLayoutConstraint!
+class LoginViewController: UIViewController,UITextFieldDelegate,UIScrollViewDelegate {
+
+ @IBOutlet weak var scrollView: UIScrollView!
@IBOutlet var iconImageView: UIImageView!//系统头像
@IBOutlet var phoneTextField: UITextField!//电话号码
@IBOutlet var passwordTextField: UITextField!//密码
@IBOutlet var passwordHiddenBtn: UIButton!//查看密码按钮
@IBOutlet var loginBtn: UIButton!
+
+ var keyShow = Bool()
override func viewDidLoad() {
super.viewDidLoad()
+
+ self.scrollView.contentSize = CGSize.init(width: 0, height: screenHeight)
+
layoutSubViews()
-
+
+ self.phoneTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged)
+ self.passwordTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged)
+
}
- override func loadView() {
- super.loadView()
- //防止tabbar隐藏导致页面跳一下
- self.tabBarController?.tabBar.isHidden = true
- self.navigationController?.setNavigationBarHidden(false, animated: true)
+
+ func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+
+ phoneTextField.resignFirstResponder()
+ passwordTextField.resignFirstResponder()
}
- override func viewWillAppear(_ animated: Bool) {
- super.viewWillAppear(animated)
+
+ //监听输入长度,显示登录按钮状态
+ @objc func textFieldChange(){
+ if (phoneTextField.text?.count)!>0 && (passwordTextField.text?.count)!>0 {
+ loginBtn.isUserInteractionEnabled = true
+ loginBtn.backgroundColor = navigationColor
+ }else{
+ loginBtn.isUserInteractionEnabled = false
+ loginBtn.backgroundColor = UIColor.lightGray
+ }
}
+
// MARK: - 设置控件属性
func layoutSubViews(){
self.navigationItem.title = "登录"
- topView.constant = (getScreenHeight()-325)/3
+
passwordHiddenBtn.setImage(UIImage(named: "my_password_look"), for: UIControlState.selected)
NotificationCenter.default.addObserver(self, selector: #selector(LoginViewController.keyboardWIllChange(_:)), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(LoginViewController.getPhoneNumber(_:)), name: NSNotification.Name(rawValue: MyPhoneNumberNotification.getPhoneNumber), object: nil)
@@ -41,10 +59,15 @@ class LoginViewController: UIViewController,UITextFieldDelegate {
@objc func keyboardWIllChange(_ noti: Notification){
let userInfo:NSDictionary=noti.userInfo! as NSDictionary
let endFrame=(userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue
+
if endFrame?.origin.y == getScreenHeight() {
- topView.constant = (getScreenHeight()-325)/3
+ UIView.animate(withDuration: 0.5) {
+ self.scrollView.setContentOffset(CGPoint.init(x: 0, y: 0), animated: true)
+ }
}else{
- topView.constant = (endFrame?.origin.y)!-375
+ UIView.animate(withDuration: 0.5) {
+ self.scrollView.setContentOffset(CGPoint.init(x: 0, y:80), animated: true)
+ }
}
}
@objc func getPhoneNumber(_ noti: Notification){
@@ -58,23 +81,9 @@ class LoginViewController: 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 textFieldShouldReturn(_ textField: UITextField) -> Bool {
- self.view.endEditing(true)
- return true
- }
- func textFieldDidEndEditing(_ textField: UITextField) {
- if textField==passwordTextField && phoneTextField.text! != "" && passwordTextField.text! != ""{
- loginBtn.isUserInteractionEnabled = true
- loginBtn.backgroundColor = UIColorFromRGB(0xC5DAFF)
- }else{
- loginBtn.isUserInteractionEnabled = false
- loginBtn.backgroundColor = UIColor.lightGray
- }
+ return textField.resignFirstResponder()
}
func isMobilePhoneNumber(_ mobile:String)->Bool {
let str="^1[0-9]{10}"
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
index 8fae4db..e36be9b 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
@@ -7,6 +7,7 @@
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+ <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -538,7 +539,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="9E0-qX-4XP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="150" y="-72"/>
+ <point key="canvasLocation" x="954" y="-72"/>
</scene>
<!--Login View Controller-->
<scene sceneID="ohO-Zi-TBy">
@@ -548,14 +549,16 @@
<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="iNa-Xg-qR8">
- <rect key="frame" x="0.0" y="148" width="375" height="325"/>
+ <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x1J-ue-QsP">
+ <rect key="frame" x="0.0" y="20" width="375" height="647"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto" translatesAutoresizingMaskIntoConstraints="NO" id="MuP-eU-u8t">
- <rect key="frame" x="157.5" y="0.0" width="60" height="60"/>
+ <rect key="frame" x="157" y="114" width="60" height="60"/>
<constraints>
- <constraint firstAttribute="width" secondItem="MuP-eU-u8t" secondAttribute="height" multiplier="1:1" id="2dS-lO-wew"/>
- <constraint firstAttribute="width" constant="60" id="vbp-ai-Bpn"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="60" id="6n8-Tt-z8Q"/>
+ <constraint firstAttribute="height" constant="60" id="O0t-sJ-e4W"/>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="Pro-uk-uVK"/>
+ <constraint firstAttribute="width" constant="60" id="UxO-hd-HqB"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -564,17 +567,89 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
+ <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8rh-jr-h8p">
+ <rect key="frame" x="8" y="368" width="359" height="40"/>
+ <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="40" id="gCr-80-H7C"/>
+ <constraint firstAttribute="height" constant="40" id="wEQ-N3-d1h"/>
+ </constraints>
+ <state key="normal" title="登录">
+ <color key="titleColor" white="1" 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="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">
+ <rect key="frame" x="8" y="419" 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="fRW-Sg-QbI">
+ <rect key="frame" x="0.0" y="0.0" width="115" height="20"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="115" id="Dgm-aw-qIM"/>
+ <constraint firstAttribute="height" constant="20" id="ORK-yo-OGM"/>
+ </constraints>
+ <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="fzA-Ya-qRu">
+ <rect key="frame" x="114" y="0.0" width="101" height="20"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="20" id="F9q-1g-471"/>
+ <constraint firstAttribute="width" constant="101" id="qIb-br-7HL"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <state key="normal" title="注册"/>
+ <connections>
+ <action selector="registerAction:" destination="UG5-bJ-YrY" eventType="touchUpInside" id="g4z-aO-EME"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bh4-Vg-DUl">
+ <rect key="frame" x="215" y="0.0" width="144" height="20"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="20" id="2bO-CK-qew"/>
+ <constraint firstAttribute="width" constant="144" id="gUO-us-cbE"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <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>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="fzA-Ya-qRu" firstAttribute="top" secondItem="X9h-K7-0bg" secondAttribute="top" id="2Du-1p-xB8"/>
+ <constraint firstItem="Bh4-Vg-DUl" firstAttribute="top" secondItem="X9h-K7-0bg" secondAttribute="top" id="5js-yF-eZS"/>
+ <constraint firstItem="Bh4-Vg-DUl" firstAttribute="leading" secondItem="fzA-Ya-qRu" secondAttribute="trailing" id="9qB-Dc-apn"/>
+ <constraint firstAttribute="trailing" secondItem="Bh4-Vg-DUl" secondAttribute="trailing" id="Aaq-mF-JsK"/>
+ <constraint firstItem="fRW-Sg-QbI" firstAttribute="top" secondItem="X9h-K7-0bg" secondAttribute="top" id="CCF-PJ-FpK"/>
+ <constraint firstAttribute="height" constant="19" id="e0a-IV-YHe"/>
+ <constraint firstItem="fRW-Sg-QbI" firstAttribute="leading" secondItem="X9h-K7-0bg" secondAttribute="leading" id="qGZ-a2-zCp"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="19" id="t8g-9K-SwO"/>
+ </constraints>
+ </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l2y-yF-IxJ">
- <rect key="frame" x="0.0" y="110" width="375" height="80"/>
+ <rect key="frame" x="0.0" y="283" width="375" height="80"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="zJR-4G-Ym9">
<rect key="frame" x="8" y="0.0" width="359" height="30"/>
<constraints>
- <constraint firstAttribute="height" constant="30" id="xRq-Ob-tzt"/>
+ <constraint firstAttribute="height" constant="30" id="CGb-2G-Jjh"/>
</constraints>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <textInputTraits key="textInputTraits" returnKeyType="done"/>
+ <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done"/>
<connections>
<outlet property="delegate" destination="UG5-bJ-YrY" id="Xho-dZ-Ore"/>
</connections>
@@ -583,20 +658,20 @@
<rect key="frame" x="8" y="38" width="359" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
- <constraint firstAttribute="height" constant="1" id="yyx-ra-eD2"/>
+ <constraint firstAttribute="height" constant="1" id="SxY-RF-Hf1"/>
</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="请输入密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx">
- <rect key="frame" x="8" y="39" width="298" height="30"/>
+ <rect key="frame" x="8" y="39" width="324" height="30"/>
<constraints>
- <constraint firstAttribute="height" constant="30" id="Idr-wo-mVx"/>
+ <constraint firstAttribute="height" constant="30" id="EzO-Mm-ZgF"/>
</constraints>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+ <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="done" secureTextEntry="YES"/>
<connections>
<outlet property="delegate" destination="UG5-bJ-YrY" id="qkm-zb-xWD"/>
</connections>
@@ -605,17 +680,17 @@
<rect key="frame" x="8" y="77" width="359" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
- <constraint firstAttribute="height" constant="1" id="fyR-u3-LBS"/>
+ <constraint firstAttribute="height" constant="1" id="eQA-Bw-4Gf"/>
</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="1J2-p5-3X1">
- <rect key="frame" x="314" y="47" width="45" height="22"/>
+ <rect key="frame" x="340" y="47" width="27" height="22"/>
<constraints>
- <constraint firstAttribute="width" constant="45" id="k3A-rs-8VG"/>
- <constraint firstAttribute="height" constant="22" id="sYv-8M-oJG"/>
+ <constraint firstAttribute="height" constant="22" id="FkQ-ZM-S8M"/>
+ <constraint firstAttribute="width" constant="27" id="Ng4-bN-yGu"/>
</constraints>
<state key="normal" image="my_password_unlook">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -634,112 +709,57 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="zJR-4G-Ym9" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="0Fc-53-ewX"/>
- <constraint firstItem="7Rz-tM-Igu" firstAttribute="top" secondItem="IOQ-sk-Ckx" secondAttribute="bottom" constant="8" id="3dr-Qz-eU8"/>
- <constraint firstItem="IOQ-sk-Ckx" firstAttribute="top" secondItem="bdq-xk-c7S" secondAttribute="bottom" id="7AX-SR-D42"/>
- <constraint firstAttribute="height" constant="80" id="7gx-7J-OKb"/>
- <constraint firstItem="7Rz-tM-Igu" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="B9p-mg-Fmu"/>
- <constraint firstAttribute="trailing" secondItem="zJR-4G-Ym9" secondAttribute="trailing" constant="8" id="CnL-fF-AU4"/>
- <constraint firstItem="zJR-4G-Ym9" firstAttribute="top" secondItem="l2y-yF-IxJ" secondAttribute="top" id="EZB-um-Gtd"/>
- <constraint firstItem="1J2-p5-3X1" firstAttribute="leading" secondItem="IOQ-sk-Ckx" secondAttribute="trailing" constant="8" id="FVN-QO-K36"/>
- <constraint firstItem="zJR-4G-Ym9" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="NN7-pk-19b"/>
- <constraint firstItem="IOQ-sk-Ckx" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="NaB-gb-EBv"/>
- <constraint firstItem="bdq-xk-c7S" firstAttribute="top" secondItem="zJR-4G-Ym9" secondAttribute="bottom" constant="8" id="VOj-JI-N5o"/>
- <constraint firstItem="zJR-4G-Ym9" firstAttribute="top" secondItem="l2y-yF-IxJ" secondAttribute="top" id="XUn-sp-IXT"/>
- <constraint firstItem="1J2-p5-3X1" firstAttribute="top" secondItem="bdq-xk-c7S" secondAttribute="bottom" constant="8" id="YZ9-un-NWs"/>
- <constraint firstAttribute="trailing" secondItem="zJR-4G-Ym9" secondAttribute="trailing" constant="8" id="ZaT-Rk-aEG"/>
- <constraint firstAttribute="trailing" secondItem="7Rz-tM-Igu" secondAttribute="trailing" constant="8" id="b67-wl-A4g"/>
- <constraint firstItem="bdq-xk-c7S" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="trq-Zr-PU8"/>
- <constraint firstAttribute="trailing" secondItem="bdq-xk-c7S" secondAttribute="trailing" constant="8" id="ytt-Nr-VyX"/>
- <constraint firstAttribute="trailing" secondItem="1J2-p5-3X1" secondAttribute="trailing" constant="16" id="zP0-t8-7QU"/>
- </constraints>
- </view>
- <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8rh-jr-h8p">
- <rect key="frame" x="8" y="198" width="359" height="40"/>
- <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstAttribute="height" constant="40" id="EUp-oS-yvq"/>
- </constraints>
- <state key="normal" title="登录">
- <color key="titleColor" white="1" 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="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">
- <rect key="frame" x="8" y="268" 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="fRW-Sg-QbI">
- <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="fzA-Ya-qRu">
- <rect key="frame" x="114" y="0.0" width="101" height="19"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <state key="normal" title="注册"/>
- <connections>
- <action selector="registerAction:" destination="UG5-bJ-YrY" eventType="touchUpInside" id="g4z-aO-EME"/>
- </connections>
- </button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bh4-Vg-DUl">
- <rect key="frame" x="215.5" y="0.0" width="143.5" height="19"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <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>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstItem="fzA-Ya-qRu" firstAttribute="top" secondItem="X9h-K7-0bg" secondAttribute="top" id="4vq-I6-cdC"/>
- <constraint firstItem="fzA-Ya-qRu" firstAttribute="leading" secondItem="fRW-Sg-QbI" secondAttribute="trailing" id="78A-H5-gJi"/>
- <constraint firstAttribute="height" constant="19" id="APE-yl-tYV"/>
- <constraint firstItem="Bh4-Vg-DUl" firstAttribute="width" secondItem="X9h-K7-0bg" secondAttribute="width" multiplier="2:5" id="Ifv-nJ-Ors"/>
- <constraint firstAttribute="bottom" secondItem="fRW-Sg-QbI" secondAttribute="bottom" id="NlF-ot-xQK"/>
- <constraint firstAttribute="bottom" secondItem="Bh4-Vg-DUl" secondAttribute="bottom" id="SAs-6n-FHC"/>
- <constraint firstAttribute="trailing" secondItem="Bh4-Vg-DUl" secondAttribute="trailing" id="X6L-Xn-PxI"/>
- <constraint firstItem="fRW-Sg-QbI" firstAttribute="top" secondItem="X9h-K7-0bg" secondAttribute="top" id="a8O-q0-Fxs"/>
- <constraint firstItem="Bh4-Vg-DUl" firstAttribute="top" secondItem="X9h-K7-0bg" secondAttribute="top" id="aV6-G9-T8n"/>
- <constraint firstItem="fRW-Sg-QbI" firstAttribute="leading" secondItem="X9h-K7-0bg" secondAttribute="leading" id="huE-rI-PsQ"/>
- <constraint firstItem="Bh4-Vg-DUl" firstAttribute="leading" secondItem="fzA-Ya-qRu" secondAttribute="trailing" id="itt-ri-mev"/>
- <constraint firstAttribute="bottom" secondItem="fzA-Ya-qRu" secondAttribute="bottom" id="kj1-TR-jJ5"/>
+ <constraint firstItem="7Rz-tM-Igu" firstAttribute="top" secondItem="IOQ-sk-Ckx" secondAttribute="bottom" constant="8" id="1O6-mf-8Tg"/>
+ <constraint firstAttribute="trailing" secondItem="zJR-4G-Ym9" secondAttribute="trailing" constant="8" id="55S-nW-Yl2"/>
+ <constraint firstItem="IOQ-sk-Ckx" firstAttribute="top" secondItem="bdq-xk-c7S" secondAttribute="bottom" id="81n-OM-M8Z"/>
+ <constraint firstItem="bdq-xk-c7S" firstAttribute="top" secondItem="zJR-4G-Ym9" secondAttribute="bottom" constant="8" id="H4t-g8-yal"/>
+ <constraint firstAttribute="height" constant="80" id="LI0-bW-uhp"/>
+ <constraint firstItem="zJR-4G-Ym9" firstAttribute="top" secondItem="l2y-yF-IxJ" secondAttribute="top" id="U38-FX-4cT"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="80" id="UBK-Wb-rbG"/>
+ <constraint firstItem="1J2-p5-3X1" firstAttribute="leading" secondItem="IOQ-sk-Ckx" secondAttribute="trailing" constant="8" id="YG1-Vv-1aV"/>
+ <constraint firstAttribute="trailing" secondItem="bdq-xk-c7S" secondAttribute="trailing" constant="8" id="c1t-if-TqW"/>
+ <constraint firstItem="7Rz-tM-Igu" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="c6u-fe-cfv"/>
+ <constraint firstAttribute="trailing" secondItem="7Rz-tM-Igu" secondAttribute="trailing" constant="8" id="cD9-Az-QD7"/>
+ <constraint firstAttribute="trailing" secondItem="1J2-p5-3X1" secondAttribute="trailing" constant="8" id="oSN-G4-x85"/>
+ <constraint firstItem="bdq-xk-c7S" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="v9n-R5-DO4"/>
+ <constraint firstItem="IOQ-sk-Ckx" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="vZZ-bD-pjG"/>
+ <constraint firstItem="zJR-4G-Ym9" firstAttribute="leading" secondItem="l2y-yF-IxJ" secondAttribute="leading" constant="8" id="vyq-KS-9zw"/>
+ <constraint firstItem="1J2-p5-3X1" firstAttribute="top" secondItem="bdq-xk-c7S" secondAttribute="bottom" constant="8" id="xfo-vG-x3T"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstAttribute="trailing" secondItem="X9h-K7-0bg" secondAttribute="trailing" constant="8" id="22E-n4-Bi5"/>
- <constraint firstItem="X9h-K7-0bg" firstAttribute="leading" secondItem="iNa-Xg-qR8" secondAttribute="leading" constant="8" id="35F-mT-dDk"/>
- <constraint firstItem="l2y-yF-IxJ" firstAttribute="leading" secondItem="iNa-Xg-qR8" secondAttribute="leading" id="52U-by-P0X"/>
- <constraint firstItem="8rh-jr-h8p" firstAttribute="leading" secondItem="iNa-Xg-qR8" secondAttribute="leading" constant="8" id="MaP-ud-Dq3"/>
- <constraint firstItem="l2y-yF-IxJ" firstAttribute="top" secondItem="MuP-eU-u8t" secondAttribute="bottom" constant="50" id="Mch-ua-vtc"/>
- <constraint firstItem="X9h-K7-0bg" firstAttribute="top" secondItem="8rh-jr-h8p" secondAttribute="bottom" constant="30" id="bPB-QH-jL9"/>
- <constraint firstItem="MuP-eU-u8t" firstAttribute="centerX" secondItem="iNa-Xg-qR8" secondAttribute="centerX" id="c4E-D6-ECk"/>
- <constraint firstAttribute="trailing" secondItem="l2y-yF-IxJ" secondAttribute="trailing" id="mD4-PT-F33"/>
- <constraint firstItem="8rh-jr-h8p" firstAttribute="top" secondItem="l2y-yF-IxJ" secondAttribute="bottom" constant="8" id="nVj-DU-BIW"/>
- <constraint firstItem="MuP-eU-u8t" firstAttribute="top" secondItem="iNa-Xg-qR8" secondAttribute="top" id="wgf-Vi-kAc"/>
- <constraint firstAttribute="trailing" secondItem="8rh-jr-h8p" secondAttribute="trailing" constant="8" id="xJF-a2-WXZ"/>
- <constraint firstAttribute="height" constant="325" id="xfQ-ur-TCe"/>
+ <constraint firstAttribute="trailing" secondItem="l2y-yF-IxJ" secondAttribute="trailing" id="21t-IW-Lfw"/>
+ <constraint firstItem="8rh-jr-h8p" firstAttribute="leading" secondItem="x1J-ue-QsP" secondAttribute="leading" constant="8" id="2dZ-uU-gs1"/>
+ <constraint firstItem="X9h-K7-0bg" firstAttribute="leading" secondItem="x1J-ue-QsP" secondAttribute="leading" constant="8" id="2lr-kL-AY0"/>
+ <constraint firstItem="l2y-yF-IxJ" firstAttribute="centerY" secondItem="x1J-ue-QsP" secondAttribute="centerY" id="2vZ-Bp-Gc7"/>
+ <constraint firstItem="l2y-yF-IxJ" firstAttribute="centerX" secondItem="8rh-jr-h8p" secondAttribute="centerX" id="356-9l-vO7"/>
+ <constraint firstItem="8rh-jr-h8p" firstAttribute="top" secondItem="l2y-yF-IxJ" secondAttribute="bottom" constant="5" id="Fbk-dO-92I"/>
+ <constraint firstAttribute="trailing" secondItem="8rh-jr-h8p" secondAttribute="trailing" constant="8" id="Jlh-eI-c8P"/>
+ <constraint firstItem="8rh-jr-h8p" firstAttribute="leading" secondItem="X9h-K7-0bg" secondAttribute="leading" id="PZU-xC-RVt"/>
+ <constraint firstAttribute="trailing" secondItem="X9h-K7-0bg" secondAttribute="trailing" constant="8" id="UXN-OE-SMD"/>
+ <constraint firstItem="X9h-K7-0bg" firstAttribute="top" secondItem="8rh-jr-h8p" secondAttribute="bottom" constant="11" id="V7b-nV-yOk"/>
+ <constraint firstItem="MuP-eU-u8t" firstAttribute="centerX" secondItem="x1J-ue-QsP" secondAttribute="centerX" id="Z3p-91-jMU"/>
+ <constraint firstItem="MuP-eU-u8t" firstAttribute="top" secondItem="x1J-ue-QsP" secondAttribute="top" constant="114" id="aqN-O5-1qw"/>
+ <constraint firstItem="l2y-yF-IxJ" firstAttribute="leading" secondItem="x1J-ue-QsP" secondAttribute="leading" id="asb-us-A3N"/>
+ <constraint firstItem="8rh-jr-h8p" firstAttribute="leading" secondItem="x1J-ue-QsP" secondAttribute="leadingMargin" id="awN-N6-199"/>
+ <constraint firstAttribute="trailing" secondItem="l2y-yF-IxJ" secondAttribute="trailing" id="ddE-p4-ng1"/>
+ <constraint firstAttribute="bottom" secondItem="X9h-K7-0bg" secondAttribute="bottom" constant="195" id="eSi-2B-vUK"/>
+ <constraint firstItem="MuP-eU-u8t" firstAttribute="centerX" secondItem="l2y-yF-IxJ" secondAttribute="centerX" id="uPW-1Y-SRK"/>
+ <constraint firstItem="l2y-yF-IxJ" firstAttribute="leading" secondItem="x1J-ue-QsP" secondAttribute="leading" id="xaT-zl-a5C"/>
+ <constraint firstItem="8rh-jr-h8p" firstAttribute="trailing" secondItem="X9h-K7-0bg" secondAttribute="trailing" id="yrC-8Q-CRp"/>
</constraints>
- </view>
+ <connections>
+ <outlet property="delegate" destination="UG5-bJ-YrY" id="NO2-hJ-x3b"/>
+ </connections>
+ </scrollView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="iNa-Xg-qR8" firstAttribute="leading" secondItem="Ntj-wl-nEm" secondAttribute="leading" id="QQW-jj-LhX"/>
- <constraint firstItem="iNa-Xg-qR8" firstAttribute="trailing" secondItem="Ntj-wl-nEm" secondAttribute="trailing" id="hIx-CF-A1l"/>
- <constraint firstItem="iNa-Xg-qR8" firstAttribute="top" secondItem="Ntj-wl-nEm" secondAttribute="top" constant="128" id="ncV-YP-8Ki"/>
+ <constraint firstAttribute="trailing" secondItem="x1J-ue-QsP" secondAttribute="trailing" id="5Sn-vu-iz6"/>
+ <constraint firstItem="x1J-ue-QsP" firstAttribute="top" secondItem="Ntj-wl-nEm" secondAttribute="top" id="E9K-SV-dEd"/>
+ <constraint firstItem="x1J-ue-QsP" firstAttribute="bottom" secondItem="Ntj-wl-nEm" secondAttribute="bottom" id="Gjv-wQ-GxF"/>
+ <constraint firstItem="x1J-ue-QsP" firstAttribute="leading" secondItem="fVn-x5-9OR" secondAttribute="leading" id="sq7-lN-Qud"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Ntj-wl-nEm"/>
</view>
@@ -750,12 +770,12 @@
<outlet property="passwordHiddenBtn" destination="1J2-p5-3X1" id="nRt-UB-PLr"/>
<outlet property="passwordTextField" destination="IOQ-sk-Ckx" id="WdM-7n-kAj"/>
<outlet property="phoneTextField" destination="zJR-4G-Ym9" id="9rT-Uj-tRY"/>
- <outlet property="topView" destination="ncV-YP-8Ki" id="NYz-Av-YPN"/>
+ <outlet property="scrollView" destination="x1J-ue-QsP" id="xCq-vd-IS3"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="S0Q-a9-78E" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-570" y="-72"/>
+ <point key="canvasLocation" x="-570.39999999999998" y="-72.413793103448285"/>
</scene>
<!--个人资料-->
<scene sceneID="krI-M9-eZ9">
@@ -977,7 +997,7 @@
</connections>
</tapGestureRecognizer>
</objects>
- <point key="canvasLocation" x="976.79999999999995" y="-70.614692653673174"/>
+ <point key="canvasLocation" x="1606" y="-72"/>
</scene>
<!--消息-->
<scene sceneID="3fz-6T-ky5">
diff --git a/ParentAssistant/ParentAssistant/Classes/libs/LZCityPickerClass/LZCityPickerView.m b/ParentAssistant/ParentAssistant/Classes/libs/LZCityPickerClass/LZCityPickerView.m
index 9a07e3c..8a07c13 100755
--- a/ParentAssistant/ParentAssistant/Classes/libs/LZCityPickerClass/LZCityPickerView.m
+++ b/ParentAssistant/ParentAssistant/Classes/libs/LZCityPickerClass/LZCityPickerView.m
@@ -66,7 +66,7 @@ static NSInteger const lz_buttonHeight = 30;
__isShowed = YES;
[self._superView addSubview:self];
[UIView animateWithDuration:self.interval animations:^{
- self.frame = CGRectMake(0, lz_screenHeight - lz_pickerHeight, lz_screenWidth, lz_pickerHeight);
+ self.frame = CGRectMake(0, lz_screenHeight - lz_pickerHeight - 66 - 44, lz_screenWidth, lz_pickerHeight);
} completion:^(BOOL finished) {
if (block) {
block();
diff --git a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
index 1e7f9aa..d1b4da5 100644
--- a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
<key>Alamofire.xcscheme</key>
<dict>
<key>orderHint</key>
- <integer>0</integer>
+ <integer>1</integer>
</dict>
<key>DZNEmptyDataSet.xcscheme</key>
<dict>
--
libgit2 0.21.0