商品 , 店铺分类跳转 ;

所有vc true

商品 , 店铺分类跳转 ;
所有vc true
张旭
1 parent 4736d036
Showing 15 changed files with 94 additions and 89 deletions
metaCode/Classes/CustomView/CNLiveAlertTool.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideCardPresentationController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveCreateShopClassifyViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailBtnsCell.swift
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailOrderAssetCell.swift
metaCode/Classes/Main/HomePage/View/CNLliveShopDetailBannerCell.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/Util/CNLiveCommonManager.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerView.swift
@@ -21,7 +21,7 @@ class AlertTool: NSObject {
     static func showSystemAlert(title:String?, message:String?, actionTitles:Array<String>, cancelTitle:String="", style:UIAlertController.Style, actionStyles:Array<UIAlertAction.Style>=[], completion: @escaping ((_ index: Int) -> ())) {
  
         let vc = UIApplication.shared.keyWindow?.rootViewController
-        vc?.dismiss(animated: false)
+        vc?.dismiss(animated: true)
  
         DispatchQueue.main.async {
             let alertController = UIAlertController(title: title, message: message, preferredStyle: style)
@@ -87,11 +87,11 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
         let itemModel = listMdl.list[indexPath.item]
         if itemModel.type == CNLiveShopConsoleType.XZSP.rawValue{
             //商城新增商品
-            
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: true)
  
         }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{
             //商城商品管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: true)
         }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{
             //新增优惠券
  
@@ -100,7 +100,9 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
  
         }else if itemModel.type == CNLiveShopConsoleType.CreateShopClassify.rawValue{
             //创建店铺分类
-            
+            let vc = CNLiveCreateShopClassifyViewController()
+            vc.classifyType = .oneLevelClassify
+            currentViewController()?.navigationController?.pushViewController(vc, animated: true)
         }else if itemModel.type == CNLiveShopConsoleType.ShopClassifyManager.rawValue{
             //店铺分类管理
  
@@ -112,7 +114,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
  
         }else if itemModel.type == CNLiveShopConsoleType.DDGL.rawValue{
             //订单管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
         }
 //        else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{
 //            //退款/售后
@@ -120,12 +122,12 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
 //        }
         else if itemModel.type == CNLiveShopConsoleType.JYJL.rawValue{
             //交易记录
-            
+            self.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: true)
         }else if itemModel.type == CNLiveShopConsoleType.OnManagerment.rawValue{
             //直播管理
             let webVC =  CNWebViewController()
             webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php")
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
         }
     }
  
@@ -22,7 +22,7 @@ class CNUpSlideCardPresentationController: UIPresentationController {
         blurView.edges(to: container)
         blurView.alpha = 0.0
  
-        presentingViewController.beginAppearanceTransition(false, animated: false)
+        presentingViewController.beginAppearanceTransition(false, animated: true)
         presentedViewController.transitionCoordinator!.animate(alongsideTransition: { (ctx) in
             self.blurView.effect = UIBlurEffect(style: .light)
             self.blurView.alpha = 1
@@ -324,7 +324,9 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
             if status == .success{
                 showMessage(message: "保存成功")
                 self.navigationController?.popViewController(animated: true)
-                self.successCompleteBlock!()
+                if (self.successCompleteBlock?()) != nil{
+                    self.successCompleteBlock!()
+                }
             }else{
                 showMessage(message: "保存失败")
             }
@@ -278,6 +278,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
  
     // MARK: - 显示/隐藏方法
     public func display(){
+
         self.view.isUserInteractionEnabled = true
         UIView.animate(withDuration: 0.2) {
             self.shadowView?.alpha = 1
@@ -478,7 +479,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         vc.successCompleteBlock = {
             self.postShopClassify()
         }
-        self.navigationController?.pushViewController(vc, animated: false)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
  
     // MARK: - 数据请求
@@ -58,12 +58,11 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     singleView1.layoutSubviews()
                 }
                 self.addChild(vc)
-                vc.view.frame = CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height-KNavigationHeight)
+                vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
                 vc.didMove(toParent: self)
                 self.view.addSubview(vc.view)
                 _selectCategoryVC = vc
             }
-            
             return _selectCategoryVC
         }
         set{
@@ -72,56 +71,62 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
  
         }
     }
