解决短剧大图cell点击crash问题

“zhangxu@cnlive.com”
1 parent dc564c43
Showing 3 changed files with 24 additions and 14 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNSlideBaseNavigationController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/Util/CNUpSlideAnimationTransition.swift
@@ -17,6 +17,9 @@ class CNSlideBaseNavigationController: UINavigationController
         self.cellType = cellType
     }
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    }
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -246,7 +246,8 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             }else if slideModel.type == SlideModelTypeOneCourse75{
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
+                let detailViewC = CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType) 
+                let detailVC = CNSlideBaseNavigationController(rootViewController: detailViewC, cellType: cellType)
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
@@ -203,20 +203,26 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             let toVCNav = toVCTabbar.viewControllers?.first as! CNLiveBaseNavigationController
             let toVC = toVCNav.viewControllers.first as! CNLiveAuthViewController
             guard let selectedCell = toVC.selectedCell else { return }
-            let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
-            
-            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
-                let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
-                fromVC.view.frame = frame
-                fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
-                fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
-                fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
-                fromVC.closeBtn.alpha = 0
-                
-            }) { (completed) in
-                transitionContext.completeTransition(completed)
+            if fromNaviVC.topViewController is CNUpSlideDetailViewController{
+                let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
+                UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                    let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
+                    fromVC.view.frame = frame
+                    fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+                    fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+                    fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+                    fromVC.closeBtn.alpha = 0
+                    
+                }) { (completed) in
+                    transitionContext.completeTransition(completed)
+                }
+            }else if fromNaviVC.topViewController is CNLiveShortVideoViewController{
+                let fromVC = fromNaviVC.topViewController as! CNLiveShortVideoViewController
+                transitionContext.completeTransition(true)
+            }else{
+                print("")
             }
-
+            
         }
     }