Commit 8ea15dbc02b71d482643dc2d7348d409f9961183
1 parent
58fda385
暂时注释 个人保护政策弹窗 , 引导改为Window
Showing
3 changed files
with
12 additions
and
13 deletions
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
| @@ -342,17 +342,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -342,17 +342,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 342 | }else{ | 342 | }else{ |
| 343 | //没有显示下滑引导 | 343 | //没有显示下滑引导 |
| 344 | self.pageFlowView.scrollView.isScrollEnabled = false | 344 | self.pageFlowView.scrollView.isScrollEnabled = false |
| 345 | - self.view.addSubview(self.downSlideGuideView) | ||
| 346 | - self.view.addSubview(self.downSlideGifView) | ||
| 347 | - self.tabBarController?.tabBar.isHidden = true | 345 | + UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView) |
| 346 | + UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView) | ||
| 347 | +// self.tabBarController?.tabBar.isHidden = true | ||
| 348 | } | 348 | } |
| 349 | 349 | ||
| 350 | }else{ | 350 | }else{ |
| 351 | //没显示过上滑引导 | 351 | //没显示过上滑引导 |
| 352 | self.pageFlowView.scrollView.isScrollEnabled = false | 352 | self.pageFlowView.scrollView.isScrollEnabled = false |
| 353 | - self.view.addSubview(self.upSlideGuideView) | ||
| 354 | - self.view.addSubview(self.upSlideGifView) | ||
| 355 | - self.tabBarController?.tabBar.isHidden = true | 353 | + |
| 354 | + UIApplication.shared.keyWindow!.addSubview(self.upSlideGuideView) | ||
| 355 | + UIApplication.shared.keyWindow!.addSubview(self.upSlideGifView) | ||
| 356 | +// self.tabBarController?.tabBar.isHidden = true | ||
| 356 | } | 357 | } |
| 357 | } | 358 | } |
| 358 | 359 | ||
| @@ -465,7 +466,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -465,7 +466,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 465 | 466 | ||
| 466 | //移除上滑引导 | 467 | //移除上滑引导 |
| 467 | if(self.upSlideGuideView.superview != nil){ | 468 | if(self.upSlideGuideView.superview != nil){ |
| 468 | - self.tabBarController?.tabBar.isHidden = false | ||
| 469 | self.upSlideGuideView.removeFromSuperview() | 469 | self.upSlideGuideView.removeFromSuperview() |
| 470 | self.upSlideGifView.removeFromSuperview() | 470 | self.upSlideGifView.removeFromSuperview() |
| 471 | UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide) | 471 | UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide) |
| @@ -473,13 +473,12 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -473,13 +473,12 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 473 | 473 | ||
| 474 | //移除下滑引导 | 474 | //移除下滑引导 |
| 475 | if (self.downSlideGuideView.superview != nil) { | 475 | if (self.downSlideGuideView.superview != nil) { |
| 476 | - self.tabBarController?.tabBar.isHidden = false | 476 | + |
| 477 | self.downSlideGuideView.removeFromSuperview() | 477 | self.downSlideGuideView.removeFromSuperview() |
| 478 | self.downSlideGifView.removeFromSuperview() | 478 | self.downSlideGifView.removeFromSuperview() |
| 479 | UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide) | 479 | UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide) |
| 480 | self.pageFlowView.scrollView.isScrollEnabled = true | 480 | self.pageFlowView.scrollView.isScrollEnabled = true |
| 481 | } | 481 | } |
| 482 | - | ||
| 483 | 482 | ||
| 484 | } | 483 | } |
| 485 | func customIndexViewDidScroll(scrollView: UIScrollView) { | 484 | func customIndexViewDidScroll(scrollView: UIScrollView) { |
| @@ -513,8 +512,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -513,8 +512,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 513 | print("不该进来") | 512 | print("不该进来") |
| 514 | }else{ | 513 | }else{ |
| 515 | //没有显示下滑引导 | 514 | //没有显示下滑引导 |
| 516 | - self.view.addSubview(self.downSlideGuideView) | ||
| 517 | - self.view.addSubview(self.downSlideGifView) | 515 | + UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView) |
| 516 | + UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView) | ||
| 518 | self.pageFlowView.scrollView.isScrollEnabled = false | 517 | self.pageFlowView.scrollView.isScrollEnabled = false |
| 519 | } | 518 | } |
| 520 | } | 519 | } |
metaCode/Classes/Main/HomePage/View/CNHomePageGuideView.swift
| @@ -58,7 +58,7 @@ class CNHomePageGuideView: UIView{ | @@ -58,7 +58,7 @@ class CNHomePageGuideView: UIView{ | ||
| 58 | let path:UIBezierPath = UIBezierPath.init(rect: UIScreen.main.bounds) | 58 | let path:UIBezierPath = UIBezierPath.init(rect: UIScreen.main.bounds) |
| 59 | 59 | ||
| 60 | //rect 首页被镂空的区域 | 60 | //rect 首页被镂空的区域 |
| 61 | - let W = MainViewW//KSreenWidth-50 | 61 | + let W = MainViewW |
| 62 | let H = W*1.5 | 62 | let H = W*1.5 |
| 63 | let rect = CGRectMake(LeftGap, KSreenHeight*0.16,W, H) | 63 | let rect = CGRectMake(LeftGap, KSreenHeight*0.16,W, H) |
| 64 | 64 |
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
| @@ -89,7 +89,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate { | @@ -89,7 +89,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate { | ||
| 89 | self.setupVeriCodeView() | 89 | self.setupVeriCodeView() |
| 90 | self.setupLoginButtonView() | 90 | self.setupLoginButtonView() |
| 91 | 91 | ||
| 92 | - LoginAuthInfoView.showAuthView() | 92 | +// LoginAuthInfoView.showAuthView() |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | deinit { | 95 | deinit { |