You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/16 06:02:03 UTC

[1/3] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 77fff9fa5 -> 7098973be


Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev


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

Branch: refs/heads/0.16-dev
Commit: 64bb75da32e3cb5c111da320ec2fdc491dcd5d94
Parents: 1215e8f 2074156
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 17:55:53 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 17:55:53 2017 +0800

----------------------------------------------------------------------
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 7570392 -> 7570504 bytes
 android/sdk/libs/x86/libweexjsc.so              | Bin 7570392 -> 12121924 bytes
 .../java/com/taobao/weex/WXEnvironment.java     |   2 +-
 .../java/com/taobao/weex/WXSDKInstance.java     |  37 ++-
 .../main/java/com/taobao/weex/WXSDKManager.java |  30 +-
 .../taobao/weex/adapter/ITracingAdapter.java    |  31 ++
 .../com/taobao/weex/bridge/WXBridgeManager.java |  66 +++-
 .../java/com/taobao/weex/common/Constants.java  |   2 +
 .../taobao/weex/dom/DOMActionContextImpl.java   |  15 +-
 .../com/taobao/weex/dom/RenderActionTask.java   |  26 +-
 .../java/com/taobao/weex/dom/WXDomHandler.java  |   8 +-
 .../java/com/taobao/weex/dom/WXDomManager.java  |  16 +-
 .../java/com/taobao/weex/dom/WXDomModule.java   |  39 ++-
 .../java/com/taobao/weex/dom/WXDomObject.java   |  24 +-
 .../java/com/taobao/weex/dom/WXDomTask.java     |   1 +
 .../dom/action/AbstractAddElementAction.java    |  26 +-
 .../dom/action/AbstractLayoutFinishAction.java  |   3 +-
 .../weex/dom/action/AddElementAction.java       |  26 ++
 .../taobao/weex/dom/action/AddEventAction.java  |  24 +-
 .../weex/dom/action/CreateBodyAction.java       |  19 ++
 .../weex/dom/action/CreateFinishAction.java     |   6 +
 .../weex/dom/action/RefreshFinishAction.java    |   4 +
 .../taobao/weex/dom/action/TraceableAction.java |  82 +++++
 .../weex/dom/action/UpdateAttributeAction.java  |   2 +-
 .../weex/dom/action/UpdateStyleAction.java      |   2 +-
 .../java/com/taobao/weex/tracing/Stopwatch.java | 132 ++++++++
 .../java/com/taobao/weex/tracing/WXTracing.java | 129 ++++++++
 .../com/taobao/weex/ui/WXRenderManager.java     |  26 +-
 .../ui/component/AbstractEditComponent.java     |   2 +-
 .../taobao/weex/ui/component/WXComponent.java   |  65 +++-
 .../taobao/weex/ui/component/WXVContainer.java  |  18 ++
 .../ui/component/list/BasicListComponent.java   |   1 +
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  45 +--
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |   1 -
 doc/source/_posts/arkit.md                      | 112 +++++++
 doc/source/_posts/cn/hello.md                   |   6 -
 doc/source/_posts/hello_world.md                |   7 -
 doc/source/_posts/test.md                       |  14 -
 doc/source/cn/blog/index.md                     |   4 -
 .../cn/references/advanced/extend-to-ios.md     |   4 +-
 .../advanced/integrate-devtool-to-android.md    |  86 ++++-
 doc/source/cn/references/common-style.md        |   2 +
 doc/source/cn/references/components/text.md     |   4 +-
 doc/source/cn/references/modules/animation.md   |   2 +-
 doc/source/references/advanced/extend-to-ios.md |   5 +-
 doc/source/references/common-style.md           |   2 +
 doc/source/references/components/text.md        |   4 +-
 doc/source/references/modules/animation.md      |   2 +-
 doc/themes/weex/layout/_partial/header.ejs      |   1 +
 .../weex/layout/_partial/post/summary.ejs       |   1 +
 doc/themes/weex/source/css/blog.scss            |   3 +
 doc/themes/weex/source/css/media-queries.scss   |   1 +
 doc/themes/weex/source/css/partial/header.scss  |   6 +-
 html5/runtime/normalize.js                      |  13 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |  24 +-
 .../Sources/Component/WXComponent_internal.h    |  12 +
 .../WeexSDK/Sources/Component/WXListComponent.m |   4 +-
 .../Sources/Display/WXComponent+Display.m       |  16 +-
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |   3 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |  67 +++-
 .../WeexSDK/Sources/Module/WXAnimationLayout.h  |  49 ---
 .../WeexSDK/Sources/Module/WXAnimationLayout.m  | 115 -------
 .../WeexSDK/Sources/Module/WXAnimationModule.h  |   2 +
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  88 ++++--
 ios/sdk/WeexSDK/Sources/Module/WXTransition.h   |  43 +++
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   | 311 +++++++++++++++++++
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m     |   3 +-
 package.json                                    |   4 +-
 pre-build/native-bundle-main.js                 |  10 +-
 test/run.sh                                     |  18 +-
 70 files changed, 1609 insertions(+), 349 deletions(-)
