Commit cab196dc5c42ca45b9c326e9ae418de65a477de3
1 parent
71814495
Exists in
newLive
no message
Showing
6 changed files
with
59 additions
and
53 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/Info.plist
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | </dict> | 56 | </dict> |
| 57 | </array> | 57 | </array> |
| 58 | <key>CFBundleVersion</key> | 58 | <key>CFBundleVersion</key> |
| 59 | - <string>3</string> | 59 | + <string>4</string> |
| 60 | <key>LSApplicationQueriesSchemes</key> | 60 | <key>LSApplicationQueriesSchemes</key> |
| 61 | <array> | 61 | <array> |
| 62 | <string>mqqopensdkapiV2</string> | 62 | <string>mqqopensdkapiV2</string> |
YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
| @@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
| 6 | <dependencies> | 6 | <dependencies> |
| 7 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> | 7 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> |
| 8 | <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> | 8 | <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> |
| 9 | + <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> | ||
| 9 | <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | 10 | <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| 10 | </dependencies> | 11 | </dependencies> |
| 11 | <scenes> | 12 | <scenes> |
| @@ -336,7 +337,7 @@ | @@ -336,7 +337,7 @@ | ||
| 336 | </label> | 337 | </label> |
| 337 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad"> | 338 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad"> |
| 338 | <rect key="frame" x="269" y="11" width="90" height="28"/> | 339 | <rect key="frame" x="269" y="11" width="90" height="28"/> |
| 339 | - <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 340 | + <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 340 | <constraints> | 341 | <constraints> |
| 341 | <constraint firstAttribute="width" constant="90" id="8cP-zC-Gtl"/> | 342 | <constraint firstAttribute="width" constant="90" id="8cP-zC-Gtl"/> |
| 342 | </constraints> | 343 | </constraints> |
| @@ -466,7 +467,7 @@ | @@ -466,7 +467,7 @@ | ||
| 466 | </constraints> | 467 | </constraints> |
| 467 | </scrollView> | 468 | </scrollView> |
| 468 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="whH-Oe-owS"> | 469 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="whH-Oe-owS"> |
| 469 | - <rect key="frame" x="0.0" y="597" width="375" height="70"/> | 470 | + <rect key="frame" x="0.0" y="617" width="375" height="50"/> |
| 470 | <subviews> | 471 | <subviews> |
| 471 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kVt-8Z-dIm"> | 472 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kVt-8Z-dIm"> |
| 472 | <rect key="frame" x="0.0" y="0.0" width="375" height="1"/> | 473 | <rect key="frame" x="0.0" y="0.0" width="375" height="1"/> |
| @@ -479,11 +480,10 @@ | @@ -479,11 +480,10 @@ | ||
| 479 | <nil key="highlightedColor"/> | 480 | <nil key="highlightedColor"/> |
| 480 | </label> | 481 | </label> |
| 481 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a1z-OP-RVi"> | 482 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a1z-OP-RVi"> |
| 482 | - <rect key="frame" x="50" y="11" width="274" height="48"/> | ||
| 483 | - <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 483 | + <rect key="frame" x="62" y="5" width="250" height="40"/> |
| 484 | + <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> | ||
| 484 | <constraints> | 485 | <constraints> |
| 485 | - <constraint firstAttribute="height" constant="48" id="SZf-lH-weB"/> | ||
| 486 | - <constraint firstAttribute="width" constant="274" id="cgT-8r-RsB"/> | 486 | + <constraint firstAttribute="height" constant="40" id="Uon-z0-Mgp"/> |
| 487 | </constraints> | 487 | </constraints> |
| 488 | <state key="normal" title="确认修改"> | 488 | <state key="normal" title="确认修改"> |
| 489 | <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 489 | <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| @@ -501,10 +501,11 @@ | @@ -501,10 +501,11 @@ | ||
| 501 | </subviews> | 501 | </subviews> |
| 502 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 502 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 503 | <constraints> | 503 | <constraints> |
| 504 | - <constraint firstItem="a1z-OP-RVi" firstAttribute="centerX" secondItem="whH-Oe-owS" secondAttribute="centerX" id="XHA-eg-Zww"/> | ||
| 505 | - <constraint firstAttribute="height" constant="70" id="ajM-N2-2Sy"/> | 504 | + <constraint firstItem="a1z-OP-RVi" firstAttribute="width" secondItem="whH-Oe-owS" secondAttribute="width" multiplier="2:3" id="Q6B-S9-Yjq"/> |
| 505 | + <constraint firstAttribute="height" constant="50" id="ajM-N2-2Sy"/> | ||
| 506 | <constraint firstItem="kVt-8Z-dIm" firstAttribute="leading" secondItem="whH-Oe-owS" secondAttribute="leading" id="izd-dc-pm1"/> | 506 | <constraint firstItem="kVt-8Z-dIm" firstAttribute="leading" secondItem="whH-Oe-owS" secondAttribute="leading" id="izd-dc-pm1"/> |
| 507 | - <constraint firstItem="a1z-OP-RVi" firstAttribute="centerY" secondItem="whH-Oe-owS" secondAttribute="centerY" id="vRa-94-ceb"/> | 507 | + <constraint firstItem="a1z-OP-RVi" firstAttribute="centerY" secondItem="whH-Oe-owS" secondAttribute="centerY" id="nue-jK-PT7"/> |
| 508 | + <constraint firstItem="a1z-OP-RVi" firstAttribute="centerX" secondItem="whH-Oe-owS" secondAttribute="centerX" id="wOI-q2-o0O"/> | ||
| 508 | <constraint firstAttribute="trailing" secondItem="kVt-8Z-dIm" secondAttribute="trailing" id="x84-QB-PR0"/> | 509 | <constraint firstAttribute="trailing" secondItem="kVt-8Z-dIm" secondAttribute="trailing" id="x84-QB-PR0"/> |
| 509 | <constraint firstItem="kVt-8Z-dIm" firstAttribute="top" secondItem="whH-Oe-owS" secondAttribute="top" id="zBm-t8-09A"/> | 510 | <constraint firstItem="kVt-8Z-dIm" firstAttribute="top" secondItem="whH-Oe-owS" secondAttribute="top" id="zBm-t8-09A"/> |
| 510 | </constraints> | 511 | </constraints> |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | 1 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | ||
| 3 | <device id="retina4_7" orientation="portrait"> | 3 | <device id="retina4_7" orientation="portrait"> |
| 4 | <adaptation id="fullscreen"/> | 4 | <adaptation id="fullscreen"/> |
| 5 | </device> | 5 | </device> |
| @@ -399,13 +399,13 @@ | @@ -399,13 +399,13 @@ | ||
| 399 | </variation> | 399 | </variation> |
| 400 | </view> | 400 | </view> |
| 401 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xNc-I3-UL6"> | 401 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xNc-I3-UL6"> |
| 402 | - <rect key="frame" x="0.0" y="64" width="375" height="168"/> | 402 | + <rect key="frame" x="0.0" y="64" width="375" height="150"/> |
| 403 | <subviews> | 403 | <subviews> |
| 404 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Cp-hz-9O4"> | 404 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Cp-hz-9O4"> |
| 405 | - <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> | 405 | + <rect key="frame" x="0.0" y="0.0" width="375" height="50"/> |
| 406 | <subviews> | 406 | <subviews> |
| 407 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o5G-fF-wVL"> | 407 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o5G-fF-wVL"> |
| 408 | - <rect key="frame" x="0.0" y="55" width="375" height="1"/> | 408 | + <rect key="frame" x="0.0" y="49" width="375" height="1"/> |
| 409 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 409 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 410 | <constraints> | 410 | <constraints> |
| 411 | <constraint firstAttribute="height" constant="1" id="lXH-lx-MSn"/> | 411 | <constraint firstAttribute="height" constant="1" id="lXH-lx-MSn"/> |
| @@ -415,7 +415,7 @@ | @@ -415,7 +415,7 @@ | ||
| 415 | <nil key="highlightedColor"/> | 415 | <nil key="highlightedColor"/> |
| 416 | </label> | 416 | </label> |
| 417 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昵称" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O8o-oN-LAH"> | 417 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昵称" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O8o-oN-LAH"> |
| 418 | - <rect key="frame" x="8" y="19" width="73" height="18"/> | 418 | + <rect key="frame" x="8" y="16" width="73" height="18"/> |
| 419 | <constraints> | 419 | <constraints> |
| 420 | <constraint firstAttribute="width" constant="73" id="bAz-Uv-bTd"/> | 420 | <constraint firstAttribute="width" constant="73" id="bAz-Uv-bTd"/> |
| 421 | </constraints> | 421 | </constraints> |
| @@ -424,7 +424,7 @@ | @@ -424,7 +424,7 @@ | ||
| 424 | <nil key="highlightedColor"/> | 424 | <nil key="highlightedColor"/> |
| 425 | </label> | 425 | </label> |
| 426 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入昵称 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="q7i-9n-2oP"> | 426 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入昵称 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="q7i-9n-2oP"> |
| 427 | - <rect key="frame" x="89" y="18.5" width="278" height="19"/> | 427 | + <rect key="frame" x="89" y="15.5" width="278" height="19"/> |
| 428 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 428 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 429 | <textInputTraits key="textInputTraits" returnKeyType="done"/> | 429 | <textInputTraits key="textInputTraits" returnKeyType="done"/> |
| 430 | <connections> | 430 | <connections> |
| @@ -434,9 +434,8 @@ | @@ -434,9 +434,8 @@ | ||
| 434 | </subviews> | 434 | </subviews> |
| 435 | <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 435 | <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 436 | <constraints> | 436 | <constraints> |
| 437 | - <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="56" id="Ctl-Pt-CPh"/> | ||
| 438 | <constraint firstItem="o5G-fF-wVL" firstAttribute="leading" secondItem="1Cp-hz-9O4" secondAttribute="leading" id="RLm-KI-JX6"/> | 437 | <constraint firstItem="o5G-fF-wVL" firstAttribute="leading" secondItem="1Cp-hz-9O4" secondAttribute="leading" id="RLm-KI-JX6"/> |
| 439 | - <constraint firstAttribute="height" constant="56" id="UfT-BQ-siu"/> | 438 | + <constraint firstAttribute="height" constant="50" id="UfT-BQ-siu"/> |
| 440 | <constraint firstItem="O8o-oN-LAH" firstAttribute="leading" secondItem="1Cp-hz-9O4" secondAttribute="leading" constant="8" id="XGD-rw-eCb"/> | 439 | <constraint firstItem="O8o-oN-LAH" firstAttribute="leading" secondItem="1Cp-hz-9O4" secondAttribute="leading" constant="8" id="XGD-rw-eCb"/> |
| 441 | <constraint firstAttribute="trailing" secondItem="q7i-9n-2oP" secondAttribute="trailing" constant="8" id="YdO-o5-5VF"/> | 440 | <constraint firstAttribute="trailing" secondItem="q7i-9n-2oP" secondAttribute="trailing" constant="8" id="YdO-o5-5VF"/> |
| 442 | <constraint firstAttribute="bottom" secondItem="o5G-fF-wVL" secondAttribute="bottom" id="f6j-pG-Rae"/> | 441 | <constraint firstAttribute="bottom" secondItem="o5G-fF-wVL" secondAttribute="bottom" id="f6j-pG-Rae"/> |
| @@ -447,10 +446,10 @@ | @@ -447,10 +446,10 @@ | ||
| 447 | </constraints> | 446 | </constraints> |
| 448 | </view> | 447 | </view> |
| 449 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="keu-Ke-SrA"> | 448 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="keu-Ke-SrA"> |
| 450 | - <rect key="frame" x="0.0" y="56" width="375" height="56"/> | 449 | + <rect key="frame" x="0.0" y="50" width="375" height="50"/> |
| 451 | <subviews> | 450 | <subviews> |
| 452 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hwy-QV-ob8"> | 451 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hwy-QV-ob8"> |
| 453 | - <rect key="frame" x="0.0" y="55" width="375" height="1"/> | 452 | + <rect key="frame" x="0.0" y="49" width="375" height="1"/> |
| 454 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 453 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 455 | <constraints> | 454 | <constraints> |
| 456 | <constraint firstAttribute="height" constant="1" id="1bP-ob-qdI"/> | 455 | <constraint firstAttribute="height" constant="1" id="1bP-ob-qdI"/> |
| @@ -460,7 +459,7 @@ | @@ -460,7 +459,7 @@ | ||
| 460 | <nil key="highlightedColor"/> | 459 | <nil key="highlightedColor"/> |
| 461 | </label> | 460 | </label> |
| 462 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xBV-ds-Ub9"> | 461 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xBV-ds-Ub9"> |
| 463 | - <rect key="frame" x="8" y="19" width="73" height="18"/> | 462 | + <rect key="frame" x="8" y="16" width="73" height="18"/> |
| 464 | <constraints> | 463 | <constraints> |
| 465 | <constraint firstAttribute="width" constant="73" id="SAa-QZ-uJF"/> | 464 | <constraint firstAttribute="width" constant="73" id="SAa-QZ-uJF"/> |
| 466 | </constraints> | 465 | </constraints> |
| @@ -469,7 +468,7 @@ | @@ -469,7 +468,7 @@ | ||
| 469 | <nil key="highlightedColor"/> | 468 | <nil key="highlightedColor"/> |
| 470 | </label> | 469 | </label> |
| 471 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="i3R-4H-gzp"> | 470 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="i3R-4H-gzp"> |
| 472 | - <rect key="frame" x="89" y="18.5" width="278" height="19"/> | 471 | + <rect key="frame" x="89" y="15.5" width="278" height="19"/> |
| 473 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 472 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 474 | <textInputTraits key="textInputTraits" keyboardType="alphabet" returnKeyType="done"/> | 473 | <textInputTraits key="textInputTraits" keyboardType="alphabet" returnKeyType="done"/> |
| 475 | <connections> | 474 | <connections> |
| @@ -484,17 +483,17 @@ | @@ -484,17 +483,17 @@ | ||
| 484 | <constraint firstAttribute="trailing" secondItem="i3R-4H-gzp" secondAttribute="trailing" constant="8" id="XnD-Fb-exn"/> | 483 | <constraint firstAttribute="trailing" secondItem="i3R-4H-gzp" secondAttribute="trailing" constant="8" id="XnD-Fb-exn"/> |
| 485 | <constraint firstAttribute="trailing" secondItem="Hwy-QV-ob8" secondAttribute="trailing" id="cUW-Va-u0h"/> | 484 | <constraint firstAttribute="trailing" secondItem="Hwy-QV-ob8" secondAttribute="trailing" id="cUW-Va-u0h"/> |
| 486 | <constraint firstItem="i3R-4H-gzp" firstAttribute="leading" secondItem="xBV-ds-Ub9" secondAttribute="trailing" constant="8" id="cZ8-V2-oKV"/> | 485 | <constraint firstItem="i3R-4H-gzp" firstAttribute="leading" secondItem="xBV-ds-Ub9" secondAttribute="trailing" constant="8" id="cZ8-V2-oKV"/> |
| 487 | - <constraint firstAttribute="height" constant="56" id="it2-lJ-vPD"/> | 486 | + <constraint firstAttribute="height" constant="50" id="it2-lJ-vPD"/> |
| 488 | <constraint firstItem="i3R-4H-gzp" firstAttribute="centerY" secondItem="keu-Ke-SrA" secondAttribute="centerY" id="j86-kg-M0P"/> | 487 | <constraint firstItem="i3R-4H-gzp" firstAttribute="centerY" secondItem="keu-Ke-SrA" secondAttribute="centerY" id="j86-kg-M0P"/> |
| 489 | <constraint firstItem="xBV-ds-Ub9" firstAttribute="centerY" secondItem="keu-Ke-SrA" secondAttribute="centerY" id="lQ9-Xe-gvX"/> | 488 | <constraint firstItem="xBV-ds-Ub9" firstAttribute="centerY" secondItem="keu-Ke-SrA" secondAttribute="centerY" id="lQ9-Xe-gvX"/> |
| 490 | <constraint firstItem="Hwy-QV-ob8" firstAttribute="leading" secondItem="keu-Ke-SrA" secondAttribute="leading" id="ws3-Zb-SqH"/> | 489 | <constraint firstItem="Hwy-QV-ob8" firstAttribute="leading" secondItem="keu-Ke-SrA" secondAttribute="leading" id="ws3-Zb-SqH"/> |
| 491 | </constraints> | 490 | </constraints> |
| 492 | </view> | 491 | </view> |
| 493 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cnM-5P-fhN"> | 492 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cnM-5P-fhN"> |
| 494 | - <rect key="frame" x="0.0" y="112" width="375" height="56"/> | 493 | + <rect key="frame" x="0.0" y="100" width="375" height="50"/> |
| 495 | <subviews> | 494 | <subviews> |
| 496 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7YJ-fu-e63"> | 495 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7YJ-fu-e63"> |
| 497 | - <rect key="frame" x="0.0" y="55" width="375" height="1"/> | 496 | + <rect key="frame" x="0.0" y="49" width="375" height="1"/> |
| 498 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 497 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 499 | <constraints> | 498 | <constraints> |
| 500 | <constraint firstAttribute="height" constant="1" id="Ypb-br-LFg"/> | 499 | <constraint firstAttribute="height" constant="1" id="Ypb-br-LFg"/> |
| @@ -504,7 +503,7 @@ | @@ -504,7 +503,7 @@ | ||
| 504 | <nil key="highlightedColor"/> | 503 | <nil key="highlightedColor"/> |
| 505 | </label> | 504 | </label> |
| 506 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认密码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xtu-Lb-h46"> | 505 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认密码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xtu-Lb-h46"> |
| 507 | - <rect key="frame" x="8" y="19" width="73" height="18"/> | 506 | + <rect key="frame" x="8" y="16" width="73" height="18"/> |
| 508 | <constraints> | 507 | <constraints> |
| 509 | <constraint firstAttribute="width" constant="73" id="A5Z-hk-VeN"/> | 508 | <constraint firstAttribute="width" constant="73" id="A5Z-hk-VeN"/> |
| 510 | </constraints> | 509 | </constraints> |
| @@ -513,7 +512,7 @@ | @@ -513,7 +512,7 @@ | ||
| 513 | <nil key="highlightedColor"/> | 512 | <nil key="highlightedColor"/> |
| 514 | </label> | 513 | </label> |
| 515 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请确认密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-iM-kKY"> | 514 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请确认密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-iM-kKY"> |
| 516 | - <rect key="frame" x="89" y="18.5" width="278" height="19"/> | 515 | + <rect key="frame" x="89" y="15.5" width="278" height="19"/> |
| 517 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 516 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 518 | <textInputTraits key="textInputTraits" keyboardType="alphabet" returnKeyType="done"/> | 517 | <textInputTraits key="textInputTraits" keyboardType="alphabet" returnKeyType="done"/> |
| 519 | <connections> | 518 | <connections> |
| @@ -523,7 +522,6 @@ | @@ -523,7 +522,6 @@ | ||
| 523 | </subviews> | 522 | </subviews> |
| 524 | <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 523 | <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 525 | <constraints> | 524 | <constraints> |
| 526 | - <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="56" id="48F-9G-Fge"/> | ||
| 527 | <constraint firstAttribute="trailing" secondItem="4Ko-iM-kKY" secondAttribute="trailing" constant="8" id="4fh-zG-9vl"/> | 525 | <constraint firstAttribute="trailing" secondItem="4Ko-iM-kKY" secondAttribute="trailing" constant="8" id="4fh-zG-9vl"/> |
| 528 | <constraint firstAttribute="bottom" secondItem="7YJ-fu-e63" secondAttribute="bottom" id="9wD-aU-bMP"/> | 526 | <constraint firstAttribute="bottom" secondItem="7YJ-fu-e63" secondAttribute="bottom" id="9wD-aU-bMP"/> |
| 529 | <constraint firstAttribute="trailing" secondItem="7YJ-fu-e63" secondAttribute="trailing" id="EjA-4T-fxE"/> | 527 | <constraint firstAttribute="trailing" secondItem="7YJ-fu-e63" secondAttribute="trailing" id="EjA-4T-fxE"/> |
| @@ -531,7 +529,7 @@ | @@ -531,7 +529,7 @@ | ||
| 531 | <constraint firstItem="4Ko-iM-kKY" firstAttribute="leading" secondItem="xtu-Lb-h46" secondAttribute="trailing" constant="8" id="aYk-72-GQD"/> | 529 | <constraint firstItem="4Ko-iM-kKY" firstAttribute="leading" secondItem="xtu-Lb-h46" secondAttribute="trailing" constant="8" id="aYk-72-GQD"/> |
| 532 | <constraint firstItem="xtu-Lb-h46" firstAttribute="leading" secondItem="cnM-5P-fhN" secondAttribute="leading" constant="8" id="kbK-3X-65q"/> | 530 | <constraint firstItem="xtu-Lb-h46" firstAttribute="leading" secondItem="cnM-5P-fhN" secondAttribute="leading" constant="8" id="kbK-3X-65q"/> |
| 533 | <constraint firstItem="7YJ-fu-e63" firstAttribute="leading" secondItem="cnM-5P-fhN" secondAttribute="leading" id="rhc-YS-Jug"/> | 531 | <constraint firstItem="7YJ-fu-e63" firstAttribute="leading" secondItem="cnM-5P-fhN" secondAttribute="leading" id="rhc-YS-Jug"/> |
| 534 | - <constraint firstAttribute="height" constant="56" id="ucM-EP-0Bc"/> | 532 | + <constraint firstAttribute="height" constant="50" id="ucM-EP-0Bc"/> |
| 535 | <constraint firstItem="4Ko-iM-kKY" firstAttribute="centerY" secondItem="cnM-5P-fhN" secondAttribute="centerY" id="wja-1l-Xos"/> | 533 | <constraint firstItem="4Ko-iM-kKY" firstAttribute="centerY" secondItem="cnM-5P-fhN" secondAttribute="centerY" id="wja-1l-Xos"/> |
| 536 | </constraints> | 534 | </constraints> |
| 537 | </view> | 535 | </view> |
| @@ -541,7 +539,7 @@ | @@ -541,7 +539,7 @@ | ||
| 541 | <constraint firstItem="keu-Ke-SrA" firstAttribute="top" secondItem="1Cp-hz-9O4" secondAttribute="bottom" id="Pee-iB-XUj"/> | 539 | <constraint firstItem="keu-Ke-SrA" firstAttribute="top" secondItem="1Cp-hz-9O4" secondAttribute="bottom" id="Pee-iB-XUj"/> |
| 542 | <constraint firstItem="cnM-5P-fhN" firstAttribute="leading" secondItem="xNc-I3-UL6" secondAttribute="leading" id="R9s-jK-AYa"/> | 540 | <constraint firstItem="cnM-5P-fhN" firstAttribute="leading" secondItem="xNc-I3-UL6" secondAttribute="leading" id="R9s-jK-AYa"/> |
| 543 | <constraint firstAttribute="trailing" secondItem="1Cp-hz-9O4" secondAttribute="trailing" id="Rib-CM-97d"/> | 541 | <constraint firstAttribute="trailing" secondItem="1Cp-hz-9O4" secondAttribute="trailing" id="Rib-CM-97d"/> |
| 544 | - <constraint firstAttribute="height" constant="168" id="SWN-6C-I6R"/> | 542 | + <constraint firstAttribute="height" constant="150" id="SWN-6C-I6R"/> |
| 545 | <constraint firstAttribute="trailing" secondItem="cnM-5P-fhN" secondAttribute="trailing" id="U6d-yM-lM8"/> | 543 | <constraint firstAttribute="trailing" secondItem="cnM-5P-fhN" secondAttribute="trailing" id="U6d-yM-lM8"/> |
| 546 | <constraint firstItem="1Cp-hz-9O4" firstAttribute="top" secondItem="xNc-I3-UL6" secondAttribute="top" id="elW-dc-FcY"/> | 544 | <constraint firstItem="1Cp-hz-9O4" firstAttribute="top" secondItem="xNc-I3-UL6" secondAttribute="top" id="elW-dc-FcY"/> |
| 547 | <constraint firstItem="keu-Ke-SrA" firstAttribute="leading" secondItem="xNc-I3-UL6" secondAttribute="leading" id="gcJ-t2-OJH"/> | 545 | <constraint firstItem="keu-Ke-SrA" firstAttribute="leading" secondItem="xNc-I3-UL6" secondAttribute="leading" id="gcJ-t2-OJH"/> |
| @@ -552,13 +550,13 @@ | @@ -552,13 +550,13 @@ | ||
| 552 | </constraints> | 550 | </constraints> |
| 553 | </view> | 551 | </view> |
| 554 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rSF-LZ-Bnl"> | 552 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rSF-LZ-Bnl"> |
| 555 | - <rect key="frame" x="0.0" y="232" width="375" height="112"/> | 553 | + <rect key="frame" x="0.0" y="214" width="375" height="100"/> |
| 556 | <subviews> | 554 | <subviews> |
| 557 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vkP-pb-ydp"> | 555 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vkP-pb-ydp"> |
| 558 | - <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> | 556 | + <rect key="frame" x="0.0" y="0.0" width="375" height="50"/> |
| 559 | <subviews> | 557 | <subviews> |
| 560 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MEf-rE-fBh"> | 558 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MEf-rE-fBh"> |
| 561 | - <rect key="frame" x="0.0" y="55" width="375" height="1"/> | 559 | + <rect key="frame" x="0.0" y="49" width="375" height="1"/> |
| 562 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 560 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 563 | <constraints> | 561 | <constraints> |
| 564 | <constraint firstAttribute="height" constant="1" id="cle-RJ-6tm"/> | 562 | <constraint firstAttribute="height" constant="1" id="cle-RJ-6tm"/> |
| @@ -568,7 +566,7 @@ | @@ -568,7 +566,7 @@ | ||
| 568 | <nil key="highlightedColor"/> | 566 | <nil key="highlightedColor"/> |
| 569 | </label> | 567 | </label> |
| 570 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+86" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ae8-Wz-CYH"> | 568 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+86" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ae8-Wz-CYH"> |
| 571 | - <rect key="frame" x="8" y="19" width="73" height="18"/> | 569 | + <rect key="frame" x="8" y="16" width="73" height="18"/> |
| 572 | <constraints> | 570 | <constraints> |
| 573 | <constraint firstAttribute="width" constant="73" id="gFs-fM-1Vg"/> | 571 | <constraint firstAttribute="width" constant="73" id="gFs-fM-1Vg"/> |
| 574 | </constraints> | 572 | </constraints> |
| @@ -577,7 +575,7 @@ | @@ -577,7 +575,7 @@ | ||
| 577 | <nil key="highlightedColor"/> | 575 | <nil key="highlightedColor"/> |
| 578 | </label> | 576 | </label> |
| 579 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVJ-81-bXY"> | 577 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVJ-81-bXY"> |
| 580 | - <rect key="frame" x="89" y="19" width="177" height="19"/> | 578 | + <rect key="frame" x="89" y="16" width="180" height="19"/> |
| 581 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 579 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 582 | <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> | 580 | <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> |
| 583 | <connections> | 581 | <connections> |
| @@ -585,11 +583,12 @@ | @@ -585,11 +583,12 @@ | ||
| 585 | </connections> | 583 | </connections> |
| 586 | </textField> | 584 | </textField> |
| 587 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hwv-0n-dsf"> | 585 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hwv-0n-dsf"> |
| 588 | - <rect key="frame" x="274" y="11" width="93" height="34"/> | 586 | + <rect key="frame" x="277" y="11" width="90" height="28"/> |
| 589 | <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 587 | <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 590 | <constraints> | 588 | <constraints> |
| 591 | - <constraint firstAttribute="width" constant="93" id="tn3-0t-fnt"/> | 589 | + <constraint firstAttribute="width" constant="90" id="tn3-0t-fnt"/> |
| 592 | </constraints> | 590 | </constraints> |
| 591 | + <fontDescription key="fontDescription" type="system" pointSize="13"/> | ||
| 593 | <state key="normal" title="获取验证码"> | 592 | <state key="normal" title="获取验证码"> |
| 594 | <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 593 | <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 595 | </state> | 594 | </state> |
| @@ -609,7 +608,7 @@ | @@ -609,7 +608,7 @@ | ||
| 609 | <constraint firstItem="MEf-rE-fBh" firstAttribute="leading" secondItem="vkP-pb-ydp" secondAttribute="leading" id="2A5-sj-MgA"/> | 608 | <constraint firstItem="MEf-rE-fBh" firstAttribute="leading" secondItem="vkP-pb-ydp" secondAttribute="leading" id="2A5-sj-MgA"/> |
| 610 | <constraint firstItem="ae8-Wz-CYH" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="Dfi-Pp-DOa"/> | 609 | <constraint firstItem="ae8-Wz-CYH" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="Dfi-Pp-DOa"/> |
| 611 | <constraint firstItem="nVJ-81-bXY" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="Q9B-BF-wWO"/> | 610 | <constraint firstItem="nVJ-81-bXY" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="Q9B-BF-wWO"/> |
| 612 | - <constraint firstAttribute="height" constant="56" id="d5e-TR-xj8"/> | 611 | + <constraint firstAttribute="height" constant="50" id="d5e-TR-xj8"/> |
| 613 | <constraint firstItem="ae8-Wz-CYH" firstAttribute="leading" secondItem="vkP-pb-ydp" secondAttribute="leading" constant="8" id="fAZ-jT-eye"/> | 612 | <constraint firstItem="ae8-Wz-CYH" firstAttribute="leading" secondItem="vkP-pb-ydp" secondAttribute="leading" constant="8" id="fAZ-jT-eye"/> |
| 614 | <constraint firstAttribute="trailing" secondItem="hwv-0n-dsf" secondAttribute="trailing" constant="8" id="jCe-9b-HiL"/> | 613 | <constraint firstAttribute="trailing" secondItem="hwv-0n-dsf" secondAttribute="trailing" constant="8" id="jCe-9b-HiL"/> |
| 615 | <constraint firstItem="hwv-0n-dsf" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="mgL-oA-0oG"/> | 614 | <constraint firstItem="hwv-0n-dsf" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="mgL-oA-0oG"/> |
| @@ -620,10 +619,10 @@ | @@ -620,10 +619,10 @@ | ||
| 620 | </constraints> | 619 | </constraints> |
| 621 | </view> | 620 | </view> |
| 622 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IlU-p3-aLY"> | 621 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IlU-p3-aLY"> |
| 623 | - <rect key="frame" x="0.0" y="56" width="375" height="56"/> | 622 | + <rect key="frame" x="0.0" y="50" width="375" height="50"/> |
| 624 | <subviews> | 623 | <subviews> |
| 625 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SOB-G4-Kln"> | 624 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SOB-G4-Kln"> |
| 626 | - <rect key="frame" x="0.0" y="55" width="375" height="1"/> | 625 | + <rect key="frame" x="0.0" y="49" width="375" height="1"/> |
| 627 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 626 | <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 628 | <constraints> | 627 | <constraints> |
| 629 | <constraint firstAttribute="height" constant="1" id="3yq-4f-vDW"/> | 628 | <constraint firstAttribute="height" constant="1" id="3yq-4f-vDW"/> |
| @@ -633,7 +632,7 @@ | @@ -633,7 +632,7 @@ | ||
| 633 | <nil key="highlightedColor"/> | 632 | <nil key="highlightedColor"/> |
| 634 | </label> | 633 | </label> |
| 635 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="验证码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KmI-sz-jsA"> | 634 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="验证码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KmI-sz-jsA"> |
| 636 | - <rect key="frame" x="8" y="19" width="73" height="18"/> | 635 | + <rect key="frame" x="8" y="16" width="73" height="18"/> |
| 637 | <constraints> | 636 | <constraints> |
| 638 | <constraint firstAttribute="width" constant="73" id="ngh-2s-quJ"/> | 637 | <constraint firstAttribute="width" constant="73" id="ngh-2s-quJ"/> |
| 639 | </constraints> | 638 | </constraints> |
| @@ -642,7 +641,7 @@ | @@ -642,7 +641,7 @@ | ||
| 642 | <nil key="highlightedColor"/> | 641 | <nil key="highlightedColor"/> |
| 643 | </label> | 642 | </label> |
| 644 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="GHW-G9-uIT"> | 643 | <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="GHW-G9-uIT"> |
| 645 | - <rect key="frame" x="89" y="18.5" width="278" height="19"/> | 644 | + <rect key="frame" x="89" y="15.5" width="278" height="19"/> |
| 646 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 645 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 647 | <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> | 646 | <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> |
| 648 | <connections> | 647 | <connections> |
| @@ -655,7 +654,7 @@ | @@ -655,7 +654,7 @@ | ||
| 655 | <constraint firstItem="SOB-G4-Kln" firstAttribute="leading" secondItem="IlU-p3-aLY" secondAttribute="leading" id="Bpm-Op-035"/> | 654 | <constraint firstItem="SOB-G4-Kln" firstAttribute="leading" secondItem="IlU-p3-aLY" secondAttribute="leading" id="Bpm-Op-035"/> |
| 656 | <constraint firstAttribute="bottom" secondItem="SOB-G4-Kln" secondAttribute="bottom" id="KjW-FI-dyR"/> | 655 | <constraint firstAttribute="bottom" secondItem="SOB-G4-Kln" secondAttribute="bottom" id="KjW-FI-dyR"/> |
| 657 | <constraint firstItem="GHW-G9-uIT" firstAttribute="leading" secondItem="KmI-sz-jsA" secondAttribute="trailing" constant="8" id="NWt-4e-GXU"/> | 656 | <constraint firstItem="GHW-G9-uIT" firstAttribute="leading" secondItem="KmI-sz-jsA" secondAttribute="trailing" constant="8" id="NWt-4e-GXU"/> |
| 658 | - <constraint firstAttribute="height" constant="56" id="QZA-UG-aso"/> | 657 | + <constraint firstAttribute="height" constant="50" id="QZA-UG-aso"/> |
| 659 | <constraint firstItem="GHW-G9-uIT" firstAttribute="centerY" secondItem="IlU-p3-aLY" secondAttribute="centerY" id="SGD-Xp-h5t"/> | 658 | <constraint firstItem="GHW-G9-uIT" firstAttribute="centerY" secondItem="IlU-p3-aLY" secondAttribute="centerY" id="SGD-Xp-h5t"/> |
| 660 | <constraint firstAttribute="trailing" secondItem="SOB-G4-Kln" secondAttribute="trailing" id="ZSY-bN-JsM"/> | 659 | <constraint firstAttribute="trailing" secondItem="SOB-G4-Kln" secondAttribute="trailing" id="ZSY-bN-JsM"/> |
| 661 | <constraint firstItem="KmI-sz-jsA" firstAttribute="centerY" secondItem="IlU-p3-aLY" secondAttribute="centerY" id="dtC-at-TCi"/> | 660 | <constraint firstItem="KmI-sz-jsA" firstAttribute="centerY" secondItem="IlU-p3-aLY" secondAttribute="centerY" id="dtC-at-TCi"/> |
| @@ -667,7 +666,7 @@ | @@ -667,7 +666,7 @@ | ||
| 667 | <color key="backgroundColor" red="1" green="0.42445692709999999" blue="0.35047448450000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 666 | <color key="backgroundColor" red="1" green="0.42445692709999999" blue="0.35047448450000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 668 | <constraints> | 667 | <constraints> |
| 669 | <constraint firstAttribute="trailing" secondItem="IlU-p3-aLY" secondAttribute="trailing" id="4ga-Jf-7Ee"/> | 668 | <constraint firstAttribute="trailing" secondItem="IlU-p3-aLY" secondAttribute="trailing" id="4ga-Jf-7Ee"/> |
| 670 | - <constraint firstAttribute="height" constant="112" id="7NK-ZN-nyz"/> | 669 | + <constraint firstAttribute="height" constant="100" id="7NK-ZN-nyz"/> |
| 671 | <constraint firstItem="vkP-pb-ydp" firstAttribute="leading" secondItem="rSF-LZ-Bnl" secondAttribute="leading" id="84d-gX-XI3"/> | 670 | <constraint firstItem="vkP-pb-ydp" firstAttribute="leading" secondItem="rSF-LZ-Bnl" secondAttribute="leading" id="84d-gX-XI3"/> |
| 672 | <constraint firstItem="IlU-p3-aLY" firstAttribute="top" secondItem="vkP-pb-ydp" secondAttribute="bottom" id="AEt-bb-mHP"/> | 671 | <constraint firstItem="IlU-p3-aLY" firstAttribute="top" secondItem="vkP-pb-ydp" secondAttribute="bottom" id="AEt-bb-mHP"/> |
| 673 | <constraint firstItem="IlU-p3-aLY" firstAttribute="leading" secondItem="rSF-LZ-Bnl" secondAttribute="leading" id="OBc-tM-vGz"/> | 672 | <constraint firstItem="IlU-p3-aLY" firstAttribute="leading" secondItem="rSF-LZ-Bnl" secondAttribute="leading" id="OBc-tM-vGz"/> |
| @@ -677,7 +676,7 @@ | @@ -677,7 +676,7 @@ | ||
| 677 | </constraints> | 676 | </constraints> |
| 678 | </view> | 677 | </view> |
| 679 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R1Y-16-Th7"> | 678 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R1Y-16-Th7"> |
| 680 | - <rect key="frame" x="62.5" y="444" width="250" height="40"/> | 679 | + <rect key="frame" x="62.5" y="414" width="250" height="40"/> |
| 681 | <color key="backgroundColor" red="0.10980392156862745" green="0.63529411764705879" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 680 | <color key="backgroundColor" red="0.10980392156862745" green="0.63529411764705879" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 682 | <constraints> | 681 | <constraints> |
| 683 | <constraint firstAttribute="height" constant="40" id="Kvn-w3-Juc"/> | 682 | <constraint firstAttribute="height" constant="40" id="Kvn-w3-Juc"/> |
| @@ -697,7 +696,7 @@ | @@ -697,7 +696,7 @@ | ||
| 697 | </connections> | 696 | </connections> |
| 698 | </button> | 697 | </button> |
| 699 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DJH-vy-tj1"> | 698 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DJH-vy-tj1"> |
| 700 | - <rect key="frame" x="325" y="359" width="35" height="30"/> | 699 | + <rect key="frame" x="325" y="329" width="35" height="30"/> |
| 701 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 700 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 702 | <state key="normal" title="登 录"> | 701 | <state key="normal" title="登 录"> |
| 703 | <color key="titleColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 702 | <color key="titleColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
| @@ -86,6 +86,8 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { | @@ -86,6 +86,8 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { | ||
| 86 | if finish{ | 86 | if finish{ |
| 87 | // self.loadUserInfo() | 87 | // self.loadUserInfo() |
| 88 | SVProgressHUD.dismiss() | 88 | SVProgressHUD.dismiss() |
| 89 | + //发出刷新首页通知 | ||
| 90 | + NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshFirstVC"), object: nil) | ||
| 89 | self.back() | 91 | self.back() |
| 90 | }else{ | 92 | }else{ |
| 91 | AppDelegate.instance().window?.makeToast("身份获取失败") | 93 | AppDelegate.instance().window?.makeToast("身份获取失败") |
| @@ -106,7 +108,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { | @@ -106,7 +108,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { | ||
| 106 | } | 108 | } |
| 107 | } | 109 | } |
| 108 | func back(){ | 110 | func back(){ |
| 109 | - self.navigationController!.dismiss(animated: true, completion: nil) | 111 | + self.navigationController!.popViewController(animated: true) |
| 110 | } | 112 | } |
| 111 | 113 | ||
| 112 | func textFieldShouldReturn(_ textField: UITextField) -> Bool { | 114 | func textFieldShouldReturn(_ textField: UITextField) -> Bool { |
| @@ -120,6 +122,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { | @@ -120,6 +122,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate { | ||
| 120 | } | 122 | } |
| 121 | @IBAction func registerAccount(_ sender: UIButton) { | 123 | @IBAction func registerAccount(_ sender: UIButton) { |
| 122 | let vc = UIStoryboard(name: "Login", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController | 124 | let vc = UIStoryboard(name: "Login", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController |
| 125 | + vc.title="注册" | ||
| 123 | self.navigationController!.pushViewController(vc, animated: true) | 126 | self.navigationController!.pushViewController(vc, animated: true) |
| 124 | } | 127 | } |
| 125 | 128 |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
| @@ -31,6 +31,7 @@ class UserViewController: UIViewController { | @@ -31,6 +31,7 @@ class UserViewController: UIViewController { | ||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | func setUserInfor(){ | 33 | func setUserInfor(){ |
| 34 | + historyList.reloadData() | ||
| 34 | userPhoto.layer.cornerRadius = userPhoto.frame.size.height/2 | 35 | userPhoto.layer.cornerRadius = userPhoto.frame.size.height/2 |
| 35 | userPhoto.layer.masksToBounds = true | 36 | userPhoto.layer.masksToBounds = true |
| 36 | userName.text = user.name() | 37 | userName.text = user.name() |
| @@ -55,7 +56,7 @@ class UserViewController: UIViewController { | @@ -55,7 +56,7 @@ class UserViewController: UIViewController { | ||
| 55 | 56 | ||
| 56 | func editBtnClick(){ | 57 | func editBtnClick(){ |
| 57 | if !user.isOnline(){ | 58 | if !user.isOnline(){ |
| 58 | - self.view.makeToast("请先登录") | 59 | + AppDelegate.instance().window?.makeToast("请先登录") |
| 59 | return | 60 | return |
| 60 | } | 61 | } |
| 61 | let vc = Story.instantiateViewControllerWithIdentifier("AppSettingViewControllerVC", storyName: "User") as! AppSettingViewController | 62 | let vc = Story.instantiateViewControllerWithIdentifier("AppSettingViewControllerVC", storyName: "User") as! AppSettingViewController |
| @@ -90,9 +91,11 @@ class UserViewController: UIViewController { | @@ -90,9 +91,11 @@ class UserViewController: UIViewController { | ||
| 90 | } | 91 | } |
| 91 | 92 | ||
| 92 | extension UserViewController:UITableViewDelegate,UITableViewDataSource{ | 93 | extension UserViewController:UITableViewDelegate,UITableViewDataSource{ |
| 93 | - | ||
| 94 | - | ||
| 95 | func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | 94 | func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { |
| 95 | + if !user.isOnline(){ | ||
| 96 | + AppDelegate.instance().window?.makeToast("请先登录") | ||
| 97 | + return | ||
| 98 | + } | ||
| 96 | let vc = Story.instantiateViewControllerWithIdentifier("HistoryViewControllerVC", storyName: "User") as! HistoryViewController | 99 | let vc = Story.instantiateViewControllerWithIdentifier("HistoryViewControllerVC", storyName: "User") as! HistoryViewController |
| 97 | vc.type = indexPath.row | 100 | vc.type = indexPath.row |
| 98 | vc.isHistory = indexPath.section | 101 | vc.isHistory = indexPath.section |
YouerLiveVideo/YouerLiveVideo/util/account.swift
| @@ -121,8 +121,8 @@ class AccountManager{ | @@ -121,8 +121,8 @@ class AccountManager{ | ||
| 121 | } | 121 | } |
| 122 | //发出刷新首页通知 | 122 | //发出刷新首页通知 |
| 123 | NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshFirstVC"), object: nil) | 123 | NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshFirstVC"), object: nil) |
| 124 | - LeadViewController.instance.removeAll() | ||
| 125 | - LeadViewController.instance.showLogin() | 124 | +// LeadViewController.instance.removeAll() |
| 125 | +// LeadViewController.instance.showLogin() | ||
| 126 | } | 126 | } |
| 127 | func refreshUserInfo(completionHandler:((Bool) -> Void)?){ | 127 | func refreshUserInfo(completionHandler:((Bool) -> Void)?){ |
| 128 | AppDelegate.instance().httpServer.getCurrentInfo { (str, error) -> Void in | 128 | AppDelegate.instance().httpServer.getCurrentInfo { (str, error) -> Void in |