Commit 67db43abb4c77fa2264cd948a385af1259f35b83
1 parent
66f62deb
Exists in
newLive
登录界面调整
Showing
8 changed files
with
108 additions
and
56 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/login_bottom2.imageset/1.png
0 → 100644
24.5 KB
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/login_bottom2.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "1.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file |
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
| @@ -785,13 +785,7 @@ | @@ -785,13 +785,7 @@ | ||
| 785 | <outlet property="delegate" destination="HdB-6p-eAX" id="k2q-uw-6l0"/> | 785 | <outlet property="delegate" destination="HdB-6p-eAX" id="k2q-uw-6l0"/> |
| 786 | </connections> | 786 | </connections> |
| 787 | </tableView> | 787 | </tableView> |
| 788 | - <navigationItem key="navigationItem" title="教育视频云" id="u6G-VK-Ob0"> | ||
| 789 | - <barButtonItem key="rightBarButtonItem" systemItem="search" id="Wrt-Tt-zFU"> | ||
| 790 | - <connections> | ||
| 791 | - <action selector="rightBarButtonAction:" destination="HdB-6p-eAX" id="FCr-SK-pbu"/> | ||
| 792 | - </connections> | ||
| 793 | - </barButtonItem> | ||
| 794 | - </navigationItem> | 788 | + <navigationItem key="navigationItem" title="教育视频云" id="u6G-VK-Ob0"/> |
| 795 | <connections> | 789 | <connections> |
| 796 | <outlet property="tableHeaderView" destination="w64-sF-NZ9" id="GF0-Uu-8HD"/> | 790 | <outlet property="tableHeaderView" destination="w64-sF-NZ9" id="GF0-Uu-8HD"/> |
| 797 | </connections> | 791 | </connections> |
YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
| @@ -21,7 +21,7 @@ class MainHomeTableViewController: UITableViewController { | @@ -21,7 +21,7 @@ class MainHomeTableViewController: UITableViewController { | ||
| 21 | func settingIconAndTitle(){ | 21 | func settingIconAndTitle(){ |
| 22 | let photo=UIImageView(frame: CGRect(x: 0, y: 0, width: 35, height: 35)) | 22 | let photo=UIImageView(frame: CGRect(x: 0, y: 0, width: 35, height: 35)) |
| 23 | photo.sd_setImage(with: URL(string: current.photo()), placeholderImage: UIImage(named: "defphoto")) | 23 | photo.sd_setImage(with: URL(string: current.photo()), placeholderImage: UIImage(named: "defphoto")) |
| 24 | - photo.layer.cornerRadius=5 | 24 | + photo.layer.cornerRadius=35/2 |
| 25 | photo.layer.masksToBounds=true | 25 | photo.layer.masksToBounds=true |
| 26 | let leftBarButtonItem=UIBarButtonItem(customView: photo) | 26 | let leftBarButtonItem=UIBarButtonItem(customView: photo) |
| 27 | self.navigationItem.leftBarButtonItem=leftBarButtonItem | 27 | self.navigationItem.leftBarButtonItem=leftBarButtonItem |
YouerLiveVideo/YouerLiveVideo/controllers/Resource/FilterViewController.swift
| @@ -12,8 +12,7 @@ class FilterViewController: UIViewController { | @@ -12,8 +12,7 @@ class FilterViewController: UIViewController { | ||
| 12 | 12 | ||
| 13 | override func viewDidLoad() { | 13 | override func viewDidLoad() { |
| 14 | super.viewDidLoad() | 14 | super.viewDidLoad() |
| 15 | - | ||
| 16 | - // Do any additional setup after loading the view. | 15 | +// AppDelegate.instance().httpServer.postResourceList(parameters: <#T##[String : AnyObject]?#>, completionHandler: <#T##(String?, NSError?) -> ()#>) |
| 17 | } | 16 | } |
| 18 | 17 | ||
| 19 | override func didReceiveMemoryWarning() { | 18 | override func didReceiveMemoryWarning() { |
YouerLiveVideo/YouerLiveVideo/controllers/Resource/Resource.storyboard
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <!--Filter View Controller--> | 12 | <!--Filter View Controller--> |
| 13 | <scene sceneID="Rmv-Eo-NBi"> | 13 | <scene sceneID="Rmv-Eo-NBi"> |
| 14 | <objects> | 14 | <objects> |
| 15 | - <viewController id="J51-bf-ysq" customClass="FilterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController"> | 15 | + <viewController storyboardIdentifier="FilterViewController" hidesBottomBarWhenPushed="YES" id="J51-bf-ysq" customClass="FilterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController"> |
| 16 | <layoutGuides> | 16 | <layoutGuides> |
| 17 | <viewControllerLayoutGuide type="top" id="8Fm-xC-jSr"/> | 17 | <viewControllerLayoutGuide type="top" id="8Fm-xC-jSr"/> |
| 18 | <viewControllerLayoutGuide type="bottom" id="bXh-Wr-qy6"/> | 18 | <viewControllerLayoutGuide type="bottom" id="bXh-Wr-qy6"/> |
| @@ -22,6 +22,7 @@ | @@ -22,6 +22,7 @@ | ||
| 22 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 22 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 23 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 23 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 24 | </view> | 24 | </view> |
| 25 | + <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/> | ||
| 25 | </viewController> | 26 | </viewController> |
| 26 | <placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/> | 27 | <placeholder placeholderIdentifier="IBFirstResponder" id="ocM-s7-Wga" userLabel="First Responder" sceneMemberID="firstResponder"/> |
| 27 | </objects> | 28 | </objects> |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift
| @@ -28,7 +28,7 @@ class LoginViewController: UIViewController,UITextFieldDelegate { | @@ -28,7 +28,7 @@ class LoginViewController: UIViewController,UITextFieldDelegate { | ||
| 28 | // let leftbtn = UIBarButtonItem(title: "返回", style: .plain, target: self, action: #selector(LoginViewController.back)) | 28 | // let leftbtn = UIBarButtonItem(title: "返回", style: .plain, target: self, action: #selector(LoginViewController.back)) |
| 29 | // self.navigationItem.title = "登录" | 29 | // self.navigationItem.title = "登录" |
| 30 | // self.navigationItem.leftBarButtonItem = leftbtn | 30 | // self.navigationItem.leftBarButtonItem = leftbtn |
| 31 | - changeViewTop.constant=(getScreenHeight()-64-220)/3 | 31 | + changeViewTop.constant=(getScreenHeight()-64-220)/2 |
| 32 | } | 32 | } |
| 33 | //点击页面回收键盘 | 33 | //点击页面回收键盘 |
| 34 | @IBAction func touchAction(_ sender: AnyObject) { | 34 | @IBAction func touchAction(_ sender: AnyObject) { |
| @@ -134,9 +134,9 @@ class LoginViewController: UIViewController,UITextFieldDelegate { | @@ -134,9 +134,9 @@ class LoginViewController: UIViewController,UITextFieldDelegate { | ||
| 134 | let userInfo:NSDictionary=noti.userInfo! as NSDictionary | 134 | let userInfo:NSDictionary=noti.userInfo! as NSDictionary |
| 135 | let endFrame=(userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue | 135 | let endFrame=(userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue |
| 136 | if endFrame?.origin.y==getScreenHeight() { | 136 | if endFrame?.origin.y==getScreenHeight() { |
| 137 | - changeViewTop.constant=(getScreenHeight()-64-220)/3 | 137 | + changeViewTop.constant=(getScreenHeight()-64-220)/2 |
| 138 | }else{ | 138 | }else{ |
| 139 | - let y = (getScreenHeight()-64-220)/3+CGFloat(64+220) | 139 | + let y = (getScreenHeight()-64-220)/2+CGFloat(64+220) |
| 140 | if (endFrame?.origin.y)! < y { | 140 | if (endFrame?.origin.y)! < y { |
| 141 | changeViewTop.constant=getScreenHeight()-64-(endFrame?.size.height)!-220 | 141 | changeViewTop.constant=getScreenHeight()-64-(endFrame?.size.height)!-220 |
| 142 | } | 142 | } |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/User.storyboard
| @@ -22,21 +22,46 @@ | @@ -22,21 +22,46 @@ | ||
| 22 | <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | 22 | <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
| 23 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 23 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 24 | <subviews> | 24 | <subviews> |
| 25 | - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loginBackGround" translatesAutoresizingMaskIntoConstraints="NO" id="Bob-Ef-450"> | ||
| 26 | - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | ||
| 27 | - </imageView> | 25 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rfv-aY-7Su"> |
| 26 | + <rect key="frame" x="0.0" y="0.0" width="375" height="186"/> | ||
| 27 | + <subviews> | ||
| 28 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="教育视频云" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hWE-Vs-d0u"> | ||
| 29 | + <rect key="frame" x="150" y="0.0" width="225" height="186"/> | ||
| 30 | + <fontDescription key="fontDescription" type="system" pointSize="22"/> | ||
| 31 | + <color key="textColor" red="0.10980392156862745" green="0.63529411764705879" blue="1" alpha="1" colorSpace="calibratedRGB"/> | ||
| 32 | + <nil key="highlightedColor"/> | ||
| 33 | + </label> | ||
| 34 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="2J4-Xk-hLV"> | ||
| 35 | + <rect key="frame" x="62" y="53" width="80" height="80"/> | ||
| 36 | + <constraints> | ||
| 37 | + <constraint firstAttribute="height" constant="80" id="gMc-Hx-iZf"/> | ||
| 38 | + <constraint firstAttribute="width" constant="80" id="kIC-aJ-75p"/> | ||
| 39 | + </constraints> | ||
| 40 | + </imageView> | ||
| 41 | + </subviews> | ||
| 42 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | ||
| 43 | + <constraints> | ||
| 44 | + <constraint firstItem="2J4-Xk-hLV" firstAttribute="centerY" secondItem="rfv-aY-7Su" secondAttribute="centerY" id="CXG-zh-yXU"/> | ||
| 45 | + <constraint firstAttribute="height" constant="186" id="MDO-eR-LT5"/> | ||
| 46 | + <constraint firstItem="hWE-Vs-d0u" firstAttribute="top" secondItem="rfv-aY-7Su" secondAttribute="top" id="MIW-gU-FEh"/> | ||
| 47 | + <constraint firstAttribute="trailing" secondItem="hWE-Vs-d0u" secondAttribute="trailing" id="RiE-Cg-vB6"/> | ||
| 48 | + <constraint firstItem="hWE-Vs-d0u" firstAttribute="width" secondItem="rfv-aY-7Su" secondAttribute="width" multiplier="3:5" id="f3q-An-JLu"/> | ||
| 49 | + <constraint firstItem="hWE-Vs-d0u" firstAttribute="leading" secondItem="2J4-Xk-hLV" secondAttribute="trailing" constant="8" id="h74-K9-uXy"/> | ||
| 50 | + <constraint firstAttribute="bottom" secondItem="hWE-Vs-d0u" secondAttribute="bottom" id="zcB-F0-ox7"/> | ||
| 51 | + </constraints> | ||
| 52 | + </view> | ||
| 28 | <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tqb-X5-ujR" customClass="UIControl"> | 53 | <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tqb-X5-ujR" customClass="UIControl"> |
| 29 | <rect key="frame" x="0.0" y="186" width="375" height="220"/> | 54 | <rect key="frame" x="0.0" y="186" width="375" height="220"/> |
| 30 | <subviews> | 55 | <subviews> |
| 31 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eXd-TY-qlW"> | 56 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eXd-TY-qlW"> |
| 32 | - <rect key="frame" x="62.5" y="0.0" width="250" height="112"/> | 57 | + <rect key="frame" x="0.0" y="0.0" width="375" height="112"/> |
| 33 | <subviews> | 58 | <subviews> |
| 34 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EAC-sg-BLE"> | 59 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EAC-sg-BLE"> |
| 35 | - <rect key="frame" x="0.0" y="0.0" width="250" height="56"/> | 60 | + <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> |
| 36 | <subviews> | 61 | <subviews> |
| 37 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NJW-yg-XQM"> | 62 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NJW-yg-XQM"> |
| 38 | - <rect key="frame" x="0.0" y="55" width="250" height="1"/> | ||
| 39 | - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 63 | + <rect key="frame" x="8" y="55" width="359" height="1"/> |
| 64 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | ||
| 40 | <constraints> | 65 | <constraints> |
| 41 | <constraint firstAttribute="height" constant="1" id="GtD-JL-A0z"/> | 66 | <constraint firstAttribute="height" constant="1" id="GtD-JL-A0z"/> |
| 42 | </constraints> | 67 | </constraints> |
| @@ -51,8 +76,8 @@ | @@ -51,8 +76,8 @@ | ||
| 51 | <constraint firstAttribute="width" secondItem="1xZ-bM-AMz" secondAttribute="height" multiplier="9:14" id="DCg-L0-4Lx"/> | 76 | <constraint firstAttribute="width" secondItem="1xZ-bM-AMz" secondAttribute="height" multiplier="9:14" id="DCg-L0-4Lx"/> |
| 52 | </constraints> | 77 | </constraints> |
| 53 | </imageView> | 78 | </imageView> |
| 54 | - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入11位数的手机号码 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IzH-dB-I9H"> | ||
| 55 | - <rect key="frame" x="36" y="18.5" width="214" height="19"/> | 79 | + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入账号" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IzH-dB-I9H"> |
| 80 | + <rect key="frame" x="36" y="18.5" width="339" height="19"/> | ||
| 56 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 81 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 57 | <fontDescription key="fontDescription" type="system" pointSize="13"/> | 82 | <fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 58 | <textInputTraits key="textInputTraits" keyboardType="numberPad"/> | 83 | <textInputTraits key="textInputTraits" keyboardType="numberPad"/> |
| @@ -61,7 +86,7 @@ | @@ -61,7 +86,7 @@ | ||
| 61 | </connections> | 86 | </connections> |
| 62 | </textField> | 87 | </textField> |
| 63 | </subviews> | 88 | </subviews> |
| 64 | - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 89 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 65 | <constraints> | 90 | <constraints> |
| 66 | <constraint firstAttribute="trailing" secondItem="IzH-dB-I9H" secondAttribute="trailing" id="DIX-3U-BQG"/> | 91 | <constraint firstAttribute="trailing" secondItem="IzH-dB-I9H" secondAttribute="trailing" id="DIX-3U-BQG"/> |
| 67 | <constraint firstAttribute="height" constant="56" id="Ff7-2n-071"/> | 92 | <constraint firstAttribute="height" constant="56" id="Ff7-2n-071"/> |
| @@ -69,16 +94,16 @@ | @@ -69,16 +94,16 @@ | ||
| 69 | <constraint firstItem="IzH-dB-I9H" firstAttribute="centerY" secondItem="EAC-sg-BLE" secondAttribute="centerY" id="Ud1-tF-ivz"/> | 94 | <constraint firstItem="IzH-dB-I9H" firstAttribute="centerY" secondItem="EAC-sg-BLE" secondAttribute="centerY" id="Ud1-tF-ivz"/> |
| 70 | <constraint firstItem="1xZ-bM-AMz" firstAttribute="leading" secondItem="EAC-sg-BLE" secondAttribute="leading" constant="8" id="Z77-MJ-BF0"/> | 95 | <constraint firstItem="1xZ-bM-AMz" firstAttribute="leading" secondItem="EAC-sg-BLE" secondAttribute="leading" constant="8" id="Z77-MJ-BF0"/> |
| 71 | <constraint firstAttribute="bottom" secondItem="NJW-yg-XQM" secondAttribute="bottom" id="i3N-yW-fre"/> | 96 | <constraint firstAttribute="bottom" secondItem="NJW-yg-XQM" secondAttribute="bottom" id="i3N-yW-fre"/> |
| 72 | - <constraint firstAttribute="trailing" secondItem="NJW-yg-XQM" secondAttribute="trailing" id="ued-ca-1l3"/> | 97 | + <constraint firstAttribute="trailing" secondItem="NJW-yg-XQM" secondAttribute="trailing" constant="8" id="ued-ca-1l3"/> |
| 73 | <constraint firstItem="1xZ-bM-AMz" firstAttribute="centerY" secondItem="EAC-sg-BLE" secondAttribute="centerY" id="xd6-hf-JPu"/> | 98 | <constraint firstItem="1xZ-bM-AMz" firstAttribute="centerY" secondItem="EAC-sg-BLE" secondAttribute="centerY" id="xd6-hf-JPu"/> |
| 74 | - <constraint firstItem="NJW-yg-XQM" firstAttribute="leading" secondItem="EAC-sg-BLE" secondAttribute="leading" id="xlc-R5-T0J"/> | 99 | + <constraint firstItem="NJW-yg-XQM" firstAttribute="leading" secondItem="EAC-sg-BLE" secondAttribute="leading" constant="8" id="xlc-R5-T0J"/> |
| 75 | </constraints> | 100 | </constraints> |
| 76 | </view> | 101 | </view> |
| 77 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xba-Rv-jIe"> | 102 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xba-Rv-jIe"> |
| 78 | - <rect key="frame" x="0.0" y="56" width="250" height="56"/> | 103 | + <rect key="frame" x="0.0" y="56" width="375" height="56"/> |
| 79 | <subviews> | 104 | <subviews> |
| 80 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BcZ-u5-RFA"> | 105 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BcZ-u5-RFA"> |
| 81 | - <rect key="frame" x="0.0" y="55" width="250" height="1"/> | 106 | + <rect key="frame" x="0.0" y="55" width="375" height="1"/> |
| 82 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 107 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 83 | <constraints> | 108 | <constraints> |
| 84 | <constraint firstAttribute="height" constant="1" id="aAz-El-TeO"/> | 109 | <constraint firstAttribute="height" constant="1" id="aAz-El-TeO"/> |
| @@ -94,8 +119,8 @@ | @@ -94,8 +119,8 @@ | ||
| 94 | <constraint firstAttribute="width" constant="20" id="vb3-Wd-N14"/> | 119 | <constraint firstAttribute="width" constant="20" id="vb3-Wd-N14"/> |
| 95 | </constraints> | 120 | </constraints> |
| 96 | </imageView> | 121 | </imageView> |
| 97 | - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入6位以上的密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVn-EA-yWM"> | ||
| 98 | - <rect key="frame" x="36" y="18.5" width="214" height="19"/> | 122 | + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVn-EA-yWM"> |
| 123 | + <rect key="frame" x="36" y="18.5" width="339" height="19"/> | ||
| 99 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 124 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 100 | <fontDescription key="fontDescription" type="system" pointSize="13"/> | 125 | <fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 101 | <textInputTraits key="textInputTraits" secureTextEntry="YES"/> | 126 | <textInputTraits key="textInputTraits" secureTextEntry="YES"/> |
| @@ -104,7 +129,7 @@ | @@ -104,7 +129,7 @@ | ||
| 104 | </connections> | 129 | </connections> |
| 105 | </textField> | 130 | </textField> |
| 106 | </subviews> | 131 | </subviews> |
| 107 | - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 132 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 108 | <constraints> | 133 | <constraints> |
| 109 | <constraint firstItem="oON-zY-4HS" firstAttribute="leading" secondItem="xba-Rv-jIe" secondAttribute="leading" constant="8" id="6sV-zB-qIs"/> | 134 | <constraint firstItem="oON-zY-4HS" firstAttribute="leading" secondItem="xba-Rv-jIe" secondAttribute="leading" constant="8" id="6sV-zB-qIs"/> |
| 110 | <constraint firstItem="nVn-EA-yWM" firstAttribute="centerY" secondItem="xba-Rv-jIe" secondAttribute="centerY" id="HaD-wa-ZFb"/> | 135 | <constraint firstItem="nVn-EA-yWM" firstAttribute="centerY" secondItem="xba-Rv-jIe" secondAttribute="centerY" id="HaD-wa-ZFb"/> |
| @@ -130,15 +155,18 @@ | @@ -130,15 +155,18 @@ | ||
| 130 | </constraints> | 155 | </constraints> |
| 131 | </view> | 156 | </view> |
| 132 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qs2-9k-jbh"> | 157 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qs2-9k-jbh"> |
| 133 | - <rect key="frame" x="62.5" y="144" width="250" height="30"/> | ||
| 134 | - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 158 | + <rect key="frame" x="16" y="134" width="343" height="40"/> |
| 159 | + <color key="backgroundColor" red="0.10980392156862745" green="0.63529411764705879" blue="1" alpha="1" colorSpace="calibratedRGB"/> | ||
| 160 | + <constraints> | ||
| 161 | + <constraint firstAttribute="height" constant="40" id="gQn-hn-Wn2"/> | ||
| 162 | + </constraints> | ||
| 135 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 163 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 136 | <state key="normal" title="登录"> | 164 | <state key="normal" title="登录"> |
| 137 | - <color key="titleColor" red="1" green="0.39607843139999999" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 165 | + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 138 | </state> | 166 | </state> |
| 139 | <userDefinedRuntimeAttributes> | 167 | <userDefinedRuntimeAttributes> |
| 140 | <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | 168 | <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> |
| 141 | - <integer key="value" value="15"/> | 169 | + <integer key="value" value="5"/> |
| 142 | </userDefinedRuntimeAttribute> | 170 | </userDefinedRuntimeAttribute> |
| 143 | <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> | 171 | <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> |
| 144 | </userDefinedRuntimeAttributes> | 172 | </userDefinedRuntimeAttributes> |
| @@ -147,22 +175,20 @@ | @@ -147,22 +175,20 @@ | ||
| 147 | </connections> | 175 | </connections> |
| 148 | </button> | 176 | </button> |
| 149 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pzO-1N-Vrz"> | 177 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pzO-1N-Vrz"> |
| 150 | - <rect key="frame" x="62.5" y="182" width="250" height="30"/> | 178 | + <rect key="frame" x="16" y="182" width="343" height="30"/> |
| 151 | <subviews> | 179 | <subviews> |
| 152 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="忘记密码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v6n-Br-sBy"> | ||
| 153 | - <rect key="frame" x="0.0" y="0.0" width="53.5" height="30"/> | 180 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设置密码或找回密码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v6n-Br-sBy"> |
| 181 | + <rect key="frame" x="0.0" y="0.0" width="119.5" height="30"/> | ||
| 154 | <fontDescription key="fontDescription" type="system" pointSize="13"/> | 182 | <fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 155 | - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 156 | <nil key="highlightedColor"/> | 183 | <nil key="highlightedColor"/> |
| 157 | </label> | 184 | </label> |
| 158 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注册" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7fx-1i-VwW"> | ||
| 159 | - <rect key="frame" x="223" y="0.0" width="27" height="30"/> | 185 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注册账号" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7fx-1i-VwW"> |
| 186 | + <rect key="frame" x="289.5" y="0.0" width="53.5" height="30"/> | ||
| 160 | <fontDescription key="fontDescription" type="system" pointSize="13"/> | 187 | <fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 161 | - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 162 | <nil key="highlightedColor"/> | 188 | <nil key="highlightedColor"/> |
| 163 | </label> | 189 | </label> |
| 164 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ps0-yz-uMV"> | 190 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ps0-yz-uMV"> |
| 165 | - <rect key="frame" x="0.0" y="0.0" width="250" height="30"/> | 191 | + <rect key="frame" x="0.0" y="0.0" width="343" height="30"/> |
| 166 | <fontDescription key="fontDescription" type="system" pointSize="13"/> | 192 | <fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 167 | <state key="normal"> | 193 | <state key="normal"> |
| 168 | <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 194 | <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| @@ -190,28 +216,38 @@ | @@ -190,28 +216,38 @@ | ||
| 190 | </subviews> | 216 | </subviews> |
| 191 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 217 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 192 | <constraints> | 218 | <constraints> |
| 193 | - <constraint firstItem="eXd-TY-qlW" firstAttribute="width" secondItem="tqb-X5-ujR" secondAttribute="width" multiplier="2:3" id="28b-2f-9yl"/> | 219 | + <constraint firstItem="eXd-TY-qlW" firstAttribute="width" secondItem="tqb-X5-ujR" secondAttribute="width" id="28b-2f-9yl"/> |
| 194 | <constraint firstAttribute="bottom" secondItem="pzO-1N-Vrz" secondAttribute="bottom" constant="8" id="AcS-52-YRY"/> | 220 | <constraint firstAttribute="bottom" secondItem="pzO-1N-Vrz" secondAttribute="bottom" constant="8" id="AcS-52-YRY"/> |
| 221 | + <constraint firstItem="Qs2-9k-jbh" firstAttribute="leading" secondItem="tqb-X5-ujR" secondAttribute="leading" constant="16" id="EHx-MA-nvQ"/> | ||
| 195 | <constraint firstAttribute="height" constant="220" id="JHj-W0-zAJ"/> | 222 | <constraint firstAttribute="height" constant="220" id="JHj-W0-zAJ"/> |
| 196 | - <constraint firstItem="pzO-1N-Vrz" firstAttribute="width" secondItem="Qs2-9k-jbh" secondAttribute="width" id="RHT-EX-Fz6"/> | 223 | + <constraint firstAttribute="trailing" secondItem="pzO-1N-Vrz" secondAttribute="trailing" constant="16" id="Qnk-VL-hpi"/> |
| 224 | + <constraint firstAttribute="trailing" secondItem="Qs2-9k-jbh" secondAttribute="trailing" constant="16" id="SnW-DX-g3F"/> | ||
| 197 | <constraint firstItem="eXd-TY-qlW" firstAttribute="centerX" secondItem="tqb-X5-ujR" secondAttribute="centerX" id="Yap-fj-Sza"/> | 225 | <constraint firstItem="eXd-TY-qlW" firstAttribute="centerX" secondItem="tqb-X5-ujR" secondAttribute="centerX" id="Yap-fj-Sza"/> |
| 198 | <constraint firstItem="pzO-1N-Vrz" firstAttribute="top" secondItem="Qs2-9k-jbh" secondAttribute="bottom" constant="8" id="YqV-mN-jUi"/> | 226 | <constraint firstItem="pzO-1N-Vrz" firstAttribute="top" secondItem="Qs2-9k-jbh" secondAttribute="bottom" constant="8" id="YqV-mN-jUi"/> |
| 227 | + <constraint firstItem="pzO-1N-Vrz" firstAttribute="leading" secondItem="tqb-X5-ujR" secondAttribute="leading" constant="16" id="fWE-W3-H4P"/> | ||
| 199 | <constraint firstItem="Qs2-9k-jbh" firstAttribute="centerX" secondItem="tqb-X5-ujR" secondAttribute="centerX" id="icb-A7-CtC"/> | 228 | <constraint firstItem="Qs2-9k-jbh" firstAttribute="centerX" secondItem="tqb-X5-ujR" secondAttribute="centerX" id="icb-A7-CtC"/> |
| 200 | - <constraint firstItem="Qs2-9k-jbh" firstAttribute="width" secondItem="eXd-TY-qlW" secondAttribute="width" id="ipD-di-CWB"/> | ||
| 201 | <constraint firstItem="pzO-1N-Vrz" firstAttribute="centerX" secondItem="tqb-X5-ujR" secondAttribute="centerX" id="o6l-Fj-Cb6"/> | 229 | <constraint firstItem="pzO-1N-Vrz" firstAttribute="centerX" secondItem="tqb-X5-ujR" secondAttribute="centerX" id="o6l-Fj-Cb6"/> |
| 202 | <constraint firstItem="eXd-TY-qlW" firstAttribute="top" secondItem="tqb-X5-ujR" secondAttribute="top" id="uPt-SF-Tbq"/> | 230 | <constraint firstItem="eXd-TY-qlW" firstAttribute="top" secondItem="tqb-X5-ujR" secondAttribute="top" id="uPt-SF-Tbq"/> |
| 203 | </constraints> | 231 | </constraints> |
| 204 | </view> | 232 | </view> |
| 233 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_bottom2" translatesAutoresizingMaskIntoConstraints="NO" id="w9T-jY-F3e"> | ||
| 234 | + <rect key="frame" x="0.0" y="520" width="375" height="147"/> | ||
| 235 | + <constraints> | ||
| 236 | + <constraint firstAttribute="width" secondItem="w9T-jY-F3e" secondAttribute="height" multiplier="636:249" id="HLo-XG-7PS"/> | ||
| 237 | + </constraints> | ||
| 238 | + </imageView> | ||
| 205 | </subviews> | 239 | </subviews> |
| 206 | - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 240 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 207 | <gestureRecognizers/> | 241 | <gestureRecognizers/> |
| 208 | <constraints> | 242 | <constraints> |
| 209 | - <constraint firstItem="agc-xf-u2B" firstAttribute="top" secondItem="Bob-Ef-450" secondAttribute="bottom" id="1po-1a-xaB"/> | ||
| 210 | - <constraint firstItem="Bob-Ef-450" firstAttribute="leading" secondItem="rVC-Df-GKu" secondAttribute="leading" id="7Sq-vg-TJG"/> | 243 | + <constraint firstAttribute="trailing" secondItem="rfv-aY-7Su" secondAttribute="trailing" id="2JQ-xt-IcS"/> |
| 244 | + <constraint firstItem="rfv-aY-7Su" firstAttribute="leading" secondItem="rVC-Df-GKu" secondAttribute="leading" id="CWh-Rw-Pq1"/> | ||
| 245 | + <constraint firstItem="tqb-X5-ujR" firstAttribute="top" secondItem="rfv-aY-7Su" secondAttribute="bottom" id="DID-eg-sFe"/> | ||
| 211 | <constraint firstAttribute="trailing" secondItem="tqb-X5-ujR" secondAttribute="trailing" id="F9s-LV-2UW"/> | 246 | <constraint firstAttribute="trailing" secondItem="tqb-X5-ujR" secondAttribute="trailing" id="F9s-LV-2UW"/> |
| 247 | + <constraint firstItem="agc-xf-u2B" firstAttribute="top" secondItem="w9T-jY-F3e" secondAttribute="bottom" id="MmO-RE-jQn"/> | ||
| 212 | <constraint firstItem="tqb-X5-ujR" firstAttribute="top" secondItem="M3F-7t-f1g" secondAttribute="bottom" constant="166" id="Oea-d4-0BB"/> | 248 | <constraint firstItem="tqb-X5-ujR" firstAttribute="top" secondItem="M3F-7t-f1g" secondAttribute="bottom" constant="166" id="Oea-d4-0BB"/> |
| 213 | - <constraint firstItem="Bob-Ef-450" firstAttribute="top" secondItem="rVC-Df-GKu" secondAttribute="top" id="TCI-Vu-vUz"/> | ||
| 214 | - <constraint firstAttribute="trailing" secondItem="Bob-Ef-450" secondAttribute="trailing" id="y4W-E4-8L6"/> | 249 | + <constraint firstItem="w9T-jY-F3e" firstAttribute="leading" secondItem="rVC-Df-GKu" secondAttribute="leading" id="mVH-Af-iXP"/> |
| 250 | + <constraint firstAttribute="trailing" secondItem="w9T-jY-F3e" secondAttribute="trailing" id="ofZ-WX-PK2"/> | ||
| 215 | <constraint firstItem="tqb-X5-ujR" firstAttribute="leading" secondItem="rVC-Df-GKu" secondAttribute="leading" id="zlD-w4-YPr"/> | 251 | <constraint firstItem="tqb-X5-ujR" firstAttribute="leading" secondItem="rVC-Df-GKu" secondAttribute="leading" id="zlD-w4-YPr"/> |
| 216 | </constraints> | 252 | </constraints> |
| 217 | <connections> | 253 | <connections> |
| @@ -524,7 +560,7 @@ | @@ -524,7 +560,7 @@ | ||
| 524 | </textField> | 560 | </textField> |
| 525 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hwv-0n-dsf"> | 561 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hwv-0n-dsf"> |
| 526 | <rect key="frame" x="274" y="13" width="93" height="30"/> | 562 | <rect key="frame" x="274" y="13" width="93" height="30"/> |
| 527 | - <color key="backgroundColor" red="1" green="0.39607843139999999" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 563 | + <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 528 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 564 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 529 | <state key="normal" title=" 发送验证码 "> | 565 | <state key="normal" title=" 发送验证码 "> |
| 530 | <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 566 | <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| @@ -613,7 +649,7 @@ | @@ -613,7 +649,7 @@ | ||
| 613 | </view> | 649 | </view> |
| 614 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R1Y-16-Th7"> | 650 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R1Y-16-Th7"> |
| 615 | <rect key="frame" x="62.5" y="444" width="250" height="40"/> | 651 | <rect key="frame" x="62.5" y="444" width="250" height="40"/> |
| 616 | - <color key="backgroundColor" red="1" green="0.39607843139999999" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 652 | + <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 617 | <constraints> | 653 | <constraints> |
| 618 | <constraint firstAttribute="height" constant="40" id="Kvn-w3-Juc"/> | 654 | <constraint firstAttribute="height" constant="40" id="Kvn-w3-Juc"/> |
| 619 | </constraints> | 655 | </constraints> |
| @@ -624,7 +660,7 @@ | @@ -624,7 +660,7 @@ | ||
| 624 | <userDefinedRuntimeAttributes> | 660 | <userDefinedRuntimeAttributes> |
| 625 | <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> | 661 | <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> |
| 626 | <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | 662 | <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> |
| 627 | - <integer key="value" value="20"/> | 663 | + <integer key="value" value="5"/> |
| 628 | </userDefinedRuntimeAttribute> | 664 | </userDefinedRuntimeAttribute> |
| 629 | </userDefinedRuntimeAttributes> | 665 | </userDefinedRuntimeAttributes> |
| 630 | <connections> | 666 | <connections> |
| @@ -635,7 +671,7 @@ | @@ -635,7 +671,7 @@ | ||
| 635 | <rect key="frame" x="325" y="359" width="35" height="30"/> | 671 | <rect key="frame" x="325" y="359" width="35" height="30"/> |
| 636 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 672 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 637 | <state key="normal" title="登 录"> | 673 | <state key="normal" title="登 录"> |
| 638 | - <color key="titleColor" red="1" green="0.39607843139999999" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 674 | + <color key="titleColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 639 | </state> | 675 | </state> |
| 640 | <connections> | 676 | <connections> |
| 641 | <action selector="loginBtnClickAction:" destination="tCx-JF-YJm" eventType="touchUpInside" id="KlD-u3-W3P"/> | 677 | <action selector="loginBtnClickAction:" destination="tCx-JF-YJm" eventType="touchUpInside" id="KlD-u3-W3P"/> |
| @@ -724,7 +760,8 @@ | @@ -724,7 +760,8 @@ | ||
| 724 | </scene> | 760 | </scene> |
| 725 | </scenes> | 761 | </scenes> |
| 726 | <resources> | 762 | <resources> |
| 727 | - <image name="loginBackGround" width="33" height="33"/> | 763 | + <image name="icon" width="512" height="512"/> |
| 764 | + <image name="login_bottom2" width="318" height="124"/> | ||
| 728 | <image name="userId.png" width="36" height="56"/> | 765 | <image name="userId.png" width="36" height="56"/> |
| 729 | <image name="userPassword.png" width="31" height="41"/> | 766 | <image name="userPassword.png" width="31" height="41"/> |
| 730 | <image name="上传头像.png" width="70" height="70"/> | 767 | <image name="上传头像.png" width="70" height="70"/> |