tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 1. ios debugger remote connected

Browse Source 
TODO:
fix arg type
This commit is contained in:
Insomnia
2019-11-08 10:30:06 +08:00
parent 70a6c9193a
commit e5106a25ba
6 changed files with 98 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.m
View File

@@ -22,6 +22,8 @@
#import "DoricJSRemoteExecutor.h"
#import <SocketRocket/SRWebSocket.h>
#import "DoricUtil.h"
#import "DoricJSRemoteArgType.h"
#import "NSString+JsonString.h"
static NSString * const kUrlStr = @"ws://192.168.24.240:2080";
@@ -121,19 +123,18 @@ - (NSString *)loadJSScript:(NSString *)script source:(NSString *)source {
- (void)injectGlobalJSObject:(NSString *)name obj:(id)obj {
if ([obj isKindOfClass:NSClassFromString(@"NSBlock")]) {
self.blockMDic[name] = obj;
} else {
NSDictionary *jsonDic = @{
@"cmd": @"injectGlobalJSFunction",
@"name": name
};
NSError *err;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:0 error:&err];
if (err) {
DoricLog(@"debugger ", NSStringFromSelector(_cmd), @" failed");
return;
}
[self.srWebSocket send:jsonData];
}
NSDictionary *jsonDic = @{
@"cmd": @"injectGlobalJSFunction",
@"name": name
};
NSString *jsonStr = [NSString dc_convertToJsonWithDic:jsonDic];
if (!jsonStr) {
return;
}
[self.srWebSocket send:jsonStr];
}
- (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(NSArray *)args {
@@ -141,27 +142,27 @@ - (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(
NSMutableArray *argsMArr = [NSMutableArray new];
for (id arg in args) {
NSDictionary *dic = @{
@"type": [arg class],
@"type": @(DoricargTypeWithArg(arg)),
@"value": arg
};
[argsMArr addObject:dic];
}
NSArray *argsArr = [argsMArr copy];
NSDictionary *jsonDic = @{
@"cmd": @"invokeMethod",
@"obj": objName,
@"objectName": objName,
@"functionName": funcName,
@"javaValues": argsMArr
@"javaValues": argsArr
};
NSError * err;
NSData * jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:0 error:&err];
if (err) {
DoricLog(@"debugger ", NSStringFromSelector(_cmd), @" failed");
NSString *jsonStr = [NSString dc_convertToJsonWithDic:jsonDic];
if (!jsonStr) {
return nil;
}
[self.srWebSocket send:jsonData];
[self.srWebSocket send:jsonStr];
DC_LOCK(self.semaphore);
return self.temp;