1.1.7

1. Add life cycle event
2. add refresh previous method

Author: Luo-Kuang

README.md

@@ -20,7 +20,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '9.0'
 
 target 'TargetName' do
-pod 'ZFWKWebView', '~> 1.1.6'
+pod 'ZFWKWebView', '~> 1.1.7'
 end
 ```
 Then, run the following command:

ZFWKWebView.podspec

@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "ZFWKWebView"
-  s.version      = "1.1.6"
+  s.version      = "1.1.7"
   s.summary      = "No short description of ZFWKWebView."
   s.homepage     = "https://github.com/FranLucky/ZFWKWebView"
   s.license      = { :type => "MIT", :file => "LICENSE"}

ZFWKWebView/ZFWKWebVC.h

@@ -35,6 +35,12 @@ UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventRightButtonClickKey;
 UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventGoBackKey;
 UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventGoForwardKey;
 
+UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventViewWillAppear;
+UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventViewWillDisappear;
+UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventViewDidDisappear;
+UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventViewDidLoad;
+UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventViewWillLayoutSubviews;
+
 @interface ZFWKWebVCConf : NSObject
 /**
  *  ZFWKWebVCPopTypePervious => popViewControllerAnimated (default)
@@ -100,6 +106,7 @@ UIKIT_EXTERN ZFWKWebViewEventKey const ZFWKWebViewEventGoForwardKey;
 
 - (void)evaluateJavaScriptMethodName:(NSString *)name params:(id _Nullable)params callback:(void (^ _Nullable)(id _Nullable body, NSError * _Nullable error))callback;
 - (void)removeUserScript:(NSString *)script;
+- (void)reloadPreviousRequest;
 
 @property (nonatomic, strong, readonly) WKWebView *webView;
 @property (nonatomic, strong, nullable) ZFWKWebVCBottomBar *bottomBar;

ZFWKWebView/ZFWKWebVC.m

@@ -29,6 +29,12 @@
 NSString * const ZFWKWebViewEventGoBackKey = @"ZFWKWebViewEventGoBackKey";
 NSString * const ZFWKWebViewEventGoForwardKey = @"ZFWKWebViewEventGoForwardKey";
 
+NSString * const ZFWKWebViewEventViewWillAppear = @"ZFWKWebViewEventViewWillAppear";
+NSString * const ZFWKWebViewEventViewWillDisappear = @"ZFWKWebViewEventViewWillDisappear";
+NSString * const ZFWKWebViewEventViewDidDisappear = @"ZFWKWebViewEventViewDidDisappear";
+NSString * const ZFWKWebViewEventViewDidLoad = @"ZFWKWebViewEventViewDidLoad";
+NSString * const ZFWKWebViewEventViewWillLayoutSubviews = @"ZFWKWebViewEventViewWillLayoutSubviews";
+
 static inline BOOL isIPhoneXSeries() {
     BOOL iPhoneXSeries = NO;
     if (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPhone) return iPhoneXSeries;
@@ -278,14 +284,26 @@ - (void)removeJS {
 }
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
+    
+    zf_wkWebViewEventCallBack callback = self.config.callbacks[ZFWKWebViewEventViewWillAppear];
+    if (callback) callback(self, self.config, nil);
+    
     [self addJS];
 }
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
+    
+    zf_wkWebViewEventCallBack callback = self.config.callbacks[ZFWKWebViewEventViewWillDisappear];
+    if (callback) callback(self, self.config, nil);
+    
     [self removeJS];
 }
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
+    
+    zf_wkWebViewEventCallBack callback = self.config.callbacks[ZFWKWebViewEventViewDidDisappear];
+    if (callback) callback(self, self.config, nil);
+    
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -380,6 +398,11 @@ - (void)viewDidLoad {
     self.loadFailedView.imageView.image = self.config.refreshButtonImage;
     [self.loadFailedView.hoverButton addTarget:self action:@selector(refresh) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:self.loadFailedView];
+    
+    
+    zf_wkWebViewEventCallBack callback = self.config.callbacks[ZFWKWebViewEventViewDidLoad];
+    if (callback) callback(self, self.config, nil);
+    
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
@@ -486,6 +509,10 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
+    
+    zf_wkWebViewEventCallBack callback = self.config.callbacks[ZFWKWebViewEventViewWillLayoutSubviews];
+    if (callback) callback(self, self.config, nil);
+    
     float y = 0;
     float navHeight = 64;
     if (isIPhoneXSeries()) {
@@ -536,13 +563,21 @@ - (void)rightButtonClick:(UIButton *)button {
     if (callback) callback(self, self.config, button);
 }
 
+- (void)reloadPreviousRequest {
+    [self refresh];
+}
+
 - (void)refresh {
     self.titleLabel.text = [ZFWKWebVCConf localizedStringForKey:@"Loading..."];
     zf_wkWebViewEventCallBack callback = self.config.callbacks[ZFWKWebViewEventRefreshKey];
     if (callback) callback(self, self.config, nil);
     [self.webView stopLoading];
-    NSURLRequest *req = [[NSURLRequest alloc] initWithURL:self.previousURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:self.config.timeoutDuration];
-    [self.webView loadRequest:req];
+    if (self.previousURL) {
+        NSURLRequest *req = [[NSURLRequest alloc] initWithURL:self.previousURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:self.config.timeoutDuration];
+        [self.webView loadRequest:req];
+    } else {
+        [self.webView reload];
+    }
 }
 - (void)goBack {
     if ([self.webView canGoBack]) [self.webView goBack];