You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/03 02:51:28 UTC
[1/3] incubator-weex git commit: no message
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 2f99d1a65 -> cf86a2174
no message
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ec6744ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ec6744ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ec6744ec
Branch: refs/heads/0.11-dev
Commit: ec6744ec65e5e52d3e26805d9b8b8d161c7be9da
Parents: 0e0e1f2
Author: hao.haoh <ha...@taobao.com>
Authored: Thu Mar 2 20:17:15 2017 +0800
Committer: hao.haoh <ha...@taobao.com>
Committed: Thu Mar 2 20:17:15 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/WXSlider.java | 25 ++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec6744ec/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 6586e83..86dd1a4 100755
--- 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
@@ -644,9 +644,30 @@ public class WXSlider extends WXVContainer<FrameLayout> {
@Override
public void onPageScrollStateChanged(int state) {
- if (state == ViewPager.SCROLL_STATE_IDLE) {
- lastPositionOffset = 99f;
+
+ /**
+ * @homeblog@vip.qq.com
+ *
+ * add scrollstart & scrollend event
+ *
+ */
+ switch (state) {
+ case ViewPager.SCROLL_STATE_IDLE:
+ lastPositionOffset = 99f;
+ target.fireEvent("scrollend");
+ break;
+ case ViewPager.SCROLL_STATE_DRAGGING:
+ target.fireEvent("scrollstart");
+ break;
+ case ViewPager.SCROLL_STATE_SETTLING:
+ break;
+
}
+
+
+// if (state == ViewPager.SCROLL_STATE_IDLE) {
+// lastPositionOffset = 99f;
+// }
}
}
}
[2/3] incubator-weex git commit: remove redundancy code
Posted by so...@apache.org.
remove redundancy code
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1a9d750a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1a9d750a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1a9d750a
Branch: refs/heads/0.11-dev
Commit: 1a9d750a1992cd79b1dd68eadf90abd1a56e155f
Parents: ec6744e
Author: hao.haoh <ha...@taobao.com>
Authored: Fri Mar 3 10:47:18 2017 +0800
Committer: hao.haoh <ha...@taobao.com>
Committed: Fri Mar 3 10:47:18 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXSlider.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1a9d750a/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 86dd1a4..bab76b1 100755
--- 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
@@ -663,11 +663,6 @@ public class WXSlider extends WXVContainer<FrameLayout> {
break;
}
-
-
-// if (state == ViewPager.SCROLL_STATE_IDLE) {
-// lastPositionOffset = 99f;
-// }
}
}
}
[3/3] incubator-weex git commit: Merge branch '0.11-dev' of
http://github.com/homeblog/incubator-weex into 0.11-dev This closes #21
Posted by so...@apache.org.
Merge branch '0.11-dev' of http://github.com/homeblog/incubator-weex into 0.11-dev
This closes #21
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cf86a217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cf86a217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cf86a217
Branch: refs/heads/0.11-dev
Commit: cf86a217498027a2759c49c2d3399b275742bed3
Parents: 2f99d1a 1a9d750
Author: sospartan <so...@gmail.com>
Authored: Fri Mar 3 10:51:06 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Fri Mar 3 10:51:06 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/WXSlider.java | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------