Browse Source

剩下音乐,滤镜内存泄露

南鑫林 5 years ago
parent
commit
32fd440560

+ 39 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import FSPagerView
+import SwiftyMediator
 
 class CommunityBannerTableViewCell: UITableViewCell {
 
@@ -111,7 +112,44 @@ extension CommunityBannerTableViewCell:FSPagerViewDataSource,FSPagerViewDelegate
     
     func pagerView(_ pagerView: FSPagerView, didSelectItemAt index: Int) {
         pagerView.deselectItem(at: index, animated: true)
-        NotificationCenter.default.post(name: NSNotification.Name("CommunityBannerClosure"), object: communityRecommendTypeDataModels?[index])
+        
+        let communityRecommendTypeDataModel = communityRecommendTypeDataModels?[index]
+        let communityBannerType = CommunityBannerType(rawValue: communityRecommendTypeDataModel?.type ?? 0)
+        switch communityBannerType {
+        case .none?:
+            break
+        case .content?: //内容
+            let postType = PostType(rawValue: communityRecommendTypeDataModel?.postType ?? "image")
+            switch postType {
+            case .image?,.html?:
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityRecommendTypeDataModel?.linkContentId ?? 0)"))
+                break
+            case .video?:
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityRecommendTypeDataModel?.linkContentId ?? 0)", departType: DepartureVCType.personal, topicId: 0))
+                break
+            default:
+                break
+            }
+            break
+        case .user?: //个人中心
+            if communityRecommendTypeDataModel?.linkContentId ?? 0 != UserModel.shared().getModel()?.uid {
+                if communityRecommendTypeDataModel?.linkContentId ?? 0 != UserModel.shared().getModel()?.uid {
+                    Mediator.push(MineRouterModuleType.pushOtherPersonalCenter(uid: communityRecommendTypeDataModel?.linkContentId ?? 0))
+                }
+            }
+            
+            break
+        case .activity?: //活动
+            Mediator.push(H5RouterModuleType.pushActivityId(id: "\(communityRecommendTypeDataModel?.linkContentId ?? 0)"))
+            break
+        case .topic?: //话题
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityRecommendTypeDataModel?.linkContentId ?? 0))
+            break
+        default:
+            break
+            
+        }
+        
     }
     
     func pagerViewWillEndDragging(_ pagerView: FSPagerView, targetIndex: Int) {

+ 1 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -27,6 +27,7 @@ class CommunityNavigationBarView: BaseView {
     
     override func setupViews() {
         scrollNumberLabel = DPScrollNumberLabel.init(number: 0, fontSize: 16, textColor: kFFA42FColor, signSetting: SignSetting.unsigned)
+        scrollNumberLabel?.addTapGesture(1, target: self, action: #selector(skittles))
         addSubview(leftButton)
         addSubview(rightButton)
         addSubview(scrollNumberLabel!)

+ 0 - 49
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -191,55 +191,6 @@ class CommunityViewController: BaseViewController {
             self?.navigationController?.pushViewController(vc, animated: true)
         }
         
-        // banner跳转
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityBannerClosure"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
-            let communityRecommendTypeDataModel = notification.object as? CommunityRecommendTypeDataModel
-            let communityBannerType = CommunityBannerType(rawValue: communityRecommendTypeDataModel?.type ?? 0)
-            switch communityBannerType {
-            case .none?:
-                break
-            case .content?: //内容
-                let postType = PostType(rawValue: communityRecommendTypeDataModel?.postType ?? "image")
-                switch postType {
-                case .image?:
-                    let vc = CommunityRecommendController()
-                    vc.id = communityRecommendTypeDataModel?.linkContentId ?? 0
-                    self?.navigationController?.pushViewController(vc, animated: true)
-                    break
-                case .html?:
-                    let vc = CommunityRecommendController()
-                    vc.id = communityRecommendTypeDataModel?.linkContentId ?? 0
-                    self?.navigationController?.pushViewController(vc, animated: true)
-                    break
-                case .video?:
-                    let vc = CommunityVideoListController()
-                    vc.contentId = communityRecommendTypeDataModel?.linkContentId ?? 0
-                    self?.navigationController?.pushViewController(vc, animated: true)
-                    break
-                default:
-                    break
-                }
-                break
-            case .user?: //找朋友
-                if communityRecommendTypeDataModel?.linkContentId ?? 0 != UserModel.shared().getModel()?.uid {
-                    let vc = OtherPersonalCenterViewController()
-                    vc.uid = communityRecommendTypeDataModel?.linkContentId ?? 0
-                    self?.navigationController?.pushViewController(vc, animated: true)
-                }
-                
-                break
-            case .activity?: //活动
-                Mediator.push(H5RouterModuleType.pushActivityId(id: "\(communityRecommendTypeDataModel?.linkContentId ?? 0)"))
-                break
-            case .topic?: //话题
-                Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityRecommendTypeDataModel?.linkContentId ?? 0))
-                break
-            default:
-                break
-                
-            }
-        }
-        
         // 待发布
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("DismissFromPublishEditVc"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             self?.reloadSegmentedFollowView()

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/ViewController/CommunitySubCommentController.swift

@@ -214,11 +214,11 @@ extension CommunitySubCommentController: UITableViewDataSource, UITableViewDeleg
                     self?.communityPostReplyModel = self?.communityPostReplyModels[indexPath.row]
                     self?.showKeyBoardCommentView(placeholder: "回复:@\(self?.communityPostReplyModel?.username ?? "")")
                     }, deleteClosure: {
-                        [weak self] in
+                        [weak self,weak tableView] in
                         self?.communityPostReplyModel?.isDelete = 1
                         self?.communityPostReplyModel?.content = "该回复已被删除"
 
-                        tableView.reloadData()
+                        tableView?.reloadData()
                 })
             }else {
                 SwiftProgressHUD.shared().showText("该评论已删除,暂时不能评论")

+ 4 - 3
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityAllCommentView.swift

@@ -189,7 +189,8 @@ class CommunityAllCommentView: FWPopupView {
             }
         }
         commentView.disTransBlock = {
-            commentView.hide()
+            [weak commentView] in
+            commentView?.hide()
         }
         return commentView
     }
