+ [ios] to eliminate the dependence of inspect and debug

yangshengtao · yangshengtao · commit e7da04c1145c · 2016-07-15T14:41:03.000+08:00
diff --git a/ios/WXDevtool/inspector/DerivedSources/PDNetworkDomain.m b/ios/WXDevtool/inspector/DerivedSources/PDNetworkDomain.m
@@ -13,7 +13,7 @@
 #import "PDNetworkDomain.h"
 #import "PDObject.h"
 #import "PDNetworkTypes.h"
-#import "WXDebuggerDomainController.h"
+#import "WXSourceDebuggerDomainController.h"
 
 
 @interface PDNetworkDomain ()
@@ -103,7 +103,7 @@ - (void)responseReceivedWithRequestId:(NSString *)requestId frameId:(NSString *)
     
     [self.debuggingServer sendEventWithName:@"Network.responseReceived" parameters:params];
     
-    [[WXDebuggerDomainController defaultInstance] getScriptSourceTreeWithId:requestId url:response.url isContentScript:[NSNumber numberWithBool:NO] sourceMapURL:@""];
+    [[WXSourceDebuggerDomainController defaultInstance] getScriptSourceTreeWithId:requestId url:response.url isContentScript:[NSNumber numberWithBool:NO] sourceMapURL:@""];
 }
 
 // Fired when data chunk was received over the network.
diff --git a/ios/WXDevtool/inspector/DerivedSources/WXDebugDomain.h b/ios/WXDevtool/inspector/DerivedSources/WXDebugDomain.h
@@ -0,0 +1,18 @@
+/**
+ * Created by Weex.
+ * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
+ *
+ * This source code is licensed under the Apache Licence 2.0.
+ * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+ */
+
+#import "PDDynamicDebuggerDomain.h"
+#import "PDObject.h"
+#import "PDDebugger.h"
+#import <WXDevtool/WXDevtool.h>
+
+@interface WXDebugDomain : PDDynamicDebuggerDomain
+
+@property (nonatomic, assign) id <PDCommandDelegate>delegate;
+
+@end
diff --git a/ios/WXDevtool/inspector/DerivedSources/WXDebugDomain.m b/ios/WXDevtool/inspector/DerivedSources/WXDebugDomain.m
@@ -0,0 +1,30 @@
+/**
+ * Created by Weex.
+ * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
+ *
+ * This source code is licensed under the Apache Licence 2.0.
+ * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+ */
+
+#import "WXDebugDomain.h"
+
+@implementation WXDebugDomain
+
+@dynamic delegate;
+
++ (NSString *)domainName {
+    return @"WxDebug";
+}
+
+#pragma mark - Public Method
+- (void)handleMethodWithName:(NSString *)methodName parameters:(NSDictionary *)params responseCallback:(PDResponseCallback)responseCallback {
+    if ([methodName isEqualToString:@"enable"] && [self.delegate respondsToSelector:@selector(domain:enableWithCallback:)]) {
+        [self.delegate domain:self enableWithCallback:^(id error) {
+            NSMutableDictionary *params = [[NSMutableDictionary alloc] initWithCapacity:2];
+            [params setObject:[NSNumber numberWithBool:YES] forKey:@"WXDebug_result"];
+            responseCallback(params, error);
+        }];
+    }
+}
+
+@end
diff --git a/ios/WXDevtool/inspector/PonyDebugger/PDDebugger.h b/ios/WXDevtool/inspector/PonyDebugger/PDDebugger.h
@@ -88,6 +88,9 @@ extern void _PDLogObjectsImpl(NSString *severity, NSArray *arguments);
 #pragma mark CSSStyle
 - (void)enableCSSStyle;
 
+#pragma mark openDevTool Debug
+- (void)enableDevToolDebug;
+
 #pragma mark - listenning on server
 //- (void)serverStartWithHost:(NSString *)host port:(NSUInteger)port;
 
