Skip to content

Commit 2ab56ea

Browse files
illusionspacesillusionspaces
committed
业务模块添加获取webView接口
1 parent 32f4f43 commit 2ab56ea

8 files changed

Lines changed: 78 additions & 68 deletions

File tree

‎.DS_Store‎

0 Bytes
Binary file not shown.

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

4.76 KB
Binary file not shown.

‎WKJavaScriptBridge-demo/WKJavaScriptBridge-demo/WKJavaScriptBridge/Plugin/WKCommandImpl.m‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,34 @@ - (instancetype)initWithBridge:(WKJavaScriptBridge *)bridge {
3232
return self;
3333
}
3434

35+
- (void)evalJs:(NSString *)js {
36+
[_bridge evaluateJavaScript:js completionHandler:^(id obj, NSError * error) {
37+
if (error) {
38+
#ifdef DEBUG
39+
NSLog(@"WKJavaScriptBridge Error : 调用JS函数报错 ： %@",error.localizedDescription);
40+
#endif
41+
}
42+
}];
43+
}
44+
45+
- (id)getCommandInstance:(NSString*)pluginName {
46+
return [_bridge getCommandInstance:pluginName];
47+
}
48+
49+
- (BOOL)isValidCallbackId:(NSString*)callbackId {
50+
if ((callbackId == nil) || (_callbackIdPattern == nil)) {
51+
return NO;
52+
}
53+
54+
// 如果太长或发现任何无效字符，则禁用
55+
if (([callbackId length] > 100) || [_callbackIdPattern firstMatchInString:callbackId options:0 range:NSMakeRange(0, [callbackId length])]) {
56+
return NO;
57+
}
58+
return YES;
59+
}
60+
61+
#pragma mark - WKCommandProtocol
62+
3563
- (void)sendPluginResult:(WKPluginResult *)result callbackId:(NSString*)callbackId {
3664
#ifdef DEBUG
3765
NSLog(@"WKJavaScriptBridge (%@): Sending result. Status=%@", callbackId, result.status);
@@ -64,38 +92,12 @@ - (void)sendPluginResult:(WKPluginResult *)result callbackId:(NSString*)callback
6492
}
6593
}
6694

67-
- (void)evalJs:(NSString *)js {
68-
[_bridge evaluateJavaScript:js completionHandler:^(id obj, NSError * error) {
69-
if (error) {
70-
#ifdef DEBUG
71-
NSLog(@"WKJavaScriptBridge Error : 调用JS函数报错 ： %@",error.localizedDescription);
72-
#endif
73-
}
74-
}];
75-
}
76-
77-
- (id)getCommandInstance:(NSString*)pluginName {
78-
return [_bridge getCommandInstance:pluginName];
79-
}
80-
8195
- (void)runInBackground:(void (^)(void))block {
8296
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), block);
8397
}
8498