@@ -225,10 +226,10 @@ extension CommunityAllCommentView : UITableViewDelegate, UITableViewDataSource {
                     self?.communityPostCommentModel = self?.communityPostCommentModels[indexPath.row]
                     self?.showKeyBoardCommentView(placeholder:"回复:@\(self?.communityPostCommentModel?.username ?? "")")
                     }, deleteClosure: {
-                        [weak self] in
+                        [weak self,weak tableView] in
                         self?.communityPostCommentModel?.isDelete = 1
                         self?.communityPostCommentModel?.content = "该评论已被删除"
-                        tableView.reloadData()
+                        tableView?.reloadData()
                 })
             }else {
                 SwiftProgressHUD.shared().showText("该评论已删除,暂时不能评论")

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -458,7 +458,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
                 kAppDelegate.setLogin()
             }else {
                 if let shareClosure = self?.shareClosure {
-                    shareClosure(self!.videoItemMdl!)
+                    shareClosure((self?.videoItemMdl)!)
                 }
             }
 

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoSubCommentController/CommunityVideoSubCommentController.swift

@@ -211,10 +211,10 @@ extension CommunityVideoSubCommentController: UITableViewDataSource, UITableView
                     [weak self] in
                     self?.showKeyBoardCommentView(placeholder: "回复:@\(self?.communityPostReplyModel?.username ?? "")")
                     }, deleteClosure: {
-                        [weak self] in
+                        [weak self,weak tableView] in
                         self?.communityPostReplyModel?.isDelete = 1
                         self?.communityPostReplyModel?.content = "该回复已被删除"
-                        tableView.reloadData()
+                        tableView?.reloadData()
                 })
             }else {
                 SwiftProgressHUD.shared().showText("该评论已删除,暂时不能评论")