push动画统一

张旭
1 parent dec1499e
Showing 19 changed files with 99 additions and 43 deletions
metaCode/Classes/Config/CNLiveConfigstant.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.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/CNIDCardView.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
metaCode/Info.plist
@@ -34,6 +34,9 @@ let kBucketName_QN:String = &quot;mam-wjjtest-802&quot;
 ///控制器背景色
 let KVCBackgroupColor = UIColor("#F9F9F9")
+///控制器push动画Bool
+let pushAnimated = true
+
 /**
  获取系统状态栏高度
  */
@@ -66,21 +69,21 @@ public func get_system_nav_top_height() -&gt; CGFloat {
  获取系统tabbar高度
  */
 public func get_system_tabbar_height() -> CGFloat {
-    return isiPhoneXSeries ? 83.0 : 49.0;
+    return isiPhoneXSeries ? 83.0 : 49.0
 }
 /**
  获取系统tabbarUI高度
  */
 public func get_system_tabbar_ui_height() -> CGFloat {
-    return 49.0;
+    return 49.0
 }
 /**
  获取系统tabbarUI增加的高度 (因iPhoneX系列底部有安全区域增加的高度)
  */
 public func get_system_tabbar_ui_offsetHeight() -> CGFloat {
-    return get_system_tabbar_height() - get_system_tabbar_ui_height();
+    return get_system_tabbar_height() - get_system_tabbar_ui_height()
 }
@@ -31,10 +31,11 @@ func currentViewController() -&gt; (UIViewController?) {
       }
     }
     let vc = window?.rootViewController
-    print("currentVC:\(currentVC(vc)!)")
-    print("currentVC.children:\((currentVC(vc)!).children)")
-    print("currentVC.navi:\((currentVC(vc)!).navigationController)")
-    return currentVC(vc)
+    let retVC = currentVC(vc)
+    print("currentVC:\(retVC!)")
+    print("111111currentVC.children:\(retVC!).children)")
+    print("111111currentVC.navi:\(retVC!.navigationController)")
+    return retVC
 }
 private func currentVC(_ vc :UIViewController?) -> UIViewController? {
@@ -54,10 +55,57 @@ private func currentVC(_ vc :UIViewController?) -&gt; UIViewController? {
        return currentVC(naiVC.visibleViewController)
     }
     else {
-       return vc
+        print("111111vcChildren:\(vc?.children)")
+        print("111111vcChildrenlast.Navi:\(vc?.children.last?.navigationController)")
+        print("111111vcChildrenlast.Navi.controls:\(vc?.children.last?.navigationController?.viewControllers)")
+        return vc
     }
  }