----------------------------------------------------------------------



[2/3] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev


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

Branch: refs/heads/0.16-dev
Commit: 7d9492afe0ce032bd0bd5f13a73a5a0c572f5657
Parents: 64bb75d 77fff9f
Author: misakuo <mi...@apache.org>
Authored: Wed Aug 16 12:08:44 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Aug 16 12:08:44 2017 +0800

----------------------------------------------------------------------
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 7570504 -> 7570392 bytes
 .../java/com/taobao/weex/common/Constants.java  |   1 +
 .../weex/dom/action/GetComponentRectAction.java |  12 ----
 .../weex/ui/component/ContentMeasurable.java    |  29 ----------
 .../taobao/weex/ui/component/WXScroller.java    |  16 +-----
 .../com/taobao/weex/ui/component/WXSlider.java  |   6 +-
 .../ui/component/list/BasicListComponent.java   |  18 +-----
 .../weex/ui/view/WXBaseCircleIndicator.java     |   3 +-
 .../taobao/weex/ui/view/WXCircleViewPager.java  |  57 ++++++++-----------
 .../ui/view/refresh/core/WXSwipeLayout.java     |  15 ++++-
 .../ui/view/refresh/wrapper/BaseBounceView.java |   2 +-
 examples/vue/market/gcanvas.vue                 |  10 +++-
 test/run.sh                                     |   6 +-
 13 files changed, 57 insertions(+), 118 deletions(-)
----------------------------------------------------------------------



[3/3] incubator-weex git commit: + [android] invoke callbacks on instance created

Posted by mi...@apache.org.
+ [android] invoke callbacks on instance created


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

Branch: refs/heads/0.16-dev
Commit: 7098973bec44a40e24710692beea6ae24c39040b
Parents: 7d9492a
Author: misakuo <mi...@apache.org>
Authored: Wed Aug 16 12:19:01 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Aug 16 12:19:01 2017 +0800

----------------------------------------------------------------------
 android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7098973b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index e6511d4..1da1a5f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -277,6 +277,11 @@ public class WXSDKManager {
   void createInstance(WXSDKInstance instance, String code, Map<String, Object> options, String jsonInitData) {
     mWXRenderManager.registerInstance(instance);
     mBridgeManager.createInstance(instance.getInstanceId(), code, options, jsonInitData);
+    if (mLifeCycleCallbacks != null) {
+      for (InstanceLifeCycleCallbacks callbacks : mLifeCycleCallbacks) {
+        callbacks.onInstanceCreated(instance.getInstanceId());
+      }
+    }
   }
 
   void refreshInstance(String instanceId, WXRefreshData jsonData) {
@@ -447,5 +452,6 @@ public class WXSDKManager {
 
   public interface InstanceLifeCycleCallbacks {
     void onInstanceDestroyed(String instanceId);
+    void onInstanceCreated(String instanceId);
   }
 }