85-
- (void)reloadWebView {
86-
[_bridge.webView reload];
87-
}
88-
89-
- (BOOL)isValidCallbackId:(NSString*)callbackId {
90-
if ((callbackId == nil) || (_callbackIdPattern == nil)) {
91-
return NO;
92-
}
93-
94-
// 如果太长或发现任何无效字符，则禁用
95-
if (([callbackId length] > 100) || [_callbackIdPattern firstMatchInString:callbackId options:0 range:NSMakeRange(0, [callbackId length])]) {
96-
return NO;
97-
}
98-
return YES;
99+
- (WKWebView *)webView {
100+
return _bridge.webView;
99101
}
100102

101103
@end

‎WKJavaScriptBridge-demo/WKJavaScriptBridge-demo/WKJavaScriptBridge/Plugin/WKCommandProtocol.h‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <Foundation/Foundation.h>
10+
#import <WebKit/WebKit.h>
1011
#import "WKPluginResult.h"
1112

1213
NS_ASSUME_NONNULL_BEGIN
@@ -21,18 +22,20 @@ NS_ASSUME_NONNULL_BEGIN
2122
*/
2223
- (void)sendPluginResult:(WKPluginResult *)result callbackId:(NSString*)callbackId;
2324

24-
/**
25-
原生模块件执行刷新webView
26-
*/
27-
- (void)reloadWebView;
28-
2925
/**
3026
原生模块执行耗时操作
3127
3228
@param block long running
3329
*/
3430
- (void)runInBackground:(void (^)(void))block;
3531

32+
/**
33+
和Bridge绑定的webView
34+
35+
@return WKWebView
36+
*/
37+
- (WKWebView *)webView;
38+
3639
@end
3740

3841
NS_ASSUME_NONNULL_END

‎WKJavaScriptBridge-demo/WKJavaScriptBridge-demo/WKJavaScriptBridge/WKJavaScriptBridge.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
2828
/**
2929
是否开启插件白名单，默认关闭
3030
31-
@param openning
31+
@param openning 开关
3232
*/
3333
- (void)openWhiteList:(BOOL)openning;
3434

‎WKJavaScriptBridge/Plugin/WKCommandImpl.m‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,34 @@ - (instancetype)initWithBridge:(WKJavaScriptBridge *)bridge {
3232
return self;
3333
}
3434

35+
- (void)evalJs:(NSString *)js {
36+
[_bridge evaluateJavaScript:js completionHandler:^(id obj, NSError * error) {
37+
if (error) {
38+
#ifdef DEBUG
39+
NSLog(@"WKJavaScriptBridge Error : 调用JS函数报错 ： %@",error.localizedDescription);
40+
#endif
41+
}
42+
}];
43+
}
44+
45+
- (id)getCommandInstance:(NSString*)pluginName {
46+
return [_bridge getCommandInstance:pluginName];
47+
}
48+
49+
- (BOOL)isValidCallbackId:(NSString*)callbackId {
50+
if ((callbackId == nil) || (_callbackIdPattern == nil)) {
51+
return NO;
52+
}
53+
54+
// 如果太长或发现任何无效字符，则禁用
55+
if (([callbackId length] > 100) || [_callbackIdPattern firstMatchInString:callbackId options:0 range:NSMakeRange(0, [callbackId length])]) {
56+
return NO;
57+
}
58+
return YES;
59+
}
60+
61+
#pragma mark - WKCommandProtocol
62+
3563
- (void)sendPluginResult:(WKPluginResult *)result callbackId:(NSString*)callbackId {
3664
#ifdef DEBUG
3765
NSLog(@"WKJavaScriptBridge (%@): Sending result. Status=%@", callbackId, result.status);
@@ -64,38 +92,12 @@ - (void)sendPluginResult:(WKPluginResult *)result callbackId:(NSString*)callback
6492
}
6593
}
6694

67-
- (void)evalJs:(NSString *)js {
68-
[_bridge evaluateJavaScript:js completionHandler:^(id obj, NSError * error) {
69-
if (error) {
70-
#ifdef DEBUG
71-
NSLog(@"WKJavaScriptBridge Error : 调用JS函数报错 ： %@",error.localizedDescription);
72-
#endif
73-
}
74-
}];
75-
}
76-
77-
- (id)getCommandInstance:(NSString*)pluginName {
78-
return [_bridge getCommandInstance:pluginName];
79-
}
80-
8195
- (void)runInBackground:(void (^)(void))block {
8296
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), block);
8397
}
8498

85-
- (void)reloadWebView {
86-
[_bridge.webView reload];
87-
}
88-
89-
- (BOOL)isValidCallbackId:(NSString*)callbackId {
90-
if ((callbackId == nil) || (_callbackIdPattern == nil)) {
91-
return NO;
92-
}
93-
94-
// 如果太长或发现任何无效字符，则禁用
95-
if (([callbackId length] > 100) || [_callbackIdPattern firstMatchInString:callbackId options:0 range:NSMakeRange(0, [callbackId length])]) {
96-
return NO;
97-
}
98-
return YES;
99+
- (WKWebView *)webView {
100+
return _bridge.webView;
99101
}
100102

101103
@end

‎WKJavaScriptBridge/Plugin/WKCommandProtocol.h‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <Foundation/Foundation.h>
10+
#import <WebKit/WebKit.h>
1011
#import "WKPluginResult.h"
1112

1213
NS_ASSUME_NONNULL_BEGIN
@@ -21,18 +22,20 @@ NS_ASSUME_NONNULL_BEGIN
2122
*/
2223
- (void)sendPluginResult:(WKPluginResult *)result callbackId:(NSString*)callbackId;
2324

24-
/**
25-
原生模块件执行刷新webView
26-
*/
27-
- (void)reloadWebView;
28-
2925
/**
3026
原生模块执行耗时操作
3127
3228
@param block long running
3329
*/
3430
- (void)runInBackground:(void (^)(void))block;
3531

32+
/**
33+
和Bridge绑定的webView
34+
35+
@return WKWebView
36+
*/
37+
- (WKWebView *)webView;
38+
3639
@end
3740

3841
NS_ASSUME_NONNULL_END

‎WKJavaScriptBridge/WKJavaScriptBridge.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
2828
/**
2929
是否开启插件白名单，默认关闭
3030
31-
@param openning
31+
@param openning 开关
3232
*/
3333
- (void)openWhiteList:(BOOL)openning;
3434

0 commit comments

Comments
 (0)