diff --git a/ios/WXDevtool/inspector/PonyDebugger/PDDebugger.m b/ios/WXDevtool/inspector/PonyDebugger/PDDebugger.m
@@ -24,9 +24,10 @@
 #import "PDDOMDomainController.h"
 #import "PDInspectorDomainController.h"
 #import "PDConsoleDomainController.h"
-#import "WXDebuggerDomainController.h"
+#import "WXSourceDebuggerDomainController.h"
 #import "WXTimelineDomainController.h"
 #import "WXCSSDomainController.h"
+#import "WXDebugDomainController.h"
 #import "WXDevTool.h"
 
 #import "WXAppConfiguration.h"
@@ -133,10 +134,7 @@ - (void)webSocketDidOpen:(SRWebSocket *)webSocket;
 - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(NSString *)message;
 {
     if ([WXDevTool isDebug]) {
-        __weak typeof(self) weakSelf = self;
-        [self _executeBridgeThead:^() {
-            [weakSelf _evaluateNative:message];
-        }];
+        [self _changeToDebugLogicMessage:message];
     }
     
     NSDictionary *obj = [NSJSONSerialization JSONObjectWithData:[message dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
@@ -154,6 +152,12 @@ - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(NSString *)message
         if (result) {
             NSMutableDictionary *newResult = [[NSMutableDictionary alloc] initWithCapacity:result.count];
             [result enumerateKeysAndObjectsUsingBlock:^(id key, id val, BOOL *stop) {
+                if ([key isEqualToString:@"WXDebug_result"]) {
+                    [WXDevTool setDebug:YES];
+                    [WXSDKEngine restart];
+                    [[NSNotificationCenter defaultCenter] postNotificationName:@"RefreshInstance" object:nil];
+                    return;
+                }
                 [newResult setObject:[val PD_JSONObjectCopy] forKey:key];
             }];
             [response setObject:newResult forKey:@"result"];
@@ -443,11 +447,11 @@ - (void)clearConsole;
 - (void)enableRemoteDebugger {
     [self _addController:[PDRuntimeDomainController defaultInstance]];
     [self _addController:[PDPageDomainController defaultInstance]];
-    [self _addController:[WXDebuggerDomainController defaultInstance]];
+    [self _addController:[WXSourceDebuggerDomainController defaultInstance]];
 }
 
 - (void)remoteDebuggertest {
-    [[WXDebuggerDomainController defaultInstance] remoteDebuggerControllerTest];
+    [[WXSourceDebuggerDomainController defaultInstance] remoteDebuggerControllerTest];
 }
 
 #pragma mark - Timeline
@@ -460,6 +464,11 @@ - (void)enableCSSStyle {
     [self _addController:[WXCSSDomainController defaultInstance]];
 }
 
+#pragma mark - DevToolDebug
+- (void)enableDevToolDebug {
+    [self _addController:[WXDebugDomainController defaultInstance]];
+}
+
 #pragma mark - WXBridgeProtocol
 - (void)executeJSFramework:(NSString *)frameworkScript {
     //WXLogInfo(@"======yangshengtao 0:jsThread:%@,currentThread:%@",_bridgeThread,[NSThread currentThread]);
@@ -513,6 +522,13 @@ - (void)resetEnvironment
 
 
 #pragma mark - Private Methods
+- (void)_changeToDebugLogicMessage:(NSString *)message {
+    __weak typeof(self) weakSelf = self;
+    [self _executeBridgeThead:^() {
+        [weakSelf _evaluateNative:message];
+    }];
+}
+
 - (void)_initBridgeThread {
     _bridgeThread = [NSThread currentThread];
     if (_debugAry.count > 0 && _registerData) {
@@ -559,7 +575,12 @@ - (void)_executeBridgeThead:(dispatch_block_t)block
 -(void)_evaluateNative:(NSString *)data
 {
     NSDictionary *dict = [WXUtility objectFromJSON:data];
-    NSString *method = [[dict objectForKey:@"method"] substringFromIndex:8];
+    
+    NSString *fullMethodName = [dict objectForKey:@"method"];
+    NSInteger dotPosition = [fullMethodName rangeOfString:@"."].location;
+    NSString *method = [fullMethodName substringFromIndex:dotPosition + 1];
+    
+//    NSString *method = [[dict objectForKey:@"method"] substringFromIndex:8];
     NSDictionary *args = [dict objectForKey:@"params"];
     
     if ([method isEqualToString:@"callNative"]) {
@@ -645,6 +666,12 @@ - (void)_registerDeviceWithParams:(id)params {
             [_debugAry insertObject:encodedData atIndex:0];
             [self _executionDebugAry];
         }];
+    }else if(![WXDevTool isDebug]) {
+        [self _executeBridgeThead:^{
+            _registerData = encodedData;
+            [_msgAry insertObject:encodedData atIndex:0];
+            [self _executionMsgAry];
+        }];
     }
 }
 
diff --git a/ios/WXDevtool/inspector/PonyDebugger/WXDebugDomainController.h b/ios/WXDevtool/inspector/PonyDebugger/WXDebugDomainController.h
@@ -0,0 +1,20 @@
+/**
+ * Created by Weex.
+ * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
+ *
+ * This source code is licensed under the Apache Licence 2.0.
+ * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+ */
+
+#import <WXDevtool/WXDevtool.h>
+#import "PonyDebugger.h"
+#import "WXDebugDomain.h"
+#import "PDDynamicDebuggerDomain.h"
+
+@interface WXDebugDomainController : PDDomainController <PDCommandDelegate>
+
+@property (nonatomic, strong) WXDebugDomain *domain;
+
++ (WXDebugDomainController *)defaultInstance;
+
+@end
diff --git a/ios/WXDevtool/inspector/PonyDebugger/WXDebugDomainController.m b/ios/WXDevtool/inspector/PonyDebugger/WXDebugDomainController.m
@@ -0,0 +1,36 @@
+/**
+ * Created by Weex.
+ * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
+ *
+ * This source code is licensed under the Apache Licence 2.0.
+ * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+ */
+
+#import "WXDebugDomainController.h"
+
+@implementation WXDebugDomainController
+@dynamic domain;
+
++ (WXDebugDomainController *)defaultInstance {
+    static WXDebugDomainController *defaultInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        defaultInstance = [[WXDebugDomainController alloc] init];
+    });
+    return defaultInstance;
+}
+
++ (Class)domainClass {
+    return [WXDebugDomain class];
+}
+
+#pragma mark - PDCommandDelegate
+- (void)domain:(PDDynamicDebuggerDomain *)domain enableWithCallback:(void (^)(id error))callback {
+    callback(nil);
+}
+
+- (void)domain:(PDDynamicDebuggerDomain *)domain disableWithCallback:(void (^)(id error))callback {
+    
+}
+
+@end
diff --git a/ios/WXDevtool/inspector/PonyDebugger/WXSourceDebuggerDomainController.h b/ios/WXDevtool/inspector/PonyDebugger/WXSourceDebuggerDomainController.h
@@ -10,9 +10,11 @@
 #import "PDDebuggerDomain.h"
 #import "PDDynamicDebuggerDomain.h"
 
-@interface WXDebuggerDomainController : PDDomainController <PDDebuggerCommandDelegate>
+@interface WXSourceDebuggerDomainController : PDDomainController <PDDebuggerCommandDelegate>
 
-+ (WXDebuggerDomainController *)defaultInstance;
+@property (nonatomic, strong) PDDebuggerDomain *domain;
+
++ (WXSourceDebuggerDomainController *)defaultInstance;
 
 - (void)remoteDebuggerControllerTest;
 
@@ -21,6 +23,4 @@
                   isContentScript:(NSNumber *)isContentScript
                      sourceMapURL:(NSString *)sourceMapURL;
 
-@property (nonatomic, strong) PDDebuggerDomain *domain;
-
 @end
diff --git a/ios/WXDevtool/inspector/PonyDebugger/WXSourceDebuggerDomainController.m b/ios/WXDevtool/inspector/PonyDebugger/WXSourceDebuggerDomainController.m
@@ -6,16 +6,16 @@
  * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
  */
 
-#import "WXDebuggerDomainController.h"
+#import "WXSourceDebuggerDomainController.h"
 
-@implementation WXDebuggerDomainController
+@implementation WXSourceDebuggerDomainController
 @dynamic domain;
 
-+ (WXDebuggerDomainController *)defaultInstance {
-    static WXDebuggerDomainController *defaultInstance = nil;
++ (WXSourceDebuggerDomainController *)defaultInstance {
+    static WXSourceDebuggerDomainController *defaultInstance = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        defaultInstance = [[WXDebuggerDomainController alloc] init];
+        defaultInstance = [[WXSourceDebuggerDomainController alloc] init];
     });
     return defaultInstance;
 }
diff --git a/ios/WXDevtool/inspector/WXHeader/WXDevTool.m b/ios/WXDevtool/inspector/WXHeader/WXDevTool.m
@@ -17,6 +17,7 @@ @implementation WXDevTool
 
 + (void)setDebug:(BOOL)isDebug {
     WXDebug = isDebug;
+    [WXDebugTool setDevToolDebug:YES];
 }
 
 + (BOOL)isDebug {
@@ -82,9 +83,6 @@ + (void)launchDebugWithSocketUrl:(NSString *)url {
 }
 
 + (void)launchDevToolDebugWithUrl:(NSString *)url {
-    if (WXDebug) {
-        [WXDebugTool setDevToolDebug:YES];
-    }
     PDDebugger *debugger = [[PDDebugger alloc] init];
     //    [debugger serverStartWithHost:@"localhost" port:9009];
     
@@ -112,6 +110,8 @@ + (void)launchDevToolDebugWithUrl:(NSString *)url {
     
     [debugger enableCSSStyle];
 
+    [debugger enableDevToolDebug];
+    
     [WXSDKEngine connectDevToolServer:url];
 }
 
diff --git a/ios/playground/WeexDemo/Scanner/WXScannerVC.m b/ios/playground/WeexDemo/Scanner/WXScannerVC.m
@@ -158,16 +158,11 @@ - (BOOL)remoteDebug:(NSURL *)url
             return YES;
         } else if ([[elts firstObject] isEqualToString:@"_wx_devtool"]) {
             NSString *devToolURL = [[elts lastObject]  stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-            [WXDevTool setDebug:YES];
             [WXDevTool launchDevToolDebugWithUrl:devToolURL];
-
-            [WXSDKEngine restart];
-            
             if ([[[self.navigationController viewControllers] objectAtIndex:0] isKindOfClass:NSClassFromString(@"WXDemoViewController")]) {
                 WXDemoViewController * vc = (WXDemoViewController*)[[self.navigationController viewControllers] objectAtIndex:0];
                 [self.navigationController popToViewController:vc animated:NO];
             }
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"RefreshInstance" object:nil];
             
             return YES;
         }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ @implementation WXDevTool`
`17`	`17`
`18`	`18`	`+ (void)setDebug:(BOOL)isDebug {`
`19`	`19`	`WXDebug = isDebug;`
	`20`	`+ [WXDebugTool setDevToolDebug:YES];`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`+ (BOOL)isDebug {`
`@@ -82,9 +83,6 @@ + (void)launchDebugWithSocketUrl:(NSString *)url {`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`+ (void)launchDevToolDebugWithUrl:(NSString *)url {`
`85`		`- if (WXDebug) {`
`86`		`- [WXDebugTool setDevToolDebug:YES];`
`87`		`- }`
`88`	`86`	`PDDebugger *debugger = [[PDDebugger alloc] init];`
`89`	`87`	`// [debugger serverStartWithHost:@"localhost" port:9009];`
`90`	`88`
`@@ -112,6 +110,8 @@ + (void)launchDevToolDebugWithUrl:(NSString *)url {`
`112`	`110`
`113`	`111`	`[debugger enableCSSStyle];`
`114`	`112`
	`113`	`+ [debugger enableDevToolDebug];`
	`114`	`+`
`115`	`115`	`[WXSDKEngine connectDevToolServer:url];`
`116`	`116`	`}`
`117`	`117`