From cf35390359c8c5c02f9b74527a2397d93833d095 Mon Sep 17 00:00:00 2001
From: 葛建军 <jun@gejianjundeMac-mini.local>
Date: Thu, 25 May 2017 14:56:45 +0800
Subject: [PATCH] no message

---
 YouerLiveVideo/YouerLiveVideo/controllers/HomePage/HomePage.storyboard                 |  6 ++----
 YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard             | 12 +++++++-----
 YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift |  9 +++------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/HomePage.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/HomePage.storyboard
index 5a2f7a4..f8d765c 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/HomePage.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/HomePage/HomePage.storyboard
@@ -48,10 +48,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ss9-IN-p7o">
-                                                    <rect key="frame" x="331" y="0.0" width="44" height="44"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="44" id="i7f-rP-uMp"/>
-                                                    </constraints>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                                     <connections>
                                                         <action selector="openOrCloseAction:" destination="cns-vb-pIQ" eventType="touchUpInside" id="pnJ-fx-YyR"/>
                                                     </connections>
@@ -66,6 +63,7 @@
                                                 <constraint firstAttribute="trailing" secondItem="ss9-IN-p7o" secondAttribute="trailing" id="aAO-V3-sgD"/>
                                                 <constraint firstItem="ss9-IN-p7o" firstAttribute="top" secondItem="ckB-W3-VJE" secondAttribute="top" id="bxF-ra-1Fc"/>
                                                 <constraint firstItem="SaW-7O-OkT" firstAttribute="centerY" secondItem="ckB-W3-VJE" secondAttribute="centerY" id="ne0-jg-T5L"/>
+                                                <constraint firstItem="ss9-IN-p7o" firstAttribute="leading" secondItem="ckB-W3-VJE" secondAttribute="leading" id="paD-hI-EiW"/>
                                                 <constraint firstItem="SaW-7O-OkT" firstAttribute="leading" secondItem="ckB-W3-VJE" secondAttribute="leading" constant="18" id="wS7-H2-6Hb"/>
                                             </constraints>
                                         </view>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
index 4956e0a..530716a 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
@@ -788,10 +788,10 @@
             </objects>
             <point key="canvasLocation" x="-2162.4000000000001" y="1533.2833583208396"/>
         </scene>
-        <!--New Login View Controller-->
+        <!--登录-->
         <scene sceneID="j0h-zV-7K8">
             <objects>
-                <viewController storyboardIdentifier="NewLoginViewControllerVC" id="7YD-gA-dLJ" customClass="NewLoginViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="NewLoginViewControllerVC" hidesBottomBarWhenPushed="YES" id="7YD-gA-dLJ" customClass="NewLoginViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Hx8-x7-gQe"/>
                         <viewControllerLayoutGuide type="bottom" id="eS2-l5-mzB"/>
@@ -943,7 +943,7 @@
                                                     <color key="titleShadowColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                                 <connections>
-                                                    <action selector="onLoginClicked:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="oVG-0D-j2T"/>
+                                                    <action selector="onLoginClicked:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="K5c-Pu-mOx"/>
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Oee-Sm-GxU">
@@ -957,7 +957,7 @@
                                                     <color key="titleColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                                 <connections>
-                                                    <action selector="activatiAction:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="Al4-o1-Tj0"/>
+                                                    <action selector="forgetPassword:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="vNy-vF-mrx"/>
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vmw-Ug-eCf">
@@ -971,7 +971,7 @@
                                                     <color key="titleColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                                 <connections>
-                                                    <action selector="returnAction:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="9DX-YN-Sc1"/>
+                                                    <action selector="registerAccount:" destination="7YD-gA-dLJ" eventType="touchUpInside" id="SPU-2J-UeI"/>
                                                 </connections>
                                             </button>
                                         </subviews>
@@ -1015,6 +1015,8 @@
                             <constraint firstItem="eS2-l5-mzB" firstAttribute="top" secondItem="zyE-vu-SeI" secondAttribute="bottom" id="Uh1-h1-vQ4"/>
                         </constraints>
                     </view>
+                    <navigationItem key="navigationItem" title="登录" id="xGB-lk-WD2"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
                         <outlet property="buttonLogin" destination="d0Y-Gl-m8Z" id="QDU-R3-RGe"/>
                         <outlet property="constraintContentOffset" destination="MqN-UP-SP0" id="dpa-vk-fx3"/>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
index 938f54d..b3cf4f9 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
@@ -19,8 +19,6 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate {
         constraintContentOffset.constant=20
         view.backgroundColor=UIColorFromRGB(0xf7f7f7)
         Theme.configButton(buttonLogin)
-        let lastAccount=Setting.getString("lastAccountNumber")
-        fieldAccount.text=lastAccount
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
@@ -39,7 +37,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
-    @IBAction func onLoginClicked(sender: AnyObject) {
+    @IBAction func onLoginClicked(_ sender: UIButton) {
         self.view.endEditing(true)
         let account=fieldAccount.text
         let pw=fieldPassword.text
@@ -110,12 +108,11 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate {
         self.navigationController!.popViewController(animated: true)
     }
     
-
-    @IBAction func activatiAction(sender: UIButton) {
+    @IBAction func forgetPassword(_ sender: UIButton) {
         let vc = Story.instantiateViewControllerWithIdentifier("ChangePassWordViewControllerVC", storyName: "User") as! ChangePassWordViewController
         self.navigationController?.pushViewController(vc, animated: true)
     }
-    @IBAction func returnAction(sender: UIButton) {
+    @IBAction func registerAccount(_ sender: UIButton) {
         let vc = UIStoryboard(name: "Login", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController
         self.navigationController!.pushViewController(vc, animated: true)
     }
--
libgit2 0.21.0