From 2f7762e670a55b607b06e91297e468ddac09433a Mon Sep 17 00:00:00 2001 From: pengfeizhou Date: Tue, 23 Feb 2021 17:21:04 +0800 Subject: [PATCH] Refact:delete and optimize code --- .../main/java/pub/doric/devkit/DevKit.java | 139 ------------------ .../main/java/pub/doric/devkit/IDevKit.java | 21 --- 2 files changed, 160 deletions(-) delete mode 100644 doric-android/devkit/src/main/java/pub/doric/devkit/DevKit.java delete mode 100644 doric-android/devkit/src/main/java/pub/doric/devkit/IDevKit.java diff --git a/doric-android/devkit/src/main/java/pub/doric/devkit/DevKit.java b/doric-android/devkit/src/main/java/pub/doric/devkit/DevKit.java deleted file mode 100644 index e79f1da4..00000000 --- a/doric-android/devkit/src/main/java/pub/doric/devkit/DevKit.java +++ /dev/null @@ -1,139 +0,0 @@ -package pub.doric.devkit; - -import android.widget.Toast; - -import com.github.pengfeizhou.jscore.JSONBuilder; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; -import org.json.JSONObject; - -import pub.doric.Doric; -import pub.doric.DoricContext; -import pub.doric.DoricContextManager; -import pub.doric.DoricNativeDriver; -import pub.doric.devkit.event.ConnectExceptionEvent; -import pub.doric.devkit.event.EOFExceptionEvent; -import pub.doric.devkit.event.OpenEvent; -import pub.doric.devkit.event.StopDebugEvent; -import pub.doric.utils.DoricLog; - -public class DevKit implements IDevKit { - public static boolean isRunningInEmulator = false; - public static String ip = ""; - - private static class Inner { - private static final DevKit sInstance = new DevKit(); - } - - private DevKit() { - DoricNativeDriver.getInstance().getRegistry().registerMonitor(new DoricDevMonitor()); - EventBus.getDefault().register(this); - } - - public static DevKit getInstance() { - return Inner.sInstance; - } - - - private WSClient wsClient; - - boolean devKitConnected = false; - - private DoricContextDebuggable debuggable; - - @Override - public void connectDevKit(String url) { - wsClient = new WSClient(url); - } - - @Override - public void sendDevCommand(IDevKit.Command command, JSONObject jsonObject) { - wsClient.sendToServer(command.toString(), jsonObject); - } - - @Override - public void disconnectDevKit() { - wsClient.close(); - wsClient = null; - } - - @Override - public void startDebugging(String source) { - if (debuggable != null) { - debuggable.stopDebug(true); - } - DoricContext context = matchContext(source); - if (context == null) { - DoricLog.d("Cannot find context source %s for debugging", source); - wsClient.sendToDebugger("DEBUG_STOP", new JSONBuilder() - .put("msg", "Cannot find suitable alive context for debugging") - .toJSONObject()); - } else { - wsClient.sendToDebugger( - "DEBUG_RES", - new JSONBuilder() - .put("contextId", context.getContextId()) - .toJSONObject()); - debuggable = new DoricContextDebuggable(wsClient, context); - debuggable.startDebug(); - } - } - - @Override - public void stopDebugging(boolean resume) { - wsClient.sendToDebugger("DEBUG_STOP", new JSONBuilder() - .put("msg", "Stop debugging") - .toJSONObject()); - if (debuggable != null) { - debuggable.stopDebug(resume); - debuggable = null; - } - } - - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onOpenEvent(OpenEvent openEvent) { - devKitConnected = true; - Toast.makeText(Doric.application(), "dev kit connected", Toast.LENGTH_LONG).show(); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onEOFEvent(EOFExceptionEvent eofExceptionEvent) { - devKitConnected = false; - Toast.makeText(Doric.application(), "dev kit eof exception", Toast.LENGTH_LONG).show(); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onConnectExceptionEvent(ConnectExceptionEvent connectExceptionEvent) { - devKitConnected = false; - Toast.makeText(Doric.application(), "dev kit connection exception", Toast.LENGTH_LONG).show(); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onQuitDebugEvent(StopDebugEvent quitDebugEvent) { - stopDebugging(true); - } - - public DoricContext matchContext(String source) { - for (DoricContext context : DoricContextManager.aliveContexts()) { - if (source.contains(context.getSource()) || context.getSource().equals("__dev__")) { - return context; - } - } - return null; - } - - public void reload(String source, String script) { - DoricContext context = matchContext(source); - if (context == null) { - DoricLog.d("Cannot find context source %s for reload", source); - } else if (context.getDriver() instanceof DoricDebugDriver) { - DoricLog.d("Context source %s in debugging,skip reload", source); - } else { - DoricLog.d("Context reload :id %s,source %s ", context.getContextId(), source); - context.reload(script); - } - } -} diff --git a/doric-android/devkit/src/main/java/pub/doric/devkit/IDevKit.java b/doric-android/devkit/src/main/java/pub/doric/devkit/IDevKit.java deleted file mode 100644 index dd720085..00000000 --- a/doric-android/devkit/src/main/java/pub/doric/devkit/IDevKit.java +++ /dev/null @@ -1,21 +0,0 @@ -package pub.doric.devkit; - - -import org.json.JSONObject; - -public interface IDevKit { - - enum Command { - HOT_RELOAD, EXCEPTION, LOG, DEBUG - } - - void connectDevKit(String url); - - void sendDevCommand(IDevKit.Command command, JSONObject jsonObject); - - void disconnectDevKit(); - - void startDebugging(String source); - - void stopDebugging(boolean resume); -}