Skip to content

Commit bcca889

Browse files
committed
* [ios] roll back to devtool
1 parent 5141019 commit bcca889

File tree

6 files changed

+34
-8
lines changed

6 files changed

+34
-8
lines changed

ios/playground/WeexDemo/Scanner/WXScannerVC.m

+2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ - (BOOL)remoteDebug:(NSURL *)url
157157
return YES;
158158
} else if ([[elts firstObject] isEqualToString:@"_wx_devtool"]) {
159159
NSString *devToolURL = [[elts lastObject] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
160+
[WXDevTool setDebug:YES];
160161
[WXDevTool launchDevToolDebugWithUrl:devToolURL];
162+
161163
[WXSDKEngine restart];
162164

163165
[WXSDKEngine registerComponent:@"select" withClass:NSClassFromString(@"WXSelectComponent")];

ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.h

+6
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070
**/
7171
- (void)registerComponents:(NSArray *)components;
7272

73+
/**
74+
* Connect To WebSocket for devtool debug
75+
* @param url : url to connect
76+
**/
77+
- (void) connectToDevToolWithUrl:(NSURL *)url;
78+
7379
/**
7480
* Connect To WebSocket for collecting log
7581
* @param url : url to connect

ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m

+10
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,16 @@ - (void)resetEnvironment
311311

312312
#pragma mark JS Debug Management
313313

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+
314324
- (void)connectToWebSocket:(NSURL *)url
315325
{
316326
_devToolSocketBridge = [[WXDebugLoggerBridge alloc] initWithURL:url];

ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m

+3-8
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,10 @@ + (void)connectDebugServer:(NSString*)URL
185185
[[WXSDKManager bridgeMgr] connectToWebSocket:[NSURL URLWithString:URL]];
186186
}
187187

188-
+ (void)connectDevToolServer:(NSString *)url
188+
+ (void)connectDevToolServer:(NSString *)URL
189189
{
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+
197192
}
198193

199194
@end

ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h

+6
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@
9090
*/
9191
- (void)callBack:(NSString *)instanceId funcId:(NSString *)funcId params:(NSString *)params keepAlive:(BOOL)keepAlive;
9292

93+
/**
94+
* Connect To WebSocket for devtool debug
95+
* @param url : url to connect
96+
**/
97+
- (void)connectToDevToolWithUrl:(NSURL *)url;
98+
9399
/**
94100
* CallBack
95101
* @param instanceId: instance id

ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m

+7
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,13 @@ - (void)callBack:(NSString *)instanceId funcId:(NSString *)funcId params:(NSStri
213213
[self callBack:instanceId funcId:funcId params:params keepAlive:NO];
214214
}
215215

216+
- (void)connectToDevToolWithUrl:(NSURL *)url {
217+
__weak typeof(self) weakSelf = self;
218+
WXPerformBlockOnBridgeThread(^(){
219+
[weakSelf.bridgeCtx connectToDevToolWithUrl:url];
220+
});
221+
}
222+
216223
- (void)connectToWebSocket:(NSURL *)url
217224
{
218225
__weak typeof(self) weakSelf = self;

0 commit comments

Comments
 (0)