+    // 获取当前活动的navigationcontroller
+    func navigationViewController() -> UINavigationController{
+        var window = UIApplication.shared.keyWindow
+        if window?.windowLevel != UIWindow.Level.normal{
+          let windows = UIApplication.shared.windows
+          for  windowTemp in windows{
+            if windowTemp.windowLevel == UIWindow.Level.normal{
+               window = windowTemp
+               break
+             }
+           }
+         }
+        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
+                return nav
+            }
+        }
+        return nil
+    }
+- (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: 内容提示
 func showMessage(message: String) {
@@ -238,7 +238,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     //MARK: - 网络请求获取店铺详情
     func getShopDetailApi()
     {
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveShopDetailViewModel.requestShopDetailInfo(storeId: "") { result, status in
             hiddenLoading()
             if status == .success{
@@ -87,27 +87,27 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
         let itemModel = listMdl.list[indexPath.item]
         if itemModel.type == CNLiveShopConsoleType.XZSP.rawValue{
             //商城新增商品
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController.init(), animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{
             //商城商品管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: false)
+            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: false)
+            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.GLYHQ.rawValue{
             //优惠券管理
             let vc = CNLiveShopCouponsManagerViewController()
-            currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.CreateShopClassify.rawValue{
             //创建店铺分类
             let vc = CNLiveCreateShopClassifyViewController()
             vc.classifyType = .oneLevelClassify
-            currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.ShopClassifyManager.rawValue{
             //店铺分类管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopClassilyManageViewController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopClassilyManageViewController.init(), animated: pushAnimated)
         }else if itemModel.type == CNLiveShopConsoleType.FBDT.rawValue{
             //发布动态
@@ -116,7 +116,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: pushAnimated)
         }
 //        else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{
 //            //退款/售后
@@ -129,14 +129,14 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
             //直播管理
             let webVC =  CNWebViewController()
             webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php")
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }
     }
     //MARK: - 网络请求获取详情页
     func getPageApi()
     {
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveShopConsoleViewModel.requestUserInfo() { result, status in
             hiddenLoading()
@@ -572,7 +572,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         if(navigationAction.navigationType == .linkActivated){
             let webVC =  CNWebViewController()
             webVC.url = URL(string: url)
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             decisionHandler(.cancel, preferences)
             return
         }else if(navigationAction.navigationType == .other){
@@ -592,7 +592,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
     {
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveMineViewModel.requestAuthStandList(page: 1)
         { result, respStatue in
@@ -205,7 +205,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
     //MARK: - 网络请求获取详情页
     func getPageApi()
     {
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveDownSlideViewModel.requestGetPage(pageId: _downPath! as NSString) { result, status in
             hiddenLoading()
@@ -486,7 +486,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         if self.navigationController == nil{
             print("self nil")
         }
-        currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     // MARK: - 数据请求
@@ -149,7 +149,7 @@ class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableVi
         vc.successCompleteBlock = {[weak self] in
             self!.loadData()
         }
-        currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     ///显示/隐藏子分类
     func showChildCalssifyAction(section:Int,classifyModel:CNLiveShopClassifyModel){
@@ -168,7 +168,7 @@ class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableVi
         vc.successCompleteBlock = {[weak self] in
             self!.loadData()
         }
-        currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
     }
     func editBtnActionWithMModel(classifyModel:CNLiveShopClassifyModel,type:CNLiveCreateType){
         let data = modelToDictionary(classifyModel) 
@@ -293,7 +293,7 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
     // MARK: - BtnAction
     @objc func addBtnAction(){
-        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: false)
+        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
     }
     // MARK: - 商品编辑通知
@@ -177,7 +177,7 @@ class CNLiveShopCouponsManagerViewController:CNLiveBaseViewController,UITableVie
             }
         }else{
             let vc = CNLiveShopCouponCreateViewController(couponListModel: nil, type: .create)
-            currentViewController()?.navigationController?.pushViewController(vc, animated: false)
+            currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
         }
     }
     // MARK: - UITableViewDelegate
@@ -58,7 +58,7 @@ class CNIDCardView: UIView{
     }
     func loadIDDetailData(){
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate) { result, respStatue in
             hiddenLoading()
             if respStatue == .success {
@@ -74,13 +74,13 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         ///push VC
         if tag == 100 {
             //商品管理                
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
         }else if tag == 101 {
             //订单管理
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if tag == 102 {
             //交易记录
-            currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
         }
 //        if tag == 100 {
 //            //发布动态
@@ -88,7 +88,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: pushAnimated)
 //
 //        }else if tag == 102 {
 //            //订单管理
@@ -125,12 +125,19 @@ 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: pushAnimated)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
         }
     }
     @objc func clickBtnAction(_ sender: UIButton){
+        if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
+            //push订单VC
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
+        }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
+            //push余额VC
+        }
+        
         let tag = sender.tag
         if tag == 100 {
@@ -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: pushAnimated)
     }
 }
@@ -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: pushAnimated)
 //        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: pushAnimated)
                 }
             }
         }else{
-            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: false)
+            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
         }
 //        }
@@ -23,7 +23,7 @@ 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: pushAnimated)
     }
     /**
@@ -19,12 +19,12 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+            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: false)
+            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 +35,7 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: false)
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }else{
             return
         }
@@ -101,7 +101,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                 self?.currentOrientation = .portrait
             }else{
                 self?.popCallBack!()
-                currentViewController()?.navigationController?.popViewController(animated: false)
+                currentViewController()?.navigationController?.popViewController(animated: pushAnimated)
             }
         }
         controlView.clickFrameBtnAction = {[weak self] in
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>zh_CN</string>
 	<key>CFBundleAllowMixedLocalizations</key>
 	<true/>
 	<key>CFBundleLocalizations</key>