IOSGroup / NewLive

Download as
Browse Code »

Commit 9f0d941aed57ed2892aa725f1bc69367e7339e48

Authored by 葛建军
1 parent ff32ea10
Exists in newLive

细节及默认图片修改。

Showing 4 changed files with 9 additions and 9 deletions   Show diff stats
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
  Diff comments   View file @9f0d941
... ... @@ -870,14 +870,14 @@
870 870 <rect key="frame" x="0.0" y="79" width="375" height="90"/>
871 871 <subviews>
872 872 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defphoto.png" translatesAutoresizingMaskIntoConstraints="NO" id="brI-5l-hmz">
873   - <rect key="frame" x="16" y="20" width="47" height="50"/>
  873 + <rect key="frame" x="16" y="20" width="50" height="50"/>
874 874 <constraints>
875 875 <constraint firstAttribute="height" constant="50" id="VpN-jf-Kgx"/>
876   - <constraint firstAttribute="width" secondItem="brI-5l-hmz" secondAttribute="height" multiplier="17:18" id="lia-o4-ohd"/>
  876 + <constraint firstAttribute="width" secondItem="brI-5l-hmz" secondAttribute="height" multiplier="1:1" id="lia-o4-ohd"/>
877 877 </constraints>
878 878 </imageView>
879 879 <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">
880   - <rect key="frame" x="79" y="35" width="42" height="21"/>
  880 + <rect key="frame" x="82" y="35" width="42" height="21"/>
881 881 <fontDescription key="fontDescription" type="system" pointSize="17"/>
882 882 <nil key="textColor"/>
883 883 <nil key="highlightedColor"/>
... ... @@ -1321,7 +1321,7 @@
1321 1321 <constraint firstItem="ZGv-kv-0Rn" firstAttribute="centerX" secondItem="kGy-5x-vFz" secondAttribute="centerX" id="vNd-db-ncO"/>
1322 1322 </constraints>
1323 1323 </view>
1324   - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="BvO-kc-ckg">
  1324 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="microCourse_default" translatesAutoresizingMaskIntoConstraints="NO" id="BvO-kc-ckg">
1325 1325 <rect key="frame" x="0.0" y="0.0" width="176" height="117.5"/>
1326 1326 <constraints>
1327 1327 <constraint firstAttribute="width" secondItem="BvO-kc-ckg" secondAttribute="height" multiplier="3:2" id="3vB-eh-5WC"/>
... ...
YouerLiveVideo/YouerLiveVideo/Info.plist
  Diff comments   View file @9f0d941
... ... @@ -56,7 +56,7 @@
56 56 </dict>
57 57 </array>
58 58 <key>CFBundleVersion</key>
59   - <string>5</string>
  59 + <string>6</string>
60 60 <key>LSApplicationQueriesSchemes</key>
61 61 <array>
62 62 <string>mqqopensdkapiV2</string>
... ...
YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift
  Diff comments   View file @9f0d941
... ... @@ -209,7 +209,7 @@ class ResourceViewController: UIViewController,UITableViewDelegate,UITableViewDa
209 209 }
210 210 //searchaBarDelegate
211 211 func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
212   - 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
  212 + 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
213 213 if success{
214 214 if CGFloat((self.searchAry.count+1)*44)>(getScreenHeight()-64){
215 215 self.searchTableHeight.constant=getScreenHeight()-64
... ...
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
  Diff comments   View file @9f0d941
... ... @@ -172,13 +172,13 @@ extension TVStationViewController:UICollectionViewDelegate,UICollectionViewDeleg
172 172 func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
173 173 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath) as! TVStationViewControllerCollectionCell
174 174 if collectionView.tag == 1{
175   - cell.image.sd_setImage(with: URL(string: topTenTVStation[indexPath.row].f_Logo), placeholderImage: UIImage(named:"icon"))
  175 + cell.image.sd_setImage(with: URL(string: topTenTVStation[indexPath.row].f_Logo), placeholderImage: UIImage(named:"microCourse_default"))
176 176 cell.tvStationName.text = topTenTVStation[indexPath.row].f_SchoolName
177 177 }else if collectionView.tag == 2{
178   - cell.image.sd_setImage(with: URL(string: xxcellentSchool[indexPath.row].f_Logo), placeholderImage: UIImage(named:"icon"))
  178 + cell.image.sd_setImage(with: URL(string: xxcellentSchool[indexPath.row].f_Logo), placeholderImage: UIImage(named:"microCourse_default"))
179 179 cell.tvStationName.text = xxcellentSchool[indexPath.row].f_SchoolName
180 180 }else if collectionView.tag == 3{
181   - cell.image.sd_setImage(with: URL(string: excellentTVStationProgram[indexPath.row].f_Img), placeholderImage: UIImage(named:"icon"))
  181 + cell.image.sd_setImage(with: URL(string: excellentTVStationProgram[indexPath.row].f_Img), placeholderImage: UIImage(named:"microCourse_default"))
182 182 cell.tvStationName.text = excellentTVStationProgram[indexPath.row].f_Title
183 183 }
184 184 return cell
... ...