You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2017/04/13 11:33:00 UTC
[1/2] incubator-weex git commit: Revert "* [android] update native so"
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev d71820ac8 -> 8c2814adf
Revert "* [android] update native so"
This reverts commit 3774b1bdfad4eeea440a61b421fd1f8109842d82.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f0b2591
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f0b2591
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f0b2591
Branch: refs/heads/0.12-dev
Commit: 7f0b2591f0a04b9df6b6ca19b20e87bdd92eb0da
Parents: d71820a
Author: zshshr <zh...@gmail.com>
Authored: Thu Apr 13 14:59:39 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Apr 13 19:29:01 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexv8.so | Bin 3571752 -> 3579944 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4566088 -> 4545544 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f0b2591/android/sdk/libs/armeabi/libweexv8.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexv8.so b/android/sdk/libs/armeabi/libweexv8.so
index 5f2bde1..405be69 100755
Binary files a/android/sdk/libs/armeabi/libweexv8.so and b/android/sdk/libs/armeabi/libweexv8.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f0b2591/android/sdk/libs/x86/libweexv8.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexv8.so b/android/sdk/libs/x86/libweexv8.so
index f0fc804..b20a73b 100755
Binary files a/android/sdk/libs/x86/libweexv8.so and b/android/sdk/libs/x86/libweexv8.so differ
[2/2] incubator-weex git commit: Revert "Merge branch '0.12-dev' of
https://github.com/lycool/incubator-weex into 0.12-dev"
Posted by ky...@apache.org.
Revert "Merge branch '0.12-dev' of https://github.com/lycool/incubator-weex into 0.12-dev"
This reverts commit 73684e5a8b29ab61729f158aeb77cef44757c26e.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8c2814ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c2814ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c2814ad
Branch: refs/heads/0.12-dev
Commit: 8c2814adf6f7ad8aa6c7334f5832a447ae2c273b
Parents: 7f0b259
Author: YorkShen <sh...@gmail.com>
Authored: Thu Apr 13 10:49:06 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Apr 13 19:29:13 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexv8.so | Bin 3579944 -> 3563544 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 8 --------
.../java/com/taobao/weex/bridge/WXBridge.java | 8 --------
.../com/taobao/weex/bridge/WXBridgeManager.java | 8 ++------
.../java/com/taobao/weex/common/IWXBridge.java | 2 --
.../taobao/weex/bridge/WXWebsocketBridge.java | 3 ---
6 files changed, 2 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2814ad/android/sdk/libs/armeabi/libweexv8.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexv8.so b/android/sdk/libs/armeabi/libweexv8.so
index 405be69..471bb04 100755
Binary files a/android/sdk/libs/armeabi/libweexv8.so and b/android/sdk/libs/armeabi/libweexv8.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2814ad/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index c054b18..ca502b5 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -761,7 +761,6 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
WXLogUtils.w("Warning :Component tree has not build completely, onActivityDestroy can not be call!");
}
- destroyUnhandledTimer();
destroy();
}
@@ -1110,13 +1109,6 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
}
}
- /**
- * destroy all unhandled c++ setTimeout/setInterval callback
- */
- public void destroyUnhandledTimer(){
- WXBridgeManager.getInstance().clearInstanceCallback(mInstanceId);
- }
-
public synchronized void destroy() {
WXSDKManager.getInstance().destroyInstance(mInstanceId);
WXComponentFactory.removeComponentTypesByInstanceId(getInstanceId());
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2814ad/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
index 0a3582a..d42839e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
@@ -68,14 +68,6 @@ class WXBridge implements IWXBridge {
*/
public native void takeHeapSnapshot(String filename);
-
- /**
- * Called to clear all unhandled c++ timer when an instance is
- * destroyed
- * @param instanceId the destoyed instance's id.
- */
- public native void clearInstanceCallback(String instanceId);
-
/**
* JavaScript uses this methods to call Android code
*
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2814ad/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 de6f21d..e056663 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
@@ -387,7 +387,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callNative >>>> instanceId:").append(instanceId)
.append(", tasks:").append(tasks).append(", callback:").append(callback);
-
+ WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
}
@@ -886,7 +886,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
.append("function:").append(function);
if(logTaskDetail)
mLodBuilder.append(" tasks:").append(WXJsonUtils.fromObjectToJSONString(args));
-
+ WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
}
mWXBridge.execJS(instanceId, namespace, function, args);
@@ -1158,10 +1158,6 @@ public class WXBridgeManager implements Callback,BactchExecutor {
}
}
- public void clearInstanceCallback(String instanceId){
- mWXBridge.clearInstanceCallback(instanceId);
- }
-
public void destroy() {
if (mJSThread != null) {
mJSThread.quit();
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2814ad/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java b/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
index a013767..06b9827 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
@@ -52,8 +52,6 @@ public interface IWXBridge extends IWXObject {
*/
void takeHeapSnapshot(String filename);
- void clearInstanceCallback(String instanceId);
-
/**
* js call native
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2814ad/android/weex_debug/src/main/java/com/taobao/weex/bridge/WXWebsocketBridge.java
----------------------------------------------------------------------
diff --git a/android/weex_debug/src/main/java/com/taobao/weex/bridge/WXWebsocketBridge.java b/android/weex_debug/src/main/java/com/taobao/weex/bridge/WXWebsocketBridge.java
index c53db0f..e89d0fe 100644
--- a/android/weex_debug/src/main/java/com/taobao/weex/bridge/WXWebsocketBridge.java
+++ b/android/weex_debug/src/main/java/com/taobao/weex/bridge/WXWebsocketBridge.java
@@ -119,9 +119,6 @@ public class WXWebsocketBridge implements IWXBridge,WXWebSocketManager.JSDebugge
public void takeHeapSnapshot(String filename) {}
@Override
- public void clearInstanceCallback(String instanceId){}
-
- @Override
public void reportJSException(String instanceId, String func, String exception) {
if (mJsManager != null) {
mJsManager.reportJSException(instanceId, func, exception);