提交0.0.14_添加web加载问题和输入框和其他人使用了同一通知

梁星国
1 parent 43535289
Showing 4 changed files with 137 additions and 17 deletions
CNLiveOrganizationValidationModule.podspec
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBWebViewController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveOrganizationValidationModule'
-  s.version          = '0.0.13'
+  s.version          = '0.0.14'
   s.summary          = '机构认证模块'
 # This description is used to generate tags and improve search results.
@@ -23,18 +23,30 @@
 #define CNLiveBOrganizationContentAgreementUrl cn_API_Refund(@"/term/cnBNraqxy.html")
 @interface CNLiveBAgreementContentController ()<WKNavigationDelegate,WKUIDelegate,UIScrollViewDelegate>
+@property (strong, nonatomic) NSString *url;
+
 @property (strong, nonatomic) WKWebView *wkwebView;
-@property (strong, nonatomic) NSString *url;
+@property (assign,nonatomic) NSUInteger loadCount;
+@property (assign,nonatomic) UIProgressView *progressView;
+
 @end
 @implementation CNLiveBAgreementContentController
+- (void)dealloc
+{
+    if (self.wkwebView && self) {
+        [self.wkwebView removeObserver:self forKeyPath:@"estimatedProgress"];
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"机构认证";
     [self.view setBackgroundColor:[UIColor whiteColor]];
+    self.url = CNLiveBOrganizationContentAgreementUrl;
     [self initWKWebView];
@@ -42,17 +54,81 @@
 -(void)initWKWebView
 {
+    
+    UIProgressView *progress = [[UIProgressView alloc]initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, 1)];
+    progress.tintColor = RGBOF(0x389FEF);
+    progress.trackTintColor = [UIColor whiteColor];
+    [self.view addSubview:progress];
+    self.progressView = progress;
+    
+    
     self.view.backgroundColor = [UIColor whiteColor];
-    self.url = CNLiveBOrganizationContentAgreementUrl;
-    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
-    self.view = webView;
-    NSURL *url = [NSURL URLWithString:self.url];
-    NSURLRequest *request = [NSURLRequest requestWithURL:url];
-    [webView loadRequest:request];
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, kScreenWidth, KScreenHeight - kNavigationBarHeight)];
+    [self.view addSubview:webView];
+    webView.UIDelegate = self;
+    webView.navigationDelegate = self;
+    webView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
+    [webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
+    if (self.url) {
+        NSURL *url = [NSURL URLWithString:self.url];
+        if (url) {
+            NSURLRequest *request = [NSURLRequest requestWithURL:url];
+            [webView loadRequest:request];
+        }
+    }
+    [self.view insertSubview:webView belowSubview:progress];
+    self.wkwebView = webView;
+    
+    self.extendedLayoutIncludesOpaqueBars = YES;
+    if (@available(iOS 11.0, *)) {
+        self.wkwebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    } else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
+}
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
+    if ([keyPath isEqualToString:@"estimatedProgress"]) {
+        CGFloat newProgress = [[change objectForKey:NSKeyValueChangeNewKey] doubleValue];
+        if (newProgress == 1) {
+            if (self) {
+                self.progressView.hidden = YES;
+                [self.progressView setProgress:0 animated:NO];
+            }
+
+        }else{
+            if (self) {
+                self.progressView.hidden = NO;
+                [self.progressView setProgress:newProgress animated:YES];
+            }
+
+        }
+    }
 }
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler{
+    //  在发送请求之前，决定是否跳转
+    decisionHandler(WKNavigationActionPolicyAllow);
+    
+}
+
+    // 页面开始加载时调用
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
+}
+    // 页面加载失败时调用
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error {
+    if (self) {
+        [self.progressView setProgress:0.0f animated:NO];
+        [QMUITips showError:@"加载失败,请检查网络" inView:self.view hideAfterDelay:0.5];
+    }
+
+    
+    
+}
+
+
@@ -30,6 +30,13 @@
 @implementation CNLiveBWebViewController
