From cab196dc5c42ca45b9c326e9ae418de65a477de3 Mon Sep 17 00:00:00 2001
From: 葛建军 <jun@gejianjundeMac-mini.local>
Date: Thu, 25 May 2017 16:48:27 +0800
Subject: [PATCH] no message
---
YouerLiveVideo/YouerLiveVideo/Info.plist | 2 +-
YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard | 19 ++++++++++---------
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard | 73 ++++++++++++++++++++++++++++++++++++-------------------------------------
YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift | 5 ++++-
YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift | 9 ++++++---
YouerLiveVideo/YouerLiveVideo/util/account.swift | 4 ++--
6 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/YouerLiveVideo/YouerLiveVideo/Info.plist b/YouerLiveVideo/YouerLiveVideo/Info.plist
index 529e067..bbb28a4 100644
--- a/YouerLiveVideo/YouerLiveVideo/Info.plist
+++ b/YouerLiveVideo/YouerLiveVideo/Info.plist
@@ -56,7 +56,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>3</string>
+ <string>4</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>mqqopensdkapiV2</string>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
index 6d9b25c..fc5efae 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
@@ -6,6 +6,7 @@
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+ <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -336,7 +337,7 @@
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad">
<rect key="frame" x="269" y="11" width="90" height="28"/>
- <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="8cP-zC-Gtl"/>
</constraints>
@@ -466,7 +467,7 @@
</constraints>
</scrollView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="whH-Oe-owS">
- <rect key="frame" x="0.0" y="597" width="375" height="70"/>
+ <rect key="frame" x="0.0" y="617" width="375" height="50"/>
<subviews>
<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">
<rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
@@ -479,11 +480,10 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a1z-OP-RVi">
- <rect key="frame" x="50" y="11" width="274" height="48"/>
- <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <rect key="frame" x="62" y="5" width="250" height="40"/>
+ <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
- <constraint firstAttribute="height" constant="48" id="SZf-lH-weB"/>
- <constraint firstAttribute="width" constant="274" id="cgT-8r-RsB"/>
+ <constraint firstAttribute="height" constant="40" id="Uon-z0-Mgp"/>
</constraints>
<state key="normal" title="确认修改">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -501,10 +501,11 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="a1z-OP-RVi" firstAttribute="centerX" secondItem="whH-Oe-owS" secondAttribute="centerX" id="XHA-eg-Zww"/>
- <constraint firstAttribute="height" constant="70" id="ajM-N2-2Sy"/>
+ <constraint firstItem="a1z-OP-RVi" firstAttribute="width" secondItem="whH-Oe-owS" secondAttribute="width" multiplier="2:3" id="Q6B-S9-Yjq"/>
+ <constraint firstAttribute="height" constant="50" id="ajM-N2-2Sy"/>
<constraint firstItem="kVt-8Z-dIm" firstAttribute="leading" secondItem="whH-Oe-owS" secondAttribute="leading" id="izd-dc-pm1"/>
- <constraint firstItem="a1z-OP-RVi" firstAttribute="centerY" secondItem="whH-Oe-owS" secondAttribute="centerY" id="vRa-94-ceb"/>
+ <constraint firstItem="a1z-OP-RVi" firstAttribute="centerY" secondItem="whH-Oe-owS" secondAttribute="centerY" id="nue-jK-PT7"/>
+ <constraint firstItem="a1z-OP-RVi" firstAttribute="centerX" secondItem="whH-Oe-owS" secondAttribute="centerX" id="wOI-q2-o0O"/>
<constraint firstAttribute="trailing" secondItem="kVt-8Z-dIm" secondAttribute="trailing" id="x84-QB-PR0"/>
<constraint firstItem="kVt-8Z-dIm" firstAttribute="top" secondItem="whH-Oe-owS" secondAttribute="top" id="zBm-t8-09A"/>
</constraints>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
index 3284065..07b4f39 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
@@ -399,13 +399,13 @@
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xNc-I3-UL6">
- <rect key="frame" x="0.0" y="64" width="375" height="168"/>
+ <rect key="frame" x="0.0" y="64" width="375" height="150"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Cp-hz-9O4">
- <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
<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">
- <rect key="frame" x="0.0" y="55" width="375" height="1"/>
+ <rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="lXH-lx-MSn"/>
@@ -415,7 +415,7 @@
<nil key="highlightedColor"/>
</label>
<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">
- <rect key="frame" x="8" y="19" width="73" height="18"/>
+ <rect key="frame" x="8" y="16" width="73" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="73" id="bAz-Uv-bTd"/>
</constraints>
@@ -424,7 +424,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入昵称 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="q7i-9n-2oP">
- <rect key="frame" x="89" y="18.5" width="278" height="19"/>
+ <rect key="frame" x="89" y="15.5" width="278" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" returnKeyType="done"/>
<connections>
@@ -434,9 +434,8 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="56" id="Ctl-Pt-CPh"/>
<constraint firstItem="o5G-fF-wVL" firstAttribute="leading" secondItem="1Cp-hz-9O4" secondAttribute="leading" id="RLm-KI-JX6"/>
- <constraint firstAttribute="height" constant="56" id="UfT-BQ-siu"/>
+ <constraint firstAttribute="height" constant="50" id="UfT-BQ-siu"/>
<constraint firstItem="O8o-oN-LAH" firstAttribute="leading" secondItem="1Cp-hz-9O4" secondAttribute="leading" constant="8" id="XGD-rw-eCb"/>
<constraint firstAttribute="trailing" secondItem="q7i-9n-2oP" secondAttribute="trailing" constant="8" id="YdO-o5-5VF"/>
<constraint firstAttribute="bottom" secondItem="o5G-fF-wVL" secondAttribute="bottom" id="f6j-pG-Rae"/>
@@ -447,10 +446,10 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="keu-Ke-SrA">
- <rect key="frame" x="0.0" y="56" width="375" height="56"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="50"/>
<subviews>
<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">
- <rect key="frame" x="0.0" y="55" width="375" height="1"/>
+ <rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="1bP-ob-qdI"/>
@@ -460,7 +459,7 @@
<nil key="highlightedColor"/>
</label>
<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">
- <rect key="frame" x="8" y="19" width="73" height="18"/>
+ <rect key="frame" x="8" y="16" width="73" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="73" id="SAa-QZ-uJF"/>
</constraints>
@@ -469,7 +468,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="i3R-4H-gzp">
- <rect key="frame" x="89" y="18.5" width="278" height="19"/>
+ <rect key="frame" x="89" y="15.5" width="278" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="alphabet" returnKeyType="done"/>
<connections>
@@ -484,17 +483,17 @@
<constraint firstAttribute="trailing" secondItem="i3R-4H-gzp" secondAttribute="trailing" constant="8" id="XnD-Fb-exn"/>
<constraint firstAttribute="trailing" secondItem="Hwy-QV-ob8" secondAttribute="trailing" id="cUW-Va-u0h"/>
<constraint firstItem="i3R-4H-gzp" firstAttribute="leading" secondItem="xBV-ds-Ub9" secondAttribute="trailing" constant="8" id="cZ8-V2-oKV"/>
- <constraint firstAttribute="height" constant="56" id="it2-lJ-vPD"/>
+ <constraint firstAttribute="height" constant="50" id="it2-lJ-vPD"/>
<constraint firstItem="i3R-4H-gzp" firstAttribute="centerY" secondItem="keu-Ke-SrA" secondAttribute="centerY" id="j86-kg-M0P"/>
<constraint firstItem="xBV-ds-Ub9" firstAttribute="centerY" secondItem="keu-Ke-SrA" secondAttribute="centerY" id="lQ9-Xe-gvX"/>
<constraint firstItem="Hwy-QV-ob8" firstAttribute="leading" secondItem="keu-Ke-SrA" secondAttribute="leading" id="ws3-Zb-SqH"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cnM-5P-fhN">
- <rect key="frame" x="0.0" y="112" width="375" height="56"/>
+ <rect key="frame" x="0.0" y="100" width="375" height="50"/>
<subviews>
<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">
- <rect key="frame" x="0.0" y="55" width="375" height="1"/>
+ <rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Ypb-br-LFg"/>
@@ -504,7 +503,7 @@
<nil key="highlightedColor"/>
</label>
<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">
- <rect key="frame" x="8" y="19" width="73" height="18"/>
+ <rect key="frame" x="8" y="16" width="73" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="73" id="A5Z-hk-VeN"/>
</constraints>
@@ -513,7 +512,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请确认密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-iM-kKY">
- <rect key="frame" x="89" y="18.5" width="278" height="19"/>
+ <rect key="frame" x="89" y="15.5" width="278" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="alphabet" returnKeyType="done"/>
<connections>
@@ -523,7 +522,6 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="56" id="48F-9G-Fge"/>
<constraint firstAttribute="trailing" secondItem="4Ko-iM-kKY" secondAttribute="trailing" constant="8" id="4fh-zG-9vl"/>
<constraint firstAttribute="bottom" secondItem="7YJ-fu-e63" secondAttribute="bottom" id="9wD-aU-bMP"/>
<constraint firstAttribute="trailing" secondItem="7YJ-fu-e63" secondAttribute="trailing" id="EjA-4T-fxE"/>
@@ -531,7 +529,7 @@
<constraint firstItem="4Ko-iM-kKY" firstAttribute="leading" secondItem="xtu-Lb-h46" secondAttribute="trailing" constant="8" id="aYk-72-GQD"/>
<constraint firstItem="xtu-Lb-h46" firstAttribute="leading" secondItem="cnM-5P-fhN" secondAttribute="leading" constant="8" id="kbK-3X-65q"/>
<constraint firstItem="7YJ-fu-e63" firstAttribute="leading" secondItem="cnM-5P-fhN" secondAttribute="leading" id="rhc-YS-Jug"/>
- <constraint firstAttribute="height" constant="56" id="ucM-EP-0Bc"/>
+ <constraint firstAttribute="height" constant="50" id="ucM-EP-0Bc"/>
<constraint firstItem="4Ko-iM-kKY" firstAttribute="centerY" secondItem="cnM-5P-fhN" secondAttribute="centerY" id="wja-1l-Xos"/>
</constraints>
</view>
@@ -541,7 +539,7 @@
<constraint firstItem="keu-Ke-SrA" firstAttribute="top" secondItem="1Cp-hz-9O4" secondAttribute="bottom" id="Pee-iB-XUj"/>
<constraint firstItem="cnM-5P-fhN" firstAttribute="leading" secondItem="xNc-I3-UL6" secondAttribute="leading" id="R9s-jK-AYa"/>
<constraint firstAttribute="trailing" secondItem="1Cp-hz-9O4" secondAttribute="trailing" id="Rib-CM-97d"/>
- <constraint firstAttribute="height" constant="168" id="SWN-6C-I6R"/>
+ <constraint firstAttribute="height" constant="150" id="SWN-6C-I6R"/>
<constraint firstAttribute="trailing" secondItem="cnM-5P-fhN" secondAttribute="trailing" id="U6d-yM-lM8"/>
<constraint firstItem="1Cp-hz-9O4" firstAttribute="top" secondItem="xNc-I3-UL6" secondAttribute="top" id="elW-dc-FcY"/>
<constraint firstItem="keu-Ke-SrA" firstAttribute="leading" secondItem="xNc-I3-UL6" secondAttribute="leading" id="gcJ-t2-OJH"/>
@@ -552,13 +550,13 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rSF-LZ-Bnl">
- <rect key="frame" x="0.0" y="232" width="375" height="112"/>
+ <rect key="frame" x="0.0" y="214" width="375" height="100"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vkP-pb-ydp">
- <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
<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">
- <rect key="frame" x="0.0" y="55" width="375" height="1"/>
+ <rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="cle-RJ-6tm"/>
@@ -568,7 +566,7 @@
<nil key="highlightedColor"/>
</label>
<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">
- <rect key="frame" x="8" y="19" width="73" height="18"/>
+ <rect key="frame" x="8" y="16" width="73" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="73" id="gFs-fM-1Vg"/>
</constraints>
@@ -577,7 +575,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码 " minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nVJ-81-bXY">
- <rect key="frame" x="89" y="19" width="177" height="19"/>
+ <rect key="frame" x="89" y="16" width="180" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
<connections>
@@ -585,11 +583,12 @@
</connections>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hwv-0n-dsf">
- <rect key="frame" x="274" y="11" width="93" height="34"/>
+ <rect key="frame" x="277" y="11" width="90" height="28"/>
<color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
- <constraint firstAttribute="width" constant="93" id="tn3-0t-fnt"/>
+ <constraint firstAttribute="width" constant="90" id="tn3-0t-fnt"/>
</constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="获取验证码">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
@@ -609,7 +608,7 @@
<constraint firstItem="MEf-rE-fBh" firstAttribute="leading" secondItem="vkP-pb-ydp" secondAttribute="leading" id="2A5-sj-MgA"/>
<constraint firstItem="ae8-Wz-CYH" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="Dfi-Pp-DOa"/>
<constraint firstItem="nVJ-81-bXY" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="Q9B-BF-wWO"/>
- <constraint firstAttribute="height" constant="56" id="d5e-TR-xj8"/>
+ <constraint firstAttribute="height" constant="50" id="d5e-TR-xj8"/>
<constraint firstItem="ae8-Wz-CYH" firstAttribute="leading" secondItem="vkP-pb-ydp" secondAttribute="leading" constant="8" id="fAZ-jT-eye"/>
<constraint firstAttribute="trailing" secondItem="hwv-0n-dsf" secondAttribute="trailing" constant="8" id="jCe-9b-HiL"/>
<constraint firstItem="hwv-0n-dsf" firstAttribute="centerY" secondItem="vkP-pb-ydp" secondAttribute="centerY" id="mgL-oA-0oG"/>
@@ -620,10 +619,10 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IlU-p3-aLY">
- <rect key="frame" x="0.0" y="56" width="375" height="56"/>
+ <rect key="frame" x="0.0" y="50" width="375" height="50"/>
<subviews>
<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">
- <rect key="frame" x="0.0" y="55" width="375" height="1"/>
+ <rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="3yq-4f-vDW"/>
@@ -633,7 +632,7 @@
<nil key="highlightedColor"/>
</label>
<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">
- <rect key="frame" x="8" y="19" width="73" height="18"/>
+ <rect key="frame" x="8" y="16" width="73" height="18"/>
<constraints>
<constraint firstAttribute="width" constant="73" id="ngh-2s-quJ"/>
</constraints>
@@ -642,7 +641,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="GHW-G9-uIT">
- <rect key="frame" x="89" y="18.5" width="278" height="19"/>
+ <rect key="frame" x="89" y="15.5" width="278" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
<connections>
@@ -655,7 +654,7 @@
<constraint firstItem="SOB-G4-Kln" firstAttribute="leading" secondItem="IlU-p3-aLY" secondAttribute="leading" id="Bpm-Op-035"/>
<constraint firstAttribute="bottom" secondItem="SOB-G4-Kln" secondAttribute="bottom" id="KjW-FI-dyR"/>
<constraint firstItem="GHW-G9-uIT" firstAttribute="leading" secondItem="KmI-sz-jsA" secondAttribute="trailing" constant="8" id="NWt-4e-GXU"/>
- <constraint firstAttribute="height" constant="56" id="QZA-UG-aso"/>
+ <constraint firstAttribute="height" constant="50" id="QZA-UG-aso"/>
<constraint firstItem="GHW-G9-uIT" firstAttribute="centerY" secondItem="IlU-p3-aLY" secondAttribute="centerY" id="SGD-Xp-h5t"/>
<constraint firstAttribute="trailing" secondItem="SOB-G4-Kln" secondAttribute="trailing" id="ZSY-bN-JsM"/>
<constraint firstItem="KmI-sz-jsA" firstAttribute="centerY" secondItem="IlU-p3-aLY" secondAttribute="centerY" id="dtC-at-TCi"/>
@@ -667,7 +666,7 @@
<color key="backgroundColor" red="1" green="0.42445692709999999" blue="0.35047448450000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="IlU-p3-aLY" secondAttribute="trailing" id="4ga-Jf-7Ee"/>
- <constraint firstAttribute="height" constant="112" id="7NK-ZN-nyz"/>
+ <constraint firstAttribute="height" constant="100" id="7NK-ZN-nyz"/>
<constraint firstItem="vkP-pb-ydp" firstAttribute="leading" secondItem="rSF-LZ-Bnl" secondAttribute="leading" id="84d-gX-XI3"/>
<constraint firstItem="IlU-p3-aLY" firstAttribute="top" secondItem="vkP-pb-ydp" secondAttribute="bottom" id="AEt-bb-mHP"/>
<constraint firstItem="IlU-p3-aLY" firstAttribute="leading" secondItem="rSF-LZ-Bnl" secondAttribute="leading" id="OBc-tM-vGz"/>
@@ -677,7 +676,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R1Y-16-Th7">
- <rect key="frame" x="62.5" y="444" width="250" height="40"/>
+ <rect key="frame" x="62.5" y="414" width="250" height="40"/>
<color key="backgroundColor" red="0.10980392156862745" green="0.63529411764705879" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="Kvn-w3-Juc"/>
@@ -697,7 +696,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DJH-vy-tj1">
- <rect key="frame" x="325" y="359" width="35" height="30"/>
+ <rect key="frame" x="325" y="329" width="35" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="登 录">
<color key="titleColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
index d6bc3b5..09f0c44 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/NewLoginViewController.swift
@@ -86,6 +86,8 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate {
if finish{
// self.loadUserInfo()
SVProgressHUD.dismiss()
+ //发出刷新首页通知
+ NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshFirstVC"), object: nil)
self.back()
}else{
AppDelegate.instance().window?.makeToast("身份获取失败")
@@ -106,7 +108,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate {
}
}
func back(){
- self.navigationController!.dismiss(animated: true, completion: nil)
+ self.navigationController!.popViewController(animated: true)
}
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@@ -120,6 +122,7 @@ class NewLoginViewController: UIViewController,UITextFieldDelegate {
}
@IBAction func registerAccount(_ sender: UIButton) {
let vc = UIStoryboard(name: "Login", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController
+ vc.title="注册"
self.navigationController!.pushViewController(vc, animated: true)
}
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
index 25b0c37..ee147f6 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
@@ -31,6 +31,7 @@ class UserViewController: UIViewController {
}
func setUserInfor(){
+ historyList.reloadData()
userPhoto.layer.cornerRadius = userPhoto.frame.size.height/2
userPhoto.layer.masksToBounds = true
userName.text = user.name()
@@ -55,7 +56,7 @@ class UserViewController: UIViewController {
func editBtnClick(){
if !user.isOnline(){
- self.view.makeToast("请先登录")
+ AppDelegate.instance().window?.makeToast("请先登录")
return
}
let vc = Story.instantiateViewControllerWithIdentifier("AppSettingViewControllerVC", storyName: "User") as! AppSettingViewController
@@ -90,9 +91,11 @@ class UserViewController: UIViewController {
}
extension UserViewController:UITableViewDelegate,UITableViewDataSource{
-
-
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+ if !user.isOnline(){
+ AppDelegate.instance().window?.makeToast("请先登录")
+ return
+ }
let vc = Story.instantiateViewControllerWithIdentifier("HistoryViewControllerVC", storyName: "User") as! HistoryViewController
vc.type = indexPath.row
vc.isHistory = indexPath.section
diff --git a/YouerLiveVideo/YouerLiveVideo/util/account.swift b/YouerLiveVideo/YouerLiveVideo/util/account.swift
index e419462..d70f069 100644
--- a/YouerLiveVideo/YouerLiveVideo/util/account.swift
+++ b/YouerLiveVideo/YouerLiveVideo/util/account.swift
@@ -121,8 +121,8 @@ class AccountManager{
}
//发出刷新首页通知
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshFirstVC"), object: nil)
- LeadViewController.instance.removeAll()
- LeadViewController.instance.showLogin()
+// LeadViewController.instance.removeAll()
+// LeadViewController.instance.showLogin()
}
func refreshUserInfo(completionHandler:((Bool) -> Void)?){
AppDelegate.instance().httpServer.getCurrentInfo { (str, error) -> Void in
--
libgit2 0.21.0