no message

zhangxiaowen
1 parent 98ea20e2
Showing 3 changed files with 60 additions and 29 deletions
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementWebController.h
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementWebController.m
Example/CNLiveUserAgreementManager/CNLiveViewController.m
@@ -11,6 +11,16 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveUserAgreementWebController : UIViewController
+
+/**
+ *  对象方法 初始化方法
+ *  @param url url
+ *  @param name 标题
+ *  注意:默认没有关闭按钮
+ */
+- (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name;
+
+
 /**
  *  对象方法 初始化方法
  *  @param url url
@@ -30,6 +30,10 @@
 static const NSInteger margin = 15;
 #pragma mark - 初始化方法
+- (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name{
+    return [self initWithUrl:url name:name showCloseBtn:NO];
+}
+
 - (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name showCloseBtn:(BOOL)isShow {
     self = [super init];
     if (self) {
@@ -43,27 +47,23 @@ static const NSInteger margin = 15;
 - (void)setName:(NSString *)name{
     _name = name;
     _titleLabel.text = name;
-
 }
 #pragma mark - 加载数据
 - (void)loadUrl {
     NSMutableURLRequest *theRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:self.url] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15.0];
     [self.webView loadRequest:theRequest];
-    
 }
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
-
 }
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     self.navigationController.navigationBarHidden = NO;
-
 }
 - (void)viewDidLoad {
@@ -76,7 +76,7 @@ static const NSInteger margin = 15;
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
     [self setupNavigationBar];
-    [self setupUI];
+    [self createSubViews];
     [self loadUrl];
 }
@@ -99,14 +99,14 @@ static const NSInteger margin = 15;
 #pragma mark - 创建导航条
 - (void)setupNavigationBar {
-    UIView *navView = [[UIView alloc] initWithFrame:CGRectMake(0, [UIApplication sharedApplication].statusBarFrame.size.height, [UIScreen mainScreen].bounds.size.width, 44)];
+    UIView *navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44+[UIApplication sharedApplication].statusBarFrame.size.height)];
     navView.backgroundColor = [UIColor clearColor];
     [self.view bringSubviewToFront:navView];
     [self.view addSubview:navView];
     UIButton *leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     leftBtn.adjustsImageWhenHighlighted = NO;
-    leftBtn.frame = CGRectMake(margin, 0, 44, 44);
+    leftBtn.frame = CGRectMake(margin, [UIApplication sharedApplication].statusBarFrame.size.height, 44, 44);
     UIImage *leftImage = [self xw_getImageName:@"web_black_back" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
     [leftBtn setImage:[leftImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
     [leftBtn addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
@@ -115,7 +115,7 @@ static const NSInteger margin = 15;
     UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     closeBtn.adjustsImageWhenHighlighted = NO;
-    closeBtn.frame = CGRectMake(44+margin, 0, 44, 44);
+    closeBtn.frame = CGRectMake(44+margin, [UIApplication sharedApplication].statusBarFrame.size.height, 44, 44);
     UIImage *closeImage = [self xw_getImageName:@"web_black_close" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
     [closeBtn setImage:[closeImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
     [closeBtn addTarget:self action:@selector(closeClick) forControlEvents:UIControlEventTouchUpInside];
@@ -123,7 +123,7 @@ static const NSInteger margin = 15;
     closeBtn.hidden = !self.isShow;
     [navView addSubview:closeBtn];
-    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(([[UIScreen mainScreen] bounds].size.width - 200)/2.0, 0, 200, 44)];
+    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(([[UIScreen mainScreen] bounds].size.width - 200)/2.0, [UIApplication sharedApplication].statusBarFrame.size.height, 200, 44)];
     titleLabel.font = [UIFont boldSystemFontOfSize:17];
     titleLabel.textColor = [UIColor blackColor];
     titleLabel.text = self.name;
@@ -133,25 +133,8 @@ static const NSInteger margin = 15;
 }
-- (void)setupUI {
-    WKWebViewConfiguration * configuration = [[WKWebViewConfiguration alloc] init];
-    configuration.allowsInlineMediaPlayback = YES;
-    WKPreferences *preferences = [WKPreferences new];
-    preferences.javaScriptCanOpenWindowsAutomatically = YES;
-    configuration.preferences = preferences;
-    self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, [UIApplication sharedApplication].statusBarFrame.size.height+44, [[UIScreen mainScreen] bounds].size.width, [[UIScreen mainScreen] bounds].size.height-([UIApplication sharedApplication].statusBarFrame.size.height+44)) configuration:configuration];
-    _webView.UIDelegate = self;
-    _webView.navigationDelegate = self;
-    _webView.contentMode = UIViewContentModeScaleAspectFit;
-    _webView.scrollView.showsHorizontalScrollIndicator = NO;
-    _webView.scrollView.showsVerticalScrollIndicator = NO;
-    _webView.allowsBackForwardNavigationGestures = YES;
-    _webView.allowsLinkPreview = NO;
+- (void)createSubViews {
     [self.view addSubview:self.webView];
-    
-    self.processView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, ([UIApplication sharedApplication].statusBarFrame.size.height+44)+0.5, [[UIScreen mainScreen] bounds].size.width, 1)];
-    _processView.progressTintColor = [UIColor colorWithRed:19/255.0 green:204/255.0 blue:12/255.0 alpha:1.0];
-    _processView.trackTintColor = [UIColor whiteColor];
     [self.view addSubview:self.processView];
     [self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
@@ -268,6 +251,35 @@ static const NSInteger margin = 15;
     }
 }
 #pragma mark - 懒加载
+- (WKWebView *)webView{
+    if(!_webView){
+        WKWebViewConfiguration * configuration = [[WKWebViewConfiguration alloc] init];
+        configuration.allowsInlineMediaPlayback = YES;
+        WKPreferences *preferences = [WKPreferences new];
+        preferences.javaScriptCanOpenWindowsAutomatically = YES;
+        configuration.preferences = preferences;
+        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, [UIApplication sharedApplication].statusBarFrame.size.height+44, [[UIScreen mainScreen] bounds].size.width, [[UIScreen mainScreen] bounds].size.height-([UIApplication sharedApplication].statusBarFrame.size.height+44)) configuration:configuration];
+        _webView.UIDelegate = self;
+        _webView.navigationDelegate = self;
+        _webView.contentMode = UIViewContentModeScaleAspectFit;
+        _webView.scrollView.showsHorizontalScrollIndicator = NO;
+        _webView.scrollView.showsVerticalScrollIndicator = NO;
+        _webView.allowsBackForwardNavigationGestures = YES;
+        _webView.allowsLinkPreview = NO;
+        
+    }
+    return _webView;
+}
+
+- (UIProgressView *)processView{
+    if(!_processView){
+        _processView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, ([UIApplication sharedApplication].statusBarFrame.size.height+44)+0.5, [[UIScreen mainScreen] bounds].size.width, 1)];
+        _processView.progressTintColor = [UIColor colorWithRed:19/255.0 green:204/255.0 blue:12/255.0 alpha:1.0];
+        _processView.trackTintColor = [UIColor whiteColor];
+    }
+    return _processView;
+}
+
 #pragma mark - 私有方法
 // 清除缓存
 - (void)clearWKCache {
@@ -7,9 +7,11 @@
 //
 #import "CNLiveViewController.h"
-#import "CNLiveUserAgreementManager.h"
 #import "CNLiveEnvironment.h"
+#import "CNLiveUserAgreementManager.h"
+#import "CNLiveUserAgreementWebController.h"
+
 @interface CNLiveViewController ()
 @end
@@ -33,8 +35,15 @@
 }
 - (void)testButtonClicked {
-    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];
+//    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];
 //    [CNLiveUserAgreementManager jumpToAgreementH5WithString:@"yhxy"];
+    [CNLiveUserAgreementManager getAgreementH5WithType:CNLiveUserAgreementCancellation success:^(NSString * _Nonnull h5, NSString * _Nonnull title, BOOL isShow) {
+        CNLiveUserAgreementWebController *vc = [[CNLiveUserAgreementWebController alloc] initWithUrl:h5 name:title showCloseBtn:NO];
+        [self.navigationController pushViewController:vc animated:YES];
+        
+    } failure:^(NSError * _Nonnull error) {
+        
+    }];
 }