Commit bcca889 1 parent 5141019 commit bcca889 Copy full SHA for bcca889
File tree 6 files changed +34
-8
lines changed
playground/WeexDemo/Scanner
6 files changed +34
-8
lines changed Original file line number Diff line number Diff line change @@ -157,7 +157,9 @@ - (BOOL)remoteDebug:(NSURL *)url
157
157
return YES ;
158
158
} else if ([[elts firstObject ] isEqualToString: @" _wx_devtool" ]) {
159
159
NSString *devToolURL = [[elts lastObject ] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
160
+ [WXDevTool setDebug: YES ];
160
161
[WXDevTool launchDevToolDebugWithUrl: devToolURL];
162
+
161
163
[WXSDKEngine restart ];
162
164
163
165
[WXSDKEngine registerComponent: @" select" withClass: NSClassFromString (@" WXSelectComponent" )];
Original file line number Diff line number Diff line change 70
70
**/
71
71
- (void )registerComponents : (NSArray *)components ;
72
72
73
+ /* *
74
+ * Connect To WebSocket for devtool debug
75
+ * @param url : url to connect
76
+ **/
77
+ - (void ) connectToDevToolWithUrl : (NSURL *)url ;
78
+
73
79
/* *
74
80
* Connect To WebSocket for collecting log
75
81
* @param url : url to connect
Original file line number Diff line number Diff line change @@ -311,6 +311,16 @@ - (void)resetEnvironment
311
311
312
312
#pragma mark JS Debug Management
313
313
314
+ - (void ) connectToDevToolWithUrl : (NSURL *)url
315
+ {
316
+ id webSocketBridge = [NSClassFromString (@" PDDebugger" ) alloc ];
317
+ if (!webSocketBridge || ![webSocketBridge respondsToSelector: @selector (connectToURL: )]) {
318
+ return ;
319
+ } else {
320
+ [webSocketBridge performSelector: @selector (connectToURL: ) withObject: url];
321
+ }
322
+ }
323
+
314
324
- (void )connectToWebSocket : (NSURL *)url
315
325
{
316
326
_devToolSocketBridge = [[WXDebugLoggerBridge alloc ] initWithURL: url];
Original file line number Diff line number Diff line change @@ -185,15 +185,10 @@ + (void)connectDebugServer:(NSString*)URL
185
185
[[WXSDKManager bridgeMgr ] connectToWebSocket: [NSURL URLWithString: URL]];
186
186
}
187
187
188
- + (void )connectDevToolServer : (NSString *)url
188
+ + (void )connectDevToolServer : (NSString *)URL
189
189
{
190
- id webSocketBridge = [NSClassFromString (@" PDDebugger" ) alloc ];
191
- if (!webSocketBridge || ![webSocketBridge respondsToSelector: @selector (connectToURL: )]) {
192
- return ;
193
- } else {
194
- NSURL *URL = [NSURL URLWithString: url];
195
- [webSocketBridge performSelector: @selector (connectToURL: ) withObject: URL];
196
- }
190
+ [[WXSDKManager bridgeMgr ] connectToDevToolWithUrl: [NSURL URLWithString: URL]];
191
+
197
192
}
198
193
199
194
@end
Original file line number Diff line number Diff line change 90
90
*/
91
91
- (void )callBack : (NSString *)instanceId funcId : (NSString *)funcId params : (NSString *)params keepAlive : (BOOL )keepAlive ;
92
92
93
+ /* *
94
+ * Connect To WebSocket for devtool debug
95
+ * @param url : url to connect
96
+ **/
97
+ - (void )connectToDevToolWithUrl : (NSURL *)url ;
98
+
93
99
/* *
94
100
* CallBack
95
101
* @param instanceId: instance id
Original file line number Diff line number Diff line change @@ -213,6 +213,13 @@ - (void)callBack:(NSString *)instanceId funcId:(NSString *)funcId params:(NSStri
213
213
[self callBack: instanceId funcId: funcId params: params keepAlive: NO ];
214
214
}
215
215
216
+ - (void )connectToDevToolWithUrl : (NSURL *)url {
217
+ __weak typeof (self) weakSelf = self;
218
+ WXPerformBlockOnBridgeThread (^(){
219
+ [weakSelf.bridgeCtx connectToDevToolWithUrl: url];
220
+ });
221
+ }
222
+
216
223
- (void )connectToWebSocket : (NSURL *)url
217
224
{
218
225
__weak typeof (self) weakSelf = self;
You can’t perform that action at this time.
0 commit comments