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/0ed86c7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0ed86c7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0ed86c7e Branch: refs/heads/master Commit: 0ed86c7e66a164ba26fac016b2d4e9632332fdbe Parents: f2d8280 Author: jianbai.gbj <jianbai....@alibaba-inc.com> Authored: Tue Oct 17 11:15:53 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Oct 17 15:25:12 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/0ed86c7e/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; + } + }