-
-    //    lazy var selectCategoryVC :CNLiveGoodsCategoryController = {
+    
+    var _selectShopClassifyVC:CNLiveGoodsCategoryController?
+    var selectShopClassifyVC:CNLiveGoodsCategoryController?{
+        get{
+            if _selectShopClassifyVC == nil{
+                let vc = CNLiveGoodsCategoryController()
+                
+                vc.categoryType = .shop
+                if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
+                    vc.firCategoryId = self.shopGoodsDetailsModel.category_id
+                    vc.secCategoryId = self.shopGoodsDetailsModel.category_id2
+                }
+                vc.finishBlock = {
+                    var singleView = self.getShopClassifyView()
+                    singleView?.contentTextField.text = "\(self.selectShopClassifyVC!.firCategoryName ?? "") \(self.selectShopClassifyVC!.secCategoryName ?? "")"
+                    singleView?.layoutSubviews()
+                }
+                self.addChild(vc)
+                vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+                self.view.addSubview(vc.view)
+                vc.didMove(toParent: self)
+                _selectShopClassifyVC = vc
+                _selectShopClassifyVC!.hideView()
+            }
+            return _selectShopClassifyVC
+        }
+        set{
+            _selectShopClassifyVC = newValue
+        }
+    }
+//    lazy var selectShopClassifyVC:CNLiveGoodsCategoryController = {
+//        if selectShopClassifyVC == nil{
 //            let vc = CNLiveGoodsCategoryController()
-//            vc.categoryType = .goods
+//            
+//            vc.categoryType = .shop
 //            if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
-//                vc.firCategoryId = self.shopGoodsDetailsModel.groupid
-//                vc.secCategoryId = self.shopGoodsDetailsModel.groupid2
-//                vc.thiCategoryId = self.shopGoodsDetailsModel.groupid3
+//                vc.firCategoryId = self.shopGoodsDetailsModel.category_id
+//                vc.secCategoryId = self.shopGoodsDetailsModel.category_id2
 //            }
 //            vc.finishBlock = {
-//                //商品分类
-//                let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
-//                singleView1.contentTextField.text = "\(self.selectCategoryVC.firCategoryName ?? "") \(self.selectCategoryVC.secCategoryName ?? "")"
-//                singleView1.layoutSubviews()
+//                var singleView = self.getShopClassifyView()
+//                singleView?.contentTextField.text = "\(self.selectShopClassifyVC.firCategoryName ?? "") \(self.selectShopClassifyVC.secCategoryName ?? "")"
+//                singleView?.layoutSubviews()
 //            }
-////            self.addChild(vc)
-////            vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
-////            vc.didMove(toParent: self)
-////            self.view.addSubview(vc.view)
-//            self.selectCategoryVC = vc
-//
-//        return selectCategoryVC
+//            self.addChild(vc)
+//            vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+//            self.view.addSubview(vc.view)
+//            vc.didMove(toParent: self)
+//            self.selectShopClassifyVC = vc
+//            self.selectShopClassifyVC.hideView()
+//        }
+//        return self.selectShopClassifyVC
+//        
 //    }()
  
  
-    lazy var selectShopClassifyVC:CNLiveGoodsCategoryController = {
-        
-        let vc = CNLiveGoodsCategoryController()
-        
-        vc.categoryType = .shop
-        if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
-            vc.firCategoryId = self.shopGoodsDetailsModel.category_id
-            vc.secCategoryId = self.shopGoodsDetailsModel.category_id2
-        }
-        vc.finishBlock = {
-            var singleView = self.getShopClassifyView()
-            singleView?.contentTextField.text = "\(self.selectShopClassifyVC.firCategoryName ?? "") \(self.selectShopClassifyVC.secCategoryName ?? "")"
-            singleView?.layoutSubviews()
-        }
-        self.addChild(vc)
-        vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
-        self.view.addSubview(vc.view)
-        vc.didMove(toParent: self)
-        self.selectShopClassifyVC = vc
-        self.selectShopClassifyVC.hideView()
-        return self.selectShopClassifyVC
-        
-    }()
-
-    
     lazy var bottomNavView :UIView = {
         let bottomNavView = UIView(frame: CGRect(x: 0, y: KSreenHeight-KTabBarHeight, width: self.view.width, height: KTabBarHeight))
         bottomNavView.backgroundColor = HexColor("F2F2F2")
@@ -144,23 +149,21 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         self.bgScrollView.frame = CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight)
         var lastView:UIView? = nil
         for i in 0..<self.dataModel.list.count{
-            if let singleView = self.view.viewWithTag(i+1) as? CNLiveShopAddGoodsSingleView{
+            let singleView = self.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
                 singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: singleView.height)
                 if i+1 == 15{
                     singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: 0.001)
                 }
                 lastView = singleView
-            }else{
-                
-            }
+            
         }
         self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: lastView?.bottom ?? 0)
-        self.selectCategoryVC!.view.frame = CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height-KNavigationHeight)
+        self.selectCategoryVC!.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
     }
  
     deinit {
         for i in 0..<self.dataModel.list.count{
-            let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+            let singleView = self.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
             if singleView.addEditGoodsListModel?.style == "3"{
                 singleView.uploadImageView.deleteUploadImageUrlAfterCancelUploadThings()
             }
@@ -324,10 +327,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
  
     // MARK: - 显示选取分类界面
     func displaySelectCategoryVC(){
-//        self.addChild(self.selectCategoryVC!)
-//        self.selectCategoryVC!.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
-//        self.selectCategoryVC!.didMove(toParent: self)
-//        self.view.addSubview(self.selectCategoryVC!.view)
+        self.view.bringSubviewToFront(self.selectCategoryVC!.view)
         self.selectCategoryVC!.display()
     }
  
@@ -345,7 +345,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     }
     // MARK: - 显示选取店铺分类界面
     func displaySelectShopClassifyVC(){
-        self.selectShopClassifyVC.display()
+        self.selectShopClassifyVC!.display()
     }
  
     // MARK: - 字符串trim处理
@@ -415,7 +415,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             showMessage(message: "请选择商品详情图")
             return
         }
-        else if (self.selectShopClassifyVC.firCategoryId == 0) {
+        else if (self.selectShopClassifyVC!.firCategoryId == 0) {
             showMessage(message: "请选择店铺分类")
             return
         }
@@ -440,8 +440,8 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         goodsDetailsModel.ads = singleView6.contentTextView.text
         goodsDetailsModel.price = singleView7.contentTextField.text
         goodsDetailsModel.prices = singleView8.contentTextField.text
-        goodsDetailsModel.category_id = self.selectShopClassifyVC.firCategoryId
-        goodsDetailsModel.category_id2 = self.selectShopClassifyVC.secCategoryId
+        goodsDetailsModel.category_id = self.selectShopClassifyVC!.firCategoryId
+        goodsDetailsModel.category_id2 = self.selectShopClassifyVC!.secCategoryId
         let contentDetailsImage = NSMutableArray()
         for imageUrl in contentDetailsSelectImageUrls{
             let model = CNLiveGoodsDetailsContentModel()
@@ -473,7 +473,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         vc.type = .preview
         vc.detailsModel = goodsDetailsModel
         vc.goodsId = self.goodsId
-        self.navigationController?.pushViewController(vc, animated: false)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     @objc func saveBtnClick(){
         //商品轮播
@@ -542,7 +542,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         if self.type == .add && self.selectCategoryVC!.thiCategoryId == 0{
             showMessage(message: "请选择商品分类")
             return
-        }else if self.selectShopClassifyVC.firCategoryId == 0{
+        }else if self.selectShopClassifyVC!.firCategoryId == 0{
             showMessage(message: "请选择店铺分类")
             return
         }else if bannersSelectImageUrls.count == 0 && bannerSelectVideoUrl.count == 0{
@@ -629,10 +629,10 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             }
         }
         var category_id = 0
-        if self.selectShopClassifyVC.secCategoryId != 0 {
-            category_id = self.selectShopClassifyVC.secCategoryId
+        if self.selectShopClassifyVC!.secCategoryId != 0 {
+            category_id = self.selectShopClassifyVC!.secCategoryId
         }else{
-            category_id = self.selectShopClassifyVC.firCategoryId
+            category_id = self.selectShopClassifyVC!.firCategoryId
         }
         showLoading(message: "")
         if self.type == .add{
@@ -646,7 +646,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     showMessage(message: "发布成功")
                     NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
                     for i in 0..<self.dataModel.list.count{
-                        let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                        let singleView = self.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
                         if singleView.addEditGoodsListModel?.style == "3"{
                             singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
                         }
@@ -678,11 +678,11 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     showMessage(message: "修改成功")
                     NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil, userInfo: (result as! Dictionary))
                     for i in 0..<self.dataModel.list.count{
-                        if let singleView = self.view.viewWithTag(i+1) as? CNLiveShopAddGoodsSingleView{
+                        let singleView = self.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
                             if singleView.addEditGoodsListModel?.style == "3"{
                                 singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
                             }
-                        }
+                        
                     }
                     self.navigationController?.popViewController(animated: true)
                 }
@@ -180,7 +180,7 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         let vc = CNLiveShopNewProductController.init()
         vc.type = .edit
         vc.goodsId = goodsModel.id!
-        self.navigationController?.pushViewController(vc, animated: false)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
  
     // MARK: - 编辑商品库存
@@ -260,7 +260,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         self.baseScrollView.addSubview(self.upSlideView)
         self.addSubview(self.topNavView)
         //默认偏移到中间
-        self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: false)
+        self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: true)
     }
  
 //    func addCustomGestureRecognizer(){
@@ -74,10 +74,10 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         ///push VC
         if tag == 100 {
             //商品管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: true)
         }else if tag == 101 {
             //订单管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
         }
 //        if tag == 100 {
 //            //发布动态
@@ -85,7 +85,7 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
 //            //商品管理
 //            let webVC = CNWebViewController()
 //            webVC.url = URL(string:"https://www.baidu.com")
-//            currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
 //
 //        }else if tag == 102 {
 //            //订单管理
@@ -125,7 +125,7 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
     @objc func navsubBtnAction(_ sender: UIButton){
         if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
             //push订单VC
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
         }
@@ -99,6 +99,6 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         let bannerMdl = self.shopDetailModel?.banner[index]
         let webVC =  CNWebViewController()
         webVC.url = URL(string: bannerMdl?.url ?? "")
-        currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+        currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
     }
 }
@@ -197,18 +197,18 @@ class CNFrontMainView : UIView{
  
     @objc func addStandBtnAction() {
         //跳转到添加身份页面
-//        currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: false)
+//        currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: true)
 //        DispatchQueue.main.asyncAfter(deadline: .now()+0.25){
         if _idModel!.id == 9 {
             showLoading(message: "")
             CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
  
                 if respStatue == .success {
-                    currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: false)
+                    currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: true)
                 }
             }
         }else{
-            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: true)
         }
  
 //        }
@@ -401,7 +401,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 if self.height != 0 && self.height != height{
                     isNeedCallBack = true
                 }
-                super.frame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: height == 0 ? frame.size.height : height)
+                super.frame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: height == 10 ? frame.size.height : height)
                 if isNeedCallBack{
                     if (self.changeFrameCallBack?()) != nil{
                         self.changeFrameCallBack!()
@@ -21,6 +21,6 @@ class CNLiveCommonManager: NSObject{
         let vc = CNLivePlayerViewController()
         vc.setPlayUrl(playUrl: playURL, isLive: false)
         vc.coverImageUrl = coverImageUrl
-        currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+        currentViewController()?.navigationController?.pushViewController(vc, animated: true)
     }
 }
@@ -101,7 +101,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                 self?.currentOrientation = .portrait
             }else{
                 self?.popCallBack!()
-                currentViewController()?.navigationController?.popViewController(animated: false)
+                currentViewController()?.navigationController?.popViewController(animated: true)
             }
         }
         controlView.clickFrameBtnAction = {[weak self] in