+- (void)dealloc
+{
+    if (self.wkwebView && self) {
+        [self.wkwebView removeObserver:self forKeyPath:@"estimatedProgress"];
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.view setBackgroundColor:[UIColor whiteColor]];
@@ -51,6 +58,8 @@
     self.view.backgroundColor = [UIColor whiteColor];
     WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, KScreenHeight)];
     [self.view addSubview:webView];
+    webView.UIDelegate = self;
+    webView.navigationDelegate = self;
     webView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
     [webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
     if (self.url) {
@@ -62,6 +71,15 @@
     }
     [self.view insertSubview:webView belowSubview:progress];
+    self.wkwebView = webView;
+    
+    self.extendedLayoutIncludesOpaqueBars = YES;
+    if (@available(iOS 11.0, *)) {
+        self.wkwebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    } else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
 }
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
@@ -69,11 +87,17 @@
     if ([keyPath isEqualToString:@"estimatedProgress"]) {
         CGFloat newProgress = [[change objectForKey:NSKeyValueChangeNewKey] doubleValue];
         if (newProgress == 1) {
-            self.progressView.hidden = YES;
-            [self.progressView setProgress:0 animated:NO];
+            if (self) {
+                self.progressView.hidden = YES;
+                [self.progressView setProgress:0 animated:NO];
+            }
+
         }else{
-            self.progressView.hidden = NO;
-            [self.progressView setProgress:newProgress animated:YES];
+            if (self) {
+                self.progressView.hidden = NO;
+                [self.progressView setProgress:newProgress animated:YES];
+            }
+
         }
     }
 }
@@ -82,9 +106,21 @@
     //  在发送请求之前，决定是否跳转
     decisionHandler(WKNavigationActionPolicyAllow);
-    
 }
+    // 页面开始加载时调用
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
+}
+    // 页面加载失败时调用
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error {
+    if (self) {
+        [self.progressView setProgress:0.0f animated:NO];
+        [QMUITips showError:@"加载失败,请检查网络" inView:self.view hideAfterDelay:0.5];
+    }
+
+    
+    
+}
@@ -28,6 +28,9 @@
 @implementation CNLiveBOrganizationTFCell
+-(void)dealloc {
+    
+}
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
@@ -61,7 +64,7 @@
     [self addSubview:self.contentL];
     self.selectionStyle = UITableViewCellSelectionStyleNone;
-    [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(textFieldTextChange:) name:UITextFieldTextDidChangeNotification object:nil];
+    [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(cnLiveBTextFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:nil];
     self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
     self.tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
@@ -180,7 +183,7 @@
 #pragma mark - ***监听实现***
-- (void)textFieldTextChange:(NSNotification *)notification{
+- (void)cnLiveBTextFieldTextDidChange:(NSNotification *)notification{
     CNLiveBOrganizationTextField *textField = (CNLiveBOrganizationTextField *)notification.object;
     if (textField) {
         if (textField.contentLengthMax == 0) {
@@ -293,6 +296,11 @@
 @implementation CNLiveBOrganizationTViewCell
+- (void)dealloc
+{
+    
+}
+
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
@@ -328,7 +336,7 @@
     self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
     self.contentTV.frame = CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 78);
-    [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(textViewTextChange:) name:UITextViewTextDidChangeNotification object:nil];
+    [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(cnliveBTextViewTextChange:) name:UITextViewTextDidChangeNotification object:nil];
 }
@@ -369,7 +377,7 @@
 #pragma mark - ***事件实现***
 #pragma mark - ***监听实现***
-- (void)textViewTextChange:(NSNotification *)notification{
+- (void)cnliveBTextViewTextChange:(NSNotification *)notification{
     CNLiveBOrganizationTextView *textView = (CNLiveBOrganizationTextView *)notification.object;
     if (textView) {
         if (textView.contentLengthMax == 0) {