改为navigationpush

张旭
1 parent 4af2c0c7
Showing 16 changed files with 79 additions and 66 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigstant.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopClassilyManageViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/Controller/ShopCoupon/CNLiveShopCouponsManagerViewController.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/Util/CNLiveCommonManager.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerView.swift
@@ -1783,7 +1783,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
+				CURRENT_PROJECT_VERSION = 1.0.2.23.12.25.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1806,7 +1806,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1828,7 +1828,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
+				CURRENT_PROJECT_VERSION = 1.0.2.23.12.25.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1851,7 +1851,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -35,7 +35,7 @@ let kBucketName_QN:String = &quot;mam-wjjtest-802&quot;
 let KVCBackgroupColor = UIColor("#F9F9F9")
 ///控制器push动画Bool
-let pushAnimated = true
+let pushAnimated = false
 /**
  获取系统状态栏高度
@@ -32,9 +32,6 @@ func currentViewController() -&gt; (UIViewController?) {
     }
     let vc = window?.rootViewController
     let retVC = currentVC(vc)
-    print("currentVC:\(retVC!)")
-    print("111111currentVC.children:\(retVC!).children)")
-    print("111111currentVC.navi:\(retVC!.navigationController)")
     return retVC
 }
@@ -55,9 +52,6 @@ private func currentVC(_ vc :UIViewController?) -&gt; UIViewController? {
        return currentVC(naiVC.visibleViewController)
     }
     else {
-        print("111111vcChildren:\(vc?.children)")
-        print("111111vcChildrenlast.Navi:\(vc?.children.last?.navigationController)")
-        print("111111vcChildrenlast.Navi.controls:\(vc?.children.last?.navigationController?.viewControllers)")
         return vc
     }
  }
@@ -75,36 +69,28 @@ private func currentVC(_ vc :UIViewController?) -&gt; UIViewController? {
            }
          }
         if let isNav = window!.rootViewController?.isKind(of: UINavigationController.self){
-            let nav = window?.rootViewController as! UINavigationController
-            return nav
-        }else if let isTabbar = window!.rootViewController?.isKind(of: UITabBarController.self){
-            let tabbar = window?.rootViewController as! UITabBarController
-            let selectVc = tabbar.selectedViewController
-            if let isNavi = selectVc?.isKind(of: UINavigationController.self){
-                let nav = selectVc as! UINavigationController
+            if isNav{
+                let nav = window?.rootViewController as! UINavigationController
                 return nav
+            }else{
+                if let isTabbar = window!.rootViewController?.isKind(of: UITabBarController.self){
+                    if isTabbar{
+                        let tabbar = window?.rootViewController as! UITabBarController
+                        let selectVc = tabbar.selectedViewController
+                        if let isNavi = selectVc?.isKind(of: UINavigationController.self){
+                            if isNavi{
+                                let nav = selectVc as! UINavigationController
+                                return nav
+                            }
+                        }
+                    }else{
+                        
+                    }
+                }
             }
         }
-        return nil
+        return UINavigationController()
     }
-- (UINavigationController *)navigationViewController
-{
-    
-    if ([self.window.rootViewController isKindOfClass:[UINavigationController class]])
-    {
-        return (UINavigationController *)self.window.rootViewController;
-    }
-    else if ([self.window.rootViewController isKindOfClass:[UITabBarController class]])
-    {
-        UIViewController *selectVc = [((UITabBarController *)self.window.rootViewController) selectedViewController];
-        if ([selectVc isKindOfClass:[UINavigationController class]])
-        {
-            return (UINavigationController *)selectVc;
-        }
-    }
-    return nil;
-}
-
 /// 弹框提示
 /// - Parameter message: 内容提示
@@ -87,27 +87,33 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
         let itemModel = listMdl.list[indexPath.item]
         if itemModel.type == CNLiveShopConsoleType.XZSP.rawValue{
             //商城新增商品
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{
             //商城商品管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{
             //新增优惠券
             let vc = CNLiveShopCouponCreateViewController(couponListModel: nil, type: .create)
-            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+            navigationViewController().pushViewController(vc, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.GLYHQ.rawValue{
             //优惠券管理
             let vc = CNLiveShopCouponsManagerViewController()
-            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+            navigationViewController().pushViewController(vc, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.CreateShopClassify.rawValue{
             //创建店铺分类
             let vc = CNLiveCreateShopClassifyViewController()
             vc.classifyType = .oneLevelClassify
-            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+            navigationViewController().pushViewController(vc, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.ShopClassifyManager.rawValue{
             //店铺分类管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.FBDT.rawValue{
             //发布动态
@@ -116,7 +122,8 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
         }else if itemModel.type == CNLiveShopConsoleType.DDGL.rawValue{
             //订单管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }
 //        else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{
 //            //退款/售后
@@ -129,7 +136,8 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
             //直播管理
             let webVC =  CNWebViewController()
             webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php")
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }
     }
@@ -572,7 +572,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         if(navigationAction.navigationType == .linkActivated){
             let webVC =  CNWebViewController()
             webVC.url = URL(string: url)
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             decisionHandler(.cancel, preferences)
             return
         }else if(navigationAction.navigationType == .other){
@@ -486,7 +486,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         if self.navigationController == nil{
             print("self nil")
         }
-        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     // MARK: - 数据请求
@@ -149,7 +149,8 @@ class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableVi
         vc.successCompleteBlock = {[weak self] in
             self!.loadData()
         }
-        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     ///显示/隐藏子分类
     func showChildCalssifyAction(section:Int,classifyModel:CNLiveShopClassifyModel){
@@ -168,7 +169,8 @@ class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableVi
         vc.successCompleteBlock = {[weak self] in
             self!.loadData()
         }
-        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     func editBtnActionWithMModel(classifyModel:CNLiveShopClassifyModel,type:CNLiveCreateType){
         let data = modelToDictionary(classifyModel) 
@@ -292,8 +292,8 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
     // MARK: - BtnAction
     @objc func addBtnAction(){
-        
-        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
+        navigationViewController().pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
     }
     // MARK: - 商品编辑通知
@@ -177,7 +177,8 @@ class CNLiveShopCouponsManagerViewController:CNLiveBaseViewController,UITableVie
             }
         }else{
             let vc = CNLiveShopCouponCreateViewController(couponListModel: nil, type: .create)
-            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+            navigationViewController().pushViewController(vc, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }
     }
     // MARK: - UITableViewDelegate
@@ -225,6 +226,7 @@ class CNLiveShopCouponsManagerViewController:CNLiveBaseViewController,UITableVie
             case 1:
                 // 编辑
                 let vc = CNLiveShopCouponCreateViewController(couponListModel: model, type: .edit)
+                
                 currentViewController()?.navigationController?.pushViewController(vc, animated: true)
                 break
             default: break
@@ -73,14 +73,17 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         let tag = sender.tag
         ///push VC
         if tag == 100 {
-            //商品管理                
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
+            //商品管理     
+            navigationViewController().pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
         }else if tag == 101 {
             //订单管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if tag == 102 {
             //交易记录
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
         }
 //        if tag == 100 {
 //            //发布动态
@@ -125,7 +125,8 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
     @objc func navsubBtnAction(_ sender: UIButton){
         if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
             //push订单VC
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
         }
@@ -133,7 +134,8 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
     @objc func clickBtnAction(_ sender: UIButton){
         if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
             //push订单VC
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
         }
@@ -99,6 +99,7 @@ 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: pushAnimated)
+        navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
     }
 }
@@ -204,11 +204,13 @@ class CNFrontMainView : UIView{
             CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
                 if respStatue == .success {
-                    currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
+                    navigationViewController().pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
+//                    currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
                 }
             }
         }else{
-            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
         }
 //        }
@@ -23,7 +23,8 @@ class CNLiveCommonManager: NSObject{
         let vc = CNLivePlayerViewController()
         vc.setPlayUrl(playUrl: playURL, isLive: false)
         vc.coverImageUrl = coverImageUrl
-        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     /**
@@ -19,12 +19,14 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
             webVC.url = URL(string: (contentMdl.thirdUrl)!)
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
@@ -35,7 +37,8 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }else{
             return
         }
@@ -101,7 +101,8 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                 self?.currentOrientation = .portrait
             }else{
                 self?.popCallBack!()
-                currentViewController()?.navigationController?.popViewController(animated: pushAnimated)
+                navigationViewController().popViewController(animated: pushAnimated)
+//                currentViewController()?.navigationController?.popViewController(animated: pushAnimated)
             }
         }
         controlView.clickFrameBtnAction = {[weak self] in