* [android] add a debugger switch, decouple the dept between inspecto…

…r and debugger
alibaba · Jul 15, 2016 · dfa71c4 · dfa71c4
1 parent fa65aac
commit dfa71c4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/...d/inspector/src/main/java/com/taobao/weex/devtools/inspector/protocol/module/WxDebug.java b/...d/inspector/src/main/java/com/taobao/weex/devtools/inspector/protocol/module/WxDebug.java
@@ -27,6 +27,24 @@ public WxDebug() {
 
     }
 
+    @ChromeDevtoolsMethod
+    public void enable(JsonRpcPeer peer, JSONObject params) {
+        Context context = WXEnvironment.getApplication();
+        if (context != null) {
+            WXSDKEngine.reload(context, true);
+            context.sendBroadcast(new Intent(IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH));
+        }
+    }
+
+    @ChromeDevtoolsMethod
+    public void disable(JsonRpcPeer peer, JSONObject params) {
+        Context context = WXEnvironment.getApplication();
+        if (context != null) {
+            WXSDKEngine.reload(context, false);
+            context.sendBroadcast(new Intent(IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH));
+        }
+    }
+
     @ChromeDevtoolsMethod
     public void callNative(JsonRpcPeer peer, JSONObject params) {
         if (params != null) {

diff --git a/...d/playground/app/src/main/java_zxing/com/google/zxing/client/android/CaptureActivity.java b/...d/playground/app/src/main/java_zxing/com/google/zxing/client/android/CaptureActivity.java
@@ -586,7 +586,7 @@ private void handleDecodeInternally(Result rawResult,
 	      return;
             } else if (uri.getQueryParameterNames().contains("_wx_devtool")) {
 	      WXEnvironment.sRemoteDebugProxyUrl=uri.getQueryParameter("_wx_devtool");
-	      WXSDKEngine.reload(getApplication(),true);
+	      WXSDKEngine.reload();
 	      Toast.makeText(this,"devtool",Toast.LENGTH_SHORT).show();
 	      finish();
 	      return;

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -111,6 +111,7 @@
 package com.taobao.weex;
 
 import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
@@ -484,20 +485,18 @@ public static void switchDebugModel(boolean debug, String debugUrl) {
       }
     }
   }
-  public static void reload(final Application application,boolean remoteDebug){
-    if(remoteDebug){
-      WXEnvironment.sRemoteDebugMode=true;
-      WXBridgeManager.getInstance().restart();
-      WXBridgeManager.getInstance().initScriptsFramework(null);
-      WXModuleManager.reload();
-      WXComponentRegistry.reload();
-      WXSDKManager.getInstance().postOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          LocalBroadcastManager.getInstance(application).sendBroadcast(new Intent(JS_FRAMEWORK_RELOAD));
-        }
-      }, 1000);
-    }
+  public static void reload(final Context context, boolean remoteDebug) {
+    WXEnvironment.sRemoteDebugMode = remoteDebug;
+    WXBridgeManager.getInstance().restart();
+    WXBridgeManager.getInstance().initScriptsFramework(null);
+    WXModuleManager.reload();
+    WXComponentRegistry.reload();
+    WXSDKManager.getInstance().postOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(JS_FRAMEWORK_RELOAD));
+      }
+    }, 1000);
   }
 
   public static void reload() {