Commit cf35390359c8c5c02f9b74527a2397d93833d095
1 parent
3345ba31
Exists in
newLive
no message
Showing
3 changed files
with
12 additions
and
15 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/controllers/HomePage/HomePage.storyboard
| ... | ... | @@ -48,10 +48,7 @@ |
| 48 | 48 | </constraints> |
| 49 | 49 | </imageView> |
| 50 | 50 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ss9-IN-p7o"> |
| 51 | - <rect key="frame" x="331" y="0.0" width="44" height="44"/> | |
| 52 | - <constraints> | |
| 53 | - <constraint firstAttribute="width" constant="44" id="i7f-rP-uMp"/> | |
| 54 | - </constraints> | |
| 51 | + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> | |
| 55 | 52 | <connections> |
| 56 | 53 | <action selector="openOrCloseAction:" destination="cns-vb-pIQ" eventType="touchUpInside" id="pnJ-fx-YyR"/> |
| 57 | 54 | </connections> |
| ... | ... | @@ -66,6 +63,7 @@ |
| 66 | 63 | <constraint firstAttribute="trailing" secondItem="ss9-IN-p7o" secondAttribute="trailing" id="aAO-V3-sgD"/> |
| 67 | 64 | <constraint firstItem="ss9-IN-p7o" firstAttribute="top" secondItem="ckB-W3-VJE" secondAttribute="top" id="bxF-ra-1Fc"/> |
| 68 | 65 | <constraint firstItem="SaW-7O-OkT" firstAttribute="centerY" secondItem="ckB-W3-VJE" secondAttribute="centerY" id="ne0-jg-T5L"/> |
| 66 | + <constraint firstItem="ss9-IN-p7o" firstAttribute="leading" secondItem="ckB-W3-VJE" secondAttribute="leading" id="paD-hI-EiW"/> | |
| 69 | 67 | <constraint firstItem="SaW-7O-OkT" firstAttribute="leading" secondItem="ckB-W3-VJE" secondAttribute="leading" constant="18" id="wS7-H2-6Hb"/> |
| 70 | 68 | </constraints> |
| 71 | 69 | </view> | ... | ... |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
| ... | ... | @@ -788,10 +788,10 @@ |
| 788 | 788 | </objects> |
| 789 | 789 | <point key="canvasLocation" x="-2162.4000000000001" y="1533.2833583208396"/> |
| 790 | 790 | </scene> |
| 791 | - <!--New Login View Controller--> | |
| 791 | + <!--登录--> | |
| 792 | 792 | <scene sceneID="j0h-zV-7K8"> |
| 793 | 793 | <objects> |
| 794 | - <viewController storyboardIdentifier="NewLoginViewControllerVC" id="7YD-gA-dLJ" customClass="NewLoginViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController"> | |
| 794 | + <viewController storyboardIdentifier="NewLoginViewControllerVC" hidesBottomBarWhenPushed="YES" id="7YD-gA-dLJ" customClass="NewLoginViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController"> | |
| 795 | 795 | <layoutGuides> |
| 796 | 796 | <viewControllerLayoutGuide type="top" id="Hx8-x7-gQe"/> |
| 797 | 797 | <viewControllerLayoutGuide type="bottom" id="eS2-l5-mzB"/> |
| ... | ... | @@ -943,7 +943,7 @@ |
| 943 | 943 | <color key="titleShadowColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> |
| 944 | 944 | </state> |
| 945 | 945 | <connections> |
| 946 | - <action selector="onLoginClicked:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="oVG-0D-j2T"/> | |
| 946 | + <action selector="onLoginClicked:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="K5c-Pu-mOx"/> | |
| 947 | 947 | </connections> |
| 948 | 948 | </button> |
| 949 | 949 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Oee-Sm-GxU"> |
| ... | ... | @@ -957,7 +957,7 @@ |
| 957 | 957 | <color key="titleColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 958 | 958 | </state> |
| 959 | 959 | <connections> |
| 960 | - <action selector="activatiAction:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="Al4-o1-Tj0"/> | |
| 960 | + <action selector="forgetPassword:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="vNy-vF-mrx"/> | |
| 961 | 961 | </connections> |
| 962 | 962 | </button> |
| 963 | 963 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vmw-Ug-eCf"> |
| ... | ... | @@ -971,7 +971,7 @@ |
| 971 | 971 | <color key="titleColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 972 | 972 | </state> |
| 973 | 973 | <connections> |
| 974 | - <action selector="returnAction:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="9DX-YN-Sc1"/> | |
| 974 | + <action selector="registerAccount:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="SPU-2J-UeI"/> | |
| 975 | 975 | </connections> |
| 976 | 976 | </button> |
| 977 | 977 | </subviews> |
| ... | ... | @@ -1015,6 +1015,8 @@ |
| 1015 | 1015 | <constraint firstItem="eS2-l5-mzB" firstAttribute="top" secondItem="zyE-vu-SeI" secondAttribute="bottom" id="Uh1-h1-vQ4"/> |
| 1016 | 1016 | </constraints> |
| 1017 | 1017 | </view> |
| 1018 | + <navigationItem key="navigationItem" title="登录" id="xGB-lk-WD2"/> | |
| 1019 | + <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/> | |
| 1018 | 1020 | <connections> |
| 1019 | 1021 | <outlet property="buttonLogin" destination="d0Y-Gl-m8Z" id="QDU-R3-RGe"/> |
| 1020 | 1022 | <outlet property="constraintContentOffset" destination="MqN-UP-SP0" id="dpa-vk-fx3"/> | ... | ... |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
| ... | ... | @@ -19,8 +19,6 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { |
| 19 | 19 | constraintContentOffset.constant=20 |
| 20 | 20 | view.backgroundColor=UIColorFromRGB(0xf7f7f7) |
| 21 | 21 | Theme.configButton(buttonLogin) |
| 22 | - let lastAccount=Setting.getString("lastAccountNumber") | |
| 23 | - fieldAccount.text=lastAccount | |
| 24 | 22 | } |
| 25 | 23 | override func viewWillAppear(_ animated: Bool) { |
| 26 | 24 | super.viewWillAppear(animated) |
| ... | ... | @@ -39,7 +37,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { |
| 39 | 37 | super.didReceiveMemoryWarning() |
| 40 | 38 | // Dispose of any resources that can be recreated. |
| 41 | 39 | } |
| 42 | - @IBAction func onLoginClicked(sender: AnyObject) { | |
| 40 | + @IBAction func onLoginClicked(_ sender: UIButton) { | |
| 43 | 41 | self.view.endEditing(true) |
| 44 | 42 | let account=fieldAccount.text |
| 45 | 43 | let pw=fieldPassword.text |
| ... | ... | @@ -110,12 +108,11 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { |
| 110 | 108 | self.navigationController!.popViewController(animated: true) |
| 111 | 109 | } |
| 112 | 110 | |
| 113 | - | |
| 114 | - @IBAction func activatiAction(sender: UIButton) { | |
| 111 | + @IBAction func forgetPassword(_ sender: UIButton) { | |
| 115 | 112 | let vc = Story.instantiateViewControllerWithIdentifier("ChangePassWordViewControllerVC", storyName: "User") as! ChangePassWordViewController |
| 116 | 113 | self.navigationController?.pushViewController(vc, animated: true) |
| 117 | 114 | } |
| 118 | - @IBAction func returnAction(sender: UIButton) { | |
| 115 | + @IBAction func registerAccount(_ sender: UIButton) { | |
| 119 | 116 | let vc = UIStoryboard(name: "Login", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController |
| 120 | 117 | self.navigationController!.pushViewController(vc, animated: true) |
| 121 | 118 | } | ... | ... |