[10/11] incubator-weex git commit: * [android] when debug server connect use global context

[toretto]

 * [android] when debug server connect use global context


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e3d67594
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e3d67594
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e3d67594

Branch: refs/heads/master
Commit: e3d67594bc40735c24981effe4f532bb7b774203
Parents: fc8028c
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Mar 20 20:45:10 2018 +0800
Committer: yuhun-alibaba <tomcat...@gmail.com>
Committed: Tue Mar 27 16:00:32 2018 +0800

----------------------------------------------------------------------
 .../main/java/com/taobao/weex/bridge/WXBridgeManager.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e3d67594/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index cb3bdcd..aed1c53 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -228,7 +228,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
         setJSFrameworkInit(false);
         WXModuleManager.resetAllModuleState();
         String jsf = "";
-        if (!isSandBoxContext) {
+        if (!isSandBoxContext || WXEnvironment.sDebugServerConnectable) {
           jsf = WXFileUtils.loadAsset("main.js", 
WXEnvironment.getApplication());
         } else {
           jsf = WXFileUtils.loadAsset("weex-main-jsfm.js", 
WXEnvironment.getApplication());
@@ -244,7 +244,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
             setJSFrameworkInit(false);
             WXModuleManager.resetAllModuleState();
             String jsf = "";
-            if (!isSandBoxContext) {
+            if (!isSandBoxContext || WXEnvironment.sDebugServerConnectable) {
               jsf = WXFileUtils.loadAsset("main.js", 
WXEnvironment.getApplication());
             } else {
               jsf = WXFileUtils.loadAsset("weex-main-jsfm.js", 
WXEnvironment.getApplication());
@@ -1741,7 +1741,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
         instance.setTemplate(template);
         // if { "framework": "Vue" } or  { "framework": "Rax" } will use 
invokeCreateInstanceContext
         // others will use invokeExecJS
-        if (!isSandBoxContext) {
+        if (!isSandBoxContext || WXEnvironment.sDebugServerConnectable) {
           invokeExecJS(instance.getInstanceId(), null, METHOD_CREATE_INSTANCE, 
args, false);
           return;
         }
@@ -1765,7 +1765,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   }
 
   public WXJSObject optionObjConvert(boolean useSandBox, BundType type, 
WXJSObject opt) {
-    if (!useSandBox || type == BundType.Others) {
+    if (!useSandBox || type == BundType.Others || 
WXEnvironment.sDebugServerConnectable) {
       return opt;
     }
     try {
@@ -2059,7 +2059,7 @@ public void invokeDestoryInstance(String instanceId, 
String namespace, String fu
         // if (WXEnvironment.isApkDebugable()) {
         WXLogUtils.d("weex JS framework from assets");
         // }
-        if (!isSandBoxContext) {
+        if (!isSandBoxContext || WXEnvironment.sDebugServerConnectable) {
           framework = WXFileUtils.loadAsset("main.js", 
WXEnvironment.getApplication());
         } else {
           framework = WXFileUtils.loadAsset("weex-main-jsfm.js", 
WXEnvironment.getApplication());