Commit 1a1054c30b381947fc24e414b1746002d18351fe
1 parent
611d9302
修改点击关闭按钮回调主视图,左右滑无响应
Showing
3 changed files
with
4 additions
and
4 deletions
metaCode/Classes/Environment/CNLiveEnvironment.swift
| @@ -25,7 +25,7 @@ let IsTestFlightEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvi | @@ -25,7 +25,7 @@ let IsTestFlightEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvi | ||
| 25 | ///是否是线上环境 | 25 | ///是否是线上环境 |
| 26 | let IsProductionEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvironment == .production) | 26 | let IsProductionEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvironment == .production) |
| 27 | 27 | ||
| 28 | -///环境类型 | 28 | +///APP 环境类型 |
| 29 | enum CNLiveEnvironment { | 29 | enum CNLiveEnvironment { |
| 30 | ///开发环境 | 30 | ///开发环境 |
| 31 | case development | 31 | case development |
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
| @@ -184,6 +184,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | @@ -184,6 +184,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | ||
| 184 | topNavView.alpha = 0 | 184 | topNavView.alpha = 0 |
| 185 | topNavView.closeAction = { [weak self ] in | 185 | topNavView.closeAction = { [weak self ] in |
| 186 | self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true) | 186 | self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true) |
| 187 | + self?.superScrollView?.isScrollEnabled = true | ||
| 187 | } | 188 | } |
| 188 | return topNavView | 189 | return topNavView |
| 189 | }() | 190 | }() |
| @@ -215,7 +216,6 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | @@ -215,7 +216,6 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | ||
| 215 | self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: false) | 216 | self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: false) |
| 216 | } | 217 | } |
| 217 | 218 | ||
| 218 | -// // MARK: - 手势 | ||
| 219 | // func addCustomGestureRecognizer(){ | 219 | // func addCustomGestureRecognizer(){ |
| 220 | // let singleTap: UITapGestureRecognizer = UITapGestureRecognizer.init(target: self, action: #selector(singleCellTapAction)) | 220 | // let singleTap: UITapGestureRecognizer = UITapGestureRecognizer.init(target: self, action: #selector(singleCellTapAction)) |
| 221 | // | 221 | // |
metaCode/Classes/Other/AppDelegate.swift
| @@ -24,8 +24,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { | @@ -24,8 +24,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { | ||
| 24 | 24 | ||
| 25 | window = UIWindow.init(frame: UIScreen.main.bounds) | 25 | window = UIWindow.init(frame: UIScreen.main.bounds) |
| 26 | window?.backgroundColor = KVCBackgroupColor | 26 | window?.backgroundColor = KVCBackgroupColor |
| 27 | - window?.rootViewController = UserInfoManager.shared.is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init() | ||
| 28 | -// window?.rootViewController = CNLiveBaseTabBarViewController.init() | 27 | +// window?.rootViewController = UserInfoManager.shared.is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init() |
| 28 | + window?.rootViewController = CNLiveBaseTabBarViewController.init() | ||
| 29 | window?.makeKeyAndVisible() | 29 | window?.makeKeyAndVisible() |
| 30 | 30 | ||
| 31 | 31 |