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 03:49:09 UTC
[01/13] 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 a0581f009 -> 77fff9fa5
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/eeff0201
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eeff0201
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eeff0201
Branch: refs/heads/0.16-dev
Commit: eeff0201e43145cf1b03b08620a82ac2feab8d1c
Parents: adaf9cf cf40471
Author: misakuo <mi...@apache.org>
Authored: Mon Aug 7 09:47:23 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Aug 7 09:47:23 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/IndexActivity.java | 14 ++
.../main/java/com/taobao/weex/WXSDKManager.java | 10 ++
.../taobao/weex/common/WXWorkThreadManager.java | 48 ++++++
.../com/taobao/weex/ui/component/WXImage.java | 68 +++++++++
.../taobao/weex/utils/WXViewToImageUtil.java | 151 +++++++++++++++++++
build/karma.vue.conf.js | 2 +-
examples/vue/components/scroller.vue | 9 +-
examples/vue/modules/picker.vue | 149 +++++++-----------
.../vue/components/scrollable/scroller.js | 8 +-
.../render/vue/components/scrollable/style.css | 5 +
html5/render/vue/modules/dom.js | 97 ++++++------
html5/test/render/vue/modules/dom.js | 17 ++-
ios/playground/Podfile | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +-
.../WeexSDK/Sources/Component/WXAComponent.m | 1 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 11 +-
.../Sources/Component/WXImageComponent.m | 30 ++--
.../Sources/Component/WXTextAreaComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 1 +
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 33 ++--
.../Sources/Component/WXVideoComponent.m | 1 +
.../WeexSDK/Sources/Component/WXWebComponent.m | 1 +
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 1 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 5 +
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 1 +
.../Sources/Network/WXResourceResponse.h | 2 +-
.../Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +
package.json | 1 +
test/pages/components/hyperlink_target.vue | 1 +
vue.html | 3 +
32 files changed, 506 insertions(+), 177 deletions(-)
----------------------------------------------------------------------
[08/13] incubator-weex git commit: * [android] using independent
Handler to handle auto scroll
Posted by mi...@apache.org.
* [android] using independent Handler to handle auto scroll
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fe0b41ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fe0b41ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fe0b41ec
Branch: refs/heads/0.16-dev
Commit: fe0b41ec834e7d747dcab48732f34a5cec6d2e48
Parents: be89af8
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 15:32:38 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 15:32:38 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe0b41ec/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 6419e48..93cac73 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -48,7 +48,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
private boolean needLoop = true;
private boolean scrollable = true;
private int mState = ViewPager.SCROLL_STATE_IDLE;
- private Handler mAutoScrollHandler = new Handler(Looper.getMainLooper());
+ private Handler mAutoScrollHandler;
private Runnable scrollAction = new ScrollAction(this);
@@ -59,6 +59,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
private void init() {
+ mAutoScrollHandler = new Handler(Looper.getMainLooper());
setOverScrollMode(View.OVER_SCROLL_NEVER);
addOnPageChangeListener(new OnPageChangeListener() {
[12/13] incubator-weex git commit: * [android] merge
Posted by mi...@apache.org.
* [android] merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7031a924
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7031a924
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7031a924
Branch: refs/heads/0.16-dev
Commit: 7031a924d94eb083ecf35f70e68a33ad568f7510
Parents: 2382887 8a8dfb8
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 17:13:36 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 17:13:36 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/x86/libweexjsc.so | Bin 7570392 -> 12121924 bytes
.../java/com/taobao/weex/common/Constants.java | 2 +
.../java/com/taobao/weex/dom/WXDomObject.java | 15 +-
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 +-
39 files changed, 766 insertions(+), 299 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7031a924/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index b9abceb,73c3399..92cb971
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@@ -170,7 -170,8 +170,9 @@@ public class Constants
String OFFSET = "offset";
String ANIMATED = "animated";
String STABLE = "stable";
+ String TRANSFORM = "transform";
+ String TRANSFORM_ORIGIN = "transformOrigin";
+ String KEEP_INDEX = "keepIndex";
String INSERT_CELL_ANIMATION = "insertAnimation";
String DELETE_CELL_ANIMATION = "deleteAnimation";
[07/13] incubator-weex git commit: * [android] using independent
Handler to handle auto scroll
Posted by mi...@apache.org.
* [android] using independent Handler to handle auto scroll
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/be89af83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/be89af83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/be89af83
Branch: refs/heads/0.16-dev
Commit: be89af838d49cb730527de9b1fb717c9885da50c
Parents: 9987070
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 15:09:47 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 15:09:47 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/view/WXCircleViewPager.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/be89af83/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index f01702e..6419e48 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -48,7 +48,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
private boolean needLoop = true;
private boolean scrollable = true;
private int mState = ViewPager.SCROLL_STATE_IDLE;
- private Handler mAutoScrollHandler;
+ private Handler mAutoScrollHandler = new Handler(Looper.getMainLooper());
private Runnable scrollAction = new ScrollAction(this);
@@ -59,8 +59,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
private void init() {
- mAutoScrollHandler = new Handler(Looper.getMainLooper());
-
setOverScrollMode(View.OVER_SCROLL_NEVER);
addOnPageChangeListener(new OnPageChangeListener() {
@@ -220,12 +218,12 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_MOVE:
- removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacks(scrollAction);
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
if (isAutoScroll()) {
- postDelayed(scrollAction, intervalTime);
+ mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
}
break;
}
@@ -301,7 +299,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
- removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacks(scrollAction);
}
private static final class ScrollAction implements Runnable {
@@ -316,8 +314,8 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
WXCircleViewPager target;
if ((target = targetRef.get()) != null) {
target.showNextItem();
- target.removeCallbacks(this);
- target.postDelayed(this, target.getIntervalTime());
+ target.mAutoScrollHandler.removeCallbacks(this);
+ target.mAutoScrollHandler.postDelayed(this, target.getIntervalTime());
}
}
}
[02/13] incubator-weex git commit: Revert "Revert "+ [android] ignore
set index when current index not zero @notdanger""
Posted by mi...@apache.org.
Revert "Revert "+ [android] ignore set index when current index not zero @notdanger""
This reverts commit 947e8510b5f6aabd21ac6c6ada1ff3b0cd0d35eb.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a2e79af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a2e79af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a2e79af4
Branch: refs/heads/0.16-dev
Commit: a2e79af4c238a3a09bef1a11127dca2066e4b987
Parents: eeff020
Author: misakuo <mi...@apache.org>
Authored: Wed Aug 9 16:18:52 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Aug 9 16:18:52 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a2e79af4/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index dd593f9..8dc5918 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -188,7 +188,9 @@ public class WXSlider extends WXVContainer<FrameLayout> {
mViewPager.setCurrentItem(initIndex);
initIndex = -1;
} else {
- mViewPager.setCurrentItem(0);
+ if (mViewPager.getCurrentItem() == 0) {
+ mViewPager.setCurrentItem(0);
+ }
}
if (mIndicator != null) {
mIndicator.getHostView().forceLayout();
[10/13] incubator-weex git commit: * [android] clean redundant
Posted by mi...@apache.org.
* [android] clean redundant
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d336ad2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d336ad2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d336ad2a
Branch: refs/heads/0.16-dev
Commit: d336ad2aed639d1e95d65428788ef26466208fb7
Parents: a62383e
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 16:48:48 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 16:48:48 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/view/WXCircleViewPager.java | 33 ++------------------
1 file changed, 2 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d336ad2a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 7e8e091..1659c30 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -34,7 +34,6 @@ import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.utils.WXLogUtils;
-import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
/**
@@ -54,6 +53,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
@Override
public void handleMessage(Message msg) {
if (msg.what == SCROLL_TO_NEXT) {
+ WXLogUtils.d("[CircleViewPager] trigger auto play action");
showNextItem();
this.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
return;
@@ -62,8 +62,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
};
- private Runnable scrollAction = new ScrollAction(this);
-
@SuppressLint("NewApi")
public WXCircleViewPager(Context context) {
super(context);
@@ -166,8 +164,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
isAutoScroll = true;
mAutoScrollHandler.removeCallbacksAndMessages(null);
mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
-// mAutoScrollHandler.removeCallbacksAndMessages(scrollAction);
-// mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
}
public void pauseAutoScroll(){
@@ -238,7 +234,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
case MotionEvent.ACTION_CANCEL:
if (isAutoScroll()) {
mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
- //postDelayed(scrollAction, intervalTime);
}
break;
}
@@ -246,7 +241,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
public void destory() {
-
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
}
@Override
@@ -310,28 +305,4 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
superSetCurrentItem(superGetCurrentItem() + 1, true);
}
}
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- mAutoScrollHandler.removeCallbacksAndMessages(null);
- }
-
- private static final class ScrollAction implements Runnable {
- private WeakReference<WXCircleViewPager> targetRef;
- private ScrollAction(WXCircleViewPager target) {
- this.targetRef = new WeakReference<>(target);
- }
-
- @Override
- public void run() {
- WXLogUtils.d("[CircleViewPager] trigger auto play action");
- WXCircleViewPager target;
- if ((target = targetRef.get()) != null) {
- target.showNextItem();
- target.removeCallbacks(this);
- target.postDelayed(this, target.getIntervalTime());
- }
- }
- }
}
[13/13] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr600' into apache-0.16-dev
Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr600' into apache-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/77fff9fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/77fff9fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/77fff9fa
Branch: refs/heads/0.16-dev
Commit: 77fff9fa56467b5dc52bbffdc61b4b9b9ad6108f
Parents: a0581f0 7031a92
Author: misakuo <mi...@apache.org>
Authored: Wed Aug 16 11:49:10 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Aug 16 11:49:10 2017 +0800
----------------------------------------------------------------------
.../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 | 8 ++-
.../ui/component/list/BasicListComponent.java | 18 +------
.../weex/ui/view/WXBaseCircleIndicator.java | 3 +-
.../taobao/weex/ui/view/WXCircleViewPager.java | 57 ++++++++------------
8 files changed, 35 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/77fff9fa/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
[06/13] incubator-weex git commit: * [android] using independent
Handler to handle auto scroll
Posted by mi...@apache.org.
* [android] using independent Handler to handle auto scroll
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/99870708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/99870708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/99870708
Branch: refs/heads/0.16-dev
Commit: 998707085d749b2dc0289650c29d665396276c27
Parents: 7606dc7
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 14:42:59 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 14:42:59 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/view/WXCircleViewPager.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/99870708/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 160dcb1..f01702e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -20,6 +20,8 @@ package com.taobao.weex.ui.view;
import android.annotation.SuppressLint;
import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
@@ -46,6 +48,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
private boolean needLoop = true;
private boolean scrollable = true;
private int mState = ViewPager.SCROLL_STATE_IDLE;
+ private Handler mAutoScrollHandler;
private Runnable scrollAction = new ScrollAction(this);
@@ -56,6 +59,8 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
private void init() {
+ mAutoScrollHandler = new Handler(Looper.getMainLooper());
+
setOverScrollMode(View.OVER_SCROLL_NEVER);
addOnPageChangeListener(new OnPageChangeListener() {
@@ -149,12 +154,12 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
*/
public void startAutoScroll() {
isAutoScroll = true;
- removeCallbacks(scrollAction);
- postDelayed(scrollAction, intervalTime);
+ mAutoScrollHandler.removeCallbacks(scrollAction);
+ mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
}
public void pauseAutoScroll(){
- removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacks(scrollAction);
}
/**
@@ -162,7 +167,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
*/
public void stopAutoScroll() {
isAutoScroll = false;
- removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacks(scrollAction);
}
public boolean isAutoScroll() {
[09/13] incubator-weex git commit: * [android] using independent
Handler to handle auto scroll
Posted by mi...@apache.org.
* [android] using independent Handler to handle auto scroll
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a62383e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a62383e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a62383e6
Branch: refs/heads/0.16-dev
Commit: a62383e6f49af57d60fbcbd9ecbe1b17724b02f5
Parents: fe0b41e
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 16:12:04 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 16:12:04 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/view/WXCircleViewPager.java | 36 ++++++++++++++------
1 file changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a62383e6/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 93cac73..7e8e091 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -22,6 +22,7 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
+import android.os.Message;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
@@ -41,6 +42,7 @@ import java.lang.reflect.Field;
@SuppressLint("HandlerLeak")
public class WXCircleViewPager extends ViewPager implements WXGestureObservable {
+ private final int SCROLL_TO_NEXT = 1;
private WXGesture wxGesture;
private boolean isAutoScroll;
private long intervalTime = 3 * 1000;
@@ -48,7 +50,17 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
private boolean needLoop = true;
private boolean scrollable = true;
private int mState = ViewPager.SCROLL_STATE_IDLE;
- private Handler mAutoScrollHandler;
+ private Handler mAutoScrollHandler = new Handler(Looper.getMainLooper()) {
+ @Override
+ public void handleMessage(Message msg) {
+ if (msg.what == SCROLL_TO_NEXT) {
+ showNextItem();
+ this.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
+ return;
+ }
+ super.handleMessage(msg);
+ }
+ };
private Runnable scrollAction = new ScrollAction(this);
@@ -59,7 +71,6 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
}
private void init() {
- mAutoScrollHandler = new Handler(Looper.getMainLooper());
setOverScrollMode(View.OVER_SCROLL_NEVER);
addOnPageChangeListener(new OnPageChangeListener() {
@@ -153,12 +164,14 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
*/
public void startAutoScroll() {
isAutoScroll = true;
- mAutoScrollHandler.removeCallbacks(scrollAction);
- mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
+ mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
+// mAutoScrollHandler.removeCallbacksAndMessages(scrollAction);
+// mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
}
public void pauseAutoScroll(){
- mAutoScrollHandler.removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
}
/**
@@ -166,7 +179,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
*/
public void stopAutoScroll() {
isAutoScroll = false;
- mAutoScrollHandler.removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
}
public boolean isAutoScroll() {
@@ -219,12 +232,13 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_MOVE:
- mAutoScrollHandler.removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
if (isAutoScroll()) {
- mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
+ mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
+ //postDelayed(scrollAction, intervalTime);
}
break;
}
@@ -300,7 +314,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
- mAutoScrollHandler.removeCallbacks(scrollAction);
+ mAutoScrollHandler.removeCallbacksAndMessages(null);
}
private static final class ScrollAction implements Runnable {
@@ -315,8 +329,8 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
WXCircleViewPager target;
if ((target = targetRef.get()) != null) {
target.showNextItem();
- target.mAutoScrollHandler.removeCallbacks(this);
- target.mAutoScrollHandler.postDelayed(this, target.getIntervalTime());
+ target.removeCallbacks(this);
+ target.postDelayed(this, target.getIntervalTime());
}
}
}
[11/13] incubator-weex git commit: Revert: + [android] return
contentSize on getComponentRect when target component implemented
ContentMeasurable @notdanger
Posted by mi...@apache.org.
Revert: + [android] return contentSize on getComponentRect when target component implemented ContentMeasurable @notdanger
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/23828878
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/23828878
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/23828878
Branch: refs/heads/0.16-dev
Commit: 238288782c20cbe420bb0f0192a7b09d56d275fb
Parents: d336ad2
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 15 17:09:11 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 15 17:09:11 2017 +0800
----------------------------------------------------------------------
.../weex/dom/action/GetComponentRectAction.java | 12 --------
.../weex/ui/component/ContentMeasurable.java | 29 --------------------
.../taobao/weex/ui/component/WXScroller.java | 16 +----------
.../ui/component/list/BasicListComponent.java | 18 +-----------
4 files changed, 2 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java b/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
index d622248..cf8e224 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
@@ -28,7 +28,6 @@ import com.taobao.weex.bridge.JSCallback;
import com.taobao.weex.bridge.SimpleJSCallback;
import com.taobao.weex.dom.RenderAction;
import com.taobao.weex.dom.RenderActionContext;
-import com.taobao.weex.ui.component.ContentMeasurable;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.utils.WXViewUtils;
@@ -75,17 +74,6 @@ class GetComponentRectAction implements RenderAction {
size.put("top", getWebPxValue(sizes.top,viewPort));
options.put("size", size);
options.put("result", true);
-
- if (component instanceof ContentMeasurable) {
- Rect contentFrame = ((ContentMeasurable) component).getContentFrame();
- if (contentFrame != null) {
- Map<String, Float> contentSize = new HashMap<>(2);
- contentSize.put("width", getWebPxValue(contentFrame.width(), viewPort));
- contentSize.put("height", getWebPxValue(contentFrame.height(), viewPort));
- options.put("contentSize", contentSize);
- }
- }
-
} else {
options.put("errMsg", "Component does not exist");
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java
deleted file mode 100644
index b804d5b..0000000
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.taobao.weex.ui.component;
-
-import android.graphics.Rect;
-
-/**
- * Created by moxun on 2017/7/31.
- */
-
-public interface ContentMeasurable {
- Rect getContentFrame();
-}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 49037ca..627776f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -69,7 +69,7 @@ import java.util.Map.Entry;
*/
@Component(lazyload = false)
-public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewListener,Scrollable,ContentMeasurable {
+public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewListener,Scrollable {
public static final String DIRECTION = "direction";
protected int mOrientation = Constants.Orientation.VERTICAL;
@@ -719,18 +719,4 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
public void resetLoadmore() {
mForceLoadmoreNextTime = true;
}
-
-
- @Override
- public Rect getContentFrame() {
- View innerView = getInnerView();
- if (innerView != null) {
- if (innerView instanceof WXScrollView) {
- return ((WXScrollView) innerView).getContentFrame();
- } else if (innerView instanceof WXHorizontalScrollView) {
- return ((WXHorizontalScrollView) innerView).getContentFrame();
- }
- }
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 9f3b2cc..c959351 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -23,7 +23,6 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.PointF;
-import android.graphics.Rect;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -52,7 +51,6 @@ import com.taobao.weex.dom.ImmutableDomObject;
import com.taobao.weex.dom.WXAttr;
import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.ui.component.AppearanceHelper;
-import com.taobao.weex.ui.component.ContentMeasurable;
import com.taobao.weex.ui.component.Scrollable;
import com.taobao.weex.ui.component.WXBaseRefresh;
import com.taobao.weex.ui.component.WXComponent;
@@ -87,7 +85,7 @@ import java.util.regex.Pattern;
*/
public abstract class BasicListComponent<T extends ViewGroup & ListComponentView> extends WXVContainer<T> implements
- IRecyclerAdapterListener<ListBaseViewHolder>, IOnLoadMoreListener, Scrollable, ContentMeasurable {
+ IRecyclerAdapterListener<ListBaseViewHolder>, IOnLoadMoreListener, Scrollable {
public static final String TRANSFORM = "transform";
public static final String LOADMOREOFFSET = "loadmoreoffset";
private String TAG = "BasicListComponent";
@@ -1333,18 +1331,4 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
return false;
}
-
- @Override
- public Rect getContentFrame() {
- T wrapper = getHostView();
- if (wrapper != null) {
- RecyclerView recyclerView = wrapper.getInnerView();
- if (recyclerView != null) {
- int contentWidth = recyclerView.getMeasuredWidth() + recyclerView.computeHorizontalScrollRange();
- int contentHeight = recyclerView.getMeasuredHeight() + recyclerView.computeVerticalScrollRange();
- return new Rect(0, 0, contentWidth, contentHeight);
- }
- }
- return null;
- }
}
[03/13] 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/043bc963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/043bc963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/043bc963
Branch: refs/heads/0.16-dev
Commit: 043bc9631801a6e74e6c4147ab057b6f17b5f27c
Parents: a2e79af 5894ef6
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 10 17:03:43 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 10 17:03:43 2017 +0800
----------------------------------------------------------------------
.gitignore | 2 +-
.travis.yml | 8 +-
android/build.gradle | 8 +-
.../java/com/taobao/weex/bridge/WXBridge.java | 8 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 36 +-
.../taobao/weex/bridge/WXValidateProcessor.java | 7 +-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../java/com/taobao/weex/dom/WXDomObject.java | 17 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 91 +-
.../dom/action/AbstractAddElementAction.java | 2 +-
.../taobao/weex/dom/action/AnimationAction.java | 1 +
.../ui/animation/CameraDistanceProperty.java | 54 +
.../weex/ui/animation/WXAnimationBean.java | 86 +-
.../taobao/weex/ui/component/WXComponent.java | 16 -
.../java/com/taobao/weex/utils/WXViewUtils.java | 4 +-
build/build.js | 1 +
build/config.js | 17 +-
html5/frameworks/legacy/core/array.js | 4 +
html5/frameworks/legacy/core/object.js | 6 +
html5/frameworks/legacy/static/create.js | 7 +-
html5/frameworks/legacy/vm/directive.js | 6 +
html5/frameworks/vanilla/index.js | 35 +-
html5/render/vue/README.md | 15 +
html5/render/vue/components/image.js | 58 +-
html5/render/vue/config.js | 10 +-
html5/render/vue/core/node.js | 27 +-
html5/render/vue/lib/gesture.js | 6 +
html5/render/vue/modules/modal/toast.js | 23 +-
html5/runtime/callback-manager.js | 12 +-
html5/runtime/config.js | 5 +-
html5/runtime/normalize.js | 107 +
html5/runtime/task-center.js | 59 +-
html5/runtime/vdom/document.js | 2 +
html5/runtime/vdom/element.js | 15 +-
html5/test/render/vue/core/node.js | 2 +
ios/.gitignore | 1 +
.../WeexDemo.xcodeproj/project.pbxproj | 24 +-
ios/playground/WeexDemo/AppDelegate.m | 8 +-
ios/playground/WeexDemo/WXDemoViewController.m | 2 -
ios/playground/WeexDemo/WXExtModule.h | 26 +
ios/playground/WeexDemo/WXExtModule.m | 43 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 +
.../Component/Recycler/WXRecyclerComponent.m | 58 +-
.../Recycler/WXRecyclerDragController.h | 52 +
.../Recycler/WXRecyclerDragController.m | 208 +
.../Sources/Component/WXImageComponent.m | 150 +-
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
package.json | 17 +-
packages/weex-js-framework/.npmignore | 4 +
packages/weex-js-framework/index.js | 26001 +++++++++++++++++
packages/weex-js-framework/index.min.js | 1 +
packages/weex-js-framework/package.json | 22 +
packages/weex-js-runtime/.npmignore | 4 +
packages/weex-js-runtime/index.js | 4088 +++
packages/weex-js-runtime/index.min.js | 1 +
packages/weex-js-runtime/index.min.js.gz | Bin 0 -> 13215 bytes
packages/weex-js-runtime/package.json | 22 +
packages/weex-legacy-framework/.npmignore | 4 +
packages/weex-legacy-framework/index.js | 5770 ++++
packages/weex-legacy-framework/index.min.js | 1 +
packages/weex-legacy-framework/package.json | 22 +
packages/weex-vue-render/README.md | 15 +
packages/weex-vue-render/package.json | 2 +-
pre-build/native-bundle-main.js | 16 +-
scripts/commit-msg.sh | 2 +-
test/pages/components/iconfont.vue | 71 +
test/pages/components/input-event.vue | 65 +
test/pages/components/refresh-loading.vue | 115 +
test/pages/components/switch-event.vue | 60 +
test/pages/components/web-event.vue | 56 +
test/pages/include/button.vue | 162 +
test/pages/include/h1.vue | 13 +
test/pages/include/h2.vue | 13 +
test/pages/include/h3.vue | 13 +
test/pages/include/hn.vue | 47 +
test/pages/include/panel.vue | 141 +
test/pages/include/wxc-desc.vue | 66 +
test/pages/modules/animation-translate.vue | 129 +
test/pages/modules/clipboard-event.vue | 57 +
test/pages/modules/cover-generate.vue | 53 +
test/pages/modules/downgrade-event.vue | 74 +
test/pages/modules/gesture-longpress.vue | 75 +
test/pages/modules/modal-event.vue | 61 +
test/pages/modules/picker-event.vue | 63 +
test/pages/modules/storage-event.vue | 59 +
test/pages/modules/stream-result.vue | 85 +
test/run.sh | 30 +-
test/screenshot/border-android.png | Bin 156247 -> 158634 bytes
test/scripts/components/iconfont.test.js | 34 +
test/scripts/components/input-event.test.js | 36 +
test/scripts/components/refresh-loading.test.js | 38 +
test/scripts/components/switch-event.test.js | 38 +
test/scripts/components/web-event.test.js | 30 +
.../scripts/modules/animation-translate.test.js | 40 +
test/scripts/modules/clipboard-event.test.js | 35 +
test/scripts/modules/downgrade-event.test.js | 30 +
test/scripts/modules/gesture-longpress.test.js | 37 +
test/scripts/modules/modal-event.test.js | 35 +
test/scripts/modules/picker-event.test.js | 41 +
test/scripts/modules/storage-event.test.js | 36 +
test/scripts/modules/stream-result.test.js | 34 +
test/scripts/util.js | 41 +
test/scripts/zcover-generate.js | 32 +
test/serve.sh | 2 +-
105 files changed, 39057 insertions(+), 323 deletions(-)
----------------------------------------------------------------------
[05/13] incubator-weex git commit: + [android] add the 'keep-index'
property for slider
Posted by mi...@apache.org.
+ [android] add the 'keep-index' property for slider
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7606dc7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7606dc7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7606dc7d
Branch: refs/heads/0.16-dev
Commit: 7606dc7de79ecb82e589b224a736faccb6467308
Parents: 1215e8f
Author: misakuo <mi...@apache.org>
Authored: Fri Aug 11 14:26:41 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Fri Aug 11 14:26:41 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/common/Constants.java | 1 +
.../src/main/java/com/taobao/weex/ui/component/WXSlider.java | 6 +++++-
.../java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7606dc7d/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index e24ed22..b9abceb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -170,6 +170,7 @@ public class Constants {
String OFFSET = "offset";
String ANIMATED = "animated";
String STABLE = "stable";
+ String KEEP_INDEX = "keepIndex";
String INSERT_CELL_ANIMATION = "insertAnimation";
String DELETE_CELL_ANIMATION = "deleteAnimation";
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7606dc7d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index 8dc5918..4ef51f3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -63,6 +63,7 @@ public class WXSlider extends WXVContainer<FrameLayout> {
Map<String, Object> params = new HashMap<>();
private float offsetXAccuracy = 0.1f;
private int initIndex = -1;
+ private boolean keepIndex = false;
public static class Creator implements ComponentCreator {
public WXComponent createInstance(WXSDKInstance instance, WXDomObject node, WXVContainer parent) throws IllegalAccessException, InvocationTargetException, InstantiationException {
@@ -188,7 +189,7 @@ public class WXSlider extends WXVContainer<FrameLayout> {
mViewPager.setCurrentItem(initIndex);
initIndex = -1;
} else {
- if (mViewPager.getCurrentItem() == 0) {
+ if (!keepIndex) {
mViewPager.setCurrentItem(0);
}
}
@@ -291,6 +292,9 @@ public class WXSlider extends WXVContainer<FrameLayout> {
boolean scrollable = WXUtils.getBoolean(param, true);
setScrollable(scrollable);
return true;
+ case Constants.Name.KEEP_INDEX:
+ this.keepIndex = WXUtils.getBoolean(param, false);
+ return true;
}
return super.setProperty(key, param);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7606dc7d/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 18b88af..1fdba29 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -123,7 +123,8 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi
public void setCircleViewPager(WXCircleViewPager mCircleViewPager) {
this.mCircleViewPager = mCircleViewPager;
if (this.mCircleViewPager != null) {
- this.mCircleViewPager.setOnPageChangeListener(this);
+ this.mCircleViewPager.addOnPageChangeListener(this);
+ this.realCurrentItem = mCircleViewPager.getRealCurrentItem();
}
requestLayout();
}
[04/13] 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/1215e8f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1215e8f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1215e8f8
Branch: refs/heads/0.16-dev
Commit: 1215e8f87ecc6624c68c6739f240a57e92fc2f0e
Parents: 043bc96 ffe4951
Author: misakuo <mi...@apache.org>
Authored: Fri Aug 11 11:25:13 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Fri Aug 11 11:25:13 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 7570392 bytes
examples/vue/modules/websocket.vue | 22 ++-
.../WeexDemo.xcodeproj/project.pbxproj | 6 +
ios/playground/WeexDemo/AppDelegate.m | 2 +-
.../WeexDemo/WXExtendCallNativeTest.h | 25 +++
.../WeexDemo/WXExtendCallNativeTest.m | 47 ++++++
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 32 ++++
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 ++--
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 ++-
.../Sources/Component/WXScrollerComponent.m | 3 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 5 +-
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 4 +
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 10 ++
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 10 ++
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 6 +
.../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +-
.../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +-
.../WeexSDK/Sources/Manager/WXBridgeManager.m | 4 +
.../Sources/Manager/WXComponentFactory.h | 1 +
.../Sources/Manager/WXComponentFactory.m | 23 +++
.../Sources/Manager/WXComponentManager.m | 18 +-
.../Sources/Manager/WXExtendCallNativeManager.h | 26 +++
.../Sources/Manager/WXExtendCallNativeManager.m | 80 +++++++++
.../WeexSDK/Sources/Manager/WXModuleFactory.h | 6 +
.../WeexSDK/Sources/Manager/WXModuleFactory.m | 24 +++
.../WeexSDK/Sources/Manager/WXTracingManager.h | 33 +++-
.../WeexSDK/Sources/Manager/WXTracingManager.m | 169 ++++++++++++++++---
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 1 -
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 ++
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +-
ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 9 +
.../Sources/Protocol/WXAppMonitorProtocol.h | 2 +
.../Protocol/WXExtendCallNativeProtocol.h | 47 ++++++
.../Sources/Protocol/WXTracingProtocol.h | 29 ++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 ++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 +++
.../Sources/View/WXComponent+ViewManagement.m | 1 -
.../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +
41 files changed, 712 insertions(+), 68 deletions(-)
----------------------------------------------------------------------