Commit 642a5f75edf89e62701bd734d2ad31f2cb217ea0
1 parent
9fdd262d
Exists in
newLive
no message
Showing
3 changed files
with
22 additions
and
3 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
| @@ -731,7 +731,7 @@ | @@ -731,7 +731,7 @@ | ||
| 731 | <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> | 731 | <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> |
| 732 | <nil key="highlightedColor"/> | 732 | <nil key="highlightedColor"/> |
| 733 | </label> | 733 | </label> |
| 734 | - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZWf-Th-UTw"> | 734 | + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZWf-Th-UTw"> |
| 735 | <rect key="frame" x="0.0" y="0.0" width="128" height="128"/> | 735 | <rect key="frame" x="0.0" y="0.0" width="128" height="128"/> |
| 736 | <constraints> | 736 | <constraints> |
| 737 | <constraint firstAttribute="width" secondItem="ZWf-Th-UTw" secondAttribute="height" multiplier="1:1" id="u0O-8v-OqH"/> | 737 | <constraint firstAttribute="width" secondItem="ZWf-Th-UTw" secondAttribute="height" multiplier="1:1" id="u0O-8v-OqH"/> |
| @@ -1656,7 +1656,7 @@ | @@ -1656,7 +1656,7 @@ | ||
| 1656 | <image name="icon_tvstation" width="25" height="25"/> | 1656 | <image name="icon_tvstation" width="25" height="25"/> |
| 1657 | <image name="icon_user" width="25" height="25"/> | 1657 | <image name="icon_user" width="25" height="25"/> |
| 1658 | <image name="icon_watchcount" width="12" height="7"/> | 1658 | <image name="icon_watchcount" width="12" height="7"/> |
| 1659 | - <image name="starLive" width="22" height="22"/> | 1659 | + <image name="starLive" width="30" height="30"/> |
| 1660 | <image name="视窗.png" width="31" height="31"/> | 1660 | <image name="视窗.png" width="31" height="31"/> |
| 1661 | </resources> | 1661 | </resources> |
| 1662 | </document> | 1662 | </document> |
YouerLiveVideo/YouerLiveVideo/controllers/HomePage/MainHomeTableViewController.swift
| @@ -403,7 +403,15 @@ class HomeFourTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollecti | @@ -403,7 +403,15 @@ class HomeFourTableViewCell: UITableViewCell,UICollectionViewDelegate,UICollecti | ||
| 403 | } | 403 | } |
| 404 | func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { | 404 | func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { |
| 405 | //点击进入学校 appRootViewController() | 405 | //点击进入学校 appRootViewController() |
| 406 | - NSLog("点击了****\(dataSet[indexPath.row])") | 406 | + let vc = Story.instantiateViewControllerWithIdentifier("TVStationInforViewControllerVC", storyName: "TVStation") as! TVStationInforViewController |
| 407 | + if collectionView.tag == 1{ | ||
| 408 | + vc.TVStationProgram = TVStationInfor(item: dataSet[indexPath.row]) | ||
| 409 | + vc.title = dataSet[indexPath.row].f_Title | ||
| 410 | + }else if collectionView.tag == 3{ | ||
| 411 | + vc.title = dataSet[indexPath.row].f_Title | ||
| 412 | + vc.excellentTVStationProgram = TVStationSubject(item: dataSet[indexPath.row]) | ||
| 413 | + } | ||
| 414 | + ((appRootViewController().childViewControllers[0] as! MViewController).selectedViewController as! UINavigationController).pushViewController(vc, animated: true) | ||
| 407 | } | 415 | } |
| 408 | func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { | 416 | func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { |
| 409 | return CGSize(width: (getScreenWidth()-40)/3, height: (getScreenWidth()-40)/3+30) | 417 | return CGSize(width: (getScreenWidth()-40)/3, height: (getScreenWidth()-40)/3+30) |
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
| @@ -241,6 +241,11 @@ class TVStationInfor { | @@ -241,6 +241,11 @@ class TVStationInfor { | ||
| 241 | f_IsExcellent = json["f_IsExcellent"].boolValue | 241 | f_IsExcellent = json["f_IsExcellent"].boolValue |
| 242 | f_Url = json["f_Url"].stringValue | 242 | f_Url = json["f_Url"].stringValue |
| 243 | } | 243 | } |
| 244 | + init(item:MicroCourseModel){ | ||
| 245 | + f_Logo=item.f_Img | ||
| 246 | + f_SchoolName=item.f_Title | ||
| 247 | + f_CreatorTime=item.f_CreatorTime | ||
| 248 | + } | ||
| 244 | } | 249 | } |
| 245 | 250 | ||
| 246 | class TVStationSubject { | 251 | class TVStationSubject { |
| @@ -316,4 +321,10 @@ class TVStationSubject { | @@ -316,4 +321,10 @@ class TVStationSubject { | ||
| 316 | f_TelevisionId = json["f_TelevisionId"].stringValue | 321 | f_TelevisionId = json["f_TelevisionId"].stringValue |
| 317 | 322 | ||
| 318 | } | 323 | } |
| 324 | + init(item:MicroCourseModel){ | ||
| 325 | + f_Img=item.f_Img | ||
| 326 | + f_Title=item.f_Title | ||
| 327 | + f_CreatorTime=item.f_CreatorTime | ||
| 328 | + f_Detail=item.f_Detail | ||
| 329 | + } | ||
| 319 | } | 330 | } |