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/06/08 10:49:25 UTC
[01/15] incubator-weex git commit: * [android] fix arm so file
Repository: incubator-weex
Updated Branches:
refs/heads/0.14-dev cd911636d -> eeb8d5e92
* [android] fix arm so file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c9d16a82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c9d16a82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c9d16a82
Branch: refs/heads/0.14-dev
Commit: c9d16a82faa97f37371c20437cdde6e06e2215d8
Parents: a6edb3f
Author: sospartan <so...@apache.org>
Authored: Wed Jun 7 16:18:28 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 7 16:18:28 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7558100 -> 7566292 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c9d16a82/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index 19e18b2..bf73161 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
[06/15] incubator-weex git commit: * [test] ignore android nav bar in
screenshot diff test
Posted by so...@apache.org.
* [test] ignore android nav bar in screenshot diff test
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d6a90e92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d6a90e92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d6a90e92
Branch: refs/heads/0.14-dev
Commit: d6a90e92723ba284b1097e8ab99b767be2ba430f
Parents: 168d168
Author: sospartan <so...@apache.org>
Authored: Mon Jun 5 16:05:44 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 7 17:06:00 2017 +0800
----------------------------------------------------------------------
test/scripts/util.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d6a90e92/test/scripts/util.js
----------------------------------------------------------------------
diff --git a/test/scripts/util.js b/test/scripts/util.js
index 775426c..23c2cae 100644
--- a/test/scripts/util.js
+++ b/test/scripts/util.js
@@ -83,8 +83,8 @@ function diffImage(imageAPath, imageB, threshold, outputPath) {
thresholdType: BlinkDiff.THRESHOLD_PIXEL,
threshold: threshold,
imageOutputPath: outputPath,
- cropImageA:isIOS?{y:128}:{y:72,height:1700},
- cropImageB:isIOS?{y:128}:{y:72,height:1700}
+ cropImageA:isIOS?{y:128}:{y:242,height:1530},//android: 242 - status bar(72)+navigator bar(170)
+ cropImageB:isIOS?{y:128}:{y:242,height:1530}
});
diff.run((err, result) => {
[13/15] incubator-weex git commit: + [android] add parallax component
as demo
Posted by so...@apache.org.
+ [android] add parallax component as demo
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/87c80ded
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/87c80ded
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/87c80ded
Branch: refs/heads/0.14-dev
Commit: 87c80dedcc53782928d7dc798de5640400f2c0c9
Parents: 6428fab
Author: zshshr <zh...@gmail.com>
Authored: Tue Jun 6 10:24:42 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:45:41 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/component/WXParallax.java | 345 +++++++++++++++++++
2 files changed, 347 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/87c80ded/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
index 283a44f..561d292 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
@@ -30,6 +30,7 @@ import com.alibaba.weex.extend.adapter.InterceptWXHttpAdapter;
import com.alibaba.weex.extend.component.RichText;
import com.alibaba.weex.extend.component.WXComponentSyncTest;
import com.alibaba.weex.extend.component.WXMask;
+import com.alibaba.weex.extend.component.WXParallax;
import com.alibaba.weex.extend.component.dom.WXMaskDomObject;
import com.alibaba.weex.extend.module.GeolocationModule;
import com.alibaba.weex.extend.module.MyModule;
@@ -75,6 +76,7 @@ public class WXApplication extends Application {
try {
Fresco.initialize(this);
WXSDKEngine.registerComponent("synccomponent", WXComponentSyncTest.class);
+ WXSDKEngine.registerComponent(WXParallax.PARALLAX, WXParallax.class);
WXSDKEngine.registerComponent("richtext", RichText.class);
WXSDKEngine.registerModule("render", RenderModule.class);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/87c80ded/android/playground/app/src/main/java/com/alibaba/weex/extend/component/WXParallax.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/extend/component/WXParallax.java b/android/playground/app/src/main/java/com/alibaba/weex/extend/component/WXParallax.java
new file mode 100644
index 0000000..7cceebc
--- /dev/null
+++ b/android/playground/app/src/main/java/com/alibaba/weex/extend/component/WXParallax.java
@@ -0,0 +1,345 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.alibaba.weex.extend.component;
+
+import android.graphics.Color;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.RotateAnimation;
+import android.view.animation.ScaleAnimation;
+import android.view.animation.TranslateAnimation;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.taobao.weex.WXEnvironment;
+import com.taobao.weex.WXSDKInstance;
+import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.ICheckBindingScroller;
+import com.taobao.weex.common.OnWXScrollListener;
+import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.ui.animation.WXAnimationBean;
+import com.taobao.weex.ui.component.Scrollable;
+import com.taobao.weex.ui.component.WXComponent;
+import com.taobao.weex.ui.component.WXDiv;
+import com.taobao.weex.ui.component.WXVContainer;
+import com.taobao.weex.utils.WXLogUtils;
+import com.taobao.weex.utils.WXResourceUtils;
+
+import java.util.ArrayList;
+
+
+/**
+ * Created by zhengshihan on 2017/5/3.
+ */
+
+public class WXParallax extends WXDiv implements OnWXScrollListener, ICheckBindingScroller {
+
+ public final static String WX_TRANSFORM = "transform";
+ public final static String WX_OPACITY = "opacity";
+ public static final String PARALLAX = "parallax";
+ public static final String BINDING_SCROLLER = "bindingScroller";
+
+
+ ArrayList<TransformCreator> mTransformPropArrayList = new ArrayList<>();
+ BackgroundColorCreator mBackgroundColor;
+ String mBindingRef = "";
+
+ private int mBackGroundColor = 0;
+ private float mOffsetY = 0;
+
+ public WXParallax(WXSDKInstance instance, WXDomObject dom, WXVContainer parent) {
+ super(instance, dom, parent);
+ initTransform(dom.getAttrs().get(WX_TRANSFORM));
+ initOpacity(dom.getAttrs().get(Constants.Name.OPACITY));
+ initBackgroundColor(dom.getAttrs().get(Constants.Name.BACKGROUND_COLOR));
+
+ mBindingRef = (String) (dom.getAttrs().get(BINDING_SCROLLER));
+ instance.registerOnWXScrollListener(this);
+ }
+
+
+ private void initBackgroundColor(Object obj) {
+ if (obj == null)
+ return;
+
+ if (obj instanceof JSONObject) {
+ mBackgroundColor = new BackgroundColorCreator();
+ JSONObject object = (JSONObject) obj;
+
+ JSONArray in = object.getJSONArray("in");
+ mBackgroundColor.input = new int[in.size()];
+ for (int i = 0; i < in.size(); i++) {
+ mBackgroundColor.input[i] = in.getInteger(i);
+ }
+
+ JSONArray out = object.getJSONArray("out");
+ mBackgroundColor.output = new int[out.size()];
+ for (int i = 0; i < out.size(); i++) {
+ String colorStr = out.getString(i);
+ mBackgroundColor.output[i] = WXResourceUtils.getColor(colorStr);
+ }
+ }
+ }
+
+ private void initOpacity(Object obj) {
+ if (obj == null)
+ return;
+
+ if (obj instanceof JSONObject) {
+ mTransformPropArrayList.add(new TransformCreator(WX_OPACITY, (JSONObject) obj));
+ }
+
+ }
+
+ private void initTransform(Object propStr) {
+
+ if (propStr == null) {
+ WXLogUtils.w("WXParallax initAnimation propStr ==null");
+ return;
+ }
+ JSONArray jsonObject;
+ if (propStr instanceof JSONArray) {
+ jsonObject = (JSONArray) propStr;
+ for (int i = 0; i < jsonObject.size(); i++) {
+ JSONObject object = jsonObject.getJSONObject(i);
+ mTransformPropArrayList.add(i,
+ new TransformCreator(object.getString("type"), object));
+ }
+ }
+ }
+
+ @Override
+ public boolean isNeedScroller(String ref, Object option) {
+
+ mBindingRef = (String) (getDomObject().getAttrs().get(BINDING_SCROLLER));
+ if (TextUtils.isEmpty(mBindingRef)) {
+ WXComponent root = getInstance().getRootComponent();
+ if (root != null && root instanceof WXVContainer) {
+ Scrollable scrollable = root.getFirstScroller();
+ if (scrollable != null) {
+ mBindingRef = scrollable.getRef();
+ }
+ }
+ }
+ if (!TextUtils.isEmpty(mBindingRef)
+ && !TextUtils.isEmpty(ref)
+ && ref.equals(mBindingRef)) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void onScrolled(View view, int dx, int dy) {
+
+ mOffsetY = mOffsetY + dy;
+
+ AnimationSet animationSet = new AnimationSet(true);
+ boolean hasAnimation = false;
+ for (int i = 0; i < mTransformPropArrayList.size(); i++) {
+ TransformCreator creator = mTransformPropArrayList.get(i);
+ Animation animation = creator.getAnimation(dx, dy);
+ if (animation != null) {
+ animationSet.addAnimation(animation);
+ hasAnimation = true;
+ }
+ }
+
+ if (hasAnimation) {
+ animationSet.setFillAfter(true);
+ if (getHostView() != null) {
+ getHostView().startAnimation(animationSet);
+ }
+ }
+
+ if (mBackgroundColor != null) {
+ int color = mBackgroundColor.getColor(dx, dy);
+ if (mBackGroundColor != color) {
+ getHostView().setBackgroundColor(color);
+ mBackGroundColor = color;
+ }
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(View view, int x, int y, int newState) {
+
+ }
+
+
+ private class BackgroundColorCreator {
+
+ int[] input;
+ int[] output;
+
+ int getColor(int XDelta, int YDelta) {
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXParallax:getColor: XDelta" + XDelta + " YDelta:" + YDelta + " mOffsetY" + mOffsetY);
+ }
+ int r1, g1, b1;
+
+ if (mOffsetY > input[1]) {
+ return output[1];
+ }
+
+ if (mOffsetY < input[0]) {
+ return output[0];
+ }
+
+ r1 = Color.red(output[0]) + (int) (mOffsetY - input[0]) * (Color.red(output[1]) - Color.red(output[0])) / (input[1] - input[0]);
+ g1 = Color.green(output[0]) + (int) (mOffsetY - input[0]) * (Color.green(output[1]) - Color.green(output[0])) / (input[1] - input[0]);
+ b1 = Color.blue(output[0]) + (int) (mOffsetY - input[0]) * (Color.blue(output[1]) - Color.blue(output[0])) / (input[1] - input[0]);
+
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXParallax:getColor: r1" + r1 + " g1:" + g1 + " b1:" + b1);
+ }
+ return Color.rgb(r1, g1, b1);
+ }
+
+ }
+
+ private class TransformCreator {
+
+ String transformType;
+ float[] input, output;
+ float fromTranslateX, fromTranslateY;
+ float fromScaleX, fromScaleY;
+ float fromRotate, fromOpacity;
+
+ TransformCreator(String type, JSONObject object) {
+ transformType = type;
+ JSONArray in = object.getJSONArray("in");
+ input = parseParamArray(in);
+ JSONArray out = object.getJSONArray("out");
+ output = parseParamArray(out);
+
+ switch (transformType) {
+ case WXAnimationBean.Style.WX_TRANSLATE:
+ fromTranslateX = output[0];
+ fromTranslateY = output[1];
+ break;
+ case WXAnimationBean.Style.WX_SCALE:
+ fromScaleX = output[0];
+ fromScaleY = output[1];
+ break;
+ case WXAnimationBean.Style.WX_ROTATE:
+ fromRotate = output[0];
+ break;
+ case WX_OPACITY:
+ fromOpacity = output[0];
+ break;
+ }
+ }
+
+ float[] parseParamArray(JSONArray in) {
+
+ int size = in.size();
+ float[] param = new float[size];
+ for (int j = 0; j < size; j++) {
+ param[j] = in.getFloatValue(j);
+ }
+ return param;
+ }
+
+
+ @Nullable
+ Animation getAnimation(float XDelta, float YDelta) {
+
+ float offset = mOffsetY;
+ if (offset > input[1]) {
+ offset = input[1];
+ }
+ if (offset < input[0]) {
+ offset = input[0];
+ }
+ float toTranslateX, toTranslateY, toOpacity, toScaleX, toScaleY, toRotate;
+ Animation animation = null;
+
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXParallax", "type:" + transformType + " XDelta:" + XDelta + " YDelta:" + YDelta);
+ }
+ switch (transformType) {
+
+ case WXAnimationBean.Style.WX_TRANSLATE:
+ toTranslateX = output[0] + (output[2] - output[0]) * (offset - input[0]) / (input[1] - input[0]);
+ toTranslateY = output[1] + (output[3] - output[1]) * (offset - input[0]) / (input[1] - input[0]);
+
+ if (fromTranslateX == toTranslateX && fromTranslateY == toTranslateY) {
+ return null;
+ }
+ animation = new TranslateAnimation(fromTranslateX, toTranslateX, fromTranslateY, toTranslateY);
+
+ fromTranslateX = toTranslateX;
+ fromTranslateY = toTranslateY;
+
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXParallax", "XDelta:" + XDelta + " YDelta:" + YDelta);
+ WXLogUtils.d("WXParallax", " fromTranslateX:" + fromTranslateX + " toTranslateX:" + toTranslateX + " fromTranslateY:" + fromTranslateY + " toTranslateY:" + toTranslateY);
+ }
+
+ break;
+ case WXAnimationBean.Style.WX_SCALE:
+ toScaleX = output[0] + (output[2] - output[0]) * (offset - input[0]) / (input[1] - input[0]);
+ toScaleY = output[1] + (output[3] - output[1]) * (offset - input[0]) / (input[1] - input[0]);
+
+ if (fromScaleX == toScaleX && fromScaleY == toScaleY) {
+ return null;
+ }
+ animation = new ScaleAnimation(fromScaleX, toScaleX, fromScaleY, toScaleY);
+
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXParallax", " fromScaleX:" + fromScaleX + " toScaleX:" + toScaleX + " fromScaleY:" + fromScaleY + " toScaleY:" + toScaleY);
+ }
+
+ fromScaleX = toScaleX;
+ fromScaleY = toScaleY;
+ break;
+
+ case WXAnimationBean.Style.WX_ROTATE:
+ toRotate = output[0] + (output[1] - output[0]) * (offset - input[0]) / (input[1] - input[0]);
+ if (fromRotate == toRotate) {
+ return null;
+ }
+ animation = new RotateAnimation(fromRotate, toRotate, output[2], output[3]);
+ fromRotate = toRotate;
+ break;
+
+ case WX_OPACITY:
+ toOpacity = output[0] + (output[1] - output[0]) * (offset - input[0]) / (input[1] - input[0]);
+ if (fromOpacity == toOpacity) {
+ return null;
+ }
+ animation = new AlphaAnimation(fromOpacity, toOpacity);
+
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXParallax", "opacity fromOpacity:" + fromOpacity + " toOpacity:" + toOpacity);
+ }
+
+ fromOpacity = toOpacity;
+ break;
+ }
+
+ return animation;
+ }
+ }
+}
[11/15] incubator-weex git commit: * [android] enlarge LOW_MEM_VALUE
to avoid crash
Posted by so...@apache.org.
* [android] enlarge LOW_MEM_VALUE to avoid crash
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2b43dc5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2b43dc5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2b43dc5e
Branch: refs/heads/0.14-dev
Commit: 2b43dc5e6df362f99e50adf547de07d4858fe233
Parents: 87c80de
Author: zshshr <zh...@gmail.com>
Authored: Tue Jun 6 10:25:34 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:45:41 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2b43dc5e/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 6a745f6..b8f68fa 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
@@ -117,7 +117,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
private static final int INIT_FRAMEWORK_OK = 1;
- private static long LOW_MEM_VALUE = 80;
+ private static long LOW_MEM_VALUE = 120;
static volatile WXBridgeManager mBridgeManager;
[04/15] incubator-weex git commit: * [test] update base for border
test
Posted by so...@apache.org.
* [test] update base for border test
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a28f8855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a28f8855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a28f8855
Branch: refs/heads/0.14-dev
Commit: a28f885549470ad78088ed6c471894e240057762
Parents: 8ed8ac6
Author: sospartan <so...@apache.org>
Authored: Wed Jun 7 10:11:25 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 7 16:54:29 2017 +0800
----------------------------------------------------------------------
test/screenshot/border-ios.png | Bin 161202 -> 128206 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a28f8855/test/screenshot/border-ios.png
----------------------------------------------------------------------
diff --git a/test/screenshot/border-ios.png b/test/screenshot/border-ios.png
index bc811e9..bb2f990 100644
Binary files a/test/screenshot/border-ios.png and b/test/screenshot/border-ios.png differ
[03/15] incubator-weex git commit: * [doc] update Tao Tickets Pro
chinese name
Posted by so...@apache.org.
* [doc] update Tao Tickets Pro chinese name
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/67363b33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/67363b33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/67363b33
Branch: refs/heads/0.14-dev
Commit: 67363b33c83ad4b1329588f7df2888e233d1689e
Parents: c9d16a8
Author: tancy <ro...@gmail.com>
Authored: Wed Jun 7 16:54:22 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Wed Jun 7 16:54:22 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/cn.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/67363b33/doc/themes/weex/languages/cn.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/cn.yml b/doc/themes/weex/languages/cn.yml
index 5c87cc1..67d0266 100644
--- a/doc/themes/weex/languages/cn.yml
+++ b/doc/themes/weex/languages/cn.yml
@@ -51,7 +51,7 @@ index:
title: 优酷
content: 中国领先的视频服务平台，提供视频播放，视频发布，视频分享等服务。
taopiaopiao:
- title: 淘票票
+ title: 淘票票专业版
content: 淘票票专业版是一款为电影人提供有价值数据的产品。通过和阿里海量用户数据相结合，为电影人提供了秒级实时票房、排片、影院经营、上映日历和用户画像等数据服务。
fliggy:
title: 飞猪
[08/15] incubator-weex git commit: * [doc] update format
Posted by so...@apache.org.
* [doc] update format
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c5f94f27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c5f94f27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c5f94f27
Branch: refs/heads/0.14-dev
Commit: c5f94f27e88801320642fc5cbfdac3034803bc83
Parents: a279c23
Author: acton393 <zh...@gmail.com>
Authored: Wed Jun 7 17:22:34 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Jun 7 17:22:34 2017 +0800
----------------------------------------------------------------------
doc/source/references/modules/animation.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c5f94f27/doc/source/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/animation.md b/doc/source/references/modules/animation.md
index 2904898..29de02b 100644
--- a/doc/source/references/modules/animation.md
+++ b/doc/source/references/modules/animation.md
@@ -13,13 +13,13 @@ Smooth and meaningful animation is very effective for enhancing the user experie
### transition(node, options, callback)
#### Arguments
-- node
+##### node
**type:** node
**position:** An element that will be animated, for example , specify the `ref` attribute for the element you want to animated as `element`, so you can get this element by calling `this.refs.element`.
-- options
+##### options
**type:** object
@@ -55,7 +55,7 @@ properties of `transform`:
|rotate|Specifies the angle of which the element will be rotated, the unit is degree.|number|none|
|scale/scaleX/scaleY|Stretch or shrink the element.|number|none|
-- callback
+##### callback
**type:** function
**position:** Callback which is called after the completion of transition.
[14/15] incubator-weex git commit: Merge branch '0.13-dev' into dev
Posted by so...@apache.org.
Merge branch '0.13-dev' into 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/c689a8ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c689a8ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c689a8ab
Branch: refs/heads/0.14-dev
Commit: c689a8ab731b80519bb1e852cce39b2e54a5c36e
Parents: c5f94f2 2b43dc5
Author: sospartan <so...@apache.org>
Authored: Thu Jun 8 18:47:44 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:47:44 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/component/WXParallax.java | 345 +++++++++++++++++++
.../com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
.../weex/common/ICheckBindingScroller.java | 9 +
.../taobao/weex/ui/component/WXComponent.java | 11 +
.../taobao/weex/ui/component/WXScroller.java | 9 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 9 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
.../Sources/Component/WXCycleSliderComponent.m | 9 +-
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
12 files changed, 408 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c689a8ab/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c689a8ab/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
[15/15] incubator-weex git commit: Merge branch 'dev' into 0.14-dev
Posted by so...@apache.org.
Merge branch 'dev' into 0.14-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/eeb8d5e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eeb8d5e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eeb8d5e9
Branch: refs/heads/0.14-dev
Commit: eeb8d5e920fe439eedfa995a770706df8e7498c8
Parents: cd91163 c689a8a
Author: sospartan <so...@apache.org>
Authored: Thu Jun 8 18:49:10 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:49:10 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/component/WXParallax.java | 345 +++++++++++++++++++
.../com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
.../weex/common/ICheckBindingScroller.java | 9 +
.../taobao/weex/ui/component/WXComponent.java | 11 +
.../taobao/weex/ui/component/WXScroller.java | 9 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 9 +-
doc/source/cn/references/weex-variable.md | 4 +-
doc/source/references/modules/animation.md | 6 +-
doc/source/references/weex-variable.md | 4 +-
doc/themes/weex/languages/cn.yml | 2 +-
.../Sources/Component/WXCycleSliderComponent.m | 9 +-
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +-
14 files changed, 414 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eeb8d5e9/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
[07/15] incubator-weex git commit: * [doc] add 750 viewport concept
Posted by so...@apache.org.
* [doc] add 750 viewport concept
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a279c232
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a279c232
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a279c232
Branch: refs/heads/0.14-dev
Commit: a279c232e1c8d160ff8685b908012ad4a6eb413e
Parents: d6a90e9
Author: acton393 <zh...@gmail.com>
Authored: Wed Jun 7 17:14:27 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Jun 7 17:14:27 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/weex-variable.md | 4 ++--
doc/source/references/weex-variable.md | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a279c232/doc/source/cn/references/weex-variable.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/weex-variable.md b/doc/source/cn/references/weex-variable.md
index d0bd406..4630681 100644
--- a/doc/source/cn/references/weex-variable.md
+++ b/doc/source/cn/references/weex-variable.md
@@ -22,7 +22,7 @@ has_chapter_content: true
* `platform: string`: 平台信息，是 iOS、Android 还是 Web。
* `osVersion: string`: 系统版本。
* `deviceModel: string`: 设备型号 (仅原生应用)。
- * `deviceWidth: number`: 设备宽度，默认为 750。
+ * `deviceWidth: number`: 设备宽度。Weex 默认以宽度为 750px 做适配渲染，要获得750px下的屏幕高度，可以通过 `height = 750/deviceWidth*deviceHeight` 公式获得，可以使用到 CSS 中，用来设置全屏尺寸
* `deviceHeight: number`: 设备高度。
## `weex.requireModule(module: string): Object`
@@ -44,4 +44,4 @@ has_chapter_content: true
## `weex.document: Document`
-返回当前 Weex 页面的文档对象。
\ No newline at end of file
+返回当前 Weex 页面的文档对象。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a279c232/doc/source/references/weex-variable.md
----------------------------------------------------------------------
diff --git a/doc/source/references/weex-variable.md b/doc/source/references/weex-variable.md
index 35b4da4..b55eef5 100644
--- a/doc/source/references/weex-variable.md
+++ b/doc/source/references/weex-variable.md
@@ -21,8 +21,8 @@ This variable contains all the environment information for the current Weex page
+ `Platform: string`: platform information, that is iOS, Android or Web.
+ `OsVersion: string`: system version.
+ `DeviceModel: string`: device model (native application only).
-+ `DeviceWidth: number`: device width, default 750.
-+ `DeviceHeight: number`: device height.
++ `DeviceWidth: number`: device width
++ `DeviceHeight: number`: device height. In Weex, the default width of viewport is 750px, thus you can obtain the height of screen by `height = 750/deviceWidth*deviceHeight` if the width of viewport remains its default value.
`weex.requireModule(module: string): Object`
[02/15] incubator-weex git commit: * [test] test border case with
another image
Posted by so...@apache.org.
* [test] test border case with another image
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8ed8ac62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8ed8ac62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8ed8ac62
Branch: refs/heads/0.14-dev
Commit: 8ed8ac62daff6487b3b560cfbb429f9100b07ce8
Parents: c9d16a8
Author: sospartan <so...@apache.org>
Authored: Tue Jun 6 20:50:42 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 7 16:54:17 2017 +0800
----------------------------------------------------------------------
test/pages/css/border.vue | 13 +++++++------
test/screenshot/border-android.png | Bin 196752 -> 156247 bytes
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8ed8ac62/test/pages/css/border.vue
----------------------------------------------------------------------
diff --git a/test/pages/css/border.vue b/test/pages/css/border.vue
index 89947eb..4943056 100644
--- a/test/pages/css/border.vue
+++ b/test/pages/css/border.vue
@@ -62,12 +62,12 @@
<text>transparent</text>
</div>
<div class="container">
- <image class="box topleft" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg"></image>
- <image class="box topright" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg"></image>
- <image class="box bottomleft" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg"></image>
- <image class="box bottomright" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg"></image>
- <image class="box" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg"></image>
- <image class="circle" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg"></image>
+ <image class="box topleft" :src="img"></image>
+ <image class="box topright" :src="img"></image>
+ <image class="box bottomleft" :src="img"></image>
+ <image class="box bottomright" :src="img"></image>
+ <image class="box" :src="img"></image>
+ <image class="circle" :src="img"></image>
<text>image</text>
</div>
</scroller>
@@ -362,6 +362,7 @@
module.exports = {
data : function(){
return {
+ img: 'http://gw.alicdn.com/tfs/TB1bg8SQFXXXXcHXXXXXXXXXXXX-85-170.png'
}
},
methods : {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8ed8ac62/test/screenshot/border-android.png
----------------------------------------------------------------------
diff --git a/test/screenshot/border-android.png b/test/screenshot/border-android.png
index 637bd99..ae57be5 100644
Binary files a/test/screenshot/border-android.png and b/test/screenshot/border-android.png differ
[12/15] incubator-weex git commit: * [android] parallax multiple
scroller binding
Posted by so...@apache.org.
* [android] parallax multiple scroller binding
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6428fab2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6428fab2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6428fab2
Branch: refs/heads/0.14-dev
Commit: 6428fab248b67264a5438cb1c4cf248ab60b8e17
Parents: a283e16
Author: zshshr <zh...@gmail.com>
Authored: Tue Jun 6 10:23:51 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:45:41 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/common/ICheckBindingScroller.java | 9 +++++++++
.../java/com/taobao/weex/ui/component/WXComponent.java | 11 +++++++++++
.../java/com/taobao/weex/ui/component/WXScroller.java | 9 ++++++++-
.../com/taobao/weex/ui/component/WXVContainer.java | 13 +++++++++++++
.../weex/ui/component/list/BasicListComponent.java | 9 ++++++++-
5 files changed, 49 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6428fab2/android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java b/android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java
new file mode 100644
index 0000000..967869d
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java
@@ -0,0 +1,9 @@
+package com.taobao.weex.common;
+
+/**
+ * Created by zhengshihan on 2017/6/5.
+ */
+
+public interface ICheckBindingScroller {
+ boolean isNeedScroller(String ref,Object option);
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6428fab2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 659cb16..ba12251 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -850,6 +850,17 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
}
+ /**
+ * get Scroller components
+ */
+ @Nullable
+ public Scrollable getFirstScroller() {
+ if(this instanceof Scrollable){
+ return (Scrollable)this;
+ }
+ return null;
+ }
+
public WXVContainer getParent() {
return mParent;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6428fab2/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 ca2e174..24e4940 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
@@ -37,6 +37,7 @@ import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.annotation.Component;
import com.taobao.weex.annotation.JSMethod;
import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.ICheckBindingScroller;
import com.taobao.weex.common.OnWXScrollListener;
import com.taobao.weex.common.WXThread;
import com.taobao.weex.dom.WXDomObject;
@@ -397,7 +398,13 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
if(listeners!=null && listeners.size()>0){
for (OnWXScrollListener listener : listeners) {
if (listener != null) {
- listener.onScrolled(scrollView, x, y);
+ if(listener instanceof ICheckBindingScroller){
+ if(((ICheckBindingScroller) listener).isNeedScroller(getRef(),null)){
+ listener.onScrolled(scrollView, x, y);
+ }
+ }else {
+ listener.onScrolled(scrollView, x, y);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6428fab2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 2e75f31..afdad86 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -126,6 +126,19 @@ public abstract class WXVContainer<T extends ViewGroup> extends WXComponent<T> {
}
+ public Scrollable getFirstScroller(){
+ if(this instanceof Scrollable){
+ return (Scrollable)this;
+ }else{
+ for (int i=0;i<getChildCount();i++){
+ Scrollable scrollable = getChild(i).getFirstScroller();
+ if(scrollable!=null){
+ return scrollable;
+ }
+ }
+ }
+ return null;
+ }
@Override
public void bindData(WXComponent component) {
if(!isLazy()) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6428fab2/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 efe9147..0d60fb9 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
@@ -43,6 +43,7 @@ import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.annotation.JSMethod;
import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.ICheckBindingScroller;
import com.taobao.weex.common.OnWXScrollListener;
import com.taobao.weex.dom.ImmutableDomObject;
import com.taobao.weex.dom.WXDomObject;
@@ -273,7 +274,13 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (listeners != null && listeners.size() > 0) {
for (OnWXScrollListener listener : listeners) {
if (listener != null) {
- listener.onScrolled(recyclerView, dx, dy);
+ if(listener instanceof ICheckBindingScroller){
+ if(((ICheckBindingScroller) listener).isNeedScroller(getRef(),null)){
+ listener.onScrolled(recyclerView, dx, dy);
+ }
+ }else {
+ listener.onScrolled(recyclerView, dx, dy);
+ }
}
}
}
[09/15] incubator-weex git commit: + [ios] bugfix timer & slider
Posted by so...@apache.org.
+ [ios] bugfix timer & 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/b1904738
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b1904738
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b1904738
Branch: refs/heads/0.14-dev
Commit: b19047383bd5616dc70d82823db3748e29956078
Parents: 404f3cc
Author: 齐山 <su...@163.com>
Authored: Thu Jun 8 11:30:12 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Jun 8 11:30:12 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m | 9 ++++++---
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +++-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1904738/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
index 517af72..d17b7db 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.m
@@ -109,6 +109,7 @@ typedef NS_ENUM(NSInteger, Direction) {
if (currentIndex >= _itemViews.count || currentIndex < 0) {
currentIndex = 0;
}
+ NSInteger oldIndex = _currentIndex;
_currentIndex = currentIndex;
if (_infinite) {
if (_direction == DirectionRight) {
@@ -130,7 +131,9 @@ typedef NS_ENUM(NSInteger, Direction) {
}
[self resetIndicatorPoint];
if (self.delegate && [self.delegate respondsToSelector:@selector(recycleSliderView:didScrollToItemAtIndex:)]) {
- [self.delegate recycleSliderView:self didScrollToItemAtIndex:_currentIndex];
+ if (oldIndex != _currentIndex) {
+ [self.delegate recycleSliderView:self didScrollToItemAtIndex:_currentIndex];
+ }
}
}
@@ -179,7 +182,7 @@ typedef NS_ENUM(NSInteger, Direction) {
_currentItemFrame = CGRectMake(self.width, 0, self.width, self.height);
for (int i = 0; i < self.itemViews.count; i++) {
UIView *view = [self.itemViews objectAtIndex:i];
- if (i != self.currentIndex && i != self.nextIndex) {
+ if (i != self.currentIndex) {
view.frame = CGRectMake(self.frame.size.width * 3, 0, self.width, self.height);;
}
}
@@ -587,7 +590,7 @@ typedef NS_ENUM(NSInteger, Direction) {
- (void)recycleSliderView:(WXRecycleSliderView *)recycleSliderView didScrollToItemAtIndex:(NSInteger)index
{
- if (_sliderChangeEvent && index != self.currentIndex) {
+ if (_sliderChangeEvent) {
[self fireEvent:@"change" params:@{@"index":@(index)} domChanges:@{@"attrs": @{@"index": @(index)}}];
self.currentIndex = index;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b1904738/ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m b/ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m
index 26a7481..6855466 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m
@@ -128,7 +128,9 @@ WX_EXPORT_METHOD(@selector(clearInterval:))
NSTimer *timer = _timers[callbackID];
[timer invalidate];
}
- [_timers removeAllObjects];
+ if([_timers count]>0){
+ [_timers removeAllObjects];
+ }
_timers = nil;
}
}
[10/15] incubator-weex git commit: * [ios] public WXErrorView
Posted by so...@apache.org.
* [ios] public WXErrorView
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a283e16a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a283e16a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a283e16a
Branch: refs/heads/0.14-dev
Commit: a283e16aab3993ade6e9b06aa691e48df964d3f1
Parents: b190473
Author: lybeen <il...@gmail.com>
Authored: Mon Jun 5 15:54:39 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jun 8 14:17:42 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a283e16a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 4f2e73c..af53def 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -43,7 +43,7 @@
37B51EE51E97804D0040A743 /* WXCycleSliderComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 37B51EE31E97804D0040A743 /* WXCycleSliderComponent.m */; };
591324A31D49B7F1004E89ED /* WXTimerModuleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 591324A21D49B7F1004E89ED /* WXTimerModuleTests.m */; };
591DD3311D23AD5800BE8709 /* WXErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 591DD32F1D23AD5800BE8709 /* WXErrorView.m */; };
- 591DD3321D23AD5800BE8709 /* WXErrorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 591DD3301D23AD5800BE8709 /* WXErrorView.h */; };
+ 591DD3321D23AD5800BE8709 /* WXErrorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 591DD3301D23AD5800BE8709 /* WXErrorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
594C28921CF9E61A009793A4 /* WXAnimationModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 594C28901CF9E61A009793A4 /* WXAnimationModule.m */; };
594C28931CF9E61A009793A4 /* WXAnimationModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 594C28911CF9E61A009793A4 /* WXAnimationModule.h */; };
59597F981D2A041700EE9317 /* WXDebugLoggerBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 59597F961D2A041700EE9317 /* WXDebugLoggerBridge.h */; };
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a283e16a/ios/sdk/WeexSDK/Sources/WeexSDK.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index 88af286..640dd02 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -47,6 +47,7 @@
#import "WXIndicatorComponent.h"
#import "WXImgLoaderProtocol.h"
#import "WXEventModuleProtocol.h"
+#import "WXErrorView.h"
#import "WXDefine.h"
#import "WXDebugTool.h"
#import "WXConvert.h"
[05/15] incubator-weex git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Posted by so...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 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/168d168c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/168d168c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/168d168c
Branch: refs/heads/0.14-dev
Commit: 168d168c3389988850a428b691e6a2817ecc80d1
Parents: a28f885 67363b3
Author: sospartan <so...@apache.org>
Authored: Wed Jun 7 16:55:08 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 7 16:55:08 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/cn.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------