IOSGroup / NewLive

Download as
Browse Code »

Commit 7bbfc07ee89d9ff95056b74a6d69b0cffa280f1b

Authored by 葛建军
2 parents c1bf8c6f 20f33773
Exists in newLive

Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive

Showing 1 changed file with 8 additions and 6 deletions   Show diff stats
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
  Diff comments   View file @7bbfc07
... ... @@ -116,17 +116,17 @@
116 116 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
117 117 <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
118 118 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="td3-ot-O0A">
119   - <size key="itemSize" width="170" height="262"/>
  119 + <size key="itemSize" width="170" height="209"/>
120 120 <size key="headerReferenceSize" width="50" height="259"/>
121 121 <size key="footerReferenceSize" width="0.0" height="0.0"/>
122 122 <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
123 123 </collectionViewFlowLayout>
124 124 <cells>
125 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="262"/>
  126 + <rect key="frame" x="0.0" y="259" width="170" height="209"/>
127 127 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
128 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="262"/>
  129 + <rect key="frame" x="0.0" y="0.0" width="170" height="209"/>
130 130 <autoresizingMask key="autoresizingMask"/>
131 131 <subviews>
132 132 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="q0M-rc-EXR">
... ... @@ -136,7 +136,7 @@
136 136 </constraints>
137 137 </imageView>
138 138 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6It-kH-Zwv">
139   - <rect key="frame" x="0.0" y="134.5" width="170" height="127.5"/>
  139 + <rect key="frame" x="0.0" y="134.5" width="170" height="74.5"/>
140 140 <subviews>
141 141 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AdV-R1-gWf">
142 142 <rect key="frame" x="8" y="8" width="37.5" height="18"/>
... ... @@ -145,13 +145,13 @@
145 145 <nil key="highlightedColor"/>
146 146 </label>
147 147 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v6H-KX-FQE">
148   - <rect key="frame" x="8" y="103.5" width="33" height="16"/>
  148 + <rect key="frame" x="8" y="50.5" width="33" height="16"/>
149 149 <fontDescription key="fontDescription" type="system" pointSize="13"/>
150 150 <nil key="textColor"/>
151 151 <nil key="highlightedColor"/>
152 152 </label>
153 153 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h8e-iU-RLj">
154   - <rect key="frame" x="132" y="49" width="30" height="30"/>
  154 + <rect key="frame" x="132" y="22.5" width="30" height="30"/>
155 155 <state key="normal" backgroundImage="starLive"/>
156 156 <connections>
157 157 <action selector="playBtnClick:" destination="h38-NB-8y1" eventType="touchUpInside" id="Pgb-5q-Qcn"/>
... ... @@ -166,6 +166,8 @@
166 166 <constraint firstItem="v6H-KX-FQE" firstAttribute="leading" secondItem="6It-kH-Zwv" secondAttribute="leading" constant="8" id="YiO-cN-CEH"/>
167 167 <constraint firstAttribute="bottom" secondItem="v6H-KX-FQE" secondAttribute="bottom" constant="8" id="ZvT-ej-8MF"/>
168 168 <constraint firstAttribute="trailing" secondItem="h8e-iU-RLj" secondAttribute="trailing" constant="8" id="dxl-DA-IUE"/>
  169 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="AdV-R1-gWf" secondAttribute="trailing" constant="40" id="kj5-TS-eLH"/>
  170 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="v6H-KX-FQE" secondAttribute="trailing" constant="40" id="xsB-FX-5P5"/>
169 171 </constraints>
170 172 </view>
171 173 </subviews>
... ...