Merge remote-tracking branch 'upstream/pr1080' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aad36055 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aad36055 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aad36055 Branch: refs/heads/master Commit: aad360553407b49847e6222720b646d0e8b4e9ea Parents: edb4426 495c7ac Author: misakuo <[email protected]> Authored: Tue Mar 27 11:40:21 2018 +0800 Committer: misakuo <[email protected]> Committed: Tue Mar 27 11:40:21 2018 +0800 ---------------------------------------------------------------------- .../java/com/alibaba/weex/IndexActivity.java | 4 +- .../java/com/taobao/weex/RenderContainer.java | 12 + .../java/com/taobao/weex/WXRenderErrorCode.java | 87 ---- .../main/java/com/taobao/weex/WXSDKEngine.java | 9 +- .../java/com/taobao/weex/WXSDKInstance.java | 133 +++-- .../main/java/com/taobao/weex/WXSDKManager.java | 17 + .../com/taobao/weex/bridge/WXBridgeManager.java | 159 +++--- .../com/taobao/weex/bridge/WXModuleManager.java | 2 +- .../com/taobao/weex/common/WXErrorCode.java | 204 +++++--- .../taobao/weex/common/WXJSExceptionInfo.java | 11 +- .../com/taobao/weex/common/WXPerformance.java | 481 +++++++++++++++---- .../java/com/taobao/weex/dom/WXDomManager.java | 2 +- .../java/com/taobao/weex/dom/WXDomObject.java | 9 +- .../dom/action/AbstractAddElementAction.java | 14 +- .../weex/dom/action/AddElementAction.java | 1 + .../taobao/weex/dom/action/AddEventAction.java | 2 +- .../taobao/weex/dom/action/AnimationAction.java | 4 +- .../weex/dom/action/ModuleInvocationAction.java | 2 +- .../weex/dom/action/MoveElementAction.java | 2 +- .../weex/dom/action/RemoveElementAction.java | 8 +- .../weex/dom/action/RemoveEventAction.java | 2 +- .../weex/dom/action/UpdateAttributeAction.java | 2 +- .../weex/dom/action/UpdateStyleAction.java | 2 +- .../taobao/weex/performance/FpsCollector.java | 113 +++++ .../taobao/weex/performance/IWXAnalyzer.java | 35 ++ .../com/taobao/weex/performance/MemUtils.java | 80 +++ .../performance/WXAnalyzerDataTransfer.java | 138 ++++++ .../taobao/weex/ui/component/WXComponent.java | 5 + .../com/taobao/weex/ui/component/WXEmbed.java | 12 +- .../com/taobao/weex/ui/component/WXImage.java | 23 + .../taobao/weex/ui/module/WXTimerModule.java | 17 + .../com/taobao/weex/utils/WXExceptionUtils.java | 32 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 35 +- .../taobao/weex/utils/WXSoInstallMgrSdk.java | 10 +- .../taobao/weex/utils/WXExceptionUtilsTest.java | 5 +- 35 files changed, 1261 insertions(+), 413 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aad36055/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aad36055/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java ----------------------------------------------------------------------
