You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/19 04:33:23 UTC
[20/50] [abbrv] incubator-weex git commit: resolve conflicts
resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/45ae6f6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/45ae6f6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/45ae6f6b
Branch: refs/heads/release
Commit: 45ae6f6ba6cdbebd13a53f153903d03d4f8926b6
Parents: 8d1552f
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Tue Oct 17 11:15:53 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Oct 17 15:48:46 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/list/WXCell.java | 32 ++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/45ae6f6b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
index 4fe4bc2..c329e99 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
@@ -61,6 +61,13 @@ public class WXCell extends WidgetContainer<WXFrameLayout> {
private boolean hasLayout = false;
+ private Object renderData;
+
+ private boolean isSourceUsed = false;
+
+ private boolean hasLayout = false;
+
+
@Deprecated
public WXCell(WXSDKInstance instance, WXDomObject dom, WXVContainer parent, String instanceId, boolean isLazy) {
super(instance, dom, parent);
@@ -208,4 +215,29 @@ public class WXCell extends WidgetContainer<WXFrameLayout> {
public void setHasLayout(boolean hasLayout) {
this.hasLayout = hasLayout;
}
+
+ public Object getRenderData() {
+ return renderData;
+ }
+
+ public void setRenderData(Object renderData) {
+ this.renderData = renderData;
+ }
+
+ public boolean isSourceUsed() {
+ return isSourceUsed;
+ }
+
+ public void setSourceUsed(boolean sourceUsed) {
+ isSourceUsed = sourceUsed;
+ }
+
+ public boolean isHasLayout() {
+ return hasLayout;
+ }
+
+ public void setHasLayout(boolean hasLayout) {
+ this.hasLayout = hasLayout;
+ }
+
}