IOSGroup / NewLive

Download as
Browse Code »

Commit 3345ba31061532cc159c6a62573fe031b6af6668

Authored by 葛建军
2 parents 82fa2992 63fbe41b
Exists in newLive

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

Showing 1 changed file with 37 additions and 23 deletions   Show diff stats
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
  Diff comments   View file @3345ba3
... ... @@ -24,31 +24,31 @@
24 24 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="T5M-Yy-22h">
25 25 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
26 26 <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
27   - <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="EWj-Hf-n52">
28   - <size key="itemSize" width="180" height="182"/>
  27 + <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="EWj-Hf-n52">
  28 + <size key="itemSize" width="180" height="180"/>
29 29 <size key="headerReferenceSize" width="0.0" height="0.0"/>
30 30 <size key="footerReferenceSize" width="0.0" height="0.0"/>
31 31 <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
32 32 </collectionViewFlowLayout>
33 33 <cells>
34 34 <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="cell" id="Es8-By-Vgs" customClass="MoreTVStationViewCollectionCell" customModule="YouerLiveVideo" customModuleProvider="target">
35   - <rect key="frame" x="0.0" y="0.0" width="180" height="182"/>
  35 + <rect key="frame" x="0.0" y="0.0" width="180" height="180"/>
36 36 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
37 37 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
38   - <rect key="frame" x="0.0" y="0.0" width="180" height="182"/>
  38 + <rect key="frame" x="0.0" y="0.0" width="180" height="180"/>
39 39 <autoresizingMask key="autoresizingMask"/>
40 40 <subviews>
41 41 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="x1d-Bc-juB">
42   - <rect key="frame" x="0.0" y="0.0" width="180" height="128"/>
  42 + <rect key="frame" x="0.0" y="0.0" width="180" height="135"/>
43 43 <constraints>
44   - <constraint firstAttribute="width" secondItem="x1d-Bc-juB" secondAttribute="height" multiplier="45:32" id="UyF-Ua-iSP"/>
  44 + <constraint firstAttribute="width" secondItem="x1d-Bc-juB" secondAttribute="height" multiplier="4:3" id="UyF-Ua-iSP"/>
45 45 </constraints>
46 46 </imageView>
47 47 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ibk-FN-SZr">
48   - <rect key="frame" x="0.0" y="128" width="180" height="54"/>
  48 + <rect key="frame" x="0.0" y="135" width="180" height="45"/>
49 49 <subviews>
50 50 <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">
51   - <rect key="frame" x="71.5" y="18" width="37.5" height="18"/>
  51 + <rect key="frame" x="71.5" y="13.5" width="37.5" height="18"/>
52 52 <fontDescription key="fontDescription" type="system" pointSize="15"/>
53 53 <nil key="textColor"/>
54 54 <nil key="highlightedColor"/>
... ... @@ -62,7 +62,7 @@
62 62 </view>
63 63 </subviews>
64 64 </view>
65   - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  65 + <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
66 66 <constraints>
67 67 <constraint firstAttribute="bottom" secondItem="Ibk-FN-SZr" secondAttribute="bottom" id="5EZ-dA-p3Y"/>
68 68 <constraint firstAttribute="trailing" secondItem="x1d-Bc-juB" secondAttribute="trailing" id="6dA-qR-VvU"/>
... ... @@ -130,13 +130,13 @@
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">
133   - <rect key="frame" x="0.0" y="0.0" width="170" height="134.5"/>
  133 + <rect key="frame" x="0.0" y="0.0" width="170" height="127.5"/>
134 134 <constraints>
135   - <constraint firstAttribute="width" secondItem="q0M-rc-EXR" secondAttribute="height" multiplier="81:64" id="4QF-fC-lnx"/>
  135 + <constraint firstAttribute="width" secondItem="q0M-rc-EXR" secondAttribute="height" multiplier="4:3" id="4QF-fC-lnx"/>
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="74.5"/>
  139 + <rect key="frame" x="0.0" y="127.5" width="170" height="81.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="50.5" width="33" height="16"/>
  148 + <rect key="frame" x="8" y="57.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="22.5" width="30" height="30"/>
  154 + <rect key="frame" x="132" y="26" 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"/>
... ... @@ -609,22 +609,36 @@
609 609 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1ZJ-ao-hBx">
610 610 <rect key="frame" x="0.0" y="0.0" width="160" height="120"/>
611 611 <color key="backgroundColor" red="0.090196078431372548" green="0.70196078431372544" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  612 + <constraints>
  613 + <constraint firstAttribute="width" secondItem="1ZJ-ao-hBx" secondAttribute="height" multiplier="4:3" id="g9E-j1-k6l"/>
  614 + </constraints>
612 615 </imageView>
613   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EE2-Y8-SP4">
614   - <rect key="frame" x="59" y="139" width="42" height="21"/>
615   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
616   - <nil key="textColor"/>
617   - <nil key="highlightedColor"/>
618   - </label>
  616 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Fe-SM-L9k">
  617 + <rect key="frame" x="0.0" y="120" width="160" height="56"/>
  618 + <subviews>
  619 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EE2-Y8-SP4">
  620 + <rect key="frame" x="59" y="17.5" width="42" height="21"/>
  621 + <fontDescription key="fontDescription" type="system" pointSize="17"/>
  622 + <nil key="textColor"/>
  623 + <nil key="highlightedColor"/>
  624 + </label>
  625 + </subviews>
  626 + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  627 + <constraints>
  628 + <constraint firstItem="EE2-Y8-SP4" firstAttribute="centerY" secondItem="4Fe-SM-L9k" secondAttribute="centerY" id="shA-Hw-iyj"/>
  629 + <constraint firstItem="EE2-Y8-SP4" firstAttribute="centerX" secondItem="4Fe-SM-L9k" secondAttribute="centerX" id="zam-O2-fYo"/>
  630 + </constraints>
  631 + </view>
619 632 </subviews>
620 633 </view>
621 634 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
622 635 <constraints>
623   - <constraint firstAttribute="bottom" secondItem="EE2-Y8-SP4" secondAttribute="bottom" constant="16" id="6w0-JP-ybD"/>
  636 + <constraint firstAttribute="bottom" secondItem="4Fe-SM-L9k" secondAttribute="bottom" id="3ky-XP-ayU"/>
  637 + <constraint firstItem="4Fe-SM-L9k" firstAttribute="leading" secondItem="XS8-dM-fSF" secondAttribute="leading" id="65s-u3-t7i"/>
624 638 <constraint firstItem="1ZJ-ao-hBx" firstAttribute="leading" secondItem="XS8-dM-fSF" secondAttribute="leading" id="Fdm-sT-5np"/>
625 639 <constraint firstItem="1ZJ-ao-hBx" firstAttribute="top" secondItem="XS8-dM-fSF" secondAttribute="top" id="HmI-98-WDB"/>
626   - <constraint firstItem="EE2-Y8-SP4" firstAttribute="top" secondItem="1ZJ-ao-hBx" secondAttribute="bottom" constant="19" id="KZ9-YD-2dJ"/>
627   - <constraint firstItem="EE2-Y8-SP4" firstAttribute="centerX" secondItem="XS8-dM-fSF" secondAttribute="centerX" id="nFb-gE-ru0"/>
  640 + <constraint firstAttribute="trailing" secondItem="4Fe-SM-L9k" secondAttribute="trailing" id="eB1-uT-7Ns"/>
  641 + <constraint firstItem="4Fe-SM-L9k" firstAttribute="top" secondItem="1ZJ-ao-hBx" secondAttribute="bottom" id="hTg-aB-OwQ"/>
628 642 <constraint firstAttribute="trailing" secondItem="1ZJ-ao-hBx" secondAttribute="trailing" id="p1m-WJ-Z3K"/>
629 643 </constraints>
630 644 <connections>
... ...