From 53a441076337133de64eb14ad915fe7e44dad8a4 Mon Sep 17 00:00:00 2001
From: 左丞 <Manger@zuochengdeMac-mini.local>
Date: Thu, 25 May 2017 09:35:52 +0800
Subject: [PATCH] no message

---
 YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard                                    | 37 ++++++++++++++++---------------------
 YouerLiveVideo/YouerLiveVideo/controllers/TVStation/MoreTVStationViewController.swift       | 10 +++++++++-
 YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift | 10 ++++++++++
 YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard                    | 50 +++++++++++++++++++++++++++++++++-----------------
 YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift           |  9 +++++++++
 YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift                 |  2 +-
 YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift                     | 10 ++++++++++
 7 files changed, 88 insertions(+), 40 deletions(-)

diff --git a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
index c1f5314..fc51741 100644
--- a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
-<?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" initialViewController="fhe-aI-EYq">
+<?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" initialViewController="fhe-aI-EYq">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -33,7 +33,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fz6-VO-SIi">
-                                        <rect key="frame" x="310" y="10" width="57" height="30"/>
+                                        <rect key="frame" x="302" y="10" width="65" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="NCP-Ag-7c1"/>
                                         </constraints>
@@ -46,7 +46,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a7C-jD-YSJ">
-                                        <rect key="frame" x="245" y="14" width="57" height="22"/>
+                                        <rect key="frame" x="229" y="10" width="65" height="30"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <state key="normal" title="排序" image="starLive">
                                             <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -826,12 +826,7 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="CFz-Ro-N17">
                                 <rect key="frame" x="0.0" y="184" width="375" height="434"/>
-                                <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <view key="tableFooterView" contentMode="scaleToFill" id="IB7-84-pRF">
-                                    <rect key="frame" x="0.0" y="72" width="375" height="1"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </view>
+                                <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" id="dJF-O6-zOW" customClass="UserCenterHistoryCell" customModule="YouerLiveVideo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="44"/>
@@ -1290,39 +1285,39 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="178" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IhH-sz-Bd2">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="178" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IhH-sz-Bd2">
                                 <rect key="frame" x="0.0" y="64" width="375" height="554"/>
                                 <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="178" id="8PR-k0-hwX" customClass="TVStationViewControllerTableViewCell" customModule="YouerLiveVideo" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="178" id="8PR-k0-hwX" customClass="TVStationViewControllerTableViewCell" customModule="YouerLiveVideo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="178"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8PR-k0-hwX" id="Bb0-oI-ccB">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="177"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="178"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="m0I-jk-Iru">
                                                     <rect key="frame" x="0.0" y="0.0" width="375" height="177.5"/>
                                                     <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="8" minimumInteritemSpacing="8" id="Mv6-Xf-FOx">
-                                                        <size key="itemSize" width="176" height="164"/>
+                                                        <size key="itemSize" width="176" height="170.5"/>
                                                         <size key="headerReferenceSize" width="0.0" height="0.0"/>
                                                         <size key="footerReferenceSize" width="0.0" height="0.0"/>
                                                         <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                     </collectionViewFlowLayout>
                                                     <cells>
                                                         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="cell" id="Xjm-Ee-xEo" customClass="TVStationViewControllerCollectionCell" customModule="YouerLiveVideo" customModuleProvider="target">
-                                                            <rect key="frame" x="0.0" y="7" width="176" height="164"/>
+                                                            <rect key="frame" x="0.0" y="4" width="176" height="170.5"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                                                <rect key="frame" x="0.0" y="0.0" width="176" height="164"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="176" height="170"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                                 <subviews>
                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="BvO-kc-ckg">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="176" height="130"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="176" height="136.5"/>
                                                                     </imageView>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZGv-kv-0Rn">
-                                                                        <rect key="frame" x="69.5" y="138" width="37.5" height="18"/>
+                                                                        <rect key="frame" x="69.5" y="144.5" width="37.5" height="18"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
@@ -1427,7 +1422,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4xl-zG-lqH">
-                                        <rect key="frame" x="310" y="10" width="57" height="30"/>
+                                        <rect key="frame" x="302" y="10" width="65" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="xBx-gX-mw4"/>
                                         </constraints>
