diff --git a/xplan-ios/Main/Login/View/LoginViewController.m b/xplan-ios/Main/Login/View/LoginViewController.m index 8395325e..95896ba6 100644 --- a/xplan-ios/Main/Login/View/LoginViewController.m +++ b/xplan-ios/Main/Login/View/LoginViewController.m @@ -21,12 +21,14 @@ #import "XPConstant.h" #import "StatisticsServiceHelper.h" #import "TTPopup.h" +#import "XPHtmlUrl.h" ///Present #import "LoginPresenter.h" #import "LoginProtocol.h" ///VC #import "LoginPhoneViewController.h" #import "UserPrivacyView.h" +#import "XPWebViewController.h" UIKIT_EXTERN NSString * const kYinyouPrivateKey; @@ -478,11 +480,13 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { attString.yy_color = [ThemeColor mainTextColor]; NSString *userString = @"《用户服务协议》"; NSMutableAttributedString *userAttString = [[NSMutableAttributedString alloc] initWithString:userString attributes:@{NSForegroundColorAttributeName:[ThemeColor appMainColor]}]; -// @weakify(self) + @weakify(self) [userAttString yy_setTextHighlightRange:NSMakeRange(0, userAttString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { -// @strongify(self); + @strongify(self); // 跳转用户协议 - // [self goToWebview:HtmlUrlKey(kUserProtocalURL)]; + XPWebViewController * webVC = [[XPWebViewController alloc] init]; + webVC.url = URLWithType(kUserProtocalURL); + [self.navigationController pushViewController:webVC animated:YES]; } longPressAction:nil]; NSMutableAttributedString *andString = [[NSMutableAttributedString alloc] initWithString:@"和"]; @@ -490,9 +494,11 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { NSString *protocolString = @"《隐私政策》"; NSMutableAttributedString *privateString = [[NSMutableAttributedString alloc] initWithString:protocolString attributes:@{NSForegroundColorAttributeName:[ThemeColor appMainColor]}]; [privateString yy_setTextHighlightRange:NSMakeRange(0, privateString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { -// @strongify(self); + @strongify(self); // 跳转隐私政策 - // [self goToWebview:HtmlUrlKey(kPrivacyURL)]; + XPWebViewController * webVC = [[XPWebViewController alloc] init]; + webVC.url = URLWithType(kPrivacyURL); + [self.navigationController pushViewController:webVC animated:YES]; } longPressAction:nil]; [attString appendAttributedString:userAttString]; [attString appendAttributedString:andString];