From 9f0d941aed57ed2892aa725f1bc69367e7339e48 Mon Sep 17 00:00:00 2001
From: 葛建军 <jun@gejianjundeMac-mini.local>
Date: Fri, 26 May 2017 14:00:10 +0800
Subject: [PATCH] 细节及默认图片修改。

---
 YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard                          | 8 ++++----
 YouerLiveVideo/YouerLiveVideo/Info.plist                                          | 2 +-
 YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift   | 2 +-
 YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
index 6eb23e2..1e24c39 100644
--- a/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
@@ -870,14 +870,14 @@
                                 <rect key="frame" x="0.0" y="79" width="375" height="90"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto.png" translatesAutoresizingMaskIntoConstraints="NO" id="brI-5l-hmz">
-                                        <rect key="frame" x="16" y="20" width="47" height="50"/>
+                                        <rect key="frame" x="16" y="20" width="50" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="VpN-jf-Kgx"/>
-                                            <constraint firstAttribute="width" secondItem="brI-5l-hmz" secondAttribute="height" multiplier="17:18" id="lia-o4-ohd"/>
+                                            <constraint firstAttribute="width" secondItem="brI-5l-hmz" secondAttribute="height" multiplier="1:1" id="lia-o4-ohd"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nqw-kl-w72">
-                                        <rect key="frame" x="79" y="35" width="42" height="21"/>
+                                        <rect key="frame" x="82" y="35" width="42" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1321,7 +1321,7 @@
                                                                             <constraint firstItem="ZGv-kv-0Rn" firstAttribute="centerX" secondItem="kGy-5x-vFz" secondAttribute="centerX" id="vNd-db-ncO"/>
                                                                         </constraints>
                                                                     </view>
-                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="BvO-kc-ckg">
+                                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="microCourse_default" translatesAutoresizingMaskIntoConstraints="NO" id="BvO-kc-ckg">
                                                                         <rect key="frame" x="0.0" y="0.0" width="176" height="117.5"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" secondItem="BvO-kc-ckg" secondAttribute="height" multiplier="3:2" id="3vB-eh-5WC"/>
diff --git a/YouerLiveVideo/YouerLiveVideo/Info.plist b/YouerLiveVideo/YouerLiveVideo/Info.plist
index 62f7034..2ecf6c2 100644
--- a/YouerLiveVideo/YouerLiveVideo/Info.plist
+++ b/YouerLiveVideo/YouerLiveVideo/Info.plist
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>mqqopensdkapiV2</string>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift
index 220896a..ebe9afe 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift
@@ -209,7 +209,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
     }
     //searchaBarDelegate
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
-        refreshLivesAction(isSearch: true,parameters: ["type":0 as AnyObject,"orderby":1 as AnyObject,"pageIndex":1 as AnyObject,"keyword":searchBar.text as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
+        refreshLivesAction(isSearch: true,parameters: ["type":1 as AnyObject,"orderby":1 as AnyObject,"pageIndex":1 as AnyObject,"keyword":searchBar.text as AnyObject,"pageSize":10 as AnyObject], completionHandler: { (success) in
             if success{
                 if CGFloat((self.searchAry.count+1)*44)>(getScreenHeight()-64){
                     self.searchTableHeight.constant=getScreenHeight()-64
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
index 18825eb..53ed77a 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
@@ -172,13 +172,13 @@ extension TVStationViewController:UICollectionViewDelegate,UICollectionViewDeleg
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath) as! TVStationViewControllerCollectionCell
         if collectionView.tag == 1{
-            cell.image.sd_setImage(with: URL(string: topTenTVStation[indexPath.row].f_Logo), placeholderImage: UIImage(named:"icon"))
+            cell.image.sd_setImage(with: URL(string: topTenTVStation[indexPath.row].f_Logo), placeholderImage: UIImage(named:"microCourse_default"))
             cell.tvStationName.text = topTenTVStation[indexPath.row].f_SchoolName
         }else if collectionView.tag == 2{
-            cell.image.sd_setImage(with: URL(string: xxcellentSchool[indexPath.row].f_Logo), placeholderImage: UIImage(named:"icon"))
+            cell.image.sd_setImage(with: URL(string: xxcellentSchool[indexPath.row].f_Logo), placeholderImage: UIImage(named:"microCourse_default"))
             cell.tvStationName.text = xxcellentSchool[indexPath.row].f_SchoolName
         }else if collectionView.tag == 3{
-            cell.image.sd_setImage(with: URL(string: excellentTVStationProgram[indexPath.row].f_Img), placeholderImage: UIImage(named:"icon"))
+            cell.image.sd_setImage(with: URL(string: excellentTVStationProgram[indexPath.row].f_Img), placeholderImage: UIImage(named:"microCourse_default"))
             cell.tvStationName.text = excellentTVStationProgram[indexPath.row].f_Title
         }
         return cell
--
libgit2 0.21.0