Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0981200C39 for ; Thu, 2 Mar 2017 04:29:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF334160B78; Thu, 2 Mar 2017 03:29:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0379F160B70 for ; Thu, 2 Mar 2017 04:29:54 +0100 (CET) Received: (qmail 34026 invoked by uid 500); 2 Mar 2017 03:29:54 -0000 Mailing-List: contact commits-help@weex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@weex.incubator.apache.org Delivered-To: mailing list commits@weex.incubator.apache.org Received: (qmail 34017 invoked by uid 99); 2 Mar 2017 03:29:53 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 03:29:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 4E35C18656D for ; Thu, 2 Mar 2017 03:29:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.567 X-Spam-Level: X-Spam-Status: No, score=-6.567 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id hlo_fu3VluDf for ; Thu, 2 Mar 2017 03:29:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 39BBF5F23D for ; Thu, 2 Mar 2017 03:29:51 +0000 (UTC) Received: (qmail 32263 invoked by uid 99); 2 Mar 2017 03:28:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 03:28:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4DB48E152F; Thu, 2 Mar 2017 03:28:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cxfeng@apache.org To: commits@weex.incubator.apache.org Date: Thu, 02 Mar 2017 03:28:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/25] incubator-weex git commit: * [android] support waterfall archived-at: Thu, 02 Mar 2017 03:29:55 -0000 * [android] support waterfall Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4f2b772f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4f2b772f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4f2b772f Branch: refs/heads/0.11-dev-recycler Commit: 4f2b772f7b52de4c9365bf4d353265aa5f524681 Parents: 7984c9b Author: zshshr Authored: Thu Feb 23 16:20:56 2017 +0800 Committer: zshshr Committed: Thu Feb 23 16:20:56 2017 +0800 ---------------------------------------------------------------------- android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java | 2 +- .../java/com/taobao/weex/ui/component/WXBasicComponentType.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4f2b772f/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java index c7a5245..ff5ce84 100755 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java @@ -348,7 +348,7 @@ public class WXSDKEngine { WXBasicComponentType.SLIDER_NEIGHBOR ); registerComponent(SimpleListComponent.class,false,"simplelist"); - registerComponent(WXListComponent.class, false,WXBasicComponentType.LIST,WXBasicComponentType.VLIST,WXBasicComponentType.RECYCLER); + registerComponent(WXListComponent.class, false,WXBasicComponentType.LIST,WXBasicComponentType.VLIST,WXBasicComponentType.RECYCLER,WXBasicComponentType.WATERFALL); registerComponent(HorizontalListComponent.class,false,WXBasicComponentType.HLIST); registerComponent(WXBasicComponentType.CELL, WXCell.class, true); registerComponent(WXBasicComponentType.INDICATOR, WXIndicator.class, true); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4f2b772f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java index 7d68799..0d47232 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java @@ -219,6 +219,7 @@ public class WXBasicComponentType { public static final String SLIDER_NEIGHBOR = "slider-neighbor"; public static final String LIST = "list"; public static final String RECYCLER = "recycler"; + public static final String WATERFALL = "waterfall"; public static final String VLIST = "vlist"; public static final String HLIST = "hlist"; public static final String CELL = "cell";