@@ -1440,7 +1435,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T2j-JJ-ft5">
-                                        <rect key="frame" x="245" y="14" width="57" height="22"/>
+                                        <rect key="frame" x="229" y="10" width="65" height="30"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <state key="normal" title="排序" image="starLive">
                                             <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1656,7 +1651,7 @@
         <image name="icon_tvstation" width="25" height="25"/>
         <image name="icon_user" width="25" height="25"/>
         <image name="icon_watchcount" width="12" height="7"/>
-        <image name="starLive" width="22" height="22"/>
+        <image name="starLive" width="30" height="30"/>
         <image name="视窗.png" width="31" height="31"/>
     </resources>
 </document>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/MoreTVStationViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/MoreTVStationViewController.swift
index 53351cb..694df4e 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/MoreTVStationViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/MoreTVStationViewController.swift
@@ -19,7 +19,7 @@ class MoreTVStationViewController: UIViewController {
     var pageIndex:Int = 2
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        self.automaticallyAdjustsScrollViewInsets = false
         if type != 0{
             addCellAndRefresh()
         }
@@ -147,6 +147,14 @@ extension MoreTVStationViewController:UICollectionViewDelegate,UICollectionViewD
         }
     }
     
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
+        return UIEdgeInsetsMake(10, 10, 10, 10)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width: (getScreenWidth()-30)/2, height: 180)
+    }
+
 }
 
 class MoreTVStationViewCollectionCell:UICollectionViewCell{
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
index 73b09b5..8352130 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
@@ -90,6 +90,16 @@ class SearchTVStationListViewController: UIViewController,UISearchBarDelegate {
         selectTableView.reloadData()
     }
     
+    func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
+        searchBar.setShowsCancelButton(true, animated: true)
+        return true
+    }
+    
+    func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
+        searchBar.setShowsCancelButton(false, animated: true)
+        searchBar.resignFirstResponder()
+    }
+    
     //搜索:根据搜索框中内容帅选全部符合的列表
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
         searchBar.resignFirstResponder()
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
index 546bbdc..fa0a751 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
@@ -24,7 +24,7 @@
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="T5M-Yy-22h">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="8" minimumInteritemSpacing="8" id="EWj-Hf-n52">
+                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="EWj-Hf-n52">
                                     <size key="itemSize" width="180" height="182"/>
                                     <size key="headerReferenceSize" width="0.0" height="0.0"/>
                                     <size key="footerReferenceSize" width="0.0" height="0.0"/>
@@ -39,23 +39,38 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="x1d-Bc-juB">
-                                                    <rect key="frame" x="0.0" y="0.0" width="180" height="148"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="180" height="128"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" secondItem="x1d-Bc-juB" secondAttribute="height" multiplier="45:32" id="UyF-Ua-iSP"/>
+                                                    </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8hi-XF-Vgx">
-                                                    <rect key="frame" x="71.5" y="156" width="37.5" height="18"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ibk-FN-SZr">
+                                                    <rect key="frame" x="0.0" y="128" width="180" height="54"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8hi-XF-Vgx">
+                                                            <rect key="frame" x="71.5" y="18" width="37.5" height="18"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <constraints>
+                                                        <constraint firstItem="8hi-XF-Vgx" firstAttribute="centerY" secondItem="Ibk-FN-SZr" secondAttribute="centerY" id="PuK-GO-6aZ"/>
+                                                        <constraint firstItem="8hi-XF-Vgx" firstAttribute="centerX" secondItem="Ibk-FN-SZr" secondAttribute="centerX" id="afd-Dr-FIr"/>
+                                                    </constraints>
+                                                </view>
                                             </subviews>
                                         </view>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="Ibk-FN-SZr" secondAttribute="bottom" id="5EZ-dA-p3Y"/>
                                             <constraint firstAttribute="trailing" secondItem="x1d-Bc-juB" secondAttribute="trailing" id="6dA-qR-VvU"/>
-                                            <constraint firstAttribute="bottom" secondItem="8hi-XF-Vgx" secondAttribute="bottom" constant="8" id="7yl-Kb-JGR"/>
-                                            <constraint firstItem="8hi-XF-Vgx" firstAttribute="centerX" secondItem="Es8-By-Vgs" secondAttribute="centerX" id="Bua-Ka-aqB"/>
                                             <constraint firstItem="x1d-Bc-juB" firstAttribute="leading" secondItem="Es8-By-Vgs" secondAttribute="leading" id="ED3-B0-TcW"/>
