// 二次弹窗UI

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHLoginMethodManager.swift

@@ -193,7 +193,7 @@ extension YHLoginMethodManager {
         model.loginBtnText = NSAttributedString(string: "本机号码一键登录", attributes: [NSAttributedString.Key.foregroundColor : UIColor.init(hex: 0x121A26), NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
         
         let enableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
-        let disableLoginBgImg = TXCommonUtils.image(with: UIColor.white.withAlphaComponent(0.4), size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
+        let disableLoginBgImg = TXCommonUtils.image(with: .white.withAlphaComponent(0.4), size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
         let imgArr:[UIImage] = [enableLoginBgImg, disableLoginBgImg, enableLoginBgImg]
         model.loginBtnBgImgs = imgArr
         
@@ -224,43 +224,45 @@ extension YHLoginMethodManager {
         // 配置二次弹窗
         model.privacyAlertIsNeedShow = true
         model.privacyAlertMaskAlpha = 0.5;
-        model.privacyAlertMaskColor = UIColor.black
+        model.privacyAlertMaskColor = .black
         model.privacyAlertCornerRadiusArray = [3, 3, 3, 3]
-        model.privacyAlertBackgroundColor = UIColor.white
+        model.privacyAlertBackgroundColor = .white
         model.privacyAlertAlpha = 1.0
-        model.privacyAlertTitleBackgroundColor = UIColor.white
-        model.privacyAlertContentBackgroundColor = UIColor.white
+        model.privacyAlertTitleBackgroundColor = .white
+        model.privacyAlertContentBackgroundColor = .white
         model.privacyAlertTitleFont = .PFSC_R(ofSize: 16)
         model.privacyAlertTitleColor = UIColor.black
         model.privacyAlertContentColors = [UIColor.gray, UIColor.orange]
         model.privacyAlertContentAlignment = .center
+        model.privacyAlertContentColors = [.black, .brandMainColor]
         
-        let activeImage = TXCommonUtils.image(with: UIColor.orange, size: CGSizeMake(UIScreen.main.bounds.size.width - 2 * 18, 50), isRoundedCorner: true, radius: 10)!
-        let hightLightImage = TXCommonUtils.image(with: UIColor.gray, size: CGSizeMake(UIScreen.main.bounds.size.width - 2 * 18, 50), isRoundedCorner: true, radius: 10)!
+        let activeImage = TXCommonUtils.image(with: .brandMainColor, size: CGSizeMake(UIScreen.main.bounds.size.width - 2 * 18, 45), isRoundedCorner: true, radius: 6)!
+        let hightLightImage = TXCommonUtils.image(with: .brandMainColor, size: CGSizeMake(UIScreen.main.bounds.size.width - 2 * 18, 45), isRoundedCorner: true, radius: 6)!
         model.privacyAlertBtnBackgroundImages = [activeImage, hightLightImage]
-        model.privacyAlertButtonTextColors = [UIColor.white, UIColor.blue]
-        model.privacyAlertButtonFont = .PFSC_R(ofSize: 18)
+        
+        model.privacyAlertButtonTextColors = [UIColor.white, UIColor.white]
+        model.privacyAlertButtonFont = .PFSC_R(ofSize: 16)
         model.privacyAlertCloseButtonIsNeedShow = true
         model.privacyAlertMaskIsNeedShow = true
-        model.privacyAlertIsNeedAutoLogin = false
+        model.privacyAlertIsNeedAutoLogin = true
         model.tapPrivacyAlertMaskCloseAlert = false
         model.expandAuthPageCheckedScope = true
         model.privacyAlertCloseButtonIsNeedShow = true
         model.privacyAlertTitleFrameBlock = {
             screenSize, superViewSize, frame in
-            return CGRectMake(0, 20, frame.size.width, frame.size.height)
+            return CGRectMake(0, 20, frame.size.width, 22)
         }
         model.privacyAlertPrivacyContentFrameBlock = {
             screenSize, superViewSize, frame in
-            return CGRectMake(0, frame.origin.y+10, frame.size.width, frame.size.height);
+            return CGRectMake(0, 20+22+20, frame.size.width-20, frame.size.height);
         }
         model.privacyAlertButtonFrameBlock = {
             screenSize, superViewSize, frame in
-            return CGRectMake(frame.origin.x,superViewSize.height - 50 - 20, frame.size.width, 50)
+            return CGRectMake(frame.origin.x, superViewSize.height - 50 - 20, frame.size.width, 45)
         }
         model.privacyAlertFrameBlock = {
             screenSize, superViewSize, frame in
-            return CGRectMake(40, (superViewSize.height - 150)*0.5, screenSize.width-80, 150)
+            return CGRectMake(40, (superViewSize.height - 150)/2.0, screenSize.width-80, 200)
         }
         return model
     }