Commit 11b0cc787d6b50da406c9ceaadd979cc06d6b793
1 parent
27a29ba1
Exists in
newLive
no message
Showing
2 changed files
with
9 additions
and
8 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/ExcellentTVViewController.swift
| @@ -141,6 +141,7 @@ extension ExcellentTVViewController:UICollectionViewDelegate,UICollectionViewDat | @@ -141,6 +141,7 @@ extension ExcellentTVViewController:UICollectionViewDelegate,UICollectionViewDat | ||
| 141 | headerView.creatTVStationClassScrollView() | 141 | headerView.creatTVStationClassScrollView() |
| 142 | headerView.settingCarouselView() | 142 | headerView.settingCarouselView() |
| 143 | headerView.superViewController = self | 143 | headerView.superViewController = self |
| 144 | + headerView.frame.size.height = headerView.frame.size.height - headerView.lunboView.frame.height + getScreenWidth()/12*5 | ||
| 144 | } | 145 | } |
| 145 | reusableView = headerView | 146 | reusableView = headerView |
| 146 | } | 147 | } |
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
| @@ -117,13 +117,13 @@ | @@ -117,13 +117,13 @@ | ||
| 117 | <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 117 | <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 118 | <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="td3-ot-O0A"> | 118 | <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="td3-ot-O0A"> |
| 119 | <size key="itemSize" width="170" height="209"/> | 119 | <size key="itemSize" width="170" height="209"/> |
| 120 | - <size key="headerReferenceSize" width="50" height="259"/> | 120 | + <size key="headerReferenceSize" width="50" height="258"/> |
| 121 | <size key="footerReferenceSize" width="0.0" height="0.0"/> | 121 | <size key="footerReferenceSize" width="0.0" height="0.0"/> |
| 122 | <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> | 122 | <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> |
| 123 | </collectionViewFlowLayout> | 123 | </collectionViewFlowLayout> |
| 124 | <cells> | 124 | <cells> |
| 125 | <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="cell1" id="h38-NB-8y1" customClass="ExcellentTVInforViewCell" customModule="YouerLiveVideo" customModuleProvider="target"> | 125 | <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="cell1" id="h38-NB-8y1" customClass="ExcellentTVInforViewCell" customModule="YouerLiveVideo" customModuleProvider="target"> |
| 126 | - <rect key="frame" x="0.0" y="259" width="170" height="209"/> | 126 | + <rect key="frame" x="0.0" y="258" width="170" height="209"/> |
| 127 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | 127 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 128 | <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> | 128 | <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> |
| 129 | <rect key="frame" x="0.0" y="0.0" width="170" height="209"/> | 129 | <rect key="frame" x="0.0" y="0.0" width="170" height="209"/> |
| @@ -189,28 +189,28 @@ | @@ -189,28 +189,28 @@ | ||
| 189 | </collectionViewCell> | 189 | </collectionViewCell> |
| 190 | </cells> | 190 | </cells> |
| 191 | <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="HeaderView" id="3l2-Hm-hjO" customClass="ExcellentTVInforHeaderView" customModule="YouerLiveVideo" customModuleProvider="target"> | 191 | <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="HeaderView" id="3l2-Hm-hjO" customClass="ExcellentTVInforHeaderView" customModule="YouerLiveVideo" customModuleProvider="target"> |
| 192 | - <rect key="frame" x="0.0" y="0.0" width="375" height="259"/> | 192 | + <rect key="frame" x="0.0" y="0.0" width="375" height="258"/> |
| 193 | <autoresizingMask key="autoresizingMask"/> | 193 | <autoresizingMask key="autoresizingMask"/> |
| 194 | <subviews> | 194 | <subviews> |
| 195 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="beS-zl-5ku"> | 195 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="beS-zl-5ku"> |
| 196 | - <rect key="frame" x="0.0" y="208" width="375" height="51"/> | 196 | + <rect key="frame" x="0.0" y="207" width="375" height="51"/> |
| 197 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 197 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 198 | <constraints> | 198 | <constraints> |
| 199 | <constraint firstAttribute="height" constant="51" id="CsW-m7-aCa"/> | 199 | <constraint firstAttribute="height" constant="51" id="CsW-m7-aCa"/> |
| 200 | </constraints> | 200 | </constraints> |
| 201 | </view> | 201 | </view> |
| 202 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kGb-T7-Fzf"> | 202 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kGb-T7-Fzf"> |
| 203 | - <rect key="frame" x="0.0" y="157" width="375" height="51"/> | 203 | + <rect key="frame" x="0.0" y="156" width="375" height="51"/> |
| 204 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 204 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 205 | <constraints> | 205 | <constraints> |
| 206 | - <constraint firstAttribute="height" constant="51" id="56p-A7-q9E"/> | 206 | + <constraint firstAttribute="height" constant="51" id="VfB-V4-c4p"/> |
| 207 | </constraints> | 207 | </constraints> |
| 208 | </view> | 208 | </view> |
| 209 | <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="0j4-AN-Lgn"> | 209 | <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="0j4-AN-Lgn"> |
| 210 | - <rect key="frame" x="0.0" y="0.0" width="375" height="157"/> | 210 | + <rect key="frame" x="0.0" y="0.0" width="375" height="156"/> |
| 211 | <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 211 | <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 212 | <constraints> | 212 | <constraints> |
| 213 | - <constraint firstAttribute="height" constant="157" id="X33-fj-VHm"/> | 213 | + <constraint firstAttribute="width" secondItem="0j4-AN-Lgn" secondAttribute="height" multiplier="12:5" id="J48-bu-n8E"/> |
| 214 | </constraints> | 214 | </constraints> |
| 215 | </view> | 215 | </view> |
| 216 | </subviews> | 216 | </subviews> |