+                                            <constraint firstItem="Ibk-FN-SZr" firstAttribute="leading" secondItem="Es8-By-Vgs" secondAttribute="leading" id="RBq-Ms-5of"/>
                                             <constraint firstItem="x1d-Bc-juB" firstAttribute="top" secondItem="Es8-By-Vgs" secondAttribute="top" id="SVy-Ie-v5b"/>
-                                            <constraint firstItem="8hi-XF-Vgx" firstAttribute="top" secondItem="x1d-Bc-juB" secondAttribute="bottom" constant="8" id="ZHk-2T-zIf"/>
+                                            <constraint firstAttribute="trailing" secondItem="Ibk-FN-SZr" secondAttribute="trailing" id="juw-Mj-qlE"/>
+                                            <constraint firstItem="Ibk-FN-SZr" firstAttribute="top" secondItem="x1d-Bc-juB" secondAttribute="bottom" id="sB8-a4-r8s"/>
                                         </constraints>
                                         <connections>
                                             <outlet property="tvPicture" destination="x1d-Bc-juB" id="588-mP-2uu"/>
@@ -253,7 +268,7 @@
                                 <rect key="frame" x="0.0" y="44" width="375" height="48"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="REy-qu-6cO">
-                                        <rect key="frame" x="144.5" y="0.0" width="86" height="48"/>
+                                        <rect key="frame" x="142" y="0.0" width="91" height="48"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EkU-OV-GCU">
                                                 <rect key="frame" x="8" y="13" width="42" height="21"/>
@@ -261,11 +276,11 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="30V-Xl-lRB">
-                                                <rect key="frame" x="58" y="14" width="20" height="20"/>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_open" translatesAutoresizingMaskIntoConstraints="NO" id="30V-Xl-lRB">
+                                                <rect key="frame" x="58" y="16.5" width="25" height="15"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="20" id="5L5-sW-hMu"/>
-                                                    <constraint firstAttribute="width" secondItem="30V-Xl-lRB" secondAttribute="height" multiplier="1:1" id="MYE-j0-EQV"/>
+                                                    <constraint firstAttribute="height" constant="15" id="5L5-sW-hMu"/>
+                                                    <constraint firstAttribute="width" secondItem="30V-Xl-lRB" secondAttribute="height" multiplier="5:3" id="MYE-j0-EQV"/>
                                                 </constraints>
                                             </imageView>
                                         </subviews>
@@ -361,7 +376,7 @@
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LO5-7p-BlF">
                                 <rect key="frame" x="0.0" y="92" width="375" height="575"/>
                                 <subviews>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IbJ-62-QUz">
+                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" keyboardDismissMode="onDrag" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IbJ-62-QUz">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="575"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <view key="tableFooterView" contentMode="scaleToFill" id="3xH-Ja-uTC">
@@ -682,6 +697,7 @@
     </scenes>
     <resources>
         <image name="arrow" width="7" height="12"/>
+        <image name="icon_open" width="14" height="8"/>
         <image name="starLive" width="30" height="30"/>
     </resources>
 </document>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
index 58a9e4e..538cdb2 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
@@ -138,6 +138,10 @@ extension TVStationViewController:UITableViewDelegate,UITableViewDataSource{
     }
     
     
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 150
+    }
+    
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
     }
     
@@ -197,6 +201,11 @@ extension TVStationViewController:UICollectionViewDelegate,UICollectionViewDeleg
         return UIEdgeInsetsMake(0, 10, 0, 10)
     }
     
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width: (getScreenWidth()-30)/2, height: 150)
+    }
+
+    
 }
 
 class TVStationViewControllerTableViewCell:UITableViewCell{
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
index 86b00ab..1de3248 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserEditViewController.swift
@@ -29,7 +29,7 @@ class UserEditViewController: UIViewController ,UIImagePickerControllerDelegate,
         }else{
             ident = "教师"
         }
-        contentArr = [user.name(),user.userid,ident,user.schoolName()]
+        contentArr = [user.name(),user.phone(),ident,user.schoolName()]
     }
     
     override func viewWillAppear(_ animated: Bool) {
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
index 5d9bc73..356d4de 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
@@ -154,6 +154,16 @@ extension UserViewController:UITableViewDelegate,UITableViewDataSource{
         return 44
     }
     
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 15
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: getScreenWidth(), height: 15))
+        view.backgroundColor = UIColor.clear
+        return view
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.tabBarController?.tabBar.isHidden = false
--
libgit2 0.21.0