1.2.3.25.08.08.14 , 打包提审 ,

默认打开一键登录页面一键登录按钮常亮 ,点击一键登录弹出二次弹窗

1.2.3.25.08.08.14 , 打包提审 ,
默认打开一键登录页面一键登录按钮常亮 ,点击一键登录弹出二次弹窗
张旭
1 parent 4af1400b
Showing 4 changed files with 58 additions and 10 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -2978,7 +2978,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.2.2.25.07.29.17;
+				CURRENT_PROJECT_VERSION = 1.2.3.25.08.08.14;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3051,7 +3051,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -3234,7 +3234,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.2.2.25.07.29.17;
+				CURRENT_PROJECT_VERSION = 1.2.3.25.08.08.14;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -3306,7 +3306,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -173,6 +173,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         self.setupLoginButtonView()
 //        LoginAuthInfoView.showAuthView()
+        oneClickLoginActionMothod()
     }
     deinit {
@@ -631,7 +632,7 @@ extension CNLiveLoginViewController {
         }
     }
-    @objc func oneClickLoginActionMothod(sender : UIButton) {
+    @objc func oneClickLoginActionMothod() {
         //一键登录
         // 假设TXCustomModel是一个已定义的Swift类，且具有相应的属性
         let model = TXCustomModel()
@@ -649,6 +650,10 @@ extension CNLiveLoginViewController {
         model.changeBtnIsHidden = true
         model.privacyOne = ["用户协议", "https://wjjh5.cnlive.com/yuanmaYhxy.html"]
         model.privacyTwo = ["隐私政策", "https://wjjh5.cnlive.com/yuanmaYszc.html"]
+        
+        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)
+//        let bgGrayImg = TXCommonUtils.image(with: UIColor.gray, size: CGSize(width: KSreenWidth*0.5+10, height: 40), isRoundedCorner: true, radius: 20)
+        model.loginBtnBgImgs = [bgNormalImg!,bgNormalImg!,bgNormalImg!]
         // 创建关键帧动画
         let animation = CAKeyframeAnimation(keyPath: "transform.translation.y")
@@ -664,7 +669,7 @@ extension CNLiveLoginViewController {
         ]
         animation.duration = 0.5
-        model.checkboxAnimation = animation
+//        model.checkboxAnimation = animation
         // 切换到其他方式按钮
         let button1: UIButton = UIButton(type: .system)
@@ -683,6 +688,44 @@ extension CNLiveLoginViewController {
                                    height: 30)
         }
+        //二次协议弹窗
+        model.privacyAlertIsNeedShow = true
+        model.privacyAlertMaskAlpha = 0.5
+        model.privacyAlertMaskColor = UIColor.black
+        model.privacyAlertCornerRadiusArray = [10,10,10,10]
+        model.privacyAlertBackgroundColor = UIColor.white
+        model.privacyAlertAlpha = 1.0
+        model.privacyAlertTitleBackgroundColor = UIColor.white
+        model.privacyAlertContentBackgroundColor = UIColor.white
+        model.privacyAlertTitleFont = UIFont.systemFont(ofSize: 16)
+        model.privacyAlertTitleColor = UIColor.black
+        model.privacyAlertContentColors = [UIColor.gray, UIColor.blue]
+        model.privacyAlertContentAlignment = NSTextAlignment.center
+        let activeImage = TXCommonUtils.image(with: UIColor.blue, size: CGSize(width: KSreenWidth-2*18, height: 50), isRoundedCorner: true, radius: 10)!
+        let hightLightImage = TXCommonUtils.image(with: UIColor.gray, size: CGSize(width: KSreenWidth-2*18, height: 50), isRoundedCorner: true, radius: 10)!
+        model.privacyAlertBtnBackgroundImages = [activeImage, hightLightImage]
+        model.privacyAlertButtonTextColors = [UIColor.white,UIColor.blue]
+        model.privacyAlertButtonFont = UIFont.systemFont(ofSize: 18)
+        model.privacyAlertCloseButtonIsNeedShow = true
+        model.privacyAlertMaskIsNeedShow = true
+        model.privacyAlertIsNeedAutoLogin = false
+        model.tapPrivacyAlertMaskCloseAlert = false
+        model.expandAuthPageCheckedScope = true
+        model.privacyAlertCloseButtonIsNeedShow = true
+        
+        model.privacyAlertTitleFrameBlock = { screenSize, superViewSize, frame in
+            return CGRect(x: 0, y: 20, width: frame.size.width, height: frame.size.height)
+        }
+        model.privacyAlertPrivacyContentFrameBlock = { screenSize, superViewSize ,frame in
+            return CGRect(x: 0, y: frame.minY+10, width: frame.size.width, height: frame.size.height)
+        }
+        model.privacyAlertButtonFrameBlock = { screenSize, superViewSize ,frame in
+            return CGRect(x: frame.minX, y: superViewSize.height - 50 - 20, width: frame.size.width, height: 50)
+        }
+        model.privacyAlertFrameBlock = { screenSize, superViewSize ,frame in
+            return CGRect(x: 40, y: (superViewSize.height - 150)*0.5, width: screenSize.width-80, height: 150)
+        }
+        
         TXCommonHandler.sharedInstance().getLoginToken(withTimeout: 3.0, controller: self, model: model) { resultDic in
             print("一键登录结果：\(resultDic)")
             if let resultCode = resultDic["resultCode"] as? String{
@@ -697,7 +740,12 @@ extension CNLiveLoginViewController {
                             PNSCodeLoginPrivacyAlertViewClickContinue == resultCode ||
                             PNSCodeLoginPrivacyAlertViewClose == resultCode ||
                             PNSCodeLoginPrivacyAlertViewPrivacyContentClick == resultCode{
-                    print("页面点击事件回调：\(resultDic)")
+                    print("页面点击事件回调：\(resultDic)")//PNSCodeLoginControllerClickLoginBtn
+//                    if PNSCodeLoginControllerClickLoginBtn == resultCode && TXCommonHandler.sharedInstance().queryCheckBoxIsChecked() == false{
+//                        print("同意并登录")//alert弹窗
+//                        TXCommonHandler.sharedInstance().setCheckboxIsChecked(true)
+//                        print(TXCommonHandler.sharedInstance().queryCheckBoxIsChecked())
+//                    }
                 }else if "700020" == resultCode{
                     print("页面已完全销毁dealloc：\(resultDic)")
                 }else if PNSCodeSuccess == resultCode{
@@ -101,7 +101,7 @@ class MineHeaderView : UIView {
     }
     @objc func loginBtnAction() {
-        currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController(), animated: true)
+        currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController(), animated: false)
     }
     @objc func tipBtnAction() {
@@ -200,8 +200,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.rootViewController = UINavigationController(rootViewController: CNLiveLoginViewController.init())
     }
     func pushLoginVC(){
-        currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController.init(), animated: true)
-    }    
+        currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController.init(), animated: false)
+    }
     // MARK: - 响应录屏状态变化