iOS Team / CNLiveMateCode · Commits

Commit 313f0a79f48caee72de84a657f93b2dc4e1f9d1f

Authored by 张旭
1 parent 4af1400b

1.2.3.25.08.08.14 , 打包提审 , 

默认打开一键登录页面
一键登录按钮常亮 ,点击一键登录弹出二次弹窗
Inline Side-by-side
Showing 4 changed files with 58 additions and 10 deletions
metaCode.xcodeproj/project.pbxproj
  View file @313f0a7
... ... @@ -2978,7 +2978,7 @@
2978 2978 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2979 2979 CODE_SIGN_IDENTITY = "Apple Development";
2980 2980 CODE_SIGN_STYLE = Automatic;
2981   - CURRENT_PROJECT_VERSION = 1.2.2.25.07.29.17;
  2981 + CURRENT_PROJECT_VERSION = 1.2.3.25.08.08.14;
2982 2982 DEBUG_INFORMATION_FORMAT = dwarf;
2983 2983 DEVELOPMENT_TEAM = 94X49GG3ZW;
2984 2984 ENABLE_BITCODE = NO;
... ... @@ -3051,7 +3051,7 @@
3051 3051 "$(inherited)",
3052 3052 "@executable_path/Frameworks",
3053 3053 );
3054   - MARKETING_VERSION = 1.2.2;
  3054 + MARKETING_VERSION = 1.2.3;
3055 3055 OTHER_LDFLAGS = (
3056 3056 "$(inherited)",
3057 3057 "-all_load",
... ... @@ -3234,7 +3234,7 @@
3234 3234 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
3235 3235 CODE_SIGN_IDENTITY = "Apple Development";
3236 3236 CODE_SIGN_STYLE = Automatic;
3237   - CURRENT_PROJECT_VERSION = 1.2.2.25.07.29.17;
  3237 + CURRENT_PROJECT_VERSION = 1.2.3.25.08.08.14;
3238 3238 DEVELOPMENT_TEAM = 94X49GG3ZW;
3239 3239 ENABLE_BITCODE = NO;
3240 3240 ENABLE_MODULE_VERIFIER = NO;
... ... @@ -3306,7 +3306,7 @@
3306 3306 "$(inherited)",
3307 3307 "@executable_path/Frameworks",
3308 3308 );
3309   - MARKETING_VERSION = 1.2.2;
  3309 + MARKETING_VERSION = 1.2.3;
3310 3310 OTHER_LDFLAGS = (
3311 3311 "$(inherited)",
3312 3312 "-all_load",
... ...
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
  View file @313f0a7
... ... @@ -173,6 +173,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
173 173 self.setupLoginButtonView()
174 174  
175 175 // LoginAuthInfoView.showAuthView()
  176 + oneClickLoginActionMothod()
176 177 }
177 178  
178 179 deinit {
... ... @@ -631,7 +632,7 @@ extension CNLiveLoginViewController {
631 632 }
632 633 }
633 634  
634   - @objc func oneClickLoginActionMothod(sender : UIButton) {
  635 + @objc func oneClickLoginActionMothod() {
635 636 //一键登录
636 637 // 假设TXCustomModel是一个已定义的Swift类，且具有相应的属性
637 638 let model = TXCustomModel()
... ... @@ -649,6 +650,10 @@ extension CNLiveLoginViewController {
649 650 model.changeBtnIsHidden = true
650 651 model.privacyOne = ["用户协议", "https://wjjh5.cnlive.com/yuanmaYhxy.html"]
651 652 model.privacyTwo = ["隐私政策", "https://wjjh5.cnlive.com/yuanmaYszc.html"]
  653 +
  654 + let bgNormalImg = TXCommonUtils.image(with: UIColor(red:0.33, green:0.55, blue:0.97, alpha:1.00), size: CGSize(width: KSreenWidth*0.5+10, height: 40), isRoundedCorner: true, radius: 20)
  655 +// let bgGrayImg = TXCommonUtils.image(with: UIColor.gray, size: CGSize(width: KSreenWidth*0.5+10, height: 40), isRoundedCorner: true, radius: 20)
  656 + model.loginBtnBgImgs = [bgNormalImg!,bgNormalImg!,bgNormalImg!]
652 657  
653 658 // 创建关键帧动画
654 659 let animation = CAKeyframeAnimation(keyPath: "transform.translation.y")
... ... @@ -664,7 +669,7 @@ extension CNLiveLoginViewController {
664 669 ]
665 670 animation.duration = 0.5
666 671  
667   - model.checkboxAnimation = animation
  672 +// model.checkboxAnimation = animation
668 673  
669 674 // 切换到其他方式按钮
670 675 let button1: UIButton = UIButton(type: .system)
... ... @@ -683,6 +688,44 @@ extension CNLiveLoginViewController {
683 688 height: 30)
684 689 }
685 690  
  691 + //二次协议弹窗
  692 + model.privacyAlertIsNeedShow = true
  693 + model.privacyAlertMaskAlpha = 0.5
  694 + model.privacyAlertMaskColor = UIColor.black
  695 + model.privacyAlertCornerRadiusArray = [10,10,10,10]
  696 + model.privacyAlertBackgroundColor = UIColor.white
  697 + model.privacyAlertAlpha = 1.0
  698 + model.privacyAlertTitleBackgroundColor = UIColor.white
  699 + model.privacyAlertContentBackgroundColor = UIColor.white
  700 + model.privacyAlertTitleFont = UIFont.systemFont(ofSize: 16)
  701 + model.privacyAlertTitleColor = UIColor.black
  702 + model.privacyAlertContentColors = [UIColor.gray, UIColor.blue]
  703 + model.privacyAlertContentAlignment = NSTextAlignment.center
  704 + let activeImage = TXCommonUtils.image(with: UIColor.blue, size: CGSize(width: KSreenWidth-2*18, height: 50), isRoundedCorner: true, radius: 10)!
  705 + let hightLightImage = TXCommonUtils.image(with: UIColor.gray, size: CGSize(width: KSreenWidth-2*18, height: 50), isRoundedCorner: true, radius: 10)!
  706 + model.privacyAlertBtnBackgroundImages = [activeImage, hightLightImage]
  707 + model.privacyAlertButtonTextColors = [UIColor.white,UIColor.blue]
  708 + model.privacyAlertButtonFont = UIFont.systemFont(ofSize: 18)
  709 + model.privacyAlertCloseButtonIsNeedShow = true
  710 + model.privacyAlertMaskIsNeedShow = true
  711 + model.privacyAlertIsNeedAutoLogin = false
  712 + model.tapPrivacyAlertMaskCloseAlert = false
  713 + model.expandAuthPageCheckedScope = true
  714 + model.privacyAlertCloseButtonIsNeedShow = true
  715 +
  716 + model.privacyAlertTitleFrameBlock = { screenSize, superViewSize, frame in
  717 + return CGRect(x: 0, y: 20, width: frame.size.width, height: frame.size.height)
  718 + }
  719 + model.privacyAlertPrivacyContentFrameBlock = { screenSize, superViewSize ,frame in
  720 + return CGRect(x: 0, y: frame.minY+10, width: frame.size.width, height: frame.size.height)
  721 + }
  722 + model.privacyAlertButtonFrameBlock = { screenSize, superViewSize ,frame in
  723 + return CGRect(x: frame.minX, y: superViewSize.height - 50 - 20, width: frame.size.width, height: 50)
  724 + }
  725 + model.privacyAlertFrameBlock = { screenSize, superViewSize ,frame in
  726 + return CGRect(x: 40, y: (superViewSize.height - 150)*0.5, width: screenSize.width-80, height: 150)
  727 + }
  728 +
686 729 TXCommonHandler.sharedInstance().getLoginToken(withTimeout: 3.0, controller: self, model: model) { resultDic in
687 730 print("一键登录结果：\(resultDic)")
688 731 if let resultCode = resultDic["resultCode"] as? String{
... ... @@ -697,7 +740,12 @@ extension CNLiveLoginViewController {
697 740 PNSCodeLoginPrivacyAlertViewClickContinue == resultCode ||
698 741 PNSCodeLoginPrivacyAlertViewClose == resultCode ||
699 742 PNSCodeLoginPrivacyAlertViewPrivacyContentClick == resultCode{
700   - print("页面点击事件回调：\(resultDic)")
  743 + print("页面点击事件回调：\(resultDic)")//PNSCodeLoginControllerClickLoginBtn
  744 +// if PNSCodeLoginControllerClickLoginBtn == resultCode && TXCommonHandler.sharedInstance().queryCheckBoxIsChecked() == false{
  745 +// print("同意并登录")//alert弹窗
  746 +// TXCommonHandler.sharedInstance().setCheckboxIsChecked(true)
  747 +// print(TXCommonHandler.sharedInstance().queryCheckBoxIsChecked())
  748 +// }
701 749 }else if "700020" == resultCode{
702 750 print("页面已完全销毁dealloc：\(resultDic)")
703 751 }else if PNSCodeSuccess == resultCode{
... ...
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
  View file @313f0a7
... ... @@ -101,7 +101,7 @@ class MineHeaderView : UIView {
101 101 }
102 102  
103 103 @objc func loginBtnAction() {
104   - currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController(), animated: true)
  104 + currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController(), animated: false)
105 105 }
106 106  
107 107 @objc func tipBtnAction() {
... ...
metaCode/Classes/Other/AppDelegate.swift
  View file @313f0a7
... ... @@ -200,8 +200,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
200 200 window?.rootViewController = UINavigationController(rootViewController: CNLiveLoginViewController.init())
201 201 }
202 202 func pushLoginVC(){
203   - currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController.init(), animated: true)
204   - }
  203 + currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController.init(), animated: false)
  204 + }
205 205  
206 206  
207 207 // MARK: - 响应录屏状态变化
... ...