暂时没复现 push不跳转问题

张旭
1 parent 445f7233
Showing 10 changed files with 46 additions and 9 deletions
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsDetail/CNLiveShopGoodsDetailsViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideView.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
@@ -20,8 +20,11 @@ func currentViewController() -&gt; (UIViewController?) {
         }
       }
     }
-   let vc = window?.rootViewController
-   return currentVC(vc)
+    let vc = window?.rootViewController
+    print("currentVC:\(currentVC(vc)!)")
+    print("currentVC.children:\((currentVC(vc)!).children)")
+    print("currentVC.navi:\((currentVC(vc)!).navigationController)")
+    return currentVC(vc)
 }
 private func currentVC(_ vc :UIViewController?) -> UIViewController? {
@@ -102,6 +102,9 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
             //创建店铺分类
             let vc = CNLiveCreateShopClassifyViewController()
             vc.classifyType = .oneLevelClassify
+            if currentViewController()?.navigationController == nil{
+                print("nil")
+            }
             currentViewController()?.navigationController?.pushViewController(vc, animated: true)
         }else if itemModel.type == CNLiveShopConsoleType.ShopClassifyManager.rawValue{
             //店铺分类管理
@@ -23,10 +23,8 @@ class CNLiveShopGoodsDetailsViewController:CNLiveBaseViewController{
     /// 编辑商品预览使用
     var detailsModel:CNLiveShopGoodsDetailsModel?
-    
     override func viewDidLoad() {
         super.viewDidLoad()
     }
-    
 }
@@ -483,7 +483,13 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         vc.successCompleteBlock = {
             self.postShopClassify()
         }
-        self.navigationController?.pushViewController(vc, animated: true)
+        if self.navigationController == nil{
+            print("self nil")
+        }
+        if currentViewController()?.navigationController == nil{
+            print("curr nil")
+        }
+        currentViewController()?.navigationController?.pushViewController(vc, animated: true)
     }
     // MARK: - 数据请求
@@ -84,7 +84,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     vc.secCategoryId = self.shopGoodsDetailsModel.category_id2
                 }
                 vc.finishBlock = {
-                    var singleView = self.getShopClassifyView()
+                    let singleView = self.getShopClassifyView()
                     singleView?.contentTextField.text = "\(self.selectShopClassifyVC!.firCategoryName ?? "") \(self.selectShopClassifyVC!.secCategoryName ?? "")"
                     singleView?.layoutSubviews()
                 }
@@ -195,7 +195,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         previewBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
         previewBtn.titleLabel?.font = Font_15
         previewBtn.addTarget(self, action: #selector(previewBtnClick), for: .touchUpInside)
-        self.bottomNavView.addSubview(previewBtn)
+//        self.bottomNavView.addSubview(previewBtn)
         let saveBtn = UIButton(type: .custom)
         saveBtn.frame = CGRect(x: previewBtn.right, y: 0, width: self.view.width - previewBtn.right, height: KTabBarHeight)
@@ -85,9 +85,18 @@ class CNDownSlideView:UIView{
             }else if(type == UpDownTypeShopDetail){
             }else if(type == UpDownTypeShopControlConsole){
-                currentViewController()?.addChild(self.shopConsoleVC)
-                self.shopConsoleVC.didMove(toParent: currentViewController())
+                var isContainVC = false
+                currentViewController()?.children.forEach({ vc in
+                    if vc == self.shopConsoleVC{
+                        isContainVC = true
+                    }
+                })
+                if isContainVC == false{
+                    currentViewController()?.addChild(self.shopConsoleVC)
+                    self.shopConsoleVC.didMove(toParent: currentViewController())
+                }
                 self.addSubview(self.shopConsoleVC.view)
+
             }
         }
     }
@@ -74,9 +74,15 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         ///push VC
         if tag == 100 {
             //商品管理
+            if currentViewController()?.navigationController == nil{
+                print("nil")
+            }
             currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: true)
         }else if tag == 101 {
             //订单管理
+            if currentViewController()?.navigationController == nil{
+                print("nil")
+            }
             currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
         }
 //        if tag == 100 {
@@ -125,6 +125,9 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
     @objc func navsubBtnAction(_ sender: UIButton){
         if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
             //push订单VC
+            if currentViewController()?.navigationController == nil{
+                print("nil")
+            }
             currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
@@ -99,6 +99,9 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         let bannerMdl = self.shopDetailModel?.banner[index]
         let webVC =  CNWebViewController()
         webVC.url = URL(string: bannerMdl?.url ?? "")
+        if currentViewController()?.navigationController == nil{
+            print("nil")
+        }
         currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
     }
 }
@@ -204,10 +204,16 @@ class CNFrontMainView : UIView{
             CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
                 if respStatue == .success {
+                    if currentViewController()?.navigationController == nil{
+                        print("nil")
+                    }
                     currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: true)
                 }
             }
         }else{
+            if currentViewController()?.navigationController == nil{
+                print("nil")
+            }
             currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: true)
         }