Commit 2561d0b1fae9975bfd144c6c5a393fa89ce360b2

Authored by “张旭”
1 parent 8eafe4a5

上滑--点击X--首页,我的,认证 tabbar消失的问题

下滑--点击回到首页 , tabbar消失的问题
metaCode.xcodeproj/project.pbxproj
@@ -2074,7 +2074,7 @@ @@ -2074,7 +2074,7 @@
2074 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 2074 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2075 CODE_SIGN_IDENTITY = "Apple Development"; 2075 CODE_SIGN_IDENTITY = "Apple Development";
2076 CODE_SIGN_STYLE = Automatic; 2076 CODE_SIGN_STYLE = Automatic;
2077 - CURRENT_PROJECT_VERSION = 1.0.5.24.01.31.17; 2077 + CURRENT_PROJECT_VERSION = 1.0.5.24.02.01.17;
2078 DEVELOPMENT_TEAM = 94X49GG3ZW; 2078 DEVELOPMENT_TEAM = 94X49GG3ZW;
2079 ENABLE_BITCODE = NO; 2079 ENABLE_BITCODE = NO;
2080 ENABLE_MODULE_VERIFIER = NO; 2080 ENABLE_MODULE_VERIFIER = NO;
@@ -2328,7 +2328,7 @@ @@ -2328,7 +2328,7 @@
2328 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 2328 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2329 CODE_SIGN_IDENTITY = "Apple Development"; 2329 CODE_SIGN_IDENTITY = "Apple Development";
2330 CODE_SIGN_STYLE = Automatic; 2330 CODE_SIGN_STYLE = Automatic;
2331 - CURRENT_PROJECT_VERSION = 1.0.5.24.01.31.17; 2331 + CURRENT_PROJECT_VERSION = 1.0.5.24.02.01.17;
2332 DEVELOPMENT_TEAM = 94X49GG3ZW; 2332 DEVELOPMENT_TEAM = 94X49GG3ZW;
2333 ENABLE_BITCODE = NO; 2333 ENABLE_BITCODE = NO;
2334 ENABLE_MODULE_VERIFIER = NO; 2334 ENABLE_MODULE_VERIFIER = NO;
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
@@ -534,10 +534,13 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel @@ -534,10 +534,13 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
534 //慢拖动时处理 534 //慢拖动时处理
535 if scrollView.contentOffset.y > 0 && scrollView.contentOffset.y < KSreenHeight/2{ 535 if scrollView.contentOffset.y > 0 && scrollView.contentOffset.y < KSreenHeight/2{
536 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: 0), animated: true) 536 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: 0), animated: true)
  537 + self.vNumPage = .VNumPageDown
537 }else if scrollView.contentOffset.y >= KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight+KSreenHeight/2{ 538 }else if scrollView.contentOffset.y >= KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight+KSreenHeight/2{
538 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight), animated: true) 539 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight), animated: true)
  540 + self.vNumPage = .VNumPageMain
539 }else if scrollView.contentOffset.y >= KSreenHeight+KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight*2+KSreenHeight/2{ 541 }else if scrollView.contentOffset.y >= KSreenHeight+KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight*2+KSreenHeight/2{
540 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight*2), animated: true) 542 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight*2), animated: true)
  543 + self.vNumPage = .VNumPageUp
541 }else{ 544 }else{
542 545
543 } 546 }
metaCode/Classes/Main/HomePage/View/VerticalViews/CNCustomIndexView.swift
@@ -192,6 +192,9 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange @@ -192,6 +192,9 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
192 collectionView.backAction = {[weak self] in 192 collectionView.backAction = {[weak self] in
193 self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true) 193 self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
194 currentViewController()?.tabBarController?.tabBar.isHidden = false 194 currentViewController()?.tabBarController?.tabBar.isHidden = false
  195 + let vc = currentViewController() as! CNMetaCodeHomePageController
  196 + vc.vNumPage = .VNumPageMain
  197 +
195 self?.superScrollView?.isScrollEnabled = true 198 self?.superScrollView?.isScrollEnabled = true
196 199
197 let time = DispatchTime.now() + 0.5 200 let time = DispatchTime.now() + 0.5
@@ -236,6 +239,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange @@ -236,6 +239,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
236 self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true) 239 self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true)
237 self?.superScrollView?.isScrollEnabled = true 240 self?.superScrollView?.isScrollEnabled = true
238 currentViewController()?.tabBarController?.tabBar.isHidden = false 241 currentViewController()?.tabBarController?.tabBar.isHidden = false
  242 + let vc = currentViewController() as! CNMetaCodeHomePageController
  243 + vc.vNumPage = .VNumPageMain
239 } 244 }
240 return topNavView 245 return topNavView
241 }() 246 }()