登录协议更改完成

RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -46,7 +46,8 @@ class ATAuthSDKManager: NSObject {
                 
                 //协议
                 //                modelNew.checkBoxImages = [UIImage(),UIImage()]
-                modelNew.privacyOne = ["服务和隐私条款",kH5ContentId6Url];
+                modelNew.privacyOne = ["由你用户协议",kH5ContentId6Url];
+                modelNew.privacyTwo = ["隐私条款",kH5ContentId11Url];
                 modelNew.checkBoxIsChecked = true
                 modelNew.privacyBottomOffetY = 46.5 - kSafeTabBarHeight
                 modelNew.privacyColors = [kbbbbbbColor,k333333Color];

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/BindPhoneNumber/View/BindPhoneNumberView.swift

@@ -190,10 +190,15 @@ class BindPhoneNumberView: BaseView {
             self?.observableString()
         }).disposed(by: disposeBag)
         
-        agreementLabel.addClickText("服务和隐私条款", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
+        agreementLabel.addClickText("由你用户协议", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
             (data) in
             Mediator.push(H5RouterModuleType.pushContentId6)
         }
+        
+        agreementLabel.addClickText("隐私条款", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
+            (data) in
+            Mediator.push(H5RouterModuleType.pushContentId11)
+        }
     }
     
     func observableString() {
@@ -364,7 +369,7 @@ class BindPhoneNumberView: BaseView {
         agreementLabel.textColor = kbbbbbbColor
         agreementLabel.font = kRegularFont12
         agreementLabel.isUserInteractionEnabled = true
-        agreementLabel.text =  "登录即表示你已阅读并同意 服务和隐私条款"
+        agreementLabel.text =  "登录即表示你已阅读并同意 由你用户协议 和 隐私条款"
         agreementLabel.textAlignment = .center
         return agreementLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/View/MobileLoginView.swift

@@ -174,10 +174,14 @@ class MobileLoginView: BaseView {
             self?.observableString()
         }).disposed(by: disposeBag)
         
-        agreementLabel.addClickText("服务和隐私条款", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
+        agreementLabel.addClickText("由你用户协议", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
             (data) in
             Mediator.push(H5RouterModuleType.pushContentId6)
         }
+        agreementLabel.addClickText("隐私条款", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
+            (data) in
+            Mediator.push(H5RouterModuleType.pushContentId11)
+        }
     }
     
     func observableString() {
@@ -348,7 +352,7 @@ class MobileLoginView: BaseView {
         agreementLabel.textColor = kbbbbbbColor
         agreementLabel.font = kRegularFont12
         agreementLabel.isUserInteractionEnabled = true
-        agreementLabel.text =  "登录即表示你已阅读并同意 服务和隐私条款"
+        agreementLabel.text =  "登录即表示你已阅读并同意 由你用户协议 和 隐私条款"
         agreementLabel.textAlignment = .center
         return agreementLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/View/PasswordLoginView.swift

@@ -146,6 +146,11 @@ class PasswordLoginView: BaseView {
             (data) in
             Mediator.push(H5RouterModuleType.pushContentId6)
         }
+        
+        agreementLabel.addClickText("隐私条款", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:k333333Color], transmitBody: nil) {
+            (data) in
+            Mediator.push(H5RouterModuleType.pushContentId11)
+        }
     }
     
     
@@ -268,7 +273,7 @@ class PasswordLoginView: BaseView {
         agreementLabel.textColor = kbbbbbbColor
         agreementLabel.font = kRegularFont12
         agreementLabel.isUserInteractionEnabled = true
-        agreementLabel.text =  "登录即表示你已阅读并同意 服务和隐私条款"
+        agreementLabel.text =  "登录即表示你已阅读并同意 由你用户协议 和 隐私条款"
         agreementLabel.textAlignment = .center
         return agreementLabel
     }()

RainbowPlanet/RainbowPlanet/Router/H5RouterModuleType.swift

@@ -30,6 +30,7 @@ public enum H5RouterModuleType: MediatorTargetType {
     case pushContentId4
     case pushContentId6
     case pushContentId7
+    case pushContentId11
     case pushBeanRecord
     case pushOrder
     case pushFeedback
@@ -61,6 +62,10 @@ extension H5RouterModuleType: MediatorSourceType {
             let vc = H5CommonViewController()
             vc.URLString = kH5ContentId7Url
             return vc
+        case .pushContentId11: //隐私协议
+            let vc = H5CommonViewController()
+            vc.URLString = kH5ContentId11Url
+            return vc
         case .pushBeanRecord: //赚豆明细
             let vc = H5CommonViewController()
             vc.URLString = kH5BeanRecordUrl

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkH5Manager.swift

@@ -32,6 +32,11 @@ let kH5ContentId6Url = kApiH5Prefix() + "/content?id=6"
 /// 内容授权协议
 let kH5ContentId7Url = kApiH5Prefix() + "/content?id=7"
 
+/// 隐私政策
+let kH5ContentId11Url = kApiH5Prefix() + "/content?id=11"
+
+
+
 /// 赚豆明细
 let kH5BeanRecordUrl = kApiH5Prefix() + "/bean/record"