diff --git a/android/inspector/src/main/java/com/taobao/weex/devtools/inspector/protocol/module/WxDebug.java b/android/inspector/src/main/java/com/taobao/weex/devtools/inspector/protocol/module/WxDebug.java index 22e195714b..1c00b49bbc 100644 --- a/android/inspector/src/main/java/com/taobao/weex/devtools/inspector/protocol/module/WxDebug.java +++ b/android/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/android/playground/app/src/main/java_zxing/com/google/zxing/client/android/CaptureActivity.java b/android/playground/app/src/main/java_zxing/com/google/zxing/client/android/CaptureActivity.java index 0510da6170..d306522af2 100755 --- a/android/playground/app/src/main/java_zxing/com/google/zxing/client/android/CaptureActivity.java +++ b/android/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 index 6115526bcd..fa1918e612 100755 --- 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() {