Commit 235e6900ebf32699d5b46b5e4a45fdbdb7d0d19a
1 parent
2b28ae19
Exists in
newLive
no message
Showing
3 changed files
with
178 additions
and
81 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
| @@ -10,11 +10,16 @@ import UIKit | @@ -10,11 +10,16 @@ import UIKit | ||
| 10 | 10 | ||
| 11 | class SearchTVStationListViewController: UIViewController { | 11 | class SearchTVStationListViewController: UIViewController { |
| 12 | var alList:[String] = ["A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"] | 12 | var alList:[String] = ["A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"] |
| 13 | - | 13 | + var grad:[String] = ["小学","初中","高中","全部年段"] |
| 14 | + @IBOutlet weak var downIcon: UIImageView! | ||
| 15 | + @IBOutlet weak var gradName: UILabel! | ||
| 16 | + @IBOutlet weak var tableView: UITableView! | ||
| 14 | @IBOutlet weak var selectView: UIView! | 17 | @IBOutlet weak var selectView: UIView! |
| 15 | 18 | ||
| 16 | override func viewDidLoad() { | 19 | override func viewDidLoad() { |
| 17 | super.viewDidLoad() | 20 | super.viewDidLoad() |
| 21 | + gradName.text = "全部年段" | ||
| 22 | + tableView.tintColor = UIColor.lightGray | ||
| 18 | // Do any additional setup after loading the view. | 23 | // Do any additional setup after loading the view. |
| 19 | } | 24 | } |
| 20 | 25 | ||
| @@ -23,7 +28,28 @@ class SearchTVStationListViewController: UIViewController { | @@ -23,7 +28,28 @@ class SearchTVStationListViewController: UIViewController { | ||
| 23 | // Dispose of any resources that can be recreated. | 28 | // Dispose of any resources that can be recreated. |
| 24 | } | 29 | } |
| 25 | 30 | ||
| 31 | + @IBAction func selectGradClick(_ sender: UIButton) { | ||
| 32 | + selectView.isHidden = false | ||
| 33 | + } | ||
| 26 | 34 | ||
| 35 | + | ||
| 36 | + @IBAction func selectBtnClick(_ sender: UIButton) { | ||
| 37 | + selectView.isHidden = true | ||
| 38 | + switch sender.tag { | ||
| 39 | + case 101: | ||
| 40 | + break | ||
| 41 | + case 102: | ||
| 42 | + break | ||
| 43 | + case 103: | ||
| 44 | + break | ||
| 45 | + case 104: | ||
| 46 | + break | ||
| 47 | + default: | ||
| 48 | + break | ||
| 49 | + } | ||
| 50 | + gradName.text = grad[sender.tag-101] | ||
| 51 | + } | ||
| 52 | + | ||
| 27 | /* | 53 | /* |
| 28 | // MARK: - Navigation | 54 | // MARK: - Navigation |
| 29 | 55 | ||
| @@ -58,6 +84,18 @@ extension SearchTVStationListViewController:UITableViewDataSource,UITableViewDel | @@ -58,6 +84,18 @@ extension SearchTVStationListViewController:UITableViewDataSource,UITableViewDel | ||
| 58 | return alList.count | 84 | return alList.count |
| 59 | } | 85 | } |
| 60 | 86 | ||
| 87 | + func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { | ||
| 88 | + return alList[section] | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { | ||
| 92 | + return 44 | ||
| 93 | + } | ||
| 94 | +} | ||
| 95 | + | ||
| 96 | +class SearchTVStationListCell: UITableViewCell { | ||
| 61 | 97 | ||
| 98 | + @IBOutlet weak var stationName: UILabel! | ||
| 99 | + @IBOutlet weak var tvStationImage: UIImageView! | ||
| 62 | 100 | ||
| 63 | } | 101 | } |
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
| @@ -97,15 +97,121 @@ | @@ -97,15 +97,121 @@ | ||
| 97 | <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | 97 | <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
| 98 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 98 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 99 | <subviews> | 99 | <subviews> |
| 100 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LO5-7p-BlF"> | 100 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q0y-9I-pQG"> |
| 101 | + <rect key="frame" x="0.0" y="44" width="375" height="48"/> | ||
| 102 | + <subviews> | ||
| 103 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="REy-qu-6cO"> | ||
| 104 | + <rect key="frame" x="144.5" y="0.0" width="86" height="48"/> | ||
| 105 | + <subviews> | ||
| 106 | + <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"> | ||
| 107 | + <rect key="frame" x="8" y="13" width="42" height="21"/> | ||
| 108 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 109 | + <nil key="textColor"/> | ||
| 110 | + <nil key="highlightedColor"/> | ||
| 111 | + </label> | ||
| 112 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="30V-Xl-lRB"> | ||
| 113 | + <rect key="frame" x="58" y="14" width="20" height="20"/> | ||
| 114 | + <constraints> | ||
| 115 | + <constraint firstAttribute="height" constant="20" id="5L5-sW-hMu"/> | ||
| 116 | + <constraint firstAttribute="width" secondItem="30V-Xl-lRB" secondAttribute="height" multiplier="1:1" id="MYE-j0-EQV"/> | ||
| 117 | + </constraints> | ||
| 118 | + </imageView> | ||
| 119 | + </subviews> | ||
| 120 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 121 | + <constraints> | ||
| 122 | + <constraint firstItem="EkU-OV-GCU" firstAttribute="leading" secondItem="REy-qu-6cO" secondAttribute="leading" constant="8" id="BP2-0y-W2m"/> | ||
| 123 | + <constraint firstItem="30V-Xl-lRB" firstAttribute="leading" secondItem="EkU-OV-GCU" secondAttribute="trailing" constant="8" id="MuH-Ax-jK5"/> | ||
| 124 | + <constraint firstAttribute="height" constant="48" id="Wyu-Lq-o7c"/> | ||
| 125 | + <constraint firstItem="30V-Xl-lRB" firstAttribute="centerY" secondItem="REy-qu-6cO" secondAttribute="centerY" id="ere-Pn-a1S"/> | ||
| 126 | + <constraint firstAttribute="trailing" secondItem="30V-Xl-lRB" secondAttribute="trailing" constant="8" id="oCN-2l-mHX"/> | ||
| 127 | + <constraint firstItem="EkU-OV-GCU" firstAttribute="centerY" secondItem="REy-qu-6cO" secondAttribute="centerY" id="veC-Ip-0YS"/> | ||
| 128 | + </constraints> | ||
| 129 | + </view> | ||
| 130 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DWH-iG-AGA"> | ||
| 131 | + <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> | ||
| 132 | + <connections> | ||
| 133 | + <action selector="selectGradClick:" destination="zPk-GV-x5H" eventType="touchUpInside" id="mFn-6w-fBL"/> | ||
| 134 | + </connections> | ||
| 135 | + </button> | ||
| 136 | + </subviews> | ||
| 137 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 138 | + <constraints> | ||
| 139 | + <constraint firstAttribute="bottom" secondItem="DWH-iG-AGA" secondAttribute="bottom" id="BB2-Ef-8Oz"/> | ||
| 140 | + <constraint firstItem="DWH-iG-AGA" firstAttribute="top" secondItem="q0y-9I-pQG" secondAttribute="top" id="KdR-z6-VcZ"/> | ||
| 141 | + <constraint firstItem="REy-qu-6cO" firstAttribute="top" secondItem="q0y-9I-pQG" secondAttribute="top" id="YeU-Ex-rj0"/> | ||
| 142 | + <constraint firstAttribute="trailing" secondItem="DWH-iG-AGA" secondAttribute="trailing" id="eW0-uW-isJ"/> | ||
| 143 | + <constraint firstAttribute="height" constant="48" id="u0w-Ne-gDI"/> | ||
| 144 | + <constraint firstItem="DWH-iG-AGA" firstAttribute="leading" secondItem="q0y-9I-pQG" secondAttribute="leading" id="z34-2n-v3C"/> | ||
| 145 | + <constraint firstItem="REy-qu-6cO" firstAttribute="centerX" secondItem="q0y-9I-pQG" secondAttribute="centerX" id="zoe-K7-XTj"/> | ||
| 146 | + </constraints> | ||
| 147 | + </view> | ||
| 148 | + <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="123" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="o4U-1y-nqL"> | ||
| 149 | + <rect key="frame" x="0.0" y="92" width="375" height="575"/> | ||
| 150 | + <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| 151 | + <prototypes> | ||
| 152 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="123" id="MMn-tR-I0v" customClass="SearchTVStationListCell" customModule="YouerLiveVideo" customModuleProvider="target"> | ||
| 153 | + <rect key="frame" x="0.0" y="28" width="375" height="123"/> | ||
| 154 | + <autoresizingMask key="autoresizingMask"/> | ||
| 155 | + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MMn-tR-I0v" id="H7d-Zz-WAS"> | ||
| 156 | + <rect key="frame" x="0.0" y="0.0" width="375" height="122"/> | ||
| 157 | + <autoresizingMask key="autoresizingMask"/> | ||
| 158 | + <subviews> | ||
| 159 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Yk-8z-nas"> | ||
| 160 | + <rect key="frame" x="8" y="4" width="359" height="114.5"/> | ||
| 161 | + <subviews> | ||
| 162 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IYQ-S7-ka2"> | ||
| 163 | + <rect key="frame" x="8" y="33.5" width="80" height="48"/> | ||
| 164 | + <constraints> | ||
| 165 | + <constraint firstAttribute="width" constant="80" id="XKV-mN-TaH"/> | ||
| 166 | + <constraint firstAttribute="width" secondItem="IYQ-S7-ka2" secondAttribute="height" multiplier="5:3" id="tZU-XC-3Mh"/> | ||
| 167 | + </constraints> | ||
| 168 | + </imageView> | ||
| 169 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lnl-RY-Pw3"> | ||
| 170 | + <rect key="frame" x="96" y="47" width="42" height="21"/> | ||
| 171 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 172 | + <nil key="textColor"/> | ||
| 173 | + <nil key="highlightedColor"/> | ||
| 174 | + </label> | ||
| 175 | + </subviews> | ||
| 176 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 177 | + <constraints> | ||
| 178 | + <constraint firstItem="IYQ-S7-ka2" firstAttribute="centerY" secondItem="9Yk-8z-nas" secondAttribute="centerY" id="2hH-CN-nVr"/> | ||
| 179 | + <constraint firstItem="Lnl-RY-Pw3" firstAttribute="centerY" secondItem="9Yk-8z-nas" secondAttribute="centerY" id="85q-3h-kh9"/> | ||
| 180 | + <constraint firstItem="IYQ-S7-ka2" firstAttribute="leading" secondItem="9Yk-8z-nas" secondAttribute="leading" constant="8" id="coB-sq-cPz"/> | ||
| 181 | + <constraint firstItem="Lnl-RY-Pw3" firstAttribute="leading" secondItem="IYQ-S7-ka2" secondAttribute="trailing" constant="8" id="pDH-gU-5j9"/> | ||
| 182 | + </constraints> | ||
| 183 | + </view> | ||
| 184 | + </subviews> | ||
| 185 | + <constraints> | ||
| 186 | + <constraint firstAttribute="bottom" secondItem="9Yk-8z-nas" secondAttribute="bottom" constant="4" id="ShN-wP-ol6"/> | ||
| 187 | + <constraint firstAttribute="trailing" secondItem="9Yk-8z-nas" secondAttribute="trailing" constant="8" id="bBV-HW-7TU"/> | ||
| 188 | + <constraint firstItem="9Yk-8z-nas" firstAttribute="leading" secondItem="H7d-Zz-WAS" secondAttribute="leading" constant="8" id="t9c-W8-vcG"/> | ||
| 189 | + <constraint firstItem="9Yk-8z-nas" firstAttribute="top" secondItem="H7d-Zz-WAS" secondAttribute="top" constant="4" id="vne-hK-wLf"/> | ||
| 190 | + </constraints> | ||
| 191 | + </tableViewCellContentView> | ||
| 192 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 193 | + <connections> | ||
| 194 | + <outlet property="stationName" destination="Lnl-RY-Pw3" id="0S0-Kr-H0X"/> | ||
| 195 | + <outlet property="tvStationImage" destination="IYQ-S7-ka2" id="m9f-mQ-TFc"/> | ||
| 196 | + </connections> | ||
| 197 | + </tableViewCell> | ||
| 198 | + </prototypes> | ||
| 199 | + <connections> | ||
| 200 | + <outlet property="dataSource" destination="zPk-GV-x5H" id="TNG-NR-BYE"/> | ||
| 201 | + <outlet property="delegate" destination="zPk-GV-x5H" id="30K-a5-vlb"/> | ||
| 202 | + </connections> | ||
| 203 | + </tableView> | ||
| 204 | + <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LO5-7p-BlF"> | ||
| 101 | <rect key="frame" x="0.0" y="92" width="375" height="575"/> | 205 | <rect key="frame" x="0.0" y="92" width="375" height="575"/> |
| 102 | <subviews> | 206 | <subviews> |
| 103 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pA5-mr-wp5"> | 207 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pA5-mr-wp5"> |
| 104 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> | 208 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
| 105 | <subviews> | 209 | <subviews> |
| 106 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fd9-K0-dbd"> | 210 | + <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fd9-K0-dbd"> |
| 107 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> | 211 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
| 108 | - <state key="normal" title="Button"/> | 212 | + <connections> |
| 213 | + <action selector="selectBtnClick:" destination="zPk-GV-x5H" eventType="touchUpInside" id="9rC-7O-cx4"/> | ||
| 214 | + </connections> | ||
| 109 | </button> | 215 | </button> |
| 110 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Unb-Qo-FiA"> | 216 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Unb-Qo-FiA"> |
| 111 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> | 217 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> |
| @@ -118,7 +224,7 @@ | @@ -118,7 +224,7 @@ | ||
| 118 | <nil key="highlightedColor"/> | 224 | <nil key="highlightedColor"/> |
| 119 | </label> | 225 | </label> |
| 120 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rF3-mJ-pPr"> | 226 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小学" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rF3-mJ-pPr"> |
| 121 | - <rect key="frame" x="169.5" y="13" width="35" height="21"/> | 227 | + <rect key="frame" x="170" y="13" width="35" height="21"/> |
| 122 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 228 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 123 | <nil key="textColor"/> | 229 | <nil key="textColor"/> |
| 124 | <nil key="highlightedColor"/> | 230 | <nil key="highlightedColor"/> |
| @@ -141,9 +247,11 @@ | @@ -141,9 +247,11 @@ | ||
| 141 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pKJ-J9-5CR"> | 247 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pKJ-J9-5CR"> |
| 142 | <rect key="frame" x="0.0" y="48" width="375" height="48"/> | 248 | <rect key="frame" x="0.0" y="48" width="375" height="48"/> |
| 143 | <subviews> | 249 | <subviews> |
| 144 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="veE-AU-inD"> | 250 | + <button opaque="NO" tag="102" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="veE-AU-inD"> |
| 145 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> | 251 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
| 146 | - <state key="normal" title="Button"/> | 252 | + <connections> |
| 253 | + <action selector="selectBtnClick:" destination="zPk-GV-x5H" eventType="touchUpInside" id="eza-Xp-8Wo"/> | ||
| 254 | + </connections> | ||
| 147 | </button> | 255 | </button> |
| 148 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ma4-Vs-Ai5"> | 256 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ma4-Vs-Ai5"> |
| 149 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> | 257 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> |
| @@ -156,7 +264,7 @@ | @@ -156,7 +264,7 @@ | ||
| 156 | <nil key="highlightedColor"/> | 264 | <nil key="highlightedColor"/> |
| 157 | </label> | 265 | </label> |
| 158 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="初中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FLD-Vw-eZ9"> | 266 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="初中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FLD-Vw-eZ9"> |
| 159 | - <rect key="frame" x="169.5" y="13" width="35" height="21"/> | 267 | + <rect key="frame" x="170" y="13" width="35" height="21"/> |
| 160 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 268 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 161 | <nil key="textColor"/> | 269 | <nil key="textColor"/> |
| 162 | <nil key="highlightedColor"/> | 270 | <nil key="highlightedColor"/> |
| @@ -179,9 +287,11 @@ | @@ -179,9 +287,11 @@ | ||
| 179 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jQ0-hJ-LW9"> | 287 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jQ0-hJ-LW9"> |
| 180 | <rect key="frame" x="0.0" y="96" width="375" height="48"/> | 288 | <rect key="frame" x="0.0" y="96" width="375" height="48"/> |
| 181 | <subviews> | 289 | <subviews> |
| 182 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rrk-re-JuF"> | 290 | + <button opaque="NO" tag="103" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rrk-re-JuF"> |
| 183 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> | 291 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
| 184 | - <state key="normal" title="Button"/> | 292 | + <connections> |
| 293 | + <action selector="selectBtnClick:" destination="zPk-GV-x5H" eventType="touchUpInside" id="apL-Gu-0OT"/> | ||
| 294 | + </connections> | ||
| 185 | </button> | 295 | </button> |
| 186 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TwL-7i-SFE"> | 296 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TwL-7i-SFE"> |
| 187 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> | 297 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> |
| @@ -194,7 +304,7 @@ | @@ -194,7 +304,7 @@ | ||
| 194 | <nil key="highlightedColor"/> | 304 | <nil key="highlightedColor"/> |
| 195 | </label> | 305 | </label> |
| 196 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bx3-SK-e4z"> | 306 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高中" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bx3-SK-e4z"> |
| 197 | - <rect key="frame" x="169.5" y="13" width="35" height="21"/> | 307 | + <rect key="frame" x="170" y="13" width="35" height="21"/> |
| 198 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 308 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 199 | <nil key="textColor"/> | 309 | <nil key="textColor"/> |
| 200 | <nil key="highlightedColor"/> | 310 | <nil key="highlightedColor"/> |
| @@ -217,9 +327,11 @@ | @@ -217,9 +327,11 @@ | ||
| 217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PdH-vs-Gjn"> | 327 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PdH-vs-Gjn"> |
| 218 | <rect key="frame" x="0.0" y="144" width="375" height="48"/> | 328 | <rect key="frame" x="0.0" y="144" width="375" height="48"/> |
| 219 | <subviews> | 329 | <subviews> |
| 220 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bqH-ub-Nyu"> | 330 | + <button opaque="NO" tag="104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bqH-ub-Nyu"> |
| 221 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> | 331 | <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
| 222 | - <state key="normal" title="Button"/> | 332 | + <connections> |
| 333 | + <action selector="selectBtnClick:" destination="zPk-GV-x5H" eventType="touchUpInside" id="a7l-bV-toi"/> | ||
| 334 | + </connections> | ||
| 223 | </button> | 335 | </button> |
| 224 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGW-tg-2H6"> | 336 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGW-tg-2H6"> |
| 225 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> | 337 | <rect key="frame" x="16" y="0.0" width="343" height="0.0"/> |
| @@ -232,7 +344,7 @@ | @@ -232,7 +344,7 @@ | ||
| 232 | <nil key="highlightedColor"/> | 344 | <nil key="highlightedColor"/> |
| 233 | </label> | 345 | </label> |
| 234 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部学段" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VfQ-qt-gdx"> | 346 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部学段" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VfQ-qt-gdx"> |
| 235 | - <rect key="frame" x="152.5" y="13" width="69.5" height="21"/> | 347 | + <rect key="frame" x="152" y="13" width="70" height="21"/> |
| 236 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 348 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 237 | <nil key="textColor"/> | 349 | <nil key="textColor"/> |
| 238 | <nil key="highlightedColor"/> | 350 | <nil key="highlightedColor"/> |
| @@ -253,7 +365,7 @@ | @@ -253,7 +365,7 @@ | ||
| 253 | </constraints> | 365 | </constraints> |
| 254 | </view> | 366 | </view> |
| 255 | </subviews> | 367 | </subviews> |
| 256 | - <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 368 | + <color key="backgroundColor" white="0.66666666666666663" alpha="0.50786493288590606" colorSpace="calibratedWhite"/> |
| 257 | <constraints> | 369 | <constraints> |
| 258 | <constraint firstItem="pKJ-J9-5CR" firstAttribute="top" secondItem="pA5-mr-wp5" secondAttribute="bottom" id="As5-CP-OI8"/> | 370 | <constraint firstItem="pKJ-J9-5CR" firstAttribute="top" secondItem="pA5-mr-wp5" secondAttribute="bottom" id="As5-CP-OI8"/> |
| 259 | <constraint firstItem="PdH-vs-Gjn" firstAttribute="leading" secondItem="LO5-7p-BlF" secondAttribute="leading" id="EiX-RE-2mV"/> | 371 | <constraint firstItem="PdH-vs-Gjn" firstAttribute="leading" secondItem="LO5-7p-BlF" secondAttribute="leading" id="EiX-RE-2mV"/> |
| @@ -276,84 +388,30 @@ | @@ -276,84 +388,30 @@ | ||
| 276 | </constraints> | 388 | </constraints> |
| 277 | <textInputTraits key="textInputTraits"/> | 389 | <textInputTraits key="textInputTraits"/> |
| 278 | </searchBar> | 390 | </searchBar> |
| 279 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DWH-iG-AGA"> | ||
| 280 | - <rect key="frame" x="0.0" y="44" width="375" height="48"/> | ||
| 281 | - <constraints> | ||
| 282 | - <constraint firstAttribute="height" constant="48" id="ikm-dk-mzG"/> | ||
| 283 | - </constraints> | ||
| 284 | - </button> | ||
| 285 | - <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="123" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="o4U-1y-nqL"> | ||
| 286 | - <rect key="frame" x="0.0" y="92" width="375" height="575"/> | ||
| 287 | - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 288 | - <prototypes> | ||
| 289 | - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="123" id="MMn-tR-I0v"> | ||
| 290 | - <rect key="frame" x="0.0" y="28" width="375" height="123"/> | ||
| 291 | - <autoresizingMask key="autoresizingMask"/> | ||
| 292 | - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MMn-tR-I0v" id="H7d-Zz-WAS"> | ||
| 293 | - <rect key="frame" x="0.0" y="0.0" width="375" height="122"/> | ||
| 294 | - <autoresizingMask key="autoresizingMask"/> | ||
| 295 | - <subviews> | ||
| 296 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Yk-8z-nas"> | ||
| 297 | - <rect key="frame" x="8" y="4" width="359" height="114.5"/> | ||
| 298 | - <subviews> | ||
| 299 | - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IYQ-S7-ka2"> | ||
| 300 | - <rect key="frame" x="8" y="33.5" width="80" height="48"/> | ||
| 301 | - <constraints> | ||
| 302 | - <constraint firstAttribute="width" constant="80" id="XKV-mN-TaH"/> | ||
| 303 | - <constraint firstAttribute="width" secondItem="IYQ-S7-ka2" secondAttribute="height" multiplier="5:3" id="tZU-XC-3Mh"/> | ||
| 304 | - </constraints> | ||
| 305 | - </imageView> | ||
| 306 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lnl-RY-Pw3"> | ||
| 307 | - <rect key="frame" x="96" y="47" width="42" height="21"/> | ||
| 308 | - <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 309 | - <nil key="textColor"/> | ||
| 310 | - <nil key="highlightedColor"/> | ||
| 311 | - </label> | ||
| 312 | - </subviews> | ||
| 313 | - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 314 | - <constraints> | ||
| 315 | - <constraint firstItem="IYQ-S7-ka2" firstAttribute="centerY" secondItem="9Yk-8z-nas" secondAttribute="centerY" id="2hH-CN-nVr"/> | ||
| 316 | - <constraint firstItem="Lnl-RY-Pw3" firstAttribute="centerY" secondItem="9Yk-8z-nas" secondAttribute="centerY" id="85q-3h-kh9"/> | ||
| 317 | - <constraint firstItem="IYQ-S7-ka2" firstAttribute="leading" secondItem="9Yk-8z-nas" secondAttribute="leading" constant="8" id="coB-sq-cPz"/> | ||
| 318 | - <constraint firstItem="Lnl-RY-Pw3" firstAttribute="leading" secondItem="IYQ-S7-ka2" secondAttribute="trailing" constant="8" id="pDH-gU-5j9"/> | ||
| 319 | - </constraints> | ||
| 320 | - </view> | ||
| 321 | - </subviews> | ||
| 322 | - <constraints> | ||
| 323 | - <constraint firstAttribute="bottom" secondItem="9Yk-8z-nas" secondAttribute="bottom" constant="4" id="ShN-wP-ol6"/> | ||
| 324 | - <constraint firstAttribute="trailing" secondItem="9Yk-8z-nas" secondAttribute="trailing" constant="8" id="bBV-HW-7TU"/> | ||
| 325 | - <constraint firstItem="9Yk-8z-nas" firstAttribute="leading" secondItem="H7d-Zz-WAS" secondAttribute="leading" constant="8" id="t9c-W8-vcG"/> | ||
| 326 | - <constraint firstItem="9Yk-8z-nas" firstAttribute="top" secondItem="H7d-Zz-WAS" secondAttribute="top" constant="4" id="vne-hK-wLf"/> | ||
| 327 | - </constraints> | ||
| 328 | - </tableViewCellContentView> | ||
| 329 | - </tableViewCell> | ||
| 330 | - </prototypes> | ||
| 331 | - <connections> | ||
| 332 | - <outlet property="dataSource" destination="zPk-GV-x5H" id="TNG-NR-BYE"/> | ||
| 333 | - <outlet property="delegate" destination="zPk-GV-x5H" id="30K-a5-vlb"/> | ||
| 334 | - </connections> | ||
| 335 | - </tableView> | ||
| 336 | </subviews> | 391 | </subviews> |
| 337 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 392 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 338 | <constraints> | 393 | <constraints> |
| 339 | <constraint firstAttribute="trailing" secondItem="o4U-1y-nqL" secondAttribute="trailing" id="6aw-Wu-lvQ"/> | 394 | <constraint firstAttribute="trailing" secondItem="o4U-1y-nqL" secondAttribute="trailing" id="6aw-Wu-lvQ"/> |
| 395 | + <constraint firstItem="q0y-9I-pQG" firstAttribute="top" secondItem="ChK-me-hP6" secondAttribute="bottom" id="BKw-ks-FzH"/> | ||
| 340 | <constraint firstItem="LO5-7p-BlF" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="NYD-jI-WGE"/> | 396 | <constraint firstItem="LO5-7p-BlF" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="NYD-jI-WGE"/> |
| 341 | - <constraint firstItem="DWH-iG-AGA" firstAttribute="top" secondItem="ChK-me-hP6" secondAttribute="bottom" id="OJG-ox-1L1"/> | ||
| 342 | - <constraint firstItem="DWH-iG-AGA" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="TKP-Gf-d9n"/> | 397 | + <constraint firstItem="LO5-7p-BlF" firstAttribute="top" secondItem="q0y-9I-pQG" secondAttribute="bottom" id="OlM-Cx-1Pu"/> |
| 398 | + <constraint firstItem="q0y-9I-pQG" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="R3W-MX-aXd"/> | ||
| 343 | <constraint firstItem="14l-HJ-g5s" firstAttribute="top" secondItem="LO5-7p-BlF" secondAttribute="bottom" id="VFT-qT-lpJ"/> | 399 | <constraint firstItem="14l-HJ-g5s" firstAttribute="top" secondItem="LO5-7p-BlF" secondAttribute="bottom" id="VFT-qT-lpJ"/> |
| 344 | <constraint firstAttribute="trailing" secondItem="LO5-7p-BlF" secondAttribute="trailing" id="Vi7-T1-ipE"/> | 400 | <constraint firstAttribute="trailing" secondItem="LO5-7p-BlF" secondAttribute="trailing" id="Vi7-T1-ipE"/> |
| 401 | + <constraint firstItem="o4U-1y-nqL" firstAttribute="top" secondItem="q0y-9I-pQG" secondAttribute="bottom" id="bZr-dz-CRh"/> | ||
| 402 | + <constraint firstAttribute="trailing" secondItem="q0y-9I-pQG" secondAttribute="trailing" id="d9O-y7-yDw"/> | ||
| 345 | <constraint firstItem="ChK-me-hP6" firstAttribute="top" secondItem="cjj-7m-eAq" secondAttribute="top" id="dpW-I0-30v"/> | 403 | <constraint firstItem="ChK-me-hP6" firstAttribute="top" secondItem="cjj-7m-eAq" secondAttribute="top" id="dpW-I0-30v"/> |
| 346 | <constraint firstItem="14l-HJ-g5s" firstAttribute="top" secondItem="o4U-1y-nqL" secondAttribute="bottom" id="fSk-oc-iab"/> | 404 | <constraint firstItem="14l-HJ-g5s" firstAttribute="top" secondItem="o4U-1y-nqL" secondAttribute="bottom" id="fSk-oc-iab"/> |
| 347 | - <constraint firstAttribute="trailing" secondItem="DWH-iG-AGA" secondAttribute="trailing" id="hha-QC-DTt"/> | ||
| 348 | <constraint firstItem="o4U-1y-nqL" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="j5g-by-76o"/> | 405 | <constraint firstItem="o4U-1y-nqL" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="j5g-by-76o"/> |
| 349 | - <constraint firstItem="LO5-7p-BlF" firstAttribute="top" secondItem="DWH-iG-AGA" secondAttribute="bottom" id="om1-z7-AYr"/> | ||
| 350 | <constraint firstAttribute="trailing" secondItem="ChK-me-hP6" secondAttribute="trailing" id="pC3-2b-J0P"/> | 406 | <constraint firstAttribute="trailing" secondItem="ChK-me-hP6" secondAttribute="trailing" id="pC3-2b-J0P"/> |
| 351 | <constraint firstItem="ChK-me-hP6" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="uMH-Xr-Czy"/> | 407 | <constraint firstItem="ChK-me-hP6" firstAttribute="leading" secondItem="cjj-7m-eAq" secondAttribute="leading" id="uMH-Xr-Czy"/> |
| 352 | - <constraint firstItem="o4U-1y-nqL" firstAttribute="top" secondItem="DWH-iG-AGA" secondAttribute="bottom" id="zEQ-6J-fPf"/> | ||
| 353 | </constraints> | 408 | </constraints> |
| 354 | </view> | 409 | </view> |
| 355 | <connections> | 410 | <connections> |
| 411 | + <outlet property="downIcon" destination="30V-Xl-lRB" id="GHM-Kf-F2D"/> | ||
| 412 | + <outlet property="gradName" destination="EkU-OV-GCU" id="1x2-I5-Dmb"/> | ||
| 356 | <outlet property="selectView" destination="LO5-7p-BlF" id="BCJ-8J-krQ"/> | 413 | <outlet property="selectView" destination="LO5-7p-BlF" id="BCJ-8J-krQ"/> |
| 414 | + <outlet property="tableView" destination="o4U-1y-nqL" id="mW2-XQ-YbM"/> | ||
| 357 | </connections> | 415 | </connections> |
| 358 | </viewController> | 416 | </viewController> |
| 359 | <placeholder placeholderIdentifier="IBFirstResponder" id="aje-z7-dD9" userLabel="First Responder" sceneMemberID="firstResponder"/> | 417 | <placeholder placeholderIdentifier="IBFirstResponder" id="aje-z7-dD9" userLabel="First Responder" sceneMemberID="firstResponder"/> |
| @@ -384,8 +442,8 @@ | @@ -384,8 +442,8 @@ | ||
| 384 | <nil key="textColor"/> | 442 | <nil key="textColor"/> |
| 385 | <nil key="highlightedColor"/> | 443 | <nil key="highlightedColor"/> |
| 386 | </label> | 444 | </label> |
| 387 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="创建时间" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tOg-Dx-FMX"> | ||
| 388 | - <rect key="frame" x="16" y="303" width="69.5" height="21"/> | 445 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="创建时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tOg-Dx-FMX"> |
| 446 | + <rect key="frame" x="16" y="303" width="74" height="21"/> | ||
| 389 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 447 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 390 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 448 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 391 | <nil key="highlightedColor"/> | 449 | <nil key="highlightedColor"/> |
| @@ -419,7 +477,6 @@ | @@ -419,7 +477,6 @@ | ||
| 419 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Nwx-qi-TmG"> | 477 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Nwx-qi-TmG"> |
| 420 | <rect key="frame" x="16" y="0.0" width="343" height="290"/> | 478 | <rect key="frame" x="16" y="0.0" width="343" height="290"/> |
| 421 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 479 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 422 | - <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.阿萨德会卡死对方不懂撒八十 按时 啊施工方按时啊 按时按时按时按时按时按时按时按时啊啊发送按时按时按时阿萨斯按时按时阿斯顿发的说法是发送到发送到发斯蒂芬啊啊的所发生的法守法的司法手段办公室的风格无法改变第三方合法工本费撒da.阿萨德会卡死对方不懂撒八十 按时 啊施工方按时啊 按时按时按时按时按时按时按时按时啊啊发送按时按时按时阿萨斯按时按时阿斯顿发的说法是发送到发送到发斯蒂芬啊啊的所发生的法守法的司法手段办公室的风格无法改变第三方合法工本费撒</string> | ||
| 423 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 480 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 424 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> | 481 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> |
| 425 | </textView> | 482 | </textView> |
| @@ -433,7 +490,7 @@ | @@ -433,7 +490,7 @@ | ||
| 433 | </constraints> | 490 | </constraints> |
| 434 | </view> | 491 | </view> |
| 435 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="04n-fF-iSZ"> | 492 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="04n-fF-iSZ"> |
| 436 | - <rect key="frame" x="93" y="303" width="42" height="21"/> | 493 | + <rect key="frame" x="97.5" y="303" width="42" height="21"/> |
| 437 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 494 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 438 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> | 495 | <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> |
| 439 | <nil key="highlightedColor"/> | 496 | <nil key="highlightedColor"/> |
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
| @@ -19,11 +19,13 @@ class TVStationViewController: UIViewController { | @@ -19,11 +19,13 @@ class TVStationViewController: UIViewController { | ||
| 19 | super.viewDidLoad() | 19 | super.viewDidLoad() |
| 20 | self.configTheme() | 20 | self.configTheme() |
| 21 | getDataList() | 21 | getDataList() |
| 22 | + self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .search, target: self, action: #selector(TVStationViewController.pushToSeachViewController)) | ||
| 22 | // Do any additional setup after loading the view. | 23 | // Do any additional setup after loading the view. |
| 23 | } | 24 | } |
| 24 | 25 | ||
| 25 | func pushToSeachViewController(){ | 26 | func pushToSeachViewController(){ |
| 26 | let vc = Story.instantiateViewControllerWithIdentifier("SearchTVStationListViewControllerVC", storyName: "TVStation") as! SearchTVStationListViewController | 27 | let vc = Story.instantiateViewControllerWithIdentifier("SearchTVStationListViewControllerVC", storyName: "TVStation") as! SearchTVStationListViewController |
| 28 | + vc.title = "搜索电视台" | ||
| 27 | self.navigationController?.pushViewController(vc, animated: true) | 29 | self.navigationController?.pushViewController(vc, animated: true) |
| 28 | } | 30 | } |
| 29 | 31 |