更新pod

Author: illusionspaces

.DS_Store

@@ -26,7 +26,11 @@ - (instancetype)initWithWebViewEngine:(WKWebViewEngine *)webViewEngine {
 
 - (UIViewController *)rootViewController {
     if (_webViewEngine != nil) {
-        return self.webViewEngine.webViewDelegate;
+        if ([self.webViewEngine.webViewDelegate isKindOfClass:[UIViewController class]]) {
+            return (UIViewController *)self.webViewEngine.webViewDelegate;
+        }else {
+            return nil;
+        }
     }
     return nil;
 }

WKJavaScriptBridge-demo/WKJavaScriptBridge-demo.xcworkspace/xcuserdata/kevin.xcuserdatad/UserInterfaceState.xcuserstate

@@ -75,19 +75,18 @@ - (void)evalJs:(NSString *)js {
 }
 
 - (id)getCommandInstance:(NSString*)pluginName {
-    return [_webViewEngine getCommandInstance:pluginName];
+    return [_webViewEngine.bridge getCommandInstance:pluginName];
 }
 
 - (void)runInBackground:(void (^)(void))block {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), block);
 }
 
 - (void)reloadWebView {
-    [_webViewEngine.bridge reload];
+    [_webViewEngine.webView reload];
 }
 
-- (BOOL)isValidCallbackId:(NSString*)callbackId
-{
+- (BOOL)isValidCallbackId:(NSString*)callbackId {
     if ((callbackId == nil) || (_callbackIdPattern == nil)) {
         return NO;
     }

WKJavaScriptBridge/WKBasePlugin.m

@@ -13,23 +13,27 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol WKJavaScriptBridgeProtocol <NSObject>
 
 /**
- native 调用 js接口
+ 执行JS
 
  @param javaScriptString js
  @param completionHandler 结果回调
  */
 - (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^)(id, NSError *))completionHandler;
 
-
 /**
- 刷新webView
+ 插件加载
+ 
+ @param pluginName name
  */
-- (void)reload;
+- (void)setupPluginName:(NSString *)pluginName;
 
 /**
- 是否开启插件白名单，默认开启
+ 获取plugin实例
+ 
+ @param pluginName plugin name
+ @return instance
  */
-@property (nonatomic, assign, getter=isOpenWhiteList) BOOL openWhiteList;
+- (id)getCommandInstance:(NSString*)pluginName;
 
 @end
 

WKJavaScriptBridge/WKCommandImpl.m

@@ -35,7 +35,7 @@ - (void)registedAnnotationModules {
     NSArray<NSString *>*services = [WKWebPluginAnnotation AnnotationModules];
     for (NSString *pluginName in services) {
         if (pluginName) {
-            [_webViewEngine setupPluginName:pluginName];
+            [_webViewEngine.bridge setupPluginName:pluginName];
         }
     }
 }

WKJavaScriptBridge/WKJavaScriptBridgeProtocol.h

@@ -19,48 +19,28 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class WKWebViewHandleFactory;
 
-@interface WKWebViewEngine : NSObject <WKScriptMessageHandler, WKJavaScriptBridgeProtocol>
+@interface WKWebViewEngine : NSObject
 
 @property (nonatomic, readonly, strong) id <WKCommandProtocol> commandDelegate;
-@property (nonatomic, readonly, strong) WKWebViewHandleFactory *webViewhandleFactory;
 @property (nonatomic, readonly, strong) id <WKJavaScriptBridgeProtocol>bridge;
 
-/**
- 是否开启插件白名单，默认开启
- */
+/** 是否开启插件白名单，默认开启 */
 @property (nonatomic, assign, getter=isOpenWhiteList) BOOL openWhiteList;
-/**
- 外部提供的webView
- */
-@property (nonatomic, readonly, weak) WKWebView *webView;
 
-/**
- webView容器VC
- */
-@property (nonatomic, weak) id webViewDelegate;
+/** 外部提供的webView */
+@property (nonatomic, readonly, weak) WKWebView *webView;
 
-/**
- webView绑定 bridge初始化
- 
- @param webView WKWebView
- @return bridge
- */
-+ (instancetype)bindBridgeWithWebView:(WKWebView *)webView;
+/** webView的容器 */
+@property (nonatomic, readonly, weak) NSObject <WKNavigationDelegate>*webViewDelegate;
 
 /**
- 插件预加载接口 onload 为 1 表示提前初始化此插件对象 否则在调用时初始化
- 
- @param pluginName name
- */
-- (void)setupPluginName:(NSString *)pluginName;
+ 初始化方法
 
-/**
- 获取plugin实例
- 
- @param pluginName plugin name
- @return instance
+ @param webView webView
+ @param webViewDelegate 实现webView代理的类，没有可传空
+ @return bridge
  */
-- (id)getCommandInstance:(NSString*)pluginName;
++ (instancetype)bindBridgeWithWebView:(WKWebView *)webView withDelegate:(NSObject <WKNavigationDelegate>*)webViewDelegate;
 
 @end
 

WKJavaScriptBridge/WKWebPluginAnnotation.m

@@ -14,60 +14,33 @@ @interface WKWebViewEngine ()
 
 @property (nonatomic, strong) WKWebViewDelegate *WKWebViewDelegate;
 @property (nonatomic, strong) WKWebPluginAnnotation *webPluginAnnotation;
+@property (nonatomic, strong) WKWebViewHandleFactory *webViewhandleFactory;
 @property (nonatomic, strong) NSMutableDictionary *pluginsMap;
 @property (nonatomic, weak, readwrite) WKWebView *webView;
+@property (nonatomic, weak, readwrite) NSObject <WKNavigationDelegate>*webViewDelegate;
 
 @end
 
 @implementation WKWebViewEngine
 
-@synthesize openWhiteList = _openWhiteList;
-
 #pragma mark - public
 
-+ (instancetype)bindBridgeWithWebView:(WKWebView *)webView {
-    return [self bridge:webView];
-}
-
-- (void)setupPluginName:(NSString *)pluginName {
-    [self.pluginsMap setValue:pluginName forKey:[pluginName lowercaseString]];
-}
-
-- (id)getCommandInstance:(NSString*)pluginName {
-    NSString* className = [self.pluginsMap objectForKey:[pluginName lowercaseString]];
-    if (className == nil && self.isOpenWhiteList) {
-#ifdef DEBUG
-        NSLog(@"(pluginName: (%@) does not register on the whitelist.", pluginName);
-#endif
-        return nil;
-    }
-    
-    id obj = [[NSClassFromString(pluginName) alloc] initWithWebViewEngine:self];
-    if (obj != nil) {
-        [self registerPlugin:obj];
-    }else {
-#ifdef DEBUG
-        NSLog(@"(pluginName: (%@) does not exist.", pluginName);
-#endif
-    }
-    return obj;
-}
-
-- (void)setWebViewDelegate:(NSObject<WKNavigationDelegate> *)webViewDelegate {
-    _webViewDelegate = webViewDelegate;
++ (instancetype)bindBridgeWithWebView:(WKWebView *)webView withDelegate:(NSObject <WKNavigationDelegate>*)webViewDelegate {
+    return [self bridge:webView delegate:webViewDelegate];
 }
 
 #pragma mark - privite
 
-+ (instancetype)bridge:(WKWebView *)webView {
++ (instancetype)bridge:(WKWebView *)webView delegate:(NSObject <WKNavigationDelegate>*)webViewDelegate {
     WKWebViewEngine *bridge = [[WKWebViewEngine alloc] init];
-    bridge.webView = webView;
-    [bridge setupInstance];
-    [bridge loadStartupPlugin];
-    
     if ([webView isKindOfClass:[WKWebView class]]) {
+        bridge.webViewDelegate = webViewDelegate;
+        bridge.webView = webView;
+        
+        [bridge setupInstance];
         [bridge configWKWebView:webView];
         [bridge setJavaScriptBridge:bridge];
+        [bridge loadStartupPlugin];
         return bridge;
     }
 
@@ -78,7 +51,7 @@ + (instancetype)bridge:(WKWebView *)webView {
 - (void)configWKWebView:(WKWebView *)webView {
     webView.navigationDelegate = _WKWebViewDelegate;
     webView.configuration.userContentController = [[WKUserContentController alloc] init];
-    [webView.configuration.userContentController addScriptMessageHandler:self name:@"WKWKJSBridge"];
+    [webView.configuration.userContentController addScriptMessageHandler:self name:@"WKJSBridge"];
 }
 
 - (void)setupInstance{
@@ -95,7 +68,6 @@ - (void)loadStartupPlugin {
 }
 
 - (void)registerPlugin:(WKBasePlugin *)plugin {
-    
     if ([plugin respondsToSelector:@selector(setCommandDelegate:)]) {
         [plugin setCommandDelegate:_commandDelegate];
     }
@@ -105,15 +77,6 @@ - (void)setJavaScriptBridge:(id<WKJavaScriptBridgeProtocol>)bridge {
     _bridge = bridge;
 }
 
-#pragma mark - dealloc
-
-- (void)dealloc {
-    if ([self.webView isKindOfClass:[WKWebView class]]) {
-        WKWebView *webView = (WKWebView *)self.webView;
-        [webView.configuration.userContentController removeScriptMessageHandlerForName:@"WKWKJSBridge"];
-    }
-}
-
 #pragma mark - WKScriptMessageHandler
 
 - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
@@ -132,13 +95,34 @@ - (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void
     }];
 }
 
-- (void)reload {
-    [self.webView reload];
+- (void)setupPluginName:(NSString *)pluginName {
+    [self.pluginsMap setValue:pluginName forKey:[pluginName lowercaseString]];
 }
 
-- (void)setOpenWhiteList:(BOOL)openWhiteList {
-    _openWhiteList = openWhiteList;
+- (id)getCommandInstance:(NSString*)pluginName {
+    NSString* className = [self.pluginsMap objectForKey:[pluginName lowercaseString]];
+    if (className == nil && self.isOpenWhiteList) {
+#ifdef DEBUG
+        NSLog(@"(pluginName: (%@) does not register on the whitelist.", pluginName);
+#endif
+        return nil;
+    }
+    
+    id obj = [[NSClassFromString(pluginName) alloc] initWithWebViewEngine:self];
+    if (obj != nil) {
+        [self registerPlugin:obj];
+    }else {
+#ifdef DEBUG
+        NSLog(@"(pluginName: (%@) does not exist.", pluginName);
+#endif
+    }
+    return obj;
 }
 
+#pragma mark - dealloc
+
+- (void)dealloc {
+    [self.webView.configuration.userContentController removeScriptMessageHandlerForName:@"WKJSBridge"];
+}
 
 @end