Browse Source

1.更新刷新空间

wenweiwei 3 năm trước cách đây
mục cha
commit
581a57abd2

+ 3 - 2
MusicVideoPlus/Classes/Modules/Home/Controllers/MVHomeController.swift

@@ -511,9 +511,10 @@ extension MVHomeController {
                 rootViewController = (rootViewController as? UINavigationController)?.visibleViewController
             }
             BFLog(message: "rootViewController is \(rootViewController)")
-            if rootViewController is MVHomeController {
+            if rootViewController is MVHomeController && cell != nil && cell?.videoData != nil{
                 cell?.pauseView.isHidden = true
-                PQSingletoVideoPlayer.shared.resumePlayer()
+                PQSingletoVideoPlayer.shared.configPlyer(videoData: (cell?.videoData)!, controllerView: cell!.converView)
+                PQSingletoVideoPlayer.shared.startPlayr()
             }
         }
     }

+ 18 - 3
MusicVideoPlus/Classes/Modules/Mine/Controllers/MVPlayViewController.swift

@@ -45,9 +45,17 @@ class MVPlayViewController: PQBaseViewController {
         } else {
             automaticallyAdjustsScrollViewInsets = false
         }
-        collectionView.addRefreshView { [weak self] isRefresh in
+        collectionView.addRefreshView(type: .REFRESH_TYPE_HEADER) { [weak self] isRefresh in
             self?.loadRequestData(isRefresh: isRefresh)
         }
+        // MJRefreshBackNormalFooter 不会附在上面
+        // MJRefreshAutoFooter 不会便宜
+        let footer = MJRefreshBackNormalFooter.init {[weak self] in
+            self?.loadRequestData(isRefresh: false)
+        }
+        footer.setTitle("暂时没有更多了", for: .noMoreData)
+        footer.setTitle("精彩内容正在加载中...", for: .refreshing)
+        collectionView.mj_footer = footer
         return collectionView
     }()
 
@@ -138,8 +146,15 @@ class MVPlayViewController: PQBaseViewController {
             } else {
                 self?.pageNum = (self?.pageNum ?? 1) - 1
             }
-            self?.collectionView.mj_header?.endRefreshing()
-            self?.collectionView.mj_footer?.endRefreshing()
+//            if isRefresh {
+//                self?.collectionView.mj_header?.endRefreshing()
+//                self?.collectionView.mj_footer?.resetNoMoreData()
+//            } else {
+//                self?.collectionView.mj_footer?.endRefreshing()
+//            }
+//            if (videoList?.count ?? 0) < 20 && videoList != nil {
+//                self?.collectionView.mj_footer?.endRefreshingWithNoMoreData()
+//            }
         }
     }
 

+ 1 - 1
Podfile

@@ -10,7 +10,7 @@ target 'MusicVideoPlus' do
  
   # 使用本地路径
 #  pod 'BFFramework', :path => '/Users/ak/Desktop/BFFramework/'
-  #pod 'BFFramework', :path => '/Users/sanw/Desktop/BytesFlow/Projects/BFFramework/'
+#  pod 'BFFramework', :path => '/Users/sanw/Desktop/BytesFlow/Projects/BFFramework/'
 
   pod 'JWTDecode','2.6.0' # Apple登陆校验库
   pod 'TYAttributedLabel','2.6.9' #  富文本