Commit c1bf8c6f5c42c338b3bb911202a4a60d1685a910
1 parent
3d541d12
Exists in
newLive
界面细节修改
Showing
6 changed files
with
71 additions
and
28 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/ranking_school.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "首页图片_01.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file |
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/ranking_school.imageset/首页图片_01.png
0 → 100644
5.92 KB
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/ranking_teacher.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "首页图片_03.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file |
YouerLiveVideo/YouerLiveVideo/Assets.xcassets/z_NewIcon/HomePage/ranking_teacher.imageset/首页图片_03.png
0 → 100644
15.9 KB
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<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"> | 1 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 2 | +<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"> | ||
| 3 | <device id="retina4_7" orientation="portrait"> | 3 | <device id="retina4_7" orientation="portrait"> |
| 4 | <adaptation id="fullscreen"/> | 4 | <adaptation id="fullscreen"/> |
| 5 | </device> | 5 | </device> |
| @@ -69,52 +69,52 @@ | @@ -69,52 +69,52 @@ | ||
| 69 | <rect key="frame" x="0.0" y="153" width="375" height="465"/> | 69 | <rect key="frame" x="0.0" y="153" width="375" height="465"/> |
| 70 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 70 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 71 | <view key="tableFooterView" contentMode="scaleToFill" id="KPy-fi-ei0"> | 71 | <view key="tableFooterView" contentMode="scaleToFill" id="KPy-fi-ei0"> |
| 72 | - <rect key="frame" x="0.0" y="171" width="375" height="1"/> | 72 | + <rect key="frame" x="0.0" y="168" width="375" height="1"/> |
| 73 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | 73 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 74 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 74 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 75 | </view> | 75 | </view> |
| 76 | <prototypes> | 76 | <prototypes> |
| 77 | - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="identifier" rowHeight="143" id="tO9-FG-1Ux" customClass="ResourceViewControllerTableViewCell" customModule="YouerLiveVideo" customModuleProvider="target"> | ||
| 78 | - <rect key="frame" x="0.0" y="28" width="375" height="143"/> | 77 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="identifier" rowHeight="140" id="tO9-FG-1Ux" customClass="ResourceViewControllerTableViewCell" customModule="YouerLiveVideo" customModuleProvider="target"> |
| 78 | + <rect key="frame" x="0.0" y="28" width="375" height="140"/> | ||
| 79 | <autoresizingMask key="autoresizingMask"/> | 79 | <autoresizingMask key="autoresizingMask"/> |
| 80 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tO9-FG-1Ux" id="73f-qf-61d"> | 80 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tO9-FG-1Ux" id="73f-qf-61d"> |
| 81 | - <rect key="frame" x="0.0" y="0.0" width="375" height="142"/> | 81 | + <rect key="frame" x="0.0" y="0.0" width="375" height="139"/> |
| 82 | <autoresizingMask key="autoresizingMask"/> | 82 | <autoresizingMask key="autoresizingMask"/> |
| 83 | <subviews> | 83 | <subviews> |
| 84 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="fqH-Ro-Yhh"> | 84 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="fqH-Ro-Yhh"> |
| 85 | - <rect key="frame" x="8" y="26.5" width="90" height="90"/> | 85 | + <rect key="frame" x="8" y="25" width="90" height="90"/> |
| 86 | <constraints> | 86 | <constraints> |
| 87 | <constraint firstAttribute="width" constant="90" id="1QK-QU-Ukp"/> | 87 | <constraint firstAttribute="width" constant="90" id="1QK-QU-Ukp"/> |
| 88 | <constraint firstAttribute="width" secondItem="fqH-Ro-Yhh" secondAttribute="height" multiplier="1:1" id="6mr-C4-eMc"/> | 88 | <constraint firstAttribute="width" secondItem="fqH-Ro-Yhh" secondAttribute="height" multiplier="1:1" id="6mr-C4-eMc"/> |
| 89 | </constraints> | 89 | </constraints> |
| 90 | </imageView> | 90 | </imageView> |
| 91 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FNV-Qr-xrm"> | 91 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FNV-Qr-xrm"> |
| 92 | - <rect key="frame" x="114" y="32" width="165" height="21"/> | 92 | + <rect key="frame" x="114" y="30.5" width="165" height="21"/> |
| 93 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 93 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 94 | <nil key="textColor"/> | 94 | <nil key="textColor"/> |
| 95 | <nil key="highlightedColor"/> | 95 | <nil key="highlightedColor"/> |
| 96 | </label> | 96 | </label> |
| 97 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IQj-VB-dch"> | 97 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IQj-VB-dch"> |
| 98 | - <rect key="frame" x="114" y="61" width="42" height="21"/> | 98 | + <rect key="frame" x="114" y="59.5" width="42" height="21"/> |
| 99 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 99 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 100 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 100 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 101 | <nil key="highlightedColor"/> | 101 | <nil key="highlightedColor"/> |
| 102 | </label> | 102 | </label> |
| 103 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WIc-YL-RvX"> | 103 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WIc-YL-RvX"> |
| 104 | - <rect key="frame" x="114" y="90" width="42" height="21"/> | 104 | + <rect key="frame" x="114" y="88.5" width="42" height="21"/> |
| 105 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 105 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 106 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 106 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 107 | <nil key="highlightedColor"/> | 107 | <nil key="highlightedColor"/> |
| 108 | </label> | 108 | </label> |
| 109 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="paA-9W-bbM"> | 109 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="paA-9W-bbM"> |
| 110 | - <rect key="frame" x="325" y="90" width="42" height="21"/> | 110 | + <rect key="frame" x="325" y="88.5" width="42" height="21"/> |
| 111 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 111 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 112 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 112 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 113 | <nil key="textColor"/> | 113 | <nil key="textColor"/> |
| 114 | <nil key="highlightedColor"/> | 114 | <nil key="highlightedColor"/> |
| 115 | </label> | 115 | </label> |
| 116 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yx0-8F-VaM"> | 116 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yx0-8F-VaM"> |
| 117 | - <rect key="frame" x="287" y="28" width="80" height="30"/> | 117 | + <rect key="frame" x="287" y="26.5" width="80" height="30"/> |
| 118 | <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 118 | <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 119 | <constraints> | 119 | <constraints> |
| 120 | <constraint firstAttribute="height" constant="30" id="Jva-gB-kRb"/> | 120 | <constraint firstAttribute="height" constant="30" id="Jva-gB-kRb"/> |
| @@ -131,7 +131,7 @@ | @@ -131,7 +131,7 @@ | ||
| 131 | </userDefinedRuntimeAttributes> | 131 | </userDefinedRuntimeAttributes> |
| 132 | </button> | 132 | </button> |
| 133 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_download" translatesAutoresizingMaskIntoConstraints="NO" id="ds9-Gw-nOf"> | 133 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_download" translatesAutoresizingMaskIntoConstraints="NO" id="ds9-Gw-nOf"> |
| 134 | - <rect key="frame" x="302" y="93" width="15" height="15"/> | 134 | + <rect key="frame" x="302" y="91.5" width="15" height="15"/> |
| 135 | <constraints> | 135 | <constraints> |
| 136 | <constraint firstAttribute="width" secondItem="ds9-Gw-nOf" secondAttribute="height" multiplier="1:1" id="Mto-fo-vVR"/> | 136 | <constraint firstAttribute="width" secondItem="ds9-Gw-nOf" secondAttribute="height" multiplier="1:1" id="Mto-fo-vVR"/> |
| 137 | <constraint firstAttribute="width" constant="15" id="jkd-ZW-KU3"/> | 137 | <constraint firstAttribute="width" constant="15" id="jkd-ZW-KU3"/> |
| @@ -334,7 +334,7 @@ | @@ -334,7 +334,7 @@ | ||
| 334 | </label> | 334 | </label> |
| 335 | </subviews> | 335 | </subviews> |
| 336 | </view> | 336 | </view> |
| 337 | - <color key="backgroundColor" red="0.10980392160000001" green="0.63529411759999999" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 337 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 338 | <constraints> | 338 | <constraints> |
| 339 | <constraint firstItem="633-X9-DpN" firstAttribute="leading" secondItem="0XL-6V-xV9" secondAttribute="leading" id="G57-Qp-dfe"/> | 339 | <constraint firstItem="633-X9-DpN" firstAttribute="leading" secondItem="0XL-6V-xV9" secondAttribute="leading" id="G57-Qp-dfe"/> |
| 340 | <constraint firstItem="AAa-2a-bHH" firstAttribute="top" secondItem="0XL-6V-xV9" secondAttribute="top" constant="8" id="Iul-8f-BwX"/> | 340 | <constraint firstItem="AAa-2a-bHH" firstAttribute="top" secondItem="0XL-6V-xV9" secondAttribute="top" constant="8" id="Iul-8f-BwX"/> |
| @@ -439,7 +439,7 @@ | @@ -439,7 +439,7 @@ | ||
| 439 | <nil key="highlightedColor"/> | 439 | <nil key="highlightedColor"/> |
| 440 | </label> | 440 | </label> |
| 441 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="主讲师：老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Okq-ZI-Xh2"> | 441 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="主讲师：老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Okq-ZI-Xh2"> |
| 442 | - <rect key="frame" x="0.0" y="163" width="138" height="15"/> | 442 | + <rect key="frame" x="0.0" y="163" width="74" height="15"/> |
| 443 | <fontDescription key="fontDescription" type="system" pointSize="12"/> | 443 | <fontDescription key="fontDescription" type="system" pointSize="12"/> |
| 444 | <nil key="textColor"/> | 444 | <nil key="textColor"/> |
| 445 | <nil key="highlightedColor"/> | 445 | <nil key="highlightedColor"/> |
| @@ -470,7 +470,6 @@ | @@ -470,7 +470,6 @@ | ||
| 470 | </view> | 470 | </view> |
| 471 | <constraints> | 471 | <constraints> |
| 472 | <constraint firstItem="Z3c-Ai-wr8" firstAttribute="leading" secondItem="FRa-kP-4Or" secondAttribute="trailing" constant="8" id="4L1-p3-lcO"/> | 472 | <constraint firstItem="Z3c-Ai-wr8" firstAttribute="leading" secondItem="FRa-kP-4Or" secondAttribute="trailing" constant="8" id="4L1-p3-lcO"/> |
| 473 | - <constraint firstAttribute="trailingMargin" secondItem="Okq-ZI-Xh2" secondAttribute="trailing" constant="61" id="6V2-3e-YCS"/> | ||
| 474 | <constraint firstItem="5g9-CD-vXa" firstAttribute="leading" secondItem="apu-hG-EEc" secondAttribute="leading" id="8mz-9g-viB"/> | 473 | <constraint firstItem="5g9-CD-vXa" firstAttribute="leading" secondItem="apu-hG-EEc" secondAttribute="leading" id="8mz-9g-viB"/> |
| 475 | <constraint firstItem="5g9-CD-vXa" firstAttribute="height" secondItem="apu-hG-EEc" secondAttribute="height" multiplier="16:33" id="Cna-LC-U6q"/> | 474 | <constraint firstItem="5g9-CD-vXa" firstAttribute="height" secondItem="apu-hG-EEc" secondAttribute="height" multiplier="16:33" id="Cna-LC-U6q"/> |
| 476 | <constraint firstAttribute="trailing" secondItem="tln-9q-8L4" secondAttribute="trailing" id="E6O-vX-SmB"/> | 475 | <constraint firstAttribute="trailing" secondItem="tln-9q-8L4" secondAttribute="trailing" id="E6O-vX-SmB"/> |
| @@ -1316,7 +1315,7 @@ | @@ -1316,7 +1315,7 @@ | ||
| 1316 | <rect key="frame" x="0.0" y="2" width="176" height="173.5"/> | 1315 | <rect key="frame" x="0.0" y="2" width="176" height="173.5"/> |
| 1317 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | 1316 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 1318 | <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> | 1317 | <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> |
| 1319 | - <rect key="frame" x="0.0" y="0.0" width="176" height="173"/> | 1318 | + <rect key="frame" x="0.0" y="0.0" width="176" height="174"/> |
| 1320 | <autoresizingMask key="autoresizingMask"/> | 1319 | <autoresizingMask key="autoresizingMask"/> |
| 1321 | <subviews> | 1320 | <subviews> |
| 1322 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kGy-5x-vFz"> | 1321 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kGy-5x-vFz"> |
| @@ -1478,52 +1477,52 @@ | @@ -1478,52 +1477,52 @@ | ||
| 1478 | <rect key="frame" x="0.0" y="153" width="375" height="465"/> | 1477 | <rect key="frame" x="0.0" y="153" width="375" height="465"/> |
| 1479 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 1478 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 1480 | <view key="tableFooterView" contentMode="scaleToFill" id="DCR-ac-r7t"> | 1479 | <view key="tableFooterView" contentMode="scaleToFill" id="DCR-ac-r7t"> |
| 1481 | - <rect key="frame" x="0.0" y="171" width="375" height="1"/> | 1480 | + <rect key="frame" x="0.0" y="168" width="375" height="1"/> |
| 1482 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | 1481 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 1483 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 1482 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 1484 | </view> | 1483 | </view> |
| 1485 | <prototypes> | 1484 | <prototypes> |
| 1486 | - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="identifier" rowHeight="143" id="IlC-3c-gI6" customClass="MicroCourseViewControllerTableViewCell" customModule="YouerLiveVideo" customModuleProvider="target"> | ||
| 1487 | - <rect key="frame" x="0.0" y="28" width="375" height="143"/> | 1485 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="identifier" rowHeight="140" id="IlC-3c-gI6" customClass="MicroCourseViewControllerTableViewCell" customModule="YouerLiveVideo" customModuleProvider="target"> |
| 1486 | + <rect key="frame" x="0.0" y="28" width="375" height="140"/> | ||
| 1488 | <autoresizingMask key="autoresizingMask"/> | 1487 | <autoresizingMask key="autoresizingMask"/> |
| 1489 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IlC-3c-gI6" id="UCf-3H-9B1"> | 1488 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IlC-3c-gI6" id="UCf-3H-9B1"> |
| 1490 | - <rect key="frame" x="0.0" y="0.0" width="375" height="142"/> | 1489 | + <rect key="frame" x="0.0" y="0.0" width="375" height="139"/> |
| 1491 | <autoresizingMask key="autoresizingMask"/> | 1490 | <autoresizingMask key="autoresizingMask"/> |
| 1492 | <subviews> | 1491 | <subviews> |
| 1493 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="qia-pR-e6p"> | 1492 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="qia-pR-e6p"> |
| 1494 | - <rect key="frame" x="8" y="27" width="90" height="90"/> | 1493 | + <rect key="frame" x="8" y="24" width="90" height="90"/> |
| 1495 | <constraints> | 1494 | <constraints> |
| 1496 | <constraint firstAttribute="width" secondItem="qia-pR-e6p" secondAttribute="height" multiplier="1:1" id="6Zi-MO-Pqe"/> | 1495 | <constraint firstAttribute="width" secondItem="qia-pR-e6p" secondAttribute="height" multiplier="1:1" id="6Zi-MO-Pqe"/> |
| 1497 | <constraint firstAttribute="width" constant="90" id="NEy-T9-LCS"/> | 1496 | <constraint firstAttribute="width" constant="90" id="NEy-T9-LCS"/> |
| 1498 | </constraints> | 1497 | </constraints> |
| 1499 | </imageView> | 1498 | </imageView> |
| 1500 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i7I-v8-vVY"> | 1499 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i7I-v8-vVY"> |
| 1501 | - <rect key="frame" x="114" y="32" width="165" height="21"/> | 1500 | + <rect key="frame" x="114" y="30.5" width="165" height="21"/> |
| 1502 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 1501 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 1503 | <nil key="textColor"/> | 1502 | <nil key="textColor"/> |
| 1504 | <nil key="highlightedColor"/> | 1503 | <nil key="highlightedColor"/> |
| 1505 | </label> | 1504 | </label> |
| 1506 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zNu-DX-cwZ"> | 1505 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zNu-DX-cwZ"> |
| 1507 | - <rect key="frame" x="114" y="61" width="42" height="21"/> | 1506 | + <rect key="frame" x="114" y="59.5" width="42" height="21"/> |
| 1508 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 1507 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 1509 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 1508 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 1510 | <nil key="highlightedColor"/> | 1509 | <nil key="highlightedColor"/> |
| 1511 | </label> | 1510 | </label> |
| 1512 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTt-gy-eUu"> | 1511 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTt-gy-eUu"> |
| 1513 | - <rect key="frame" x="114" y="90" width="42" height="21"/> | 1512 | + <rect key="frame" x="114" y="88.5" width="42" height="21"/> |
| 1514 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 1513 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 1515 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 1514 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 1516 | <nil key="highlightedColor"/> | 1515 | <nil key="highlightedColor"/> |
| 1517 | </label> | 1516 | </label> |
| 1518 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oz8-OI-zTn"> | 1517 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oz8-OI-zTn"> |
| 1519 | - <rect key="frame" x="325" y="90" width="42" height="21"/> | 1518 | + <rect key="frame" x="325" y="88.5" width="42" height="21"/> |
| 1520 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 1519 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 1521 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 1520 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 1522 | <nil key="textColor"/> | 1521 | <nil key="textColor"/> |
| 1523 | <nil key="highlightedColor"/> | 1522 | <nil key="highlightedColor"/> |
| 1524 | </label> | 1523 | </label> |
| 1525 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jqG-kN-3bx"> | 1524 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jqG-kN-3bx"> |
| 1526 | - <rect key="frame" x="287" y="27.5" width="80" height="30"/> | 1525 | + <rect key="frame" x="287" y="26" width="80" height="30"/> |
| 1527 | <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> | 1526 | <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 1528 | <constraints> | 1527 | <constraints> |
| 1529 | <constraint firstAttribute="width" constant="80" id="Alz-7v-3a2"/> | 1528 | <constraint firstAttribute="width" constant="80" id="Alz-7v-3a2"/> |
| @@ -1543,7 +1542,7 @@ | @@ -1543,7 +1542,7 @@ | ||
| 1543 | </connections> | 1542 | </connections> |
| 1544 | </button> | 1543 | </button> |
| 1545 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_watchcount" translatesAutoresizingMaskIntoConstraints="NO" id="anY-xC-gfl"> | 1544 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_watchcount" translatesAutoresizingMaskIntoConstraints="NO" id="anY-xC-gfl"> |
| 1546 | - <rect key="frame" x="297" y="96" width="20" height="10"/> | 1545 | + <rect key="frame" x="297" y="94.5" width="20" height="10"/> |
| 1547 | <constraints> | 1546 | <constraints> |
| 1548 | <constraint firstAttribute="width" constant="20" id="FKY-fi-PSd"/> | 1547 | <constraint firstAttribute="width" constant="20" id="FKY-fi-PSd"/> |
| 1549 | <constraint firstAttribute="height" constant="10" id="pGb-Oo-Maj"/> | 1548 | <constraint firstAttribute="height" constant="10" id="pGb-Oo-Maj"/> |
YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
| @@ -178,8 +178,10 @@ class HomeFirstTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollect | @@ -178,8 +178,10 @@ class HomeFirstTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollect | ||
| 178 | let cell=collectionView.dequeueReusableCell(withReuseIdentifier: "HomeFirstCollectionViewCell", for: indexPath) as! HomeFirstCollectionViewCell | 178 | let cell=collectionView.dequeueReusableCell(withReuseIdentifier: "HomeFirstCollectionViewCell", for: indexPath) as! HomeFirstCollectionViewCell |
| 179 | if indexPath.row==0{ | 179 | if indexPath.row==0{ |
| 180 | cell.nameLabel.text="学校" | 180 | cell.nameLabel.text="学校" |
| 181 | + cell.iconImageView.image=UIImage(named: "ranking_school") | ||
| 181 | }else{ | 182 | }else{ |
| 182 | cell.nameLabel.text="教师" | 183 | cell.nameLabel.text="教师" |
| 184 | + cell.iconImageView.image=UIImage(named: "ranking_teacher") | ||
| 183 | } | 185 | } |
| 184 | return cell | 186 | return cell |
| 185 | } | 187 | } |