iOS Team / CNLiveMateCode · Commits

Commit 664d0a9048c454f8a338962e8fa3c607eed3200e

Authored by “张旭”
1 parent dda1df7b

no message

Inline Side-by-side
Showing 1 changed file with 1 additions and 8 deletions
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
  View file @664d0a9
@@ -216,7 +216,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele @@ -216,7 +216,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
216 self.isSelectable = false 216 self.isSelectable = false
217 self.currentIndex = currentIndex 217 self.currentIndex = currentIndex
218 218
219 -  
220 if let mdl = slideModel{ 219 if let mdl = slideModel{
221 self.isDuanJuPlayer = true 220 self.isDuanJuPlayer = true
222 for (idx,model) in mdl.contents.enumerated() { 221 for (idx,model) in mdl.contents.enumerated() {
@@ -234,7 +233,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele @@ -234,7 +233,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
234 } 233 }
235 self.pageNum = page 234 self.pageNum = page
236 self.slideModel = slideModel 235 self.slideModel = slideModel
237 -  
238 } 236 }
239 237
240 override func viewWillAppear(_ animated: Bool) { 238 override func viewWillAppear(_ animated: Bool) {
@@ -607,9 +605,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele @@ -607,9 +605,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
607 if self.pageNum == 1 { 605 if self.pageNum == 1 {
608 self.dataArray.removeAllObjects() 606 self.dataArray.removeAllObjects()
609 self.dataURLArray.removeAllObjects() 607 self.dataURLArray.removeAllObjects()
610 -// if self.currentIndex == 0 {  
611 -// self.tableView.setContentOffset(CGPoint.zero, animated: false)  
612 -// }  
613 } 608 }
614 var listArray = [CNLiveAlbumListModel]() 609 var listArray = [CNLiveAlbumListModel]()
615 var urlArray = [String]() 610 var urlArray = [String]()
@@ -648,9 +643,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele @@ -648,9 +643,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
648 } 643 }
649 self.tableView.refreshControl?.endRefreshing() 644 self.tableView.refreshControl?.endRefreshing()
650 self.tableView.reloadData() 645 self.tableView.reloadData()
651 -// if self.pageNum == 1 {  
652 -// self.tableView.contentOffset = CGPoint.zero  
653 -// } 646 +
654 let hasNextPage = (result as! [Any])[1] as! Bool 647 let hasNextPage = (result as! [Any])[1] as! Bool
655 if listArray.count == 0 && urlArray.count == 0 { 648 if listArray.count == 0 && urlArray.count == 0 {
656 if !hasNextPage { 649 if !hasNextPage {