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

Revert "debugging add module support"

Browse Source 
This reverts commit 85da528de5e258a765b842ca5e55c4cf81fd2936.
This commit is contained in:
pengfei.zhou
2021-08-24 16:11:04 +08:00
committed by osborn
parent 7516cef93e
commit 059f27c743
7 changed files with 4 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doric-android/devkit/src/main/java/pub/doric/devkit/DoricDev.java
View File

@@ -15,7 +15,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
@@ -132,15 +131,6 @@ public class DoricDev {
.toJSONObject());
} else {
final DoricContext context = contexts.get(contexts.size() - 1);
Map<String, String> bundles = DoricSingleton.getInstance().getJSBundles();
for (String key : bundles.keySet()) {
wsClient.sendToDebugger(
"LOAD_MODULE",
new JSONBuilder()
.put("name", key)
.put("content", bundles.get(key))
.toJSONObject());
}
wsClient.sendToDebugger(
"DEBUG_RES",
new JSONBuilder()

6
doric-android/devkit/src/main/java/pub/doric/devkit/remote/RemoteJSExecutor.java
View File

@@ -19,17 +19,19 @@ import pub.doric.devkit.WSClient;
public class RemoteJSExecutor implements WSClient.Interceptor {
private final Map<String, JavaFunction> globalFunctions = new HashMap<>();
private final WSClient wsClient;
private final Thread currentThread;
private final AtomicInteger callIdCounter = new AtomicInteger();
private final Map<Integer, Thread> mThreads = new HashMap<>();
private final Map<Integer, JSDecoder> mResults = new HashMap<>();
private Map<Integer, Thread> mThreads = new HashMap<>();
private Map<Integer, JSDecoder> mResults = new HashMap<>();
public volatile boolean invokingMethod = false;
public RemoteJSExecutor(WSClient wsClient) {
this.wsClient = wsClient;
this.wsClient.addInterceptor(this);
currentThread = Thread.currentThread();
}
public String loadJS(String script, String source) {