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/07/17 07:42:10 UTC
[1/7] incubator-weex git commit: * [android] fix invalid init index
Repository: incubator-weex
Updated Branches:
refs/heads/apache-0.15-dev [created] 68e694160
* [android] fix invalid init index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ab75b9e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ab75b9e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ab75b9e2
Branch: refs/heads/apache-0.15-dev
Commit: ab75b9e262e8da6816c1c47be7dece8d35d22d55
Parents: 7d1602b
Author: misakuo <mi...@apache.org>
Authored: Wed Jul 12 14:43:05 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Jul 12 14:43:05 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ICreateFinishListener.java | 27 ++++++++++++++++++++
.../java/com/taobao/weex/WXSDKInstance.java | 20 +++++++++++++++
.../com/taobao/weex/ui/component/WXSlider.java | 17 ++++++++++++
3 files changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab75b9e2/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java b/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java
new file mode 100644
index 0000000..b06fd86
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java
@@ -0,0 +1,27 @@
+/**
+ * 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;
+
+/**
+ * Created by moxun on 2017/7/12.
+ */
+
+public interface ICreateFinishListener {
+ void onCreateFinish();
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab75b9e2/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index a8d8a60..9586993 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -115,6 +115,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
private boolean mNeedValidate = false;
private static volatile int mViewPortWidth = 750;
private int mInstanceViewPortWidth = 750;
+ private List<ICreateFinishListener> mCreateFinishListeners;
/**
* Render strategy.
@@ -995,6 +996,12 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, mWXPerformance.toString());
}
}
+
+ if (mCreateFinishListeners != null) {
+ for (ICreateFinishListener listener : mCreateFinishListeners) {
+ listener.onCreateFinish();
+ }
+ }
}
});
}
@@ -1590,4 +1597,17 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
public interface NestedInstanceInterceptor {
void onCreateNestInstance(WXSDKInstance instance, NestedContainer container);
}
+
+ public void addCreateFinishListener(ICreateFinishListener listener) {
+ if (mCreateFinishListeners == null) {
+ mCreateFinishListeners = new ArrayList<>();
+ }
+ mCreateFinishListeners.add(listener);
+ }
+
+ public void removeCreateFinishListener(ICreateFinishListener listener) {
+ if (mCreateFinishListeners != null && listener != null) {
+ mCreateFinishListeners.remove(listener);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab75b9e2/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 f436dd0..8fbd291 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
@@ -30,6 +30,7 @@ import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
+import com.taobao.weex.ICreateFinishListener;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
@@ -62,6 +63,7 @@ public class WXSlider extends WXVContainer<FrameLayout> {
Map<String, Object> params = new HashMap<>();
private float offsetXAccuracy = 0.1f;
+ private int initIndex = -1;
public static class Creator implements ComponentCreator {
public WXComponent createInstance(WXSDKInstance instance, WXDomObject node, WXVContainer parent) throws IllegalAccessException, InvocationTargetException, InstantiationException {
@@ -340,6 +342,7 @@ public class WXSlider extends WXVContainer<FrameLayout> {
public void setIndex(int index) {
if (mViewPager != null && mAdapter != null) {
if (index >= mAdapter.getRealCount() || index < 0) {
+ initIndex = index;
return;
}
mViewPager.setCurrentItem(index);
@@ -509,6 +512,20 @@ public class WXSlider extends WXVContainer<FrameLayout> {
}
}
+ @Override
+ protected void onHostViewInitialized(FrameLayout host) {
+ super.onHostViewInitialized(host);
+ getInstance().addCreateFinishListener(new ICreateFinishListener() {
+ @Override
+ public void onCreateFinish() {
+ if (mViewPager != null && initIndex != -1) {
+ mViewPager.setCurrentItem(initIndex);
+ initIndex = -1;
+ }
+ }
+ });
+ }
+
private static class FlingGestureListener extends GestureDetector.SimpleOnGestureListener {
private static final int SWIPE_MIN_DISTANCE = WXViewUtils.dip2px(50);
private static final int SWIPE_MAX_OFF_PATH = WXViewUtils.dip2px(250);
[6/7] incubator-weex git commit: + [ios] update default to cycslider
Posted by mi...@apache.org.
+ [ios] update default to cycslider
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eca0f51e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eca0f51e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eca0f51e
Branch: refs/heads/apache-0.15-dev
Commit: eca0f51ece319aa69de0500d808996c63a67cb47
Parents: 0b6aeb1
Author: 齐山 <su...@163.com>
Authored: Mon Jul 17 14:13:08 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Jul 17 15:41:10 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eca0f51e/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 016e11f..78a2b08 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -207,7 +207,7 @@ typedef enum : NSUInteger {
if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
BOOL useCoreText = [[configCenter configForKey:@"iOS_weex_ext_config.text_render_useCoreText" defaultValue:@YES isDefault:NULL] boolValue];
[WXTextComponent setRenderUsingCoreText:useCoreText];
- id sliderConfig = [configCenter configForKey:@"iOS_weex_ext_config.slider_class_name" defaultValue:@"WXSliderComponent" isDefault:NULL];
+ id sliderConfig = [configCenter configForKey:@"iOS_weex_ext_config.slider_class_name" defaultValue:@"WXCycleSliderComponent" isDefault:NULL];
if(sliderConfig){
NSString *sliderClassName = [WXConvert NSString:sliderConfig];
if(sliderClassName.length>0){
[3/7] incubator-weex git commit: * [android] fix invalid init index
Posted by mi...@apache.org.
* [android] fix invalid init index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/faa70394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/faa70394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/faa70394
Branch: refs/heads/apache-0.15-dev
Commit: faa70394776ce7e99e4feb139ecbfdae08c76ce6
Parents: a3e8540
Author: misakuo <mi...@apache.org>
Authored: Thu Jul 13 11:08:01 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Jul 13 11:08:01 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/CreateFinishListener.java | 27 ++++++++++++++++++++
.../com/taobao/weex/ICreateFinishListener.java | 27 --------------------
.../com/taobao/weex/IUpdateFinishListener.java | 9 -------
.../com/taobao/weex/UpdateFinishListener.java | 27 ++++++++++++++++++++
.../java/com/taobao/weex/WXSDKInstance.java | 16 ++++++------
.../com/taobao/weex/ui/component/WXSlider.java | 12 ++++-----
6 files changed, 68 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faa70394/android/sdk/src/main/java/com/taobao/weex/CreateFinishListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/CreateFinishListener.java b/android/sdk/src/main/java/com/taobao/weex/CreateFinishListener.java
new file mode 100644
index 0000000..37b4cfb
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/CreateFinishListener.java
@@ -0,0 +1,27 @@
+/**
+ * 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;
+
+/**
+ * Created by moxun on 2017/7/13.
+ */
+
+public interface CreateFinishListener {
+ void onCreateFinish();
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faa70394/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java b/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java
deleted file mode 100644
index b06fd86..0000000
--- a/android/sdk/src/main/java/com/taobao/weex/ICreateFinishListener.java
+++ /dev/null
@@ -1,27 +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;
-
-/**
- * Created by moxun on 2017/7/12.
- */
-
-public interface ICreateFinishListener {
- void onCreateFinish();
-}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faa70394/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java b/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java
deleted file mode 100644
index 6824bf5..0000000
--- a/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.taobao.weex;
-
-/**
- * Created by moxun on 2017/7/12.
- */
-
-public interface IUpdateFinishListener {
- void onUpdateFinish();
-}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faa70394/android/sdk/src/main/java/com/taobao/weex/UpdateFinishListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/UpdateFinishListener.java b/android/sdk/src/main/java/com/taobao/weex/UpdateFinishListener.java
new file mode 100644
index 0000000..c44cd8a
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/UpdateFinishListener.java
@@ -0,0 +1,27 @@
+/**
+ * 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;
+
+/**
+ * Created by moxun on 2017/7/12.
+ */
+
+public interface UpdateFinishListener {
+ void onUpdateFinish();
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faa70394/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index c6b0553..9339f67 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -115,8 +115,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
private boolean mNeedValidate = false;
private static volatile int mViewPortWidth = 750;
private int mInstanceViewPortWidth = 750;
- private List<ICreateFinishListener> mCreateFinishListeners;
- private List<IUpdateFinishListener> mUpdateFinishListeners;
+ private List<CreateFinishListener> mCreateFinishListeners;
+ private List<UpdateFinishListener> mUpdateFinishListeners;
/**
* Render strategy.
@@ -951,7 +951,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
public void onUpdateFinish() {
WXLogUtils.d("Instance onUpdateSuccess");
if (mUpdateFinishListeners != null && mUpdateFinishListeners.size() > 0) {
- for (IUpdateFinishListener listener : mUpdateFinishListeners) {
+ for (UpdateFinishListener listener : mUpdateFinishListeners) {
listener.onUpdateFinish();
}
}
@@ -1004,7 +1004,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
}
if (mCreateFinishListeners != null) {
- for (ICreateFinishListener listener : mCreateFinishListeners) {
+ for (CreateFinishListener listener : mCreateFinishListeners) {
listener.onCreateFinish();
}
}
@@ -1604,27 +1604,27 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
void onCreateNestInstance(WXSDKInstance instance, NestedContainer container);
}
- public void addCreateFinishListener(ICreateFinishListener listener) {
+ public void addCreateFinishListener(CreateFinishListener listener) {
if (mCreateFinishListeners == null) {
mCreateFinishListeners = new ArrayList<>();
}
mCreateFinishListeners.add(listener);
}
- public void removeCreateFinishListener(ICreateFinishListener listener) {
+ public void removeCreateFinishListener(CreateFinishListener listener) {
if (mCreateFinishListeners != null && listener != null) {
mCreateFinishListeners.remove(listener);
}
}
- public void addUpdateFinishListener(IUpdateFinishListener listener) {
+ public void addUpdateFinishListener(UpdateFinishListener listener) {
if (mUpdateFinishListeners == null) {
mUpdateFinishListeners = new ArrayList<>();
}
mUpdateFinishListeners.add(listener);
}
- public void removeUpdateFinishListener(IUpdateFinishListener listener) {
+ public void removeUpdateFinishListener(UpdateFinishListener listener) {
if (mUpdateFinishListeners != null && listener != null) {
mUpdateFinishListeners.remove(listener);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faa70394/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 b983f98..121b416 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
@@ -30,8 +30,8 @@ import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
-import com.taobao.weex.ICreateFinishListener;
-import com.taobao.weex.IUpdateFinishListener;
+import com.taobao.weex.CreateFinishListener;
+import com.taobao.weex.UpdateFinishListener;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
@@ -516,20 +516,20 @@ public class WXSlider extends WXVContainer<FrameLayout> {
@Override
protected void onHostViewInitialized(FrameLayout host) {
super.onHostViewInitialized(host);
- getInstance().addCreateFinishListener(new ICreateFinishListener() {
+ getInstance().addCreateFinishListener(new CreateFinishListener() {
@Override
public void onCreateFinish() {
- if (mViewPager != null && initIndex != -1) {
+ if (mViewPager != null && initIndex != -1 && mAdapter != null && mAdapter.getRealCount() > initIndex) {
mViewPager.setCurrentItem(initIndex);
initIndex = -1;
}
}
});
- getInstance().addUpdateFinishListener(new IUpdateFinishListener() {
+ getInstance().addUpdateFinishListener(new UpdateFinishListener() {
@Override
public void onUpdateFinish() {
- if (mViewPager != null && initIndex != -1) {
+ if (mViewPager != null && initIndex != -1 && mAdapter != null && mAdapter.getRealCount() > initIndex) {
mViewPager.setCurrentItem(initIndex);
initIndex = -1;
}
[5/7] incubator-weex git commit: Merge remote-tracking branch
'remotes/upstream/0.15-dev' into android-bugfix-init-index
Posted by mi...@apache.org.
Merge remote-tracking branch 'remotes/upstream/0.15-dev' into android-bugfix-init-index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0b6aeb12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0b6aeb12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0b6aeb12
Branch: refs/heads/apache-0.15-dev
Commit: 0b6aeb121247770c5a5fd16e5c9e96f4b673b57b
Parents: 0228437 d33479d
Author: misakuo <mi...@apache.org>
Authored: Mon Jul 17 11:22:29 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Jul 17 11:22:29 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/WXTextDomObject.java | 4 +-
.../vue/components/scrollable/list/index.js | 3 +-
.../vue/components/scrollable/scroller.js | 3 +-
.../vue/components/scrollable/waterfall.js | 3 +-
.../render/vue/components/slider/slideMixin.js | 17 +-
html5/render/vue/core/node.js | 172 ++++++++++++++-----
html5/render/vue/env/wx-env.js | 2 +-
html5/render/vue/mixins/base.js | 16 +-
html5/render/vue/mixins/scrollable.js | 18 +-
html5/render/vue/utils/style.js | 30 +++-
html5/test/render/vue/core/node.js | 22 ++-
.../WeexSDK/Sources/Component/WXTextComponent.m | 7 +-
package.json | 2 +-
packages/weex-vue-render/package.json | 8 +-
14 files changed, 220 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
[7/7] incubator-weex git commit: Merge branch '0.15-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.15-dev
Posted by mi...@apache.org.
Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.15-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/68e69416
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68e69416
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68e69416
Branch: refs/heads/apache-0.15-dev
Commit: 68e6941609bce3312f992259dea90b512031b035
Parents: eca0f51 2c435d1
Author: misakuo <mi...@apache.org>
Authored: Mon Jul 17 15:41:54 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Jul 17 15:41:54 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/7] incubator-weex git commit: * [android] fix invalid init index
Posted by mi...@apache.org.
* [android] fix invalid init index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a3e85400
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a3e85400
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a3e85400
Branch: refs/heads/apache-0.15-dev
Commit: a3e8540066186d64663cdfaa992cc66126f7625c
Parents: ab75b9e
Author: misakuo <mi...@apache.org>
Authored: Wed Jul 12 17:56:49 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Jul 12 17:56:49 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/IUpdateFinishListener.java | 9 +++++++++
.../main/java/com/taobao/weex/WXSDKInstance.java | 19 +++++++++++++++++++
.../com/taobao/weex/ui/component/WXSlider.java | 11 +++++++++++
3 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3e85400/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java b/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java
new file mode 100644
index 0000000..6824bf5
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/IUpdateFinishListener.java
@@ -0,0 +1,9 @@
+package com.taobao.weex;
+
+/**
+ * Created by moxun on 2017/7/12.
+ */
+
+public interface IUpdateFinishListener {
+ void onUpdateFinish();
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3e85400/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 9586993..c6b0553 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -116,6 +116,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
private static volatile int mViewPortWidth = 750;
private int mInstanceViewPortWidth = 750;
private List<ICreateFinishListener> mCreateFinishListeners;
+ private List<IUpdateFinishListener> mUpdateFinishListeners;
/**
* Render strategy.
@@ -949,6 +950,11 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
*/
public void onUpdateFinish() {
WXLogUtils.d("Instance onUpdateSuccess");
+ if (mUpdateFinishListeners != null && mUpdateFinishListeners.size() > 0) {
+ for (IUpdateFinishListener listener : mUpdateFinishListeners) {
+ listener.onUpdateFinish();
+ }
+ }
}
@@ -1610,4 +1616,17 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
mCreateFinishListeners.remove(listener);
}
}
+
+ public void addUpdateFinishListener(IUpdateFinishListener listener) {
+ if (mUpdateFinishListeners == null) {
+ mUpdateFinishListeners = new ArrayList<>();
+ }
+ mUpdateFinishListeners.add(listener);
+ }
+
+ public void removeUpdateFinishListener(IUpdateFinishListener listener) {
+ if (mUpdateFinishListeners != null && listener != null) {
+ mUpdateFinishListeners.remove(listener);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3e85400/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 8fbd291..b983f98 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
@@ -31,6 +31,7 @@ import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
import com.taobao.weex.ICreateFinishListener;
+import com.taobao.weex.IUpdateFinishListener;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
@@ -524,6 +525,16 @@ public class WXSlider extends WXVContainer<FrameLayout> {
}
}
});
+
+ getInstance().addUpdateFinishListener(new IUpdateFinishListener() {
+ @Override
+ public void onUpdateFinish() {
+ if (mViewPager != null && initIndex != -1) {
+ mViewPager.setCurrentItem(initIndex);
+ initIndex = -1;
+ }
+ }
+ });
}
private static class FlingGestureListener extends GestureDetector.SimpleOnGestureListener {
[4/7] incubator-weex git commit: Merge remote-tracking branch
'remotes/apache/0.15-dev' into android-bugfix-init-index
Posted by mi...@apache.org.
Merge remote-tracking branch 'remotes/apache/0.15-dev' into android-bugfix-init-index
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0228437f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0228437f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0228437f
Branch: refs/heads/apache-0.15-dev
Commit: 0228437fd5bea47be72060a419908e87eba02a6a
Parents: faa7039 ba53cd4
Author: misakuo <mi...@apache.org>
Authored: Fri Jul 14 16:53:19 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Fri Jul 14 16:53:19 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/modules/timer.md | 47 ++++++++++++++++
doc/source/references/modules/timer.md | 59 ++++++++++++++++++++
examples/vue/hello.vue | 2 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 33 +++++------
.../WeexSDK/Sources/Component/WXAComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 2 +-
.../Sources/Component/WXImageComponent.m | 4 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 55 +++++++++++++-----
.../WeexSDK/Sources/Component/WXTextComponent.m | 51 +++++++----------
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 8 +--
.../Sources/Component/WXVideoComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
.../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +-
.../Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
.../Sources/View/WXComponent+ViewManagement.m | 4 ++
ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 ++++++++++
18 files changed, 231 insertions(+), 77 deletions(-)
----------------------------------------------------------------------