You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/06 02:32:45 UTC

[1/4] incubator-weex git commit: Revert "* [ios] support delete header in the middle of list dynamicly"

Repository: incubator-weex
Updated Branches:
  refs/heads/0.11-dev 21878b0f7 -> 3621001f1


Revert "* [ios] support delete header in the middle of list dynamicly"

This reverts commit 21878b0f7a64b0e8075c65ca925b5a2811e57b40.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/11352c71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/11352c71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/11352c71

Branch: refs/heads/0.11-dev
Commit: 11352c71b600a1f04a9063a1db8bf7da6361d129
Parents: 21878b0
Author: cxfeng <cx...@gmail.com>
Authored: Mon Mar 6 10:28:51 2017 +0800
Committer: cxfeng <cx...@gmail.com>
Committed: Mon Mar 6 10:28:51 2017 +0800

----------------------------------------------------------------------
 .../Sources/Component/WXHeaderComponent.h       |   1 -
 .../Sources/Component/WXHeaderComponent.m       |   8 -
 .../WeexSDK/Sources/Component/WXListComponent.m | 148 +++++++------------
 3 files changed, 51 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/11352c71/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
index 20245b8..1ac21cc 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
@@ -23,6 +23,5 @@
 
 @property (nonatomic, weak) id<WXHeaderRenderDelegate> delegate;
 @property (nonatomic, assign, readonly) BOOL isSticky;
-@property (nonatomic, assign, readonly) BOOL keepScrollPosition;
 
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/11352c71/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
index a95c645..33b3040 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
@@ -21,19 +21,11 @@
     if (self) {
         _async = YES;
         _isNeedJoinLayoutSystem = NO;
-        _keepScrollPosition = attributes[@"keepScrollPosition"] ? [WXConvert BOOL:attributes[@"keepScrollPosition"]] : NO;
     }
     
     return self;
 }
 
-- (void)updateAttributes:(NSDictionary *)attributes
-{
-    if (attributes[@"keepScrollPosition"]) {
-        _keepScrollPosition = [WXConvert BOOL:attributes[@"keepScrollPosition"]];
-    }
-}
-
 - (BOOL)isSticky
 {
     return _positionType == WXPositionTypeSticky;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/11352c71/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index 157b68c..0418ae8 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -224,33 +224,31 @@
         // conditions to insert section: insert a header or insert first cell of table view
         // this will be updated by recycler's update controller in the future
         WXSection *insertSection = [WXSection new];
-        BOOL keepScrollPosition = NO;
+        BOOL keepScrollPostion = NO;
         if ([subcomponent isKindOfClass:[WXHeaderComponent class]]) {
             WXHeaderComponent *header = (WXHeaderComponent*)subcomponent;
             insertSection.header = header;
-            keepScrollPosition = header.keepScrollPosition;
         }
         
         NSUInteger insertIndex = indexPath.section;
         WXSection *reloadSection;
-        if (insertIndex > 0 && insertIndex <= _sections.count
-            && [subcomponent isKindOfClass:[WXHeaderComponent class]]) {
+        if (insertIndex > 0 && insertIndex < _sections.count) {
             // insert a header in the middle, one section may divide into two
             // so the original section need to be reloaded
+            NSArray *rowsToSeparate = reloadSection.rows;
             NSIndexPath *indexPathBeforeHeader = [self indexPathForSubIndex:index - 1];
             if (indexPathBeforeHeader.row != _sections[insertIndex - 1].rows.count - 1) {
                 reloadSection = _sections[insertIndex - 1];
-                NSArray *rowsToSeparate = reloadSection.rows;
                 insertSection.rows = [[rowsToSeparate subarrayWithRange:NSMakeRange(indexPathBeforeHeader.row + 1, rowsToSeparate.count - indexPathBeforeHeader.row - 1)] mutableCopy];
                 reloadSection.rows = [[rowsToSeparate subarrayWithRange:NSMakeRange(0, indexPathBeforeHeader.row + 1)]  mutableCopy];
             }
         }
     
         [_sections insertObject:insertSection atIndex:insertIndex];
-        WXSection *completedInsertSection = [insertSection copy];
+        WXSection *completedInsertSection = [insertSection mutableCopy];
         WXSection *completedReloadSection;
         if (reloadSection) {
-            completedReloadSection = [reloadSection copy];
+            completedReloadSection = [reloadSection mutableCopy];
         }
         
         [self.weexInstance.componentManager _addUITask:^{
@@ -261,18 +259,16 @@
                 _completedSections[insertIndex - 1] = completedReloadSection;
             }
             
+            [_tableView beginUpdates];
+            
             [UIView performWithoutAnimation:^{
-                [_tableView beginUpdates];
-                
-                [self _insertTableViewSectionAtIndex:insertIndex keepScrollPosition:keepScrollPosition animation:UITableViewRowAnimationNone];
-                
+                [self _insertTableViewSectionAtIndex:insertIndex keepScrollPosition:keepScrollPostion animation:UITableViewRowAnimationNone];
                 if (completedReloadSection) {
-                    [_tableView reloadSections:[NSIndexSet indexSetWithIndex:insertIndex - 1] withRowAnimation:UITableViewRowAnimationNone];
+                    [_tableView reloadSections:[NSIndexSet indexSetWithIndex:index - 1] withRowAnimation:UITableViewRowAnimationNone];
                 }
-                
-                [_tableView endUpdates];
             }];
             
+            [_tableView endUpdates];
         }];
     }
 }
@@ -304,43 +300,7 @@
 
 - (void)headerDidRemove:(WXHeaderComponent *)header
 {
-    NSUInteger deleteIndex = [self indexForHeader:header sections:_sections];
-    // this will be updated by recycler's update controller in the future
-    WXSection *deleteSection = _sections[deleteIndex];
-    WXSection *reloadSection;
-    if (deleteIndex > 0 && deleteSection.rows.count > 0) {
-        // delete a header in the middle, two sections merge into one
-        // so the one section need to be reloaded
-        reloadSection = _sections[deleteIndex - 1];
-        reloadSection.rows = [[reloadSection.rows arrayByAddingObjectsFromArray:deleteSection.rows] mutableCopy];
-    }
     
-    [_sections removeObjectAtIndex:deleteIndex];
-    WXSection *completedReloadSection;
-    if (reloadSection) {
-        completedReloadSection = [reloadSection copy];
-    }
-    BOOL keepScrollPosition = header.keepScrollPosition;
-    
-    [self.weexInstance.componentManager _addUITask:^{
-        WXLogDebug(@"delete section:%ld", deleteIndex);
-        [_completedSections removeObjectAtIndex:deleteIndex];
-        if (completedReloadSection) {
-            WXLogDebug(@"Reload section:%ld", deleteIndex - 1);
-            _completedSections[deleteIndex - 1] = completedReloadSection;
-        }
-        
-        [UIView performWithoutAnimation:^{
-            [_tableView beginUpdates];
-            [self _deleteTableViewSectionAtIndex:deleteIndex keepScrollPosition:keepScrollPosition animation:UITableViewRowAnimationNone];
-            if (completedReloadSection) {
-                [_tableView reloadSections:[NSIndexSet indexSetWithIndex:deleteIndex - 1] withRowAnimation:UITableViewRowAnimationNone];
-            }
-            
-            [_tableView endUpdates];
-        }];
-        
-    }];
 }
 
 #pragma mark - WXCellRenderDelegate
@@ -692,77 +652,71 @@
     return [NSIndexPath indexPathForRow:row inSection:section];
 }
 
-- (void)_performUpdates:(void(^)())updates withKeepScrollPosition:(BOOL)keepScrollPosition adjustmentBlock:(CGFloat(^)(NSIndexPath *topVisibleCell))adjustmentBlock
+- (void)_insertTableViewSectionAtIndex:(NSUInteger)section keepScrollPosition:(BOOL)keepScrollPosition animation:(UITableViewRowAnimation)animation
 {
     CGFloat adjustment = 0;
     
-    // keep the scroll position when inserting or deleting sections/rows by adjusting the content offset
+    // keep the scroll position when inserting or deleting cells by adjusting the content offset
     if (keepScrollPosition) {
         NSIndexPath *top = _tableView.indexPathsForVisibleRows.firstObject;
-        adjustment = adjustmentBlock(top);
+        if (section <= top.section) {
+            adjustment = [self tableView:_tableView heightForHeaderInSection:section];
+        }
     }
-    
-    updates();
+
+    [_tableView insertSections:[NSIndexSet indexSetWithIndex:section] withRowAnimation:animation];
     
     if (keepScrollPosition) {
         CGPoint afterContentOffset = _tableView.contentOffset;
         CGPoint newContentOffset = CGPointMake(afterContentOffset.x, afterContentOffset.y + adjustment);
         _tableView.contentOffset = newContentOffset;
     }
-    
-    [self handleAppear];
-}
-
-- (void)_insertTableViewSectionAtIndex:(NSUInteger)section keepScrollPosition:(BOOL)keepScrollPosition animation:(UITableViewRowAnimation)animation
-{
-    [self _performUpdates:^{
-        [_tableView insertSections:[NSIndexSet indexSetWithIndex:section] withRowAnimation:animation];
-    } withKeepScrollPosition:keepScrollPosition adjustmentBlock:^CGFloat(NSIndexPath *top) {
-        if (section <= top.section) {
-            return [self tableView:_tableView heightForHeaderInSection:section];
-        } else {
-            return 0.0;
-        }
-    }];
-}
-
-- (void)_deleteTableViewSectionAtIndex:(NSUInteger)section keepScrollPosition:(BOOL)keepScrollPosition animation:(UITableViewRowAnimation)animation
-{
-    [self _performUpdates:^{
-        [_tableView deleteSections:[NSIndexSet indexSetWithIndex:section] withRowAnimation:animation];
-    } withKeepScrollPosition:keepScrollPosition adjustmentBlock:^CGFloat(NSIndexPath *top) {
-        if (section <= top.section) {
-            return [self tableView:_tableView heightForHeaderInSection:section];
-        } else {
-            return 0.0;
-        }
-    }];
 }
 
 - (void)_insertTableViewCellAtIndexPath:(NSIndexPath *)indexPath keepScrollPosition:(BOOL)keepScrollPosition animation:(UITableViewRowAnimation)animation
 {
-    [self _performUpdates:^{
-        [_tableView insertRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:animation];
-    } withKeepScrollPosition:keepScrollPosition adjustmentBlock:^CGFloat(NSIndexPath *top) {
+    CGFloat adjustment = 0;
+    
+    // keep the scroll position when inserting or deleting cells by adjusting the content offset
+    if (keepScrollPosition) {
+        NSIndexPath *top = _tableView.indexPathsForVisibleRows.firstObject;
         if ([indexPath compare:top] <= 0) {
-            return [self tableView:_tableView heightForRowAtIndexPath:indexPath];
-        } else {
-            return 0.0;
+            adjustment = [self tableView:_tableView heightForRowAtIndexPath:indexPath];
         }
-    }];
+    }
+    
+    [_tableView insertRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:animation];
+    
+    if (keepScrollPosition) {
+        CGPoint afterContentOffset = _tableView.contentOffset;
+        CGPoint newContentOffset = CGPointMake(afterContentOffset.x, afterContentOffset.y + adjustment);
+        _tableView.contentOffset = newContentOffset;
+    }
+    
+    [self handleAppear];
 }
 
 - (void)_deleteTableViewCellAtIndexPath:(NSIndexPath *)indexPath keepScrollPosition:(BOOL)keepScrollPosition animation:(UITableViewRowAnimation)animation
 {
-    [self _performUpdates:^{
-        [_tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:animation];
-    } withKeepScrollPosition:keepScrollPosition adjustmentBlock:^CGFloat(NSIndexPath *top) {
+    CGFloat adjustment = 0;
+    
+    // keep the scroll position when inserting or deleting cells by adjusting the content offset
+    if (keepScrollPosition) {
+        NSIndexPath *top = _tableView.indexPathsForVisibleRows.firstObject;
         if ([indexPath compare:top] <= 0) {
-            return [self tableView:_tableView heightForRowAtIndexPath:indexPath];
-        } else {
-            return 0.0;
+            adjustment = [self tableView:_tableView heightForRowAtIndexPath:indexPath];
         }
-    }];
+    }
+    
+    [_tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:animation];
+    
+    if (keepScrollPosition) {
+        CGPoint afterContentOffset = _tableView.contentOffset;
+        CGPoint newContentOffset = CGPointMake(afterContentOffset.x, afterContentOffset.y - adjustment > 0 ? afterContentOffset.y - adjustment : 0);
+        _tableView.contentOffset = newContentOffset;
+    }
+    
+    [self handleAppear];
 }
 
 - (void)fixFlicker


[3/4] incubator-weex git commit: * [ios] revert recycler merge

Posted by cx...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 29ccab4..2a0f761 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -115,22 +115,6 @@
 		744BEA561D05178F00452B5D /* WXComponent+Display.m in Sources */ = {isa = PBXBuildFile; fileRef = 744BEA541D05178F00452B5D /* WXComponent+Display.m */; };
 		744BEA591D0520F300452B5D /* WXComponent+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 744BEA571D0520F300452B5D /* WXComponent+Layout.h */; };
 		744BEA5A1D0520F300452B5D /* WXComponent+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 744BEA581D0520F300452B5D /* WXComponent+Layout.m */; };
-		744D610C1E49978200B624B3 /* WXHeaderComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 744D610A1E49978200B624B3 /* WXHeaderComponent.h */; };
-		744D610D1E49978200B624B3 /* WXHeaderComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 744D610B1E49978200B624B3 /* WXHeaderComponent.m */; };
-		744D61101E49979000B624B3 /* WXFooterComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 744D610E1E49979000B624B3 /* WXFooterComponent.h */; };
-		744D61111E49979000B624B3 /* WXFooterComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 744D610F1E49979000B624B3 /* WXFooterComponent.m */; };
-		744D61141E4AF23E00B624B3 /* WXDiffUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 744D61121E4AF23E00B624B3 /* WXDiffUtil.h */; };
-		744D61151E4AF23E00B624B3 /* WXDiffUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 744D61131E4AF23E00B624B3 /* WXDiffUtil.m */; };
-		745B2D681E5A8E1E0092D38A /* WXMultiColumnLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 745B2D5E1E5A8E1E0092D38A /* WXMultiColumnLayout.h */; };
-		745B2D691E5A8E1E0092D38A /* WXMultiColumnLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 745B2D5F1E5A8E1E0092D38A /* WXMultiColumnLayout.m */; };
-		745B2D6A1E5A8E1E0092D38A /* WXRecyclerComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 745B2D601E5A8E1E0092D38A /* WXRecyclerComponent.h */; };
-		745B2D6B1E5A8E1E0092D38A /* WXRecyclerComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 745B2D611E5A8E1E0092D38A /* WXRecyclerComponent.m */; };
-		745B2D6C1E5A8E1E0092D38A /* WXRecyclerDataController.h in Headers */ = {isa = PBXBuildFile; fileRef = 745B2D621E5A8E1E0092D38A /* WXRecyclerDataController.h */; };
-		745B2D6D1E5A8E1E0092D38A /* WXRecyclerDataController.m in Sources */ = {isa = PBXBuildFile; fileRef = 745B2D631E5A8E1E0092D38A /* WXRecyclerDataController.m */; };
-		745B2D6E1E5A8E1E0092D38A /* WXRecyclerUpdateController.h in Headers */ = {isa = PBXBuildFile; fileRef = 745B2D641E5A8E1E0092D38A /* WXRecyclerUpdateController.h */; };
-		745B2D6F1E5A8E1E0092D38A /* WXRecyclerUpdateController.m in Sources */ = {isa = PBXBuildFile; fileRef = 745B2D651E5A8E1E0092D38A /* WXRecyclerUpdateController.m */; };
-		745B2D701E5A8E1E0092D38A /* WXSectionDataController.h in Headers */ = {isa = PBXBuildFile; fileRef = 745B2D661E5A8E1E0092D38A /* WXSectionDataController.h */; };
-		745B2D711E5A8E1E0092D38A /* WXSectionDataController.m in Sources */ = {isa = PBXBuildFile; fileRef = 745B2D671E5A8E1E0092D38A /* WXSectionDataController.m */; };
 		745ED2DA1C5F2C7E002DB5A8 /* WXView.h in Headers */ = {isa = PBXBuildFile; fileRef = 745ED2D61C5F2C7E002DB5A8 /* WXView.h */; };
 		745ED2DB1C5F2C7E002DB5A8 /* WXView.m in Sources */ = {isa = PBXBuildFile; fileRef = 745ED2D71C5F2C7E002DB5A8 /* WXView.m */; };
 		7461F8901CFB373100F62D44 /* WXDisplayQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7461F88C1CFB373100F62D44 /* WXDisplayQueue.h */; };
@@ -423,22 +407,6 @@
 		744BEA541D05178F00452B5D /* WXComponent+Display.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WXComponent+Display.m"; sourceTree = "<group>"; };
 		744BEA571D0520F300452B5D /* WXComponent+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "WXComponent+Layout.h"; path = "Layout/WXComponent+Layout.h"; sourceTree = "<group>"; };
 		744BEA581D0520F300452B5D /* WXComponent+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "WXComponent+Layout.m"; path = "Layout/WXComponent+Layout.m"; sourceTree = "<group>"; };
-		744D610A1E49978200B624B3 /* WXHeaderComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXHeaderComponent.h; sourceTree = "<group>"; };
-		744D610B1E49978200B624B3 /* WXHeaderComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXHeaderComponent.m; sourceTree = "<group>"; };
-		744D610E1E49979000B624B3 /* WXFooterComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXFooterComponent.h; sourceTree = "<group>"; };
-		744D610F1E49979000B624B3 /* WXFooterComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXFooterComponent.m; sourceTree = "<group>"; };
-		744D61121E4AF23E00B624B3 /* WXDiffUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDiffUtil.h; sourceTree = "<group>"; };
-		744D61131E4AF23E00B624B3 /* WXDiffUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXDiffUtil.m; sourceTree = "<group>"; };
-		745B2D5E1E5A8E1E0092D38A /* WXMultiColumnLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXMultiColumnLayout.h; path = WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h; sourceTree = SOURCE_ROOT; };
-		745B2D5F1E5A8E1E0092D38A /* WXMultiColumnLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WXMultiColumnLayout.m; path = WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m; sourceTree = SOURCE_ROOT; };
-		745B2D601E5A8E1E0092D38A /* WXRecyclerComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXRecyclerComponent.h; path = WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h; sourceTree = SOURCE_ROOT; };
-		745B2D611E5A8E1E0092D38A /* WXRecyclerComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WXRecyclerComponent.m; path = WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m; sourceTree = SOURCE_ROOT; };
-		745B2D621E5A8E1E0092D38A /* WXRecyclerDataController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXRecyclerDataController.h; path = WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.h; sourceTree = SOURCE_ROOT; };
-		745B2D631E5A8E1E0092D38A /* WXRecyclerDataController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WXRecyclerDataController.m; path = WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.m; sourceTree = SOURCE_ROOT; };
-		745B2D641E5A8E1E0092D38A /* WXRecyclerUpdateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXRecyclerUpdateController.h; path = WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.h; sourceTree = SOURCE_ROOT; };
-		745B2D651E5A8E1E0092D38A /* WXRecyclerUpdateController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WXRecyclerUpdateController.m; path = WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m; sourceTree = SOURCE_ROOT; };
-		745B2D661E5A8E1E0092D38A /* WXSectionDataController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXSectionDataController.h; path = WeexSDK/Sources/Component/Recycler/WXSectionDataController.h; sourceTree = SOURCE_ROOT; };
-		745B2D671E5A8E1E0092D38A /* WXSectionDataController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WXSectionDataController.m; path = WeexSDK/Sources/Component/Recycler/WXSectionDataController.m; sourceTree = SOURCE_ROOT; };
 		745ED2D61C5F2C7E002DB5A8 /* WXView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXView.h; sourceTree = "<group>"; };
 		745ED2D71C5F2C7E002DB5A8 /* WXView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXView.m; sourceTree = "<group>"; };
 		7461F88C1CFB373100F62D44 /* WXDisplayQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDisplayQueue.h; sourceTree = "<group>"; };
@@ -810,24 +778,6 @@
 			path = WeexSDKTests;
 			sourceTree = "<group>";
 		};
-		74D8DB401E4825920078B667 /* Recycler */ = {
-			isa = PBXGroup;
-			children = (
-				745B2D5E1E5A8E1E0092D38A /* WXMultiColumnLayout.h */,
-				745B2D5F1E5A8E1E0092D38A /* WXMultiColumnLayout.m */,
-				745B2D601E5A8E1E0092D38A /* WXRecyclerComponent.h */,
-				745B2D611E5A8E1E0092D38A /* WXRecyclerComponent.m */,
-				745B2D621E5A8E1E0092D38A /* WXRecyclerDataController.h */,
-				745B2D631E5A8E1E0092D38A /* WXRecyclerDataController.m */,
-				745B2D641E5A8E1E0092D38A /* WXRecyclerUpdateController.h */,
-				745B2D651E5A8E1E0092D38A /* WXRecyclerUpdateController.m */,
-				745B2D661E5A8E1E0092D38A /* WXSectionDataController.h */,
-				745B2D671E5A8E1E0092D38A /* WXSectionDataController.m */,
-			);
-			name = Recycler;
-			path = Grid;
-			sourceTree = "<group>";
-		};
 		74EF31C11DE6932900667A07 /* handler */ = {
 			isa = PBXGroup;
 			children = (
@@ -1040,8 +990,6 @@
 				74896F2F1D1AC79400D1D593 /* NSObject+WXSwizzle.m */,
 				747DF6801E31AEE4005C53A8 /* WXLength.h */,
 				747DF6811E31AEE4005C53A8 /* WXLength.m */,
-				744D61121E4AF23E00B624B3 /* WXDiffUtil.h */,
-				744D61131E4AF23E00B624B3 /* WXDiffUtil.m */,
 			);
 			path = Utility;
 			sourceTree = "<group>";
@@ -1088,7 +1036,6 @@
 			children = (
 				C4B3D6D21E6954300013F38D /* WXEditComponent.h */,
 				C4B3D6D31E6954300013F38D /* WXEditComponent.m */,
-				74D8DB401E4825920078B667 /* Recycler */,
 				2A837AAC1CD9DE9200AEDF03 /* WXLoadingComponent.h */,
 				2A837AAD1CD9DE9200AEDF03 /* WXLoadingComponent.m */,
 				2A837AAE1CD9DE9200AEDF03 /* WXLoadingIndicator.h */,
@@ -1113,12 +1060,12 @@
 				77E65A181C155F25008B8775 /* WXScrollerComponent.m */,
 				2A44AB0F1C1AD5B00067A7EA /* WXSliderComponent.h */,
 				59D3CA461CFC3CC0008835DC /* WXSliderComponent.m */,
+				74CC7A1A1C2BC5F800829368 /* WXCellComponent.h */,
 				74CC7A1B1C2BC5F800829368 /* WXCellComponent.m */,
 				74CC7A1E1C2BF9DC00829368 /* WXListComponent.h */,
 				74CC7A1F1C2BF9DC00829368 /* WXListComponent.m */,
 				2AC750221C7565690041D390 /* WXIndicatorComponent.h */,
 				2AC750231C7565690041D390 /* WXIndicatorComponent.m */,
-				74CC7A1A1C2BC5F800829368 /* WXCellComponent.h */,
 				2A1F57B51C75C6A600B58017 /* WXTextInputComponent.h */,
 				2A1F57B61C75C6A600B58017 /* WXTextInputComponent.m */,
 				DC03ADB81D508719003F76E7 /* WXTextAreaComponent.h */,
@@ -1136,10 +1083,6 @@
 				D33451071D3E19480083598A /* WXCanvasComponent.m */,
 				59970D2C1E0D228D0049F535 /* WXComponent+GradientColor.h */,
 				59970D2D1E0D228D0049F535 /* WXComponent+GradientColor.m */,
-				744D610A1E49978200B624B3 /* WXHeaderComponent.h */,
-				744D610B1E49978200B624B3 /* WXHeaderComponent.m */,
-				744D610E1E49979000B624B3 /* WXFooterComponent.h */,
-				744D610F1E49979000B624B3 /* WXFooterComponent.m */,
 			);
 			path = Component;
 			sourceTree = "<group>";
@@ -1239,12 +1182,9 @@
 				77D161621C02ED790010B15B /* WXLog.h in Headers */,
 				77D1614B1C02E3790010B15B /* WXConvert.h in Headers */,
 				59A596221CB6311F0012CD52 /* WXNavigatorModule.h in Headers */,
-				745B2D6A1E5A8E1E0092D38A /* WXRecyclerComponent.h in Headers */,
 				749DC27B1D40827B009E1C91 /* WXMonitor.h in Headers */,
 				77E659DA1C07F594008B8775 /* WXDomModule.h in Headers */,
 				74EF31AD1DE58BE200667A07 /* WXURLRewriteDefaultImpl.h in Headers */,
-				744D61101E49979000B624B3 /* WXFooterComponent.h in Headers */,
-				744D61141E4AF23E00B624B3 /* WXDiffUtil.h in Headers */,
 				74862F791E02B88D00B7A041 /* JSValue+Weex.h in Headers */,
 				2A1F57B71C75C6A600B58017 /* WXTextInputComponent.h in Headers */,
 				C4F012791E1502A6003378D0 /* SRWebSocket+Weex.h in Headers */,
@@ -1258,8 +1198,6 @@
 				74A4BA961CB365D100195969 /* WXAppConfiguration.h in Headers */,
 				7461F8921CFB373100F62D44 /* WXLayer.h in Headers */,
 				594C28931CF9E61A009793A4 /* WXAnimationModule.h in Headers */,
-				745B2D701E5A8E1E0092D38A /* WXSectionDataController.h in Headers */,
-				745B2D6E1E5A8E1E0092D38A /* WXRecyclerUpdateController.h in Headers */,
 				D3FC0DF71C508B2A002B9E31 /* WXTimerModule.h in Headers */,
 				D312CE3B1C730DEB00046D68 /* WXWebComponent.h in Headers */,
 				741081261CEDB4EC001BC6E5 /* WXComponent_internal.h in Headers */,
@@ -1302,13 +1240,10 @@
 				D33451081D3E19480083598A /* WXCanvasComponent.h in Headers */,
 				74B8BEFE1DC47B72004A6027 /* WXRootView.h in Headers */,
 				77E65A111C155EA8008B8775 /* WXImageComponent.h in Headers */,
-				745B2D6C1E5A8E1E0092D38A /* WXRecyclerDataController.h in Headers */,
-				745B2D681E5A8E1E0092D38A /* WXMultiColumnLayout.h in Headers */,
 				2A60CE9C1C91733E00857B9F /* WXSwitchComponent.h in Headers */,
 				DCDFED011E68238F00C228D7 /* WXJSExceptionProtocol.h in Headers */,
 				2A4445BF1CA8FD56009E7C6D /* WXTextComponentProtocol.h in Headers */,
 				746319021C60AFC100EFEBD4 /* WXThreadSafeCounter.h in Headers */,
-				744D610C1E49978200B624B3 /* WXHeaderComponent.h in Headers */,
 				77D1613C1C02DEA60010B15B /* WXJSCoreBridge.h in Headers */,
 				74D205201E091B8000128F44 /* WXCallJSMethod.h in Headers */,
 				741DFE061DDD9B30009B020F /* UIBezierPath+Weex.h in Headers */,
@@ -1525,9 +1460,6 @@
 				C4F0127C1E1502A6003378D0 /* WXWebSocketDefaultImpl.m in Sources */,
 				77E65A0E1C155E99008B8775 /* WXDivComponent.m in Sources */,
 				2A60CE9D1C91733E00857B9F /* WXSwitchComponent.m in Sources */,
-				744D61111E49979000B624B3 /* WXFooterComponent.m in Sources */,
-				745B2D6F1E5A8E1E0092D38A /* WXRecyclerUpdateController.m in Sources */,
-				745B2D6B1E5A8E1E0092D38A /* WXRecyclerComponent.m in Sources */,
 				2A837AB71CD9DE9200AEDF03 /* WXRefreshComponent.m in Sources */,
 				74A4BA9B1CB3BAA100195969 /* WXThreadSafeMutableDictionary.m in Sources */,
 				77E65A1A1C155F25008B8775 /* WXScrollerComponent.m in Sources */,
@@ -1556,7 +1488,6 @@
 				74AD99851D5B0E59008F0336 /* WXPolyfillSet.m in Sources */,
 				D317338D1C57257000BB7539 /* WXTransform.m in Sources */,
 				7461F8A91CFC33A800F62D44 /* WXThreadSafeMutableArray.m in Sources */,
-				745B2D6D1E5A8E1E0092D38A /* WXRecyclerDataController.m in Sources */,
 				2AC750251C7565690041D390 /* WXIndicatorComponent.m in Sources */,
 				591DD3311D23AD5800BE8709 /* WXErrorView.m in Sources */,
 				59D3CA4B1CFC3CE1008835DC /* NSTimer+Weex.m in Sources */,
@@ -1569,7 +1500,6 @@
 				C4D872261E5DDF7500E39BC1 /* WXBoxShadow.m in Sources */,
 				746319031C60AFC100EFEBD4 /* WXThreadSafeCounter.m in Sources */,
 				74A4BAA71CB4F98300195969 /* WXStreamModule.m in Sources */,
-				744D610D1E49978200B624B3 /* WXHeaderComponent.m in Sources */,
 				59597F991D2A041700EE9317 /* WXDebugLoggerBridge.m in Sources */,
 				77E659F21C0C3612008B8775 /* WXModuleFactory.m in Sources */,
 				DCF343681E49CAEE00A2FB34 /* WXJSExceptionInfo.m in Sources */,
@@ -1578,7 +1508,6 @@
 				2A919DA71E321F1F006EB6B5 /* WXBridgeMethod.m in Sources */,
 				DCAB35FF1D658EB700C0EA70 /* WXRuleManager.m in Sources */,
 				77D161251C02DDD10010B15B /* WXSDKInstance.m in Sources */,
-				744D61151E4AF23E00B624B3 /* WXDiffUtil.m in Sources */,
 				74EF31AE1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m in Sources */,
 				C4B3D6D51E6954300013F38D /* WXEditComponent.m in Sources */,
 				C4C30DE81E1B833D00786B6C /* WXComponent+PseudoClassManagement.m in Sources */,
@@ -1590,7 +1519,6 @@
 				D334510D1D3E19B80083598A /* WXCanvasModule.m in Sources */,
 				741081241CED6756001BC6E5 /* WXComponentFactory.m in Sources */,
 				D362F9501C83EDA20003F546 /* WXWebViewModule.m in Sources */,
-				745B2D711E5A8E1E0092D38A /* WXSectionDataController.m in Sources */,
 				2A1F57B81C75C6A600B58017 /* WXTextInputComponent.m in Sources */,
 				74CC7A1D1C2BC5F800829368 /* WXCellComponent.m in Sources */,
 				74862F821E03A24500B7A041 /* WXComponentMethod.m in Sources */,
@@ -1626,7 +1554,6 @@
 				C4B834271DE69B09007AD27E /* WXPickerModule.m in Sources */,
 				C4F0127A1E1502A6003378D0 /* SRWebSocket+Weex.m in Sources */,
 				59970D2F1E0D228D0049F535 /* WXComponent+GradientColor.m in Sources */,
-				745B2D691E5A8E1E0092D38A /* WXMultiColumnLayout.m in Sources */,
 				77D161391C02DE940010B15B /* WXBridgeManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h
deleted file mode 100644
index f107db0..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-#import "WXLength.h"
-
-extern NSString * const kCollectionSupplementaryViewKindHeader;
-
-@protocol WXMultiColumnLayoutDelegate <NSObject>
-
-- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView insetForLayout:(UICollectionViewLayout *)collectionViewLayout;
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView contentWidthForLayout:(UICollectionViewLayout *)collectionViewLayout;
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout heightForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout heightForHeaderInSection:(NSInteger)section;
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout isNeedStickyForHeaderInSection:(NSInteger)section;
-
-@end
-
-@interface WXMultiColumnLayout : UICollectionViewLayout
-
-@property (nonatomic, weak) id<WXMultiColumnLayoutDelegate> delegate;
-
-@property (nonatomic, strong) WXLength *columnCount;
-
-@property (nonatomic, strong) WXLength *columnWidth;
-
-@property (nonatomic, assign) float columnGap;
-
-@property (nonatomic, assign, readonly) CGFloat computedColumnWidth;
-@property (nonatomic, assign, readonly) int computedColumnCount;
-@property (nonatomic, assign, readonly) CGFloat computedHeaderWidth;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
deleted file mode 100644
index f5d641e..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXMultiColumnLayout.h"
-#import "NSArray+Weex.h"
-#import "WXUtility.h"
-#import "WXAssert.h"
-
-void computeColumnWidthAndCount(float availableWidth, WXLength *columnCount, WXLength *columnWidth, float columnGap, int *N, float *W)
-{
-    /* Pseudo-algorithm according to
-     * https://www.w3.org/TR/css3-multicol/
-     * Note that, in most cases, only one of \u2018column-width\u2019 and \u2018column-count\u2019 affect the layout. 
-     * If \u2018column-width\u2019 has a value other than \u2018auto\u2019, \u2018column-count\u2019 indicates the maximum number of columns.
-     **/
-    if (columnWidth.isAuto && columnCount.isAuto) {
-        WXAssert(NO, @"Unsupport both of column-width and column-count being auto.");
-        return;
-    }
-    
-    if (columnWidth.isAuto && !columnCount.isAuto) {
-        *N = columnCount.intValue;
-        *W = MAX(0, (availableWidth - ((*N -1) * columnGap)) / *N);
-    }
-    
-    if (!columnWidth.isAuto && columnCount.isAuto) {
-        *N = MAX(1, WXFloorPixelValue((availableWidth + columnGap) / (columnWidth.floatValue + columnGap)));
-        *W = ((availableWidth + columnGap) / *N) - columnGap;
-    }
-    
-    if (!columnWidth.isAuto && !columnCount.isAuto) {
-        *N = MIN(columnCount.intValue, WXFloorPixelValue((availableWidth + columnGap) / (columnWidth.floatValue + columnGap)));
-        *W = ((availableWidth + columnGap) / *N) - columnGap;
-    }
-}
-
-NSString * const kCollectionSupplementaryViewKindHeader = @"WXCollectionSupplementaryViewKindHeader";
-NSString * const kMultiColumnLayoutHeader = @"WXMultiColumnLayoutHeader";
-NSString * const kMultiColumnLayoutCell = @"WXMultiColumnLayoutCell";
-
-@interface WXMultiColumnLayoutHeaderAttributes : UICollectionViewLayoutAttributes
-
-@property (nonatomic, assign) BOOL isSticky;
-
-@end
-
-@implementation WXMultiColumnLayoutHeaderAttributes
-
-- (id)copyWithZone:(NSZone *)zone
-{
-    WXMultiColumnLayoutHeaderAttributes *copy = [super copyWithZone:zone];
-    copy.isSticky = self.isSticky;
-    
-    return copy;
-}
-
-@end
-
-@interface WXMultiColumnLayout ()
-
-@property (nonatomic, strong) NSMutableDictionary<NSString *, NSDictionary<id, UICollectionViewLayoutAttributes *> *> *layoutAttributes;
-@property (nonatomic, strong) NSMutableArray<NSNumber *> *columnsMaxHeights;
-
-@property (nonatomic, assign, readwrite) CGFloat computedColumnWidth;
-@property (nonatomic, assign, readwrite) int computedColumnCount;
-
-@end
-
-@implementation WXMultiColumnLayout
-
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _layoutAttributes = [NSMutableDictionary dictionary];
-        _columnsMaxHeights = [NSMutableArray array];
-    }
-    
-    return self;
-}
-
-#pragma mark - Public Accessors
-
-- (void)setColumnCount:(WXLength *)columnCount
-{
-    if (!(columnCount.isAuto && _columnCount.isAuto) || _columnCount.intValue != columnCount.intValue) {
-        _columnCount = columnCount;
-        [self _cleanComputed];
-    }
-}
-
-- (void)setColumnWidth:(WXLength *)columnWidth
-{
-    if (!(columnWidth.isAuto && _columnWidth.isAuto) || _columnWidth.floatValue != columnWidth.floatValue) {
-        _columnWidth = columnWidth;
-        [self _cleanComputed];
-    }
-}
-
-- (void)setColumnGap:(float)columnGap
-{
-    if (_columnGap != columnGap) {
-        _columnGap = columnGap;
-        [self _cleanComputed];
-    }
-}
-
-- (CGFloat)computedColumnWidth
-{
-    if (!_computedColumnWidth && !_computedColumnCount) {
-        [self _computeColumnWidthAndCount];
-    }
-    
-    return _computedColumnWidth;
-}
-
-- (int)computedColumnCount
-{
-    if (!_computedColumnWidth && !_computedColumnCount) {
-        [self _computeColumnWidthAndCount];
-    }
-    
-    return _computedColumnCount;
-}
-
-- (CGFloat)computedHeaderWidth
-{
-    UIEdgeInsets insets = [self.delegate collectionView:self.collectionView insetForLayout:self];
-    return self.contentWidth - (insets.left + insets.right);
-}
-
-#pragma mark - Methods to Override for UICollectionViewLayout
-
-- (void)prepareLayout
-{
-    [super prepareLayout];
-    
-    [self _cleanup];
-    
-    NSInteger numberOfSections = [self.collectionView numberOfSections];
-    UIEdgeInsets insets = [self.delegate collectionView:self.collectionView insetForLayout:self];
-    
-    float columnWidth = self.computedColumnWidth;
-    int columnCount = self.computedColumnCount;
-    float columnGap = self.columnGap;
-    
-    CGFloat currentHeight = insets.top;
-    NSMutableDictionary *headersAttributes = [NSMutableDictionary dictionaryWithCapacity:numberOfSections];
-    NSMutableDictionary *cellAttributes = [NSMutableDictionary dictionary];
-    for (NSInteger i = 0; i < columnCount; i++) {
-        [self.columnsMaxHeights addObject:@(currentHeight)];
-    }
-    
-    for (NSInteger section = 0; section < numberOfSections; section++) {
-        CGFloat headerHeight = [self.delegate collectionView:self.collectionView layout:self heightForHeaderInSection:section];
-        // header
-        if (headerHeight > 0) {
-            WXMultiColumnLayoutHeaderAttributes *headerAttributes = [WXMultiColumnLayoutHeaderAttributes layoutAttributesForSupplementaryViewOfKind:kCollectionSupplementaryViewKindHeader withIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
-            headerAttributes.frame = CGRectMake(insets.left, currentHeight, self.contentWidth - (insets.left + insets.right), headerHeight);
-            headerAttributes.isSticky = [self.delegate collectionView:self.collectionView layout:self isNeedStickyForHeaderInSection:section];
-            headerAttributes.zIndex = headerAttributes.isSticky ? 1 : 0;
-            headersAttributes[@(section)] = headerAttributes;
-            
-            currentHeight = CGRectGetMaxY(headerAttributes.frame);
-            [self _columnsReachToHeight:currentHeight];
-        }
-        
-        // cells
-        for (NSInteger item = 0; item < [self.collectionView numberOfItemsInSection:section]; item++) {
-            NSIndexPath *indexPath = [NSIndexPath indexPathForItem:item inSection:section];
-            CGFloat itemHeight = [self.delegate collectionView:self.collectionView layout:self heightForItemAtIndexPath:indexPath];
-            UICollectionViewLayoutAttributes *itemAttributes = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
-            NSUInteger column = [self _minHeightColumnForAllColumns];
-            CGFloat x = insets.left + (columnWidth + columnGap) * column;
-            CGFloat y = [self.columnsMaxHeights[column] floatValue];
-            itemAttributes.frame = CGRectMake(x, y, columnWidth, itemHeight);
-            cellAttributes[indexPath] = itemAttributes;
-            
-            self.columnsMaxHeights[column] = @(CGRectGetMaxY(itemAttributes.frame));
-        }
-    }
-    
-    currentHeight = [self _maxHeightForAllColumns] + insets.bottom;
-    [self _columnsReachToHeight:currentHeight];
-    
-    self.layoutAttributes[kMultiColumnLayoutHeader] = headersAttributes;
-    self.layoutAttributes[kMultiColumnLayoutCell] = cellAttributes;
-}
-
-- (CGSize)collectionViewContentSize
-{
-    NSInteger numberOfSections = [self.collectionView numberOfSections];
-    if (numberOfSections == 0) {
-        return CGSizeZero;
-    }
-    
-    return CGSizeMake(self.contentWidth, self.contentHeight);
-}
-
-- (NSArray<UICollectionViewLayoutAttributes *> *)layoutAttributesForElementsInRect:(CGRect)rect
-{
-    NSMutableArray<WXMultiColumnLayoutHeaderAttributes *> *stickyHeaders = [NSMutableArray array];
-    NSMutableArray<UICollectionViewLayoutAttributes *> *result = [NSMutableArray array];
-    
-    [self.layoutAttributes enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull kind, NSDictionary<id,UICollectionViewLayoutAttributes *> * _Nonnull dictionary, BOOL * _Nonnull stop) {
-        [dictionary enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, UICollectionViewLayoutAttributes * _Nonnull attributes, BOOL * _Nonnull stop) {
-            if (attributes.representedElementKind == kCollectionSupplementaryViewKindHeader
-                && [self.delegate collectionView:self.collectionView layout:self isNeedStickyForHeaderInSection:attributes.indexPath.section]) {
-                [stickyHeaders addObject:(WXMultiColumnLayoutHeaderAttributes *)attributes];
-            } else if (CGRectIntersectsRect(rect, attributes.frame)) {
-                [result addObject:attributes];
-            }
-        }];
-    }];
-    
-    [stickyHeaders sortUsingComparator:^NSComparisonResult(WXMultiColumnLayoutHeaderAttributes *obj1, WXMultiColumnLayoutHeaderAttributes *obj2) {
-        if (obj1.indexPath.section < obj2.indexPath.section) {
-            return NSOrderedAscending;
-        } else {
-            return NSOrderedDescending;
-        }
-    }];
-    
-    for (int i = 0; i < stickyHeaders.count; i++) {
-        WXMultiColumnLayoutHeaderAttributes *header = stickyHeaders[i];
-        [self _adjustStickyForHeaderAttributes:header next:(i == stickyHeaders.count - 1) ? nil : stickyHeaders[i + 1]];
-        [result addObject:header];
-    }
-    
-    WXLogDebug(@"return result attributes:%@ for rect:%@", result, NSStringFromCGRect(rect));
-    
-    return result;
-}
-
-- (void)_adjustStickyForHeaderAttributes:(WXMultiColumnLayoutHeaderAttributes *)header
-                                   next:(WXMultiColumnLayoutHeaderAttributes *)nextHeader
-{
-    CGRect bounds = self.collectionView.bounds;
-    CGFloat originY = header.frame.origin.y;
-    CGFloat maxY = nextHeader ? (nextHeader.frame.origin.y - header.frame.size.height) : (CGRectGetMaxY(bounds) - header.frame.size.height);
-    CGFloat currentY = CGRectGetMaxY(bounds) - bounds.size.height + self.collectionView.contentInset.top;
-    
-    CGFloat resultY = MIN(MAX(currentY, originY), maxY);
-    CGPoint origin = header.frame.origin;
-    origin.y = resultY;
-    
-    header.frame = (CGRect){origin, header.frame.size};
-    header.hidden = NO;
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForSupplementaryViewOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath
-{
-    if ([elementKind isEqualToString:kCollectionSupplementaryViewKindHeader]) {
-        UICollectionViewLayoutAttributes *attributes = self.layoutAttributes[kMultiColumnLayoutHeader][@(indexPath.section)];
-        WXLogDebug(@"return header attributes:%@ for index path:%@", attributes, indexPath);
-        
-        return attributes;
-    }
-    
-    return nil;
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    if (self.layoutAttributes.count == 0) {
-        [self prepareLayout];
-    }
-    
-    UICollectionViewLayoutAttributes *attributes = self.layoutAttributes[kMultiColumnLayoutCell][indexPath];
-    WXLogDebug(@"return item attributes:%@ for index path:%@", attributes, indexPath);
-    return attributes;
-}
-
-- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds
-{
-    __block BOOL hasStickyHeader = NO;
-    [self.layoutAttributes[kMultiColumnLayoutHeader] enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, UICollectionViewLayoutAttributes * _Nonnull obj, BOOL * _Nonnull stop) {
-        WXMultiColumnLayoutHeaderAttributes *attribute = (WXMultiColumnLayoutHeaderAttributes *)obj;
-        if (attribute.isSticky) {
-            hasStickyHeader = YES;
-            *stop = YES;
-        }
-    }];
-    
-    if (hasStickyHeader) {
-        // always return yes no trigger resetting sticky header's frame.
-        return YES;
-    } else {
-        CGRect oldBounds = self.collectionView.bounds;
-        if (CGRectGetWidth(newBounds) != CGRectGetWidth(oldBounds)) {
-            return YES;
-        }
-    }
-    
-    return NO;
-}
-
-#pragma mark - Private
-
-- (CGFloat)contentWidth
-{
-    return [self.delegate collectionView:self.collectionView contentWidthForLayout:self];
-}
-
-- (CGFloat)contentHeight
-{
-    return [self _maxHeightForAllColumns];
-}
-
-- (void)_computeColumnWidthAndCount
-{
-    UIEdgeInsets insets = [self.delegate collectionView:self.collectionView insetForLayout:self];
-    
-    int columnCount;
-    float columnWidth ;
-    float availableWidth = self.contentWidth - (insets.left + insets.right);
-    computeColumnWidthAndCount(availableWidth, self.columnCount, self.columnWidth, self.columnGap, &columnCount, &columnWidth);
-    if (availableWidth <= 0) {
-        return;
-    }
-    WXAssert(columnCount > 0, @"invalid column count");
-    WXAssert(columnWidth > 0, @"invalid column width");
-    
-    _computedColumnWidth = columnWidth;
-    _computedColumnCount = columnCount;
-}
-
-- (CGFloat)_maxHeightForAllColumns
-{
-    CGFloat maxHeight = 0.0;
-    for (NSNumber *number in self.columnsMaxHeights) {
-        CGFloat height = [number floatValue];
-        if (height > maxHeight) {
-            maxHeight = height;
-        }
-    }
-    
-    return maxHeight;
-}
-
-- (NSUInteger)_minHeightColumnForAllColumns
-{
-    __block NSUInteger index = 0;
-    __block CGFloat minHeight = FLT_MAX;
-    
-    [self.columnsMaxHeights enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        CGFloat height = [obj floatValue];
-        if (height < minHeight) {
-            minHeight = height;
-            index = idx;
-        }
-    }];
-    
-    return index;
-}
-
-- (void)_columnsReachToHeight:(CGFloat)height
-{
-    for (NSInteger i = 0; i < self.columnsMaxHeights.count; i ++) {
-        self.columnsMaxHeights[i] = @(height);
-    }
-}
-
-- (void)_cleanup
-{
-    [self.layoutAttributes removeAllObjects];
-    [self.columnsMaxHeights removeAllObjects];
-}
-
-- (void)_cleanComputed
-{
-    _computedColumnWidth = 0;
-    _computedColumnCount = 0;
-}
-
-- (void)invalidateLayout
-{
-    [super invalidateLayout];
-    
-    [self _cleanComputed];
-}
-
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h
deleted file mode 100644
index 2b13e4b..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-#import <WeexSDK/WeexSDK.h>
-
-@interface WXRecyclerComponent : WXScrollerComponent
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
deleted file mode 100644
index 7dffe8c..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
+++ /dev/null
@@ -1,525 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXRecyclerComponent.h"
-#import "WXComponent_internal.h"
-#import "WXSDKInstance_private.h"
-#import "WXRecyclerDataController.h"
-#import "WXRecyclerUpdateController.h"
-#import "WXMultiColumnLayout.h"
-#import "WXHeaderComponent.h"
-#import "WXFooterComponent.h"
-#import "WXCellComponent.h"
-#import "WXAssert.h"
-#import "WXConvert.h"
-
-static NSString * const kCollectionCellReuseIdentifier = @"WXRecyclerCell";
-static NSString * const kCollectionHeaderReuseIdentifier = @"WXRecyclerHeader";
-static float const kRecyclerNormalColumnGap = 32;
-
-typedef enum : NSUInteger {
-    WXRecyclerLayoutTypeMultiColumn,
-    WXRecyclerLayoutTypeFlex,
-    WXRecyclerLayoutTypeGrid,
-} WXRecyclerLayoutType;
-
-@interface WXCollectionView : UICollectionView
-
-@end
-
-@implementation WXCollectionView
-
-- (void)insertSubview:(UIView *)view atIndex:(NSInteger)index
-{
-    [super insertSubview:view atIndex:index];
-}
-
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-    [self.wx_component layoutDidFinish];
-}
-
-@end
-
-@interface WXCollectionViewCell : UICollectionViewCell
-
-@end
-
-@implementation WXCollectionViewCell
-
-- (void)prepareForReuse
-{
-    [super prepareForReuse];
-
-    WXCellComponent *cellComponent = (WXCellComponent *)self.wx_component;
-    if (cellComponent.isRecycle && [cellComponent isViewLoaded] && [self.contentView.subviews containsObject:cellComponent.view]) {
-        [cellComponent _unloadViewWithReusing:YES];
-    }
-}
-
-@end
-
-@interface WXRecyclerComponent () <UICollectionViewDataSource, UICollectionViewDelegate, WXMultiColumnLayoutDelegate, WXRecyclerUpdateControllerDelegate, WXCellRenderDelegate, WXHeaderRenderDelegate>
-
-@property (nonatomic, strong, readonly) WXRecyclerDataController *dataController;
-@property (nonatomic, strong, readonly) WXRecyclerUpdateController *updateController;
-@property (nonatomic, weak, readonly) UICollectionView *collectionView;
-
-@end
-
-@implementation WXRecyclerComponent
-{
-    WXRecyclerLayoutType _layoutType;
-    UICollectionViewLayout *_collectionViewlayout;
-    
-    UIEdgeInsets _padding;
-}
-
-- (instancetype)initWithRef:(NSString *)ref type:(NSString *)type styles:(NSDictionary *)styles attributes:(NSDictionary *)attributes events:(NSArray *)events weexInstance:(WXSDKInstance *)weexInstance
-{
-    if (self = [super initWithRef:ref type:type styles:styles attributes:attributes events:events weexInstance:weexInstance]) {
-        [self _fillPadding];
-        
-        if ([type isEqualToString:@"waterfall"] || (attributes[@"layout"] && [attributes[@"layout"] isEqualToString:@"multi-column"])) {
-            // TODO: abstraction
-            _layoutType = WXRecyclerLayoutTypeMultiColumn;
-            CGFloat scaleFactor = weexInstance.pixelScaleFactor;
-            _collectionViewlayout = [WXMultiColumnLayout new];
-            WXMultiColumnLayout *layout = (WXMultiColumnLayout *)_collectionViewlayout;
-            layout.columnWidth = [WXConvert WXLength:attributes[@"columnWidth"] isFloat:YES scaleFactor:scaleFactor] ? : [WXLength lengthWithFloat:0.0 type:WXLengthTypeAuto];
-            layout.columnCount = [WXConvert WXLength:attributes[@"columnCount"] isFloat:NO scaleFactor:1.0] ? : [WXLength lengthWithInt:1 type:WXLengthTypeFixed];
-            layout.columnGap = [self _floatValueForColumnGap:([WXConvert WXLength:attributes[@"columnGap"] isFloat:YES scaleFactor:scaleFactor] ? : [WXLength lengthWithFloat:0.0 type:WXLengthTypeNormal])];
-            
-            layout.delegate = self;
-        }
-        
-        _dataController = [WXRecyclerDataController new];
-        _updateController = [WXRecyclerUpdateController new];
-        _updateController.delegate = self;
-    }
-    
-    return self;
-}
-
-- (void)dealloc
-{
-    _collectionView.delegate = nil;
-    _collectionView.dataSource = nil;
-}
-
-#pragma mark - Public Subclass Methods
-
-- (UIView *)loadView
-{
-    return [[WXCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:_collectionViewlayout];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    _collectionView = (UICollectionView *)self.view;
-    _collectionView.allowsSelection = NO;
-    _collectionView.allowsMultipleSelection = NO;
-    _collectionView.dataSource = self;
-    _collectionView.delegate = self;
-    
-    [_collectionView registerClass:[WXCollectionViewCell class] forCellWithReuseIdentifier:kCollectionCellReuseIdentifier];
-    [_collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:kCollectionSupplementaryViewKindHeader withReuseIdentifier:kCollectionHeaderReuseIdentifier];
-    
-    [self performUpdatesWithCompletion:^(BOOL finished) {
-        
-    }];
-}
-
-- (void)viewWillUnload
-{
-    [super viewWillUnload];
-    
-    _collectionView.dataSource = nil;
-    _collectionView.delegate = nil;
-}
-
-- (void)updateAttributes:(NSDictionary *)attributes
-{
-    [super updateAttributes:attributes];
-    
-    if (_layoutType == WXRecyclerLayoutTypeMultiColumn) {
-        CGFloat scaleFactor = self.weexInstance.pixelScaleFactor;
-        WXMultiColumnLayout *layout = (WXMultiColumnLayout *)_collectionViewlayout;
-        BOOL needUpdateLayout = NO;
-        if (attributes[@"columnWidth"]) {
-            layout.columnWidth = [WXConvert WXLength:attributes[@"columnWidth"] isFloat:YES scaleFactor:scaleFactor];
-            needUpdateLayout = YES;
-        }
-        
-        if (attributes[@"columnCount"]) {
-            layout.columnCount = [WXConvert WXLength:attributes[@"columnCount"] isFloat:NO scaleFactor:1.0];
-            
-            needUpdateLayout = YES;
-        }
-        if (attributes[@"columnGap"]) {
-            layout.columnGap = [self _floatValueForColumnGap:([WXConvert WXLength:attributes[@"columnGap"] isFloat:YES scaleFactor:scaleFactor])];
-            needUpdateLayout = YES;
-        }
-        
-        if (needUpdateLayout) {
-            for (WXComponent *component in self.subcomponents) {
-                [component setNeedsLayout];
-            }
-            
-            [self.collectionView reloadData];
-            [self.collectionView.collectionViewLayout invalidateLayout];
-        }
-    }
-    
-}
-
-- (void)setContentSize:(CGSize)contentSize
-{
-    // Do Nothing
-}
-
-- (void)adjustSticky
-{
-    // Do Nothing, sticky is adjusted by layout
-}
-
-#pragma mark - Private Subclass Methods
-
-- (void)_updateStylesOnComponentThread:(NSDictionary *)styles resetStyles:(NSMutableArray *)resetStyles isUpdateStyles:(BOOL)isUpdateStyles
-{
-    [super _updateStylesOnComponentThread:styles resetStyles:resetStyles isUpdateStyles:isUpdateStyles];
-    
-    [self _fillPadding];
-}
-
-- (void)_handleFirstScreenTime
-{
-    // Do Nothing\uff0c firstScreenTime is set by cellDidRendered:
-}
-
-- (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset animated:(BOOL)animated
-{
-    [super scrollToComponent:component withOffset:offset animated:animated];
-}
-
-- (void)performUpdatesWithCompletion:(void (^)(BOOL finished))completion
-{
-    WXAssertMainThread();
-    
-    //TODO: support completion
-    
-    if (![self isViewLoaded]) {
-        completion(NO);
-    }
-    
-    NSArray *oldData = [self.dataController.sections copy];
-    NSArray *newData = [self _sectionArrayFromComponents:self.subcomponents];
-    
-    [_updateController performUpdatesWithNewData:newData oldData:oldData view:_collectionView];
-}
-
-- (void)_insertSubcomponent:(WXComponent *)subcomponent atIndex:(NSInteger)index
-{
-    // TODO: refresh loading fixed
-    if ([subcomponent isKindOfClass:[WXCellComponent class]]) {
-        ((WXCellComponent *)subcomponent).delegate = self;
-    } else if ([subcomponent isKindOfClass:[WXHeaderComponent class]]) {
-        ((WXHeaderComponent *)subcomponent).delegate = self;
-    }
-    
-    [super _insertSubcomponent:subcomponent atIndex:index];
-    
-    if (![subcomponent isKindOfClass:[WXHeaderComponent class]]
-        && ![subcomponent isKindOfClass:[WXCellComponent class]]) {
-        return;
-    }
-    
-    WXPerformBlockOnMainThread(^{
-        [self performUpdatesWithCompletion:^(BOOL finished) {
-    
-        }];
-    });
-}
-
-- (void)insertSubview:(WXComponent *)subcomponent atIndex:(NSInteger)index
-{
-    //Here will not insert cell/header/footer's view again
-    if (![subcomponent isKindOfClass:[WXCellComponent class]]
-        && ![subcomponent isKindOfClass:[WXHeaderComponent class]]
-        && ![subcomponent isKindOfClass:[WXFooterComponent class]]) {
-        [super insertSubview:subcomponent atIndex:index];
-    }
-}
-
-#pragma mark - WXRecyclerUpdateControllerDelegate
-
-- (void)updateController:(WXRecyclerUpdateController *)controller willPerformUpdateWithNewData:(NSArray<WXSectionDataController *> *)newData
-{
-    if (newData) {
-        [self.dataController updateData:newData];
-    }
-}
-
-- (void)updateController:(WXRecyclerUpdateController *)controller didPerformUpdateWithFinished:(BOOL)finished
-{
-    
-}
-
-#pragma mark - UICollectionViewDataSource
-
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
-{
-    WXLogDebug(@"section number:%zi", [self.dataController numberOfSections]);
-    return [self.dataController numberOfSections];
-}
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
-{
-    NSInteger numberOfItems = [self.dataController numberOfItemsInSection:section];
-    
-    WXLogDebug(@"Number of items is %ld in section:%ld", numberOfItems, section);
-    
-    return numberOfItems;
-}
-
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXLogDebug(@"Getting cell at indexPath:%@", indexPath);
-    
-    WXCollectionViewCell *cellView = [_collectionView dequeueReusableCellWithReuseIdentifier:kCollectionCellReuseIdentifier forIndexPath:indexPath];
-    
-    UIView *contentView = [self.dataController cellForItemAtIndexPath:indexPath];
-    
-    cellView.wx_component = contentView.wx_component;
-    
-    if (contentView.superview == cellView.contentView) {
-        return cellView;
-    }
-    
-    for (UIView *view in cellView.contentView.subviews) {
-        [view removeFromSuperview];
-    }
-    
-    [cellView.contentView addSubview:contentView];
-    
-    return cellView;
-}
-
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-    UICollectionReusableView *reusableView = nil;
-    if ([kind isEqualToString:kCollectionSupplementaryViewKindHeader]) {
-        reusableView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:kCollectionHeaderReuseIdentifier forIndexPath:indexPath];
-        UIView *contentView = [self.dataController viewForHeaderAtIndexPath:indexPath];
-        if (contentView.superview != reusableView) {
-            for (UIView *view in reusableView.subviews) {
-                [view removeFromSuperview];
-            }
-
-            [reusableView addSubview:contentView];
-        }
-    }
-    
-    return reusableView;
-}
-
-#pragma mark - UICollectionViewDelegate
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXLogDebug(@"will display cell:%@, at index path:%@", cell, indexPath);
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXLogDebug(@"Did end displaying cell:%@, at index path:%@", cell, indexPath);
-}
-
-#pragma mark - WXMultiColumnLayoutDelegate
-
-- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView insetForLayout:(UICollectionViewLayout *)collectionViewLayout
-{
-    return _padding;
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView contentWidthForLayout:(UICollectionViewLayout *)collectionViewLayout
-{
-    return self.scrollerCSSNode->style.dimensions[CSS_WIDTH];
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout heightForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    CGSize itemSize = [self.dataController sizeForItemAtIndexPath:indexPath];
-    return itemSize.height;
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout heightForHeaderInSection:(NSInteger)section
-{
-    CGSize headerSize = [self.dataController sizeForHeaderAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
-    return headerSize.height;
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout isNeedStickyForHeaderInSection:(NSInteger)section
-{
-    return [self.dataController isStickyForHeaderAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
-}
-
-#pragma mark - WXHeaderRenderDelegate
-
-- (float)headerWidthForLayout:(WXHeaderComponent *)header
-{
-    if (_layoutType == WXRecyclerLayoutTypeMultiColumn) {
-        return ((WXMultiColumnLayout *)_collectionViewlayout).computedHeaderWidth;
-    }
-    
-    return 0.0;
-}
-
-- (void)headerDidLayout:(WXHeaderComponent *)header
-{
-    WXPerformBlockOnMainThread(^{
-        [self.collectionView.collectionViewLayout invalidateLayout];
-    });
-}
-
-- (void)headerDidRemove:(WXHeaderComponent *)header
-{
-    WXPerformBlockOnMainThread(^{
-        [self performUpdatesWithCompletion:^(BOOL finished) {
-            
-        }];
-    });
-}
-
-#pragma mark - WXCellRenderDelegate
-
-- (float)containerWidthForLayout:(WXCellComponent *)cell
-{
-    if (_layoutType == WXRecyclerLayoutTypeMultiColumn) {
-        return ((WXMultiColumnLayout *)_collectionViewlayout).computedColumnWidth;
-    }
-    
-    return 0.0;
-}
-
-- (void)cellDidLayout:(WXCellComponent *)cell
-{
-    BOOL previousLayoutComplete = cell.isLayoutComplete;
-    cell.isLayoutComplete = YES;
-    WXPerformBlockOnMainThread(^{
-        if (previousLayoutComplete) {
-            [self.updateController reloadItemsAtIndexPath:[self.dataController indexPathForCell:cell]];
-        } else {
-            [self performUpdatesWithCompletion:^(BOOL finished) {
-            }];
-        }
-    });
-}
-
-- (void)cellDidRendered:(WXCellComponent *)cell
-{
-    
-}
-
-- (void)cellDidRemove:(WXCellComponent *)cell
-{
-    if (cell.isLayoutComplete) {
-        WXPerformBlockOnMainThread(^{
-            [self performUpdatesWithCompletion:^(BOOL finished) {
-            }];
-        });
-    }
-}
-
-- (void)cell:(WXCellComponent *)cell didMoveToIndex:(NSUInteger)index
-{
-    if (cell.isLayoutComplete) {
-        WXPerformBlockOnMainThread(^{
-            [self performUpdatesWithCompletion:^(BOOL finished) {
-            }];
-        });
-    }
-}
-
-#pragma makrk - private
-
-- (float)_floatValueForColumnGap:(WXLength *)gap
-{
-    if (gap.isNormal) {
-        return kRecyclerNormalColumnGap * self.weexInstance.pixelScaleFactor;
-    } else {
-        return gap.floatValue;
-    }
-}
-
-- (void)_fillPadding
-{
-    UIEdgeInsets padding = {
-        WXFloorPixelValue(self.cssNode->style.padding[CSS_TOP] + self.cssNode->style.border[CSS_TOP]),
-        WXFloorPixelValue(self.cssNode->style.padding[CSS_LEFT] + self.cssNode->style.border[CSS_LEFT]),
-        WXFloorPixelValue(self.cssNode->style.padding[CSS_BOTTOM] + self.cssNode->style.border[CSS_BOTTOM]),
-        WXFloorPixelValue(self.cssNode->style.padding[CSS_RIGHT] + self.cssNode->style.border[CSS_RIGHT])
-    };
-    
-    if (!UIEdgeInsetsEqualToEdgeInsets(padding, _padding)) {
-        _padding = padding;
-        [self setNeedsLayout];
-        
-        for (WXComponent *component in self.subcomponents) {
-            [component setNeedsLayout];
-        }
-        
-        if (_collectionView) {
-            WXPerformBlockOnMainThread(^{
-                [_collectionView.collectionViewLayout invalidateLayout];
-            });
-        }
-    }
-}
-
-- (NSArray<WXSectionDataController *> *)_sectionArrayFromComponents:(NSArray<WXComponent *> *)components
-{
-    NSMutableArray<WXSectionDataController *> *sectionArray = [NSMutableArray array];
-    NSMutableArray<WXCellComponent *> *cellArray = [NSMutableArray array];
-    WXSectionDataController *currentSection;
-    
-    for (int i = 0; i < components.count; i++) {
-        if (!currentSection) {
-            currentSection = [WXSectionDataController new];
-        }
-        
-        WXComponent* component = components[i];
-        
-        if ([component isKindOfClass:[WXHeaderComponent class]]) {
-            if (i != 0) {
-                currentSection.cellComponents = [cellArray copy];
-                [sectionArray addObject:currentSection];
-                currentSection = [WXSectionDataController new];
-                [cellArray removeAllObjects];
-            }
-            currentSection.headerComponent = (WXHeaderComponent *)component;
-        } else if ([component isKindOfClass:[WXCellComponent class]]
-                   && ((WXCellComponent *)component).isLayoutComplete) {
-            [cellArray addObject:(WXCellComponent *)component];
-        } else if ([component isKindOfClass:[WXFooterComponent class]]) {
-            currentSection.footerComponent = component;
-        }
-        
-        if (i == components.count - 1 && cellArray.count > 0) {
-            currentSection.cellComponents = [cellArray copy];
-            [sectionArray addObject:currentSection];
-        }
-    }
-    
-    return sectionArray;
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.h b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.h
deleted file mode 100644
index 3b85155..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-#import "WXSectionDataController.h"
-
-@interface WXRecyclerDataController : NSObject
-
-@property (nonatomic, strong, readonly) NSArray<WXSectionDataController *> *sections;
-
-- (void)updateData:(NSArray<WXSectionDataController *> *)newData;
-
-- (NSInteger)numberOfSections;
-
-- (NSInteger)numberOfItemsInSection:(NSInteger)section;
-
-- (UIView *)cellForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (CGSize)sizeForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (UIView *)viewForHeaderAtIndexPath:(NSIndexPath *)indexPath;
-
-- (CGSize)sizeForHeaderAtIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)isStickyForHeaderAtIndexPath:(NSIndexPath *)indexPath;
-
-- (NSIndexPath *)indexPathForCell:(WXCellComponent *)cell;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.m
deleted file mode 100644
index aa5732d..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerDataController.m
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXRecyclerDataController.h"
-#import "WXCellComponent.h"
-#import "NSArray+Weex.h"
-#import "WXAssert.h"
-
-@interface WXRecyclerDataController ()
-
-@property (nonatomic, strong, readwrite) NSArray<WXSectionDataController *> *sections;
-@property (nonatomic, strong, readonly) NSMapTable<WXCellComponent *, NSIndexPath*> *cellToIndexPathTable;
-
-@end
-
-@implementation WXRecyclerDataController
-
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _sections = [NSArray new];
-        _cellToIndexPathTable = [NSMapTable weakToStrongObjectsMapTable];
-    }
-    
-    return self;
-}
-
-#pragma mark - Public
-
-- (void)updateData:(NSArray<WXSectionDataController *> *)newData
-{
-    WXAssertMainThread();
-    
-    [self cleanup];
-    _sections = [newData copy];
-    
-    [newData enumerateObjectsUsingBlock:^(WXSectionDataController * _Nonnull controller, NSUInteger idx, BOOL * _Nonnull stop) {
-        [controller.cellComponents enumerateObjectsUsingBlock:^(WXCellComponent * _Nonnull obj, NSUInteger idx2, BOOL * _Nonnull stop) {
-            NSIndexPath *indexPath = [NSIndexPath indexPathForItem:idx2 inSection:idx];
-            [_cellToIndexPathTable setObject:indexPath forKey:obj];
-        }];
-    }];
-}
-
-- (NSInteger)numberOfSections
-{
-    WXAssertMainThread();
-    return self.sections.count;
-}
-
-- (NSInteger)numberOfItemsInSection:(NSInteger)section
-{
-    WXSectionDataController *sectionController = [self dataControllerForSection:section];
-    WXAssert(sectionController, @"No section controller found for section:%ld", section);
-    
-    return [sectionController numberOfItems];
-}
-
-- (UIView *)cellForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXSectionDataController *sectionController = [self dataControllerForSection:indexPath.section];
-    UIView *contentView = [sectionController cellForItemAtIndex:indexPath.item];
-    
-    return contentView;
-}
-
-- (CGSize)sizeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXSectionDataController *sectionController = [self dataControllerForSection:indexPath.section];
-    return [sectionController sizeForItemAtIndex:indexPath.item];
-}
-
-- (UIView *)viewForHeaderAtIndexPath:(NSIndexPath *)indexPath;
-{
-    WXSectionDataController *sectionController = [self dataControllerForSection:indexPath.section];
-    return [sectionController viewForHeaderAtIndex:indexPath.item];
-}
-
-- (CGSize)sizeForHeaderAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXSectionDataController *sectionController = [self dataControllerForSection:indexPath.section];
-    return [sectionController sizeForHeaderAtIndex:indexPath.item];
-}
-
-- (BOOL)isStickyForHeaderAtIndexPath:(NSIndexPath *)indexPath
-{
-    WXSectionDataController *sectionController = [self dataControllerForSection:indexPath.section];
-    return [sectionController isStickyForHeaderAtIndex:indexPath.item];
-}
-
-- (NSIndexPath *)indexPathForCell:(WXCellComponent *)cell
-{
-    return [_cellToIndexPathTable objectForKey:cell];
-}
-
-#pragma mark - Private
-
-- (WXSectionDataController *)dataControllerForSection:(NSInteger)section
-{
-    WXAssertMainThread();
-    return [self.sections wx_safeObjectAtIndex:section];
-}
-
-- (void)cleanup
-{
-    [_cellToIndexPathTable removeAllObjects];
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.h b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.h
deleted file mode 100644
index e376c19..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-#import "WXSectionDataController.h"
-@class WXRecyclerUpdateController;
-
-@protocol WXRecyclerUpdateControllerDelegate <NSObject>
-
-- (void)updateController:(WXRecyclerUpdateController *)controller willPerformUpdateWithNewData:(NSArray<WXSectionDataController *> *)newData;
-
-- (void)updateController:(WXRecyclerUpdateController *)controller didPerformUpdateWithFinished:(BOOL)finished;
-
-@end
-
-@interface WXRecyclerUpdateController : NSObject
-
-@property (nonatomic, weak) id<WXRecyclerUpdateControllerDelegate> delegate;
-
-- (void)performUpdatesWithNewData:(NSArray<WXSectionDataController *> *)newData
-                          oldData:(NSArray<WXSectionDataController *> *)oldData
-                             view:(UICollectionView *)collectionView;
-
-- (void)reloadItemsAtIndexPath:(NSIndexPath *)indexPath;
-
-@end
-

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
deleted file mode 100644
index 31c9dd0..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXRecyclerUpdateController.h"
-#import "WXCellComponent.h"
-#import "WXAssert.h"
-#import "WXLog.h"
-#import "WXDiffUtil.h"
-#import "NSArray+Weex.h"
-
-@interface WXRecyclerDiffResult : NSObject
-
-@property (nonatomic, strong, readonly) NSIndexSet *insertSections;
-@property (nonatomic, strong, readonly) NSIndexSet *deleteSections;
-@property (nonatomic, strong, readonly) NSIndexSet *reloadSections;
-
-@property (nonatomic, strong, readonly) NSMutableSet<NSIndexPath *> *deleteIndexPaths;
-@property (nonatomic, strong, readonly) NSMutableSet<NSIndexPath *> *insertIndexPaths;
-@property (nonatomic, strong, readonly) NSMutableSet<NSIndexPath *> *reloadIndexPaths;
-
-- (BOOL)hasChanges;
-
-@end
-
-@implementation WXRecyclerDiffResult
-
-- (instancetype)initWithInsertSections:(NSIndexSet *)insertSections
-                        deleteSections:(NSIndexSet *)deletesSections
-                        reloadSections:(NSIndexSet *)reloadSections
-                      insertIndexPaths:(NSMutableSet<NSIndexPath *> *)insertIndexPaths
-                      deleteIndexPaths:(NSMutableSet<NSIndexPath *> *)deleteIndexPaths
-                      reloadIndexPaths:(NSMutableSet<NSIndexPath *> *)reloadIndexPaths
-{
-    if (self = [super init]) {
-        _insertSections = [insertSections copy];
-        _deleteSections = [deletesSections copy];
-        _reloadSections = [reloadSections copy];
-        _insertIndexPaths = [insertIndexPaths copy];
-        _deleteIndexPaths = [deleteIndexPaths copy];
-        _reloadIndexPaths = [reloadIndexPaths copy];
-    }
-    
-    return self;
-}
-
-- (BOOL)hasChanges
-{
-    return _insertSections.count > 0 || _deleteSections.count > 0 || _reloadSections.count > 0 || _insertIndexPaths.count > 0 || _deleteIndexPaths.count > 0 || _reloadIndexPaths.count > 0;
-}
-
-- (NSString *)description
-{
-    return [NSString stringWithFormat:@"<%@: %p; insert sections: %@; delete sections: %@; reload sections: %@; insert index paths: %@; delete index paths: %@; reload index paths: %@", NSStringFromClass([self class]), self,_insertSections, _deleteSections, _reloadSections, _insertIndexPaths, _deleteIndexPaths, _reloadIndexPaths];
-}
-
-@end
-
-@interface WXRecyclerUpdateController ()
-
-@property (nonatomic, copy) NSArray<WXSectionDataController *> *theNewData;
-@property (nonatomic, copy) NSArray<WXSectionDataController *> *theOldData;
-@property (nonatomic, weak) UICollectionView *collectionView;
-@property (nonatomic, strong) NSMutableSet<NSIndexPath *> *reloadIndexPaths;
-@property (nonatomic, assign) BOOL isUpdating;
-
-@end
-
-@implementation WXRecyclerUpdateController
-
-- (void)performUpdatesWithNewData:(NSArray<WXSectionDataController *> *)newData oldData:(NSArray<WXSectionDataController *> *)oldData view:(UICollectionView *)collectionView
-{
-    if (!collectionView) {
-        return;
-    }
-    
-    self.theNewData = newData;
-    self.theOldData = oldData;
-    self.collectionView = collectionView;
-    
-    [self checkUpdates];
-}
-
-- (void)reloadItemsAtIndexPath:(NSIndexPath *)indexPath
-{
-    if (!indexPath) {
-        return;
-    }
-    
-    if (!_reloadIndexPaths) {
-        _reloadIndexPaths = [NSMutableSet set];
-    }
-    
-    [_reloadIndexPaths addObject:indexPath];
-    
-    [self checkUpdates];
-}
-
-- (void)checkUpdates
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if (self.isUpdating) {
-            return ;
-        }
-        
-        [self performBatchUpdates];
-    });
-}
-
-- (void)performBatchUpdates
-{
-    WXAssertMainThread();
-    WXAssert(!self.isUpdating, @"Can not perform updates while an updating is being performed");
-    
-    UICollectionView *collectionView = self.collectionView;
-    if (!collectionView) {
-        return;
-    }
-    
-    NSArray<WXSectionDataController *> *newData = [self.theNewData copy];
-    NSArray<WXSectionDataController *> *oldData = [self.theOldData copy];
-
-    [self cleanup];
-    
-    WXRecyclerDiffResult *diffResult = [self diffWithNewData:newData oldData:oldData];
-    if (![diffResult hasChanges] && self.reloadIndexPaths.count == 0) {
-        return;
-    }
-    
-    void (^updates)() = ^{
-        [UIView setAnimationsEnabled:NO];
-        WXLogDebug(@"UICollectionView update:%@", diffResult);
-        [self applyUpdate:diffResult toCollectionView:self.collectionView];
-    };
-    
-    void (^completion)(BOOL) = ^(BOOL finished) {
-        [UIView setAnimationsEnabled:YES];
-        self.isUpdating = NO;
-        [self.delegate updateController:self didPerformUpdateWithFinished:finished];
-        [self.reloadIndexPaths removeAllObjects];
-        [self checkUpdates];
-    };
-    
-    self.isUpdating = YES;
-    
-    if (!self.delegate) {
-        return;
-    }
-    
-    [self.delegate updateController:self willPerformUpdateWithNewData:newData];
-    
-    NSLog(@"Diff result:%@", diffResult);
-    [collectionView performBatchUpdates:updates completion:completion];
-}
-
-- (void)cleanup
-{
-    self.theNewData = nil;
-    self.theOldData = nil;
-}
-
-- (WXRecyclerDiffResult *)diffWithNewData:(NSArray<WXSectionDataController *> *)newData
-                              oldData:(NSArray<WXSectionDataController *> *)oldData
-{
-    NSMutableIndexSet *reloadSections = [NSMutableIndexSet indexSet];
-    NSMutableSet<NSIndexPath *> *reloadIndexPaths = [NSMutableSet set];
-    NSMutableSet<NSIndexPath *> *deleteIndexPaths = [NSMutableSet set];
-    NSMutableSet<NSIndexPath *> *insertIndexPaths = [NSMutableSet set];
-    
-    WXDiffResult *sectionDiffResult = [WXDiffUtil diffWithMinimumDistance:newData oldArray:oldData];
-    
-    WXLogDebug(@"section diff result:%@", sectionDiffResult);
-    
-    [sectionDiffResult.inserts enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-        WXSectionDataController *newSection = [newData wx_safeObjectAtIndex:idx];
-        [newSection.cellComponents enumerateObjectsUsingBlock:^(WXCellComponent * _Nonnull obj, NSUInteger idx2, BOOL * _Nonnull stop) {
-            if (obj.isLayoutComplete) {
-                NSIndexPath *insertIndexPath = [NSIndexPath indexPathForItem:idx2 inSection:idx];
-                [insertIndexPaths addObject:insertIndexPath];
-            }
-        }];
-        WXAssert(newSection, @"No section found in  new index:%ld");
-    }];
-    
-    for (WXDiffUpdateIndex *sectionUpdate in sectionDiffResult.updates) {
-        WXSectionDataController *oldSection = [oldData wx_safeObjectAtIndex:sectionUpdate.oldIndex];
-        WXSectionDataController *newSection = [newData wx_safeObjectAtIndex:sectionUpdate.newIndex];
-        WXAssert(newSection && oldSection, @"No section found in old index:%ld, new index:%ld", sectionUpdate.oldIndex, sectionUpdate.newIndex);
-        
-        WXDiffResult *itemDiffResult = [WXDiffUtil diffWithMinimumDistance:newSection.cellComponents oldArray:oldSection.cellComponents];
-        if (![itemDiffResult hasChanges]) {
-            // header or footer need to be updated
-            [reloadSections addIndex:sectionUpdate.oldIndex];
-        } else {
-            for (WXDiffUpdateIndex *update in itemDiffResult.updates) {
-                NSIndexPath *reloadIndexPath = [NSIndexPath indexPathForItem:update.oldIndex inSection:sectionUpdate.oldIndex];
-                [reloadIndexPaths addObject:reloadIndexPath];
-            }
-            
-            [itemDiffResult.inserts enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-                WXCellComponent *cell = [newSection.cellComponents wx_safeObjectAtIndex:idx];
-                if (cell.isLayoutComplete) {
-                    NSIndexPath *insertIndexPath = [NSIndexPath indexPathForItem:idx inSection:sectionUpdate.oldIndex];
-                    [insertIndexPaths addObject:insertIndexPath];
-                }
-            }];
-            
-            [itemDiffResult.deletes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-                NSIndexPath *deleteIndexPath = [NSIndexPath indexPathForItem:idx inSection:sectionUpdate.oldIndex];
-                [deleteIndexPaths addObject:deleteIndexPath];
-            }];
-        }
-        
-    }
-    
-    WXRecyclerDiffResult *result = [[WXRecyclerDiffResult alloc] initWithInsertSections:sectionDiffResult.inserts
-                                                                 deleteSections:sectionDiffResult.deletes
-                                                                 reloadSections:reloadSections
-                                                               insertIndexPaths:insertIndexPaths
-                                                               deleteIndexPaths:deleteIndexPaths
-                                                               reloadIndexPaths:reloadIndexPaths];
-    
-    return result;
-}
-
-- (void)applyUpdate:(WXRecyclerDiffResult *)diffResult toCollectionView:(UICollectionView *)collectionView
-{
-    if (!collectionView) {
-        return;
-    }
-    
-    [collectionView deleteItemsAtIndexPaths:[diffResult.deleteIndexPaths allObjects]];
-    [collectionView insertItemsAtIndexPaths:[diffResult.insertIndexPaths allObjects]];
-    
-    NSSet *reloadIndexPaths = self.reloadIndexPaths ? [diffResult.reloadIndexPaths setByAddingObjectsFromSet:self.reloadIndexPaths] : diffResult.reloadIndexPaths;
-    
-    [collectionView reloadItemsAtIndexPaths:[reloadIndexPaths allObjects]];
-    
-    [collectionView deleteSections:diffResult.deleteSections];
-    [collectionView insertSections:diffResult.insertSections];
-    [collectionView reloadSections:diffResult.reloadSections];
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.h b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.h
deleted file mode 100644
index ae257b3..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-#import "WXDiffUtil.h"
-@class WXComponent;
-@class WXCellComponent;
-@class WXHeaderComponent;
-
-@interface WXSectionDataController : NSObject <WXDiffable>
-
-@property (nonatomic, strong) NSArray<WXCellComponent *> *cellComponents;
-@property (nonatomic, strong) WXHeaderComponent *headerComponent;
-@property (nonatomic, strong) WXComponent *footerComponent;
-
-- (NSInteger)numberOfItems;
-
-- (UIView *)cellForItemAtIndex:(NSInteger)index;
-
-- (CGSize)sizeForItemAtIndex:(NSInteger)index;
-
-- (UIView *)viewForHeaderAtIndex:(NSInteger)index;
-
-- (CGSize)sizeForHeaderAtIndex:(NSInteger)index;
-
-- (BOOL)isStickyForHeaderAtIndex:(NSInteger)index;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.m
deleted file mode 100644
index 8aaa031..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXSectionDataController.m
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXSectionDataController.h"
-#import "WXCellComponent.h"
-#import "WXHeaderComponent.h"
-#import "WXAssert.h"
-
-@implementation WXSectionDataController
-
-- (NSInteger)numberOfItems
-{
-    return self.cellComponents.count;
-}
-
-- (UIView *)cellForItemAtIndex:(NSInteger)index
-{
-    WXAssertMainThread();
-    
-    WXCellComponent *cellComponent = self.cellComponents[index];
-    return cellComponent.view;
-}
-
-- (CGSize)sizeForItemAtIndex:(NSInteger)index
-{
-    WXAssertMainThread();
-    
-    WXCellComponent *cellComponent = self.cellComponents[index];
-    return cellComponent.calculatedFrame.size;
-}
-
-- (UIView *)viewForHeaderAtIndex:(NSInteger)index;
-{
-    return self.headerComponent.view;
-}
-
-- (CGSize)sizeForHeaderAtIndex:(NSInteger)index
-{
-    return self.headerComponent.calculatedFrame.size;
-}
-
-- (BOOL)isStickyForHeaderAtIndex:(NSInteger)index
-{
-    return self.headerComponent.isSticky;
-}
-
-- (NSUInteger)hash
-{
-    return [super hash];
-}
-
-- (BOOL)isEqualToWXObject:(id<WXDiffable>)object
-{
-    if ([object isKindOfClass:[WXSectionDataController class]]) {
-        WXSectionDataController *controller = (WXSectionDataController *)object;
-        BOOL headerEqual = (self.headerComponent && controller.headerComponent && self.headerComponent == controller.headerComponent) || (!self.headerComponent && !controller.headerComponent);
-        BOOL footerEqual = (self.footerComponent && controller.footerComponent && self.footerComponent == controller.footerComponent) || (!self.footerComponent && !controller.footerComponent);
-        BOOL cellEqual = self.cellComponents && controller.cellComponents && self.cellComponents.count == controller.cellComponents.count;
-        if (cellEqual) {
-            for (int i = 0; i < self.cellComponents.count; i ++) {
-                if (self.cellComponents[i] != controller.cellComponents[i]) {
-                    cellEqual = NO;
-                    break;
-                }
-            }
-        } else {
-            cellEqual = !self.cellComponents && controller.cellComponents;
-        }
-        
-        return headerEqual && footerEqual && cellEqual;
-    } else {
-        return NO;
-    }
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
index aff5ab1..2c40cd8 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.h
@@ -7,31 +7,15 @@
  */
 
 #import "WXComponent.h"
-#import "WXDiffUtil.h"
-@class WXCellComponent;
+@class WXListComponent;
 
-@protocol WXCellRenderDelegate <NSObject>
-
-- (float)containerWidthForLayout:(WXCellComponent *)cell;
-
-- (void)cellDidLayout:(WXCellComponent *)cell;
-
-- (void)cellDidRendered:(WXCellComponent *)cell;
-
-- (void)cellDidRemove:(WXCellComponent *)cell;
-
-- (void)cell:(WXCellComponent *)cell didMoveToIndex:(NSUInteger)index;
-
-@end
-
-@interface WXCellComponent : WXComponent <WXDiffable>
+@interface WXCellComponent : WXComponent
 
 @property (nonatomic, strong) NSString *scope;
 @property (nonatomic, assign) BOOL isRecycle;
-@property (nonatomic, assign) BOOL isLayoutComplete;
 @property (nonatomic, assign) UITableViewRowAnimation insertAnimation;
 @property (nonatomic, assign) UITableViewRowAnimation deleteAnimation;
+@property (nonatomic, weak) WXListComponent *list;
 @property (nonatomic, assign) BOOL keepScrollPosition;
-@property (nonatomic, weak) id<WXCellRenderDelegate> delegate;
 
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
index 24a5a1d..3c35a0b 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
@@ -11,16 +11,10 @@
 #import "WXCellComponent.h"
 #import "WXListComponent.h"
 #import "WXComponent_internal.h"
-#import "WXDiffUtil.h"
-
-@interface WXCellComponent ()
-
-@end
 
 @implementation WXCellComponent
 {
     NSIndexPath *_indexPathBeforeMove;
-    BOOL _isUseContainerWidth;
 }
 
 - (instancetype)initWithRef:(NSString *)ref type:(NSString *)type styles:(NSDictionary *)styles attributes:(NSDictionary *)attributes events:(NSArray *)events weexInstance:(WXSDKInstance *)weexInstance
@@ -45,17 +39,12 @@
     
 }
 
-- (BOOL)isEqualToWXObject:(id<WXDiffable>)object
-{
-    return self == object;
-}
-
 - (void)_frameDidCalculated:(BOOL)isChanged
 {
     [super _frameDidCalculated:isChanged];
     
     if (isChanged) {
-        [self.delegate cellDidLayout:self];
+        [self.list cellDidLayout:self];
     }
 }
 
@@ -66,7 +55,7 @@
             [super displayCompletionBlock](layer, finished);
         }
         
-        [self.delegate cellDidRendered:self];
+        [self.list cellDidRendered:self];
     };
 }
 
@@ -95,8 +84,8 @@
 
 - (void)_moveToSupercomponent:(WXComponent *)newSupercomponent atIndex:(NSUInteger)index
 {
-    if (self.delegate == newSupercomponent) {
-        [self.delegate cell:self didMoveToIndex:index];
+    if (self.list == newSupercomponent) {
+        [self.list cell:self didMoveToIndex:index];
         [super _removeFromSupercomponent];
         [newSupercomponent _insertSubcomponent:self atIndex:index];
     } else {
@@ -108,7 +97,7 @@
 {
     [super _removeFromSupercomponent];
     
-    [self.delegate cellDidRemove:self];
+    [self.list cellDidRemove:self];
 }
 
 - (void)removeFromSuperview
@@ -118,10 +107,8 @@
 
 - (void)_calculateFrameWithSuperAbsolutePosition:(CGPoint)superAbsolutePosition gatherDirtyComponents:(NSMutableSet<WXComponent *> *)dirtyComponents
 {
-    if (self.delegate && (isUndefined(self.cssNode->style.dimensions[CSS_WIDTH]) || _isUseContainerWidth)) {
-        self.cssNode->style.dimensions[CSS_WIDTH] = [self.delegate containerWidthForLayout:self];
-        //TODO: set _isUseContainerWidth to NO if updateStyles have width
-        _isUseContainerWidth = YES;
+    if (isUndefined(self.cssNode->style.dimensions[CSS_WIDTH]) && self.list) {
+        self.cssNode->style.dimensions[CSS_WIDTH] = self.list.scrollerCSSNode->style.dimensions[CSS_WIDTH];
     }
     
     if ([self needsLayout]) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.h
index 92b7596..0706eed 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.h
@@ -1,11 +1,10 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
+//
+//  WXComponent+GradientColor.h
+//  Pods
+//
+//  Created by bobning on 16/12/23.
+//
+//
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m b/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
index 86c3379..e710ed0 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
@@ -1,11 +1,10 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
+//
+//  WXComponent+GradientColor.m
+//  Pods
+//
+//  Created by bobning on 16/12/23.
+//
+//
 
 #import "WXComponent+GradientColor.h"
 #import "WXComponent_internal.h"

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.h
deleted file mode 100644
index e9c801c..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <WeexSDK/WeexSDK.h>
-
-@interface WXFooterComponent : WXComponent
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.m
deleted file mode 100644
index f139eaf..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/WXFooterComponent.m
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXFooterComponent.h"
-
-@implementation WXFooterComponent
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
deleted file mode 100644
index 1ac21cc..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <WeexSDK/WeexSDK.h>
-@class WXHeaderComponent;
-
-@protocol WXHeaderRenderDelegate <NSObject>
-
-- (float)headerWidthForLayout:(WXHeaderComponent *)header;
-
-- (void)headerDidLayout:(WXHeaderComponent *)header;
-
-- (void)headerDidRemove:(WXHeaderComponent *)header;
-
-@end
-
-@interface WXHeaderComponent : WXComponent
-
-@property (nonatomic, weak) id<WXHeaderRenderDelegate> delegate;
-@property (nonatomic, assign, readonly) BOOL isSticky;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
deleted file mode 100644
index 33b3040..0000000
--- a/ios/sdk/WeexSDK/Sources/Component/WXHeaderComponent.m
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXHeaderComponent.h"
-#import "WXComponent_internal.h"
-
-@implementation WXHeaderComponent
-{
-    BOOL _isUseContainerWidth;
-}
-
-- (instancetype)initWithRef:(NSString *)ref type:(NSString *)type styles:(NSDictionary *)styles attributes:(NSDictionary *)attributes events:(NSArray *)events weexInstance:(WXSDKInstance *)weexInstance
-{
-    self = [super initWithRef:ref type:type styles:styles attributes:attributes events:events weexInstance:weexInstance];
-    
-    if (self) {
-        _async = YES;
-        _isNeedJoinLayoutSystem = NO;
-    }
-    
-    return self;
-}
-
-- (BOOL)isSticky
-{
-    return _positionType == WXPositionTypeSticky;
-}
-
-- (void)_frameDidCalculated:(BOOL)isChanged
-{
-    [super _frameDidCalculated:isChanged];
-    
-    if (isChanged) {
-        [self.delegate headerDidLayout:self];
-    }
-}
-
-- (void)_removeFromSupercomponent
-{
-    [super _removeFromSupercomponent];
-    
-    [self.delegate headerDidRemove:self];
-}
-
-- (void)_calculateFrameWithSuperAbsolutePosition:(CGPoint)superAbsolutePosition gatherDirtyComponents:(NSMutableSet<WXComponent *> *)dirtyComponents
-{
-    if (self.delegate && (isUndefined(self.cssNode->style.dimensions[CSS_WIDTH]) || _isUseContainerWidth)) {
-        self.cssNode->style.dimensions[CSS_WIDTH] = [self.delegate headerWidthForLayout:self];
-        //TODO: set _isUseContainerWidth to NO if updateStyles have width
-        _isUseContainerWidth = YES;
-    }
-    
-    if ([self needsLayout]) {
-        layoutNode(self.cssNode, CSS_UNDEFINED, CSS_UNDEFINED, CSS_DIRECTION_INHERIT);
-        if ([WXLog logLevel] >= WXLogLevelDebug) {
-            print_css_node(self.cssNode, CSS_PRINT_LAYOUT | CSS_PRINT_STYLE | CSS_PRINT_CHILDREN);
-        }
-    }
-    
-    [super _calculateFrameWithSuperAbsolutePosition:superAbsolutePosition gatherDirtyComponents:dirtyComponents];
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXListComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.h
index 2497c3b..007f502 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.h
@@ -8,6 +8,18 @@
 
 #import "WXScrollerComponent.h"
 
+@class WXCellComponent;
+@class WXHeaderComponent;
 @interface WXListComponent : WXScrollerComponent
 
+- (void)cellDidRemove:(WXCellComponent *)cell;
+
+- (void)cellDidLayout:(WXCellComponent *)cell;
+
+- (void)headerDidLayout:(WXHeaderComponent *)header;
+
+- (void)cellDidRendered:(WXCellComponent *)cell;
+
+- (void)cell:(WXCellComponent *)cell didMoveToIndex:(NSUInteger)index;
+
 @end



[2/4] incubator-weex git commit: * [ios] revert recycler merge

Posted by cx...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index 0418ae8..104a8f2 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -8,7 +8,6 @@
 
 #import "WXListComponent.h"
 #import "WXCellComponent.h"
-#import "WXHeaderComponent.h"
 #import "WXComponent.h"
 #import "WXComponent_internal.h"
 #import "NSArray+Weex.h"
@@ -53,6 +52,53 @@
 
 @end
 
+@interface WXHeaderComponent : WXComponent
+
+@property (nonatomic, weak) WXListComponent *list;
+
+@end
+
+@implementation WXHeaderComponent
+
+//TODO: header remove->need reload
+- (instancetype)initWithRef:(NSString *)ref type:(NSString *)type styles:(NSDictionary *)styles attributes:(NSDictionary *)attributes events:(NSArray *)events weexInstance:(WXSDKInstance *)weexInstance
+{
+    self = [super initWithRef:ref type:type styles:styles attributes:attributes events:events weexInstance:weexInstance];
+    
+    if (self) {
+        _async = YES;
+        _isNeedJoinLayoutSystem = NO;
+    }
+    
+    return self;
+}
+
+- (void)_frameDidCalculated:(BOOL)isChanged
+{
+    [super _frameDidCalculated:isChanged];
+    
+    if (isChanged) {
+        [self.list headerDidLayout:self];
+    }
+}
+
+- (void)_calculateFrameWithSuperAbsolutePosition:(CGPoint)superAbsolutePosition gatherDirtyComponents:(NSMutableSet<WXComponent *> *)dirtyComponents
+{
+    if (isUndefined(self.cssNode->style.dimensions[CSS_WIDTH]) && self.list) {
+        self.cssNode->style.dimensions[CSS_WIDTH] = self.list.scrollerCSSNode->style.dimensions[CSS_WIDTH];
+    }
+    
+    if ([self needsLayout]) {
+        layoutNode(self.cssNode, CSS_UNDEFINED, CSS_UNDEFINED, CSS_DIRECTION_INHERIT);
+        if ([WXLog logLevel] >= WXLogLevelDebug) {
+            print_css_node(self.cssNode, CSS_PRINT_LAYOUT | CSS_PRINT_STYLE | CSS_PRINT_CHILDREN);
+        }
+    }
+    
+    [super _calculateFrameWithSuperAbsolutePosition:superAbsolutePosition gatherDirtyComponents:dirtyComponents];
+}
+
+@end
 
 @interface WXSection : NSObject<NSCopying>
 
@@ -87,7 +133,7 @@
 }
 @end
 
-@interface WXListComponent () <UITableViewDataSource, UITableViewDelegate, WXCellRenderDelegate, WXHeaderRenderDelegate>
+@interface WXListComponent () <UITableViewDataSource, UITableViewDelegate>
 
 @end
 
@@ -200,9 +246,9 @@
 - (void)_insertSubcomponent:(WXComponent *)subcomponent atIndex:(NSInteger)index
 {
     if ([subcomponent isKindOfClass:[WXCellComponent class]]) {
-        ((WXCellComponent *)subcomponent).delegate = self;
+        ((WXCellComponent *)subcomponent).list = self;
     } else if ([subcomponent isKindOfClass:[WXHeaderComponent class]]) {
-        ((WXHeaderComponent *)subcomponent).delegate = self;
+        ((WXHeaderComponent *)subcomponent).list = self;
     } else if (![subcomponent isKindOfClass:[WXRefreshComponent class]]
                && ![subcomponent isKindOfClass:[WXLoadingComponent class]]
                && subcomponent->_positionType != WXPositionTypeFixed) {
@@ -282,13 +328,6 @@
     }
 }
 
-#pragma mark - WXHeaderRenderDelegate
-
-- (float)headerWidthForLayout:(WXHeaderComponent *)cell
-{
-    return self.scrollerCSSNode->style.dimensions[CSS_WIDTH];
-}
-
 - (void)headerDidLayout:(WXHeaderComponent *)header
 {
     [self.weexInstance.componentManager _addUITask:^{
@@ -296,19 +335,9 @@
         [_tableView beginUpdates];
         [_tableView endUpdates];
     }];
-}
-
-- (void)headerDidRemove:(WXHeaderComponent *)header
-{
     
 }
 
-#pragma mark - WXCellRenderDelegate
-
-- (float)containerWidthForLayout:(WXCellComponent *)cell
-{
-    return self.scrollerCSSNode->style.dimensions[CSS_WIDTH];
-}
 
 - (void)cellDidRemove:(WXCellComponent *)cell
 {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
index e5ed68b..a72f39b 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
@@ -87,7 +87,7 @@
     }
     
     if (_translateX || _translateY) {
-        nativeTransform = CGAffineTransformTranslate(nativeTransform, _translateX ? [_translateX valueForMaximum:view.bounds.size.width] : 0,  _translateY ? [_translateY valueForMaximum:view.bounds.size.height] : 0);
+        nativeTransform = CGAffineTransformTranslate(nativeTransform, _translateX ? [_translateX valueForMaximumValue:view.bounds.size.width] : 0,  _translateY ? [_translateY valueForMaximumValue:view.bounds.size.height] : 0);
     }
     
     nativeTransform = CGAffineTransformScale(nativeTransform, _scaleX, _scaleY);
@@ -131,8 +131,8 @@
           * http://ronnqvi.st/translate-rotate-translate/
           **/
         CGPoint anchorPoint = CGPointMake(
-                                          _originX ? [_originX valueForMaximum:view.bounds.size.width] / view.bounds.size.width : 0.5,
-                                          _originY ? [_originY valueForMaximum:view.bounds.size.width] / view.bounds.size.height : 0.5);
+                                          _originX ? [_originX valueForMaximumValue:view.bounds.size.width] / view.bounds.size.width : 0.5,
+                                          _originY ? [_originY valueForMaximumValue:view.bounds.size.width] / view.bounds.size.height : 0.5);
         [self setAnchorPoint:anchorPoint forView:view];
     }
     
@@ -220,8 +220,8 @@
         }
     }
     
-    _originX = [WXLength lengthWithFloat:originX type:typeX];
-    _originY = [WXLength lengthWithFloat:originY type:typeY];
+    _originX = [WXLength lengthWithValue:originX type:typeX];
+    _originY = [WXLength lengthWithValue:originY type:typeY];
 }
 
 - (void)parseRotate:(NSArray *)value
@@ -235,20 +235,20 @@
     WXLength *translateX;
     double x = [value[0] doubleValue];
     if ([value[0] hasSuffix:@"%"]) {
-        translateX = [WXLength lengthWithFloat:x type:WXLengthTypePercent];
+        translateX = [WXLength lengthWithValue:x type:WXLengthTypePercent];
     } else {
         x = WXPixelScale(x, self.weexInstance.pixelScaleFactor);
-        translateX = [WXLength lengthWithFloat:x type:WXLengthTypeFixed];
+        translateX = [WXLength lengthWithValue:x type:WXLengthTypeFixed];
     }
 
     WXLength *translateY;
     if (value.count > 1) {
         double y = [value[1] doubleValue];
         if ([value[1] hasSuffix:@"%"]) {
-            translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent];
+            translateY = [WXLength lengthWithValue:y type:WXLengthTypePercent];
         } else {
             y = WXPixelScale(y, self.weexInstance.pixelScaleFactor);
-            translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed];
+            translateY = [WXLength lengthWithValue:y type:WXLengthTypeFixed];
         }
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index f28f6f1..4103f01 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -72,8 +72,6 @@
     [self registerComponent:@"image" withClass:NSClassFromString(@"WXImageComponent") withProperties:nil];
     [self registerComponent:@"scroller" withClass:NSClassFromString(@"WXScrollerComponent") withProperties:nil];
     [self registerComponent:@"list" withClass:NSClassFromString(@"WXListComponent") withProperties:nil];
-    [self registerComponent:@"recycler" withClass:NSClassFromString(@"WXRecyclerComponent") withProperties:nil];
-    [self registerComponent:@"waterfall" withClass:NSClassFromString(@"WXRecyclerComponent") withProperties:nil];
     
     [self registerComponent:@"header" withClass:NSClassFromString(@"WXHeaderComponent")];
     [self registerComponent:@"cell" withClass:NSClassFromString(@"WXCellComponent")];

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 2feb24c..c6d5ba6 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -168,7 +168,7 @@
 
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"<%@:%p ref=%@> %@", _type, self, _ref, _view];
+    return [NSString stringWithFormat:@"<%@ ref=%@> %@", _type, _ref, _view];
 }
 
 #pragma mark Property

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
index 404402e..81e888a 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -176,16 +176,16 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
             if ((wxTransform.translateX && ![wxTransform.translateX isEqualToLength:oldTransform.translateX]) || (!wxTransform.translateX && oldTransform.translateX)) {
                 WXAnimationInfo *newInfo = [info copy];
                 newInfo.propertyName = @"transform.translation.x";
-                newInfo.fromValue = @([oldTransform.translateX valueForMaximum:view.bounds.size.width]);
-                newInfo.toValue = @([wxTransform.translateX valueForMaximum:view.bounds.size.width]);
+                newInfo.fromValue = @([oldTransform.translateX valueForMaximumValue:view.bounds.size.width]);
+                newInfo.toValue = @([wxTransform.translateX valueForMaximumValue:view.bounds.size.width]);
                 [infos addObject:newInfo];
             }
             
             if ((wxTransform.translateY && ![wxTransform.translateY isEqualToLength:oldTransform.translateY]) || (!wxTransform.translateY && oldTransform.translateY)) {
                 WXAnimationInfo *newInfo = [info copy];
                 newInfo.propertyName = @"transform.translation.y";
-                newInfo.fromValue = @([oldTransform.translateY valueForMaximum:view.bounds.size.height]);
-                newInfo.toValue = @([wxTransform.translateY valueForMaximum:view.bounds.size.height]);
+                newInfo.fromValue = @([oldTransform.translateY valueForMaximumValue:view.bounds.size.height]);
+                newInfo.toValue = @([wxTransform.translateY valueForMaximumValue:view.bounds.size.height]);
                 [infos addObject:newInfo];
             }
             

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m b/ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m
index af8c2d0..3fa4f66 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m
@@ -22,9 +22,9 @@ WX_EXPORT_METHOD(@selector(setViewport:))
     id viewportWidth = viewportArguments[@"width"];
     if ([viewportWidth isKindOfClass:[NSString class]]) {
         if ([viewportWidth isEqualToString:@"device-width"]) {
-            viewportWidthFloat = [WXUtility portraitScreenSize].width;
+            viewportWidthFloat = [WXUtility portraitScreenSize].width * WXScreenScale();
         } else if ([viewportWidth isEqualToString:@"device-height"]) {
-            viewportWidthFloat = [WXUtility portraitScreenSize].height;
+            viewportWidthFloat = [WXUtility portraitScreenSize].height * WXScreenScale();
         } else {
             viewportWidthFloat = [WXConvert CGFloat:viewportWidth];
         }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
index 9703e8c..f181700 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
@@ -11,7 +11,6 @@
 #import "WXLog.h"
 #import "WXLayoutDefine.h"
 #import "WXType.h"
-#import "WXLength.h"
 
 @class WXBoxShadow;
 @interface WXConvert : NSObject
@@ -70,7 +69,6 @@ typedef BOOL WXClipType;
 
 + (WXGradientType)gradientType:(id)value;
 
-+ (WXLength *)WXLength:(id)value isFloat:(BOOL)isFloat scaleFactor:(CGFloat)scaleFactor;
 + (WXBoxShadow *)WXBoxShadow:(id)value scaleFactor:(CGFloat)scaleFactor;
 
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
index c678000..d3ee3b2 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
@@ -9,7 +9,6 @@
 #import "WXConvert.h"
 #import "WXUtility.h"
 #import "WXBoxShadow.h"
-#import "WXAssert.h"
 
 @implementation WXConvert
 
@@ -725,34 +724,6 @@ WX_NUMBER_CONVERT(NSUInteger, unsignedIntegerValue)
     return type;
 }
 
-#pragma mark - Length
-
-+ (WXLength *)WXLength:(id)value isFloat:(BOOL)isFloat scaleFactor:(CGFloat)scaleFactor
-{
-    if (!value) {
-        return nil;
-    }
-    
-    WXLengthType type = WXLengthTypeFixed;
-    if ([value isKindOfClass:[NSString class]]) {
-        if ([value isEqualToString:@"auto"]) {
-            type = WXLengthTypeAuto;
-        } else if ([value isEqualToString:@"normal"]){
-            type = WXLengthTypeNormal;
-        } else if ([value hasSuffix:@"%"]) {
-            type = WXLengthTypePercent;
-        }
-    } else if (![value isKindOfClass:[NSNumber class]]) {
-        WXAssert(NO, @"Unsupported type:%@ for WXLength", NSStringFromClass([value class]));
-    }
-    
-    if (isFloat) {
-        return [WXLength lengthWithFloat:([value floatValue] * scaleFactor) type:type];
-    } else {
-        return [WXLength lengthWithInt:([value intValue] * scaleFactor) type:type];
-    }
-}
-
 + (WXBoxShadow *)WXBoxShadow:(id)value scaleFactor:(CGFloat)scaleFactor
 {
     NSString *boxShadow = @"";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h b/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h
deleted file mode 100644
index e407469..0000000
--- a/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-
-@protocol WXDiffable <NSObject>
-
-- (BOOL)isEqualToWXObject:(id<WXDiffable>)object;
-
-@end
-
-@interface WXDiffUpdateIndex : NSObject
-
-@property (nonatomic, assign, readonly) NSUInteger oldIndex;
-@property (nonatomic, assign, readonly) NSUInteger newIndex;
-
-@end
-
-@interface WXDiffResult : NSObject
-
-@property (nonatomic, strong, readonly) NSIndexSet *inserts;
-@property (nonatomic, strong, readonly) NSIndexSet *deletes;
-@property (nonatomic, strong, readonly) NSArray<WXDiffUpdateIndex *> *updates;
-
-- (BOOL)hasChanges;
-
-@end
-
-@interface WXDiffUtil : NSObject
-
-+ (WXDiffResult *)diffWithMinimumDistance:(NSArray<id<WXDiffable>> *)newArray oldArray:(NSArray<id<WXDiffable>> *)oldArray;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m b/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m
deleted file mode 100644
index 01cab02..0000000
--- a/ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
-
-#import "WXDiffUtil.h"
-#import "WXLog.h"
-
-typedef enum : NSUInteger {
-    WXDiffOperationDoNothing,
-    WXDiffOperationUpdate,
-    WXDiffOperationDelete,
-    WXDiffOperationInsert
-} WXDiffOperation;
-
-@implementation WXDiffUpdateIndex
-
-- (instancetype)initWithOldIndex:(NSUInteger)oldIndex newIndex:(NSUInteger)newIndex
-{
-    if (self = [super init]) {
-        _oldIndex = oldIndex;
-        _newIndex = newIndex;
-    }
-    
-    return self;
-}
-
-@end
-
-@implementation WXDiffResult
-
-- (instancetype)initWithInserts:(NSIndexSet *)inserts
-                        deletes:(NSIndexSet *)deletes
-                        updates:(NSArray<WXDiffUpdateIndex *> *)updates
-{
-    if (self = [super init]) {
-        _inserts = [inserts copy];
-        _deletes = [deletes copy];
-        _updates = [updates copy];
-    }
-    
-    return self;
-}
-
-- (BOOL)hasChanges
-{
-    return _updates.count > 0 || _inserts.count > 0 || _deletes.count > 0;
-}
-
-- (NSString *)description
-{
-    return [NSString stringWithFormat:@"<%@: %p; %zi inserts; %zi deletes; %zi updates", NSStringFromClass([self class]), self, _inserts.count, _deletes.count, _updates.count];
-}
-
-
-@end
-
-@implementation WXDiffUtil
-
-+ (WXDiffResult *)diffWithMinimumDistance:(NSArray<id<WXDiffable>> *)newArray oldArray:(NSArray<id<WXDiffable>> *)oldArray
-{
-    // Using the levenshtein algorithm
-    // https://en.wikipedia.org/wiki/Levenshtein_distance
-    
-    int oldSize = (int)(oldArray.count + 1);
-    int newSize = (int)(newArray.count + 1);
-    
-    int **matrix = malloc(oldSize * sizeof(int *));
-    for (int i = 0; i < oldSize; i++) {
-        matrix[i] = malloc(newSize * sizeof(int));
-    }
-    
-    matrix[0][0] = 0;
-    
-    for (int i = 1; i < oldSize; i++) {
-        matrix[i][0] = i;
-    }
-    
-    for (int j = 1; j < newSize; j++) {
-        matrix[0][j] = j;
-    }
-    
-    for (int oldIndex = 1; oldIndex < oldSize; oldIndex ++) {
-        for (int newIndex = 1; newIndex < newSize; newIndex ++) {
-            if ([oldArray[oldIndex - 1] isEqualToWXObject:newArray[newIndex - 1]]) {
-                matrix[oldIndex][newIndex] = matrix[oldIndex - 1][newIndex - 1];
-            } else {
-                int updateCost = matrix[oldIndex - 1][newIndex - 1] + 1;
-                int insertCost = matrix[oldIndex][newIndex - 1] + 1;
-                int deleteCost = matrix[oldIndex - 1][newIndex] + 1;
-                matrix[oldIndex][newIndex] = MIN(MIN(insertCost, deleteCost), updateCost);
-            }
-        }
-    }
-    
-    [self _printMatrix:matrix rowSize:oldSize columnSize:newSize];
-    
-    NSMutableArray *updates = [NSMutableArray array];
-    NSMutableIndexSet *inserts = [NSMutableIndexSet indexSet];
-    NSMutableIndexSet *deletes = [NSMutableIndexSet indexSet];
-    int oldIndex = oldSize - 1;
-    int newIndex = newSize - 1;
-    while (oldIndex != 0 || newIndex != 0) {
-        WXDiffOperation operation = [self _operationInMatrix:matrix newIndex:newIndex oldIndex:oldIndex];
-        switch (operation) {
-            case WXDiffOperationUpdate:
-                newIndex --;
-                oldIndex --;
-                [updates addObject:[[WXDiffUpdateIndex alloc] initWithOldIndex:oldIndex newIndex:newIndex]];
-                break;
-            case WXDiffOperationDelete:
-                oldIndex --;
-                [deletes addIndex:oldIndex];
-                break;
-            case WXDiffOperationInsert:
-                newIndex --;
-                [inserts addIndex:newIndex];
-                break;
-            case WXDiffOperationDoNothing:
-                newIndex --;
-                oldIndex --;
-                break;
-        }
-    }
-    
-    for (int i = 0; i < oldSize; i++) {
-        free(matrix[i]);
-    }
-    free(matrix);
-    
-    WXDiffResult *result = [[WXDiffResult alloc] initWithInserts:inserts deletes:deletes updates:updates];
-    return result;
-}
-
-+ (WXDiffOperation)_operationInMatrix:(int **)matrix newIndex:(int)newIndex oldIndex:(int)oldIndex
-{
-    if (newIndex == 0) {
-        return WXDiffOperationDelete;
-    }
-    
-    if (oldIndex == 0) {
-        return WXDiffOperationInsert;
-    }
-    
-    int cost = matrix[oldIndex][newIndex];
-    
-    int costBeforeInsert = matrix[oldIndex][newIndex - 1];
-    if (costBeforeInsert + 1 == cost) {
-        return WXDiffOperationInsert;
-    }
-    
-    int costBeforDelete = matrix[oldIndex - 1][newIndex];
-    if (costBeforDelete + 1 == cost) {
-        return WXDiffOperationDelete;
-    }
-    
-    int costBeforUpdate = matrix[oldIndex - 1][newIndex - 1];
-    if (costBeforUpdate + 1 == cost) {
-        return WXDiffOperationUpdate;
-    }
-    
-    return WXDiffOperationDoNothing;
-}
-
-+ (void)_printMatrix:(int **)matrix rowSize:(int)rowSize columnSize:(int)columnSize
-{
-    for (int i = 0; i < rowSize; i ++) {
-        NSMutableArray *array = [NSMutableArray array];
-        for (int j = 0; j < columnSize; j ++) {
-            int value = matrix[i][j];
-            NSString *result;
-            if (value < 10) {
-                result = [NSString stringWithFormat:@"0%zi", value];
-            } else {
-                result = [NSString stringWithFormat:@"%zi", value];
-            }
-            [array addObject:result];
-        }
-        WXLogDebug(@"%@", [array componentsJoinedByString:@" "]);
-    }
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Utility/WXLength.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXLength.h b/ios/sdk/WeexSDK/Sources/Utility/WXLength.h
index 491d2d7..b8480ea 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXLength.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXLength.h
@@ -12,20 +12,13 @@ typedef enum : NSUInteger {
     WXLengthTypeFixed,
     WXLengthTypePercent,
     WXLengthTypeAuto,
-    WXLengthTypeNormal
 } WXLengthType;
 
 @interface WXLength : NSObject
 
-+ (instancetype)lengthWithFloat:(float)value type:(WXLengthType)type;
++ (instancetype)lengthWithValue:(float)value type:(WXLengthType)type;
 
-+ (instancetype)lengthWithInt:(int)value type:(WXLengthType)type;
-
-- (float)valueForMaximum:(float)maximumValue;
-
-- (int)intValue;
-
-- (float)floatValue;
+- (float)valueForMaximumValue:(float)maximumValue;
 
 - (BOOL)isEqualToLength:(WXLength *)length;
 
@@ -35,6 +28,4 @@ typedef enum : NSUInteger {
 
 - (BOOL)isAuto;
 
-- (BOOL)isNormal;
-
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/Utility/WXLength.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXLength.m b/ios/sdk/WeexSDK/Sources/Utility/WXLength.m
index e64526d..30cf57e 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXLength.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXLength.m
@@ -11,38 +11,25 @@
 
 @implementation WXLength
 {
-    float _floatValue;
-    int _intValue;
+    float _value;
     WXLengthType _type;
-    BOOL _isFloat;
 }
 
-+ (instancetype)lengthWithFloat:(float)value type:(WXLengthType)type
++ (instancetype)lengthWithValue:(float)value type:(WXLengthType)type
 {
     WXLength *length = [WXLength new];
-    length->_floatValue = value;
+    length->_value = value;
     length->_type = type;
-    length->_isFloat = YES;
     return length;
 }
 
-+ (instancetype)lengthWithInt:(int)value type:(WXLengthType)type
+- (float)valueForMaximumValue:(float)maximumValue
 {
-    WXLength *length = [WXLength new];
-    length->_intValue = value;
-    length->_type = type;
-    length->_isFloat = NO;
-    return length;
-}
-
-- (float)valueForMaximum:(float)maximumValue
-{
-    
     switch (_type) {
         case WXLengthTypeFixed:
-            return _isFloat ? _floatValue : _intValue;
+            return _value;
         case WXLengthTypePercent:
-            return maximumValue * (_isFloat ? _floatValue : _intValue) / 100.0;
+            return maximumValue * _value / 100.0;
         case WXLengthTypeAuto:
             return maximumValue;
         default:
@@ -51,22 +38,9 @@
     }
 }
 
-- (int)intValue
-{
-    WXAssert(!_isFloat, @"call `intValue` for non-int length");
-    return _intValue;
-}
-
-- (float)floatValue
-{
-    WXAssert(_isFloat,  @"call `floatValue` for non-float length");
-    return _floatValue;
-}
-
 - (BOOL)isEqualToLength:(WXLength *)length
 {
-    return length && _type == length->_type && _isFloat == length->_isFloat
-    && _floatValue == length->_floatValue && _intValue == length->_intValue;
+    return length && _type == length->_type && _value == length->_value;
 }
 
 - (BOOL)isFixed
@@ -84,9 +58,4 @@
     return _type == WXLengthTypeAuto;
 }
 
-- (BOOL)isNormal
-{
-    return _type == WXLengthTypeNormal;
-}
-
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index 686b341..3e0c7fc 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -100,7 +100,7 @@
     _visibility = styles[@"visibility"] ? [WXConvert WXVisibility:styles[@"visibility"]] : WXVisibilityShow;
     _positionType = styles[@"position"] ? [WXConvert WXPositionType:styles[@"position"]] : WXPositionTypeRelative;
     _transform = styles[@"transform"] || styles[@"transformOrigin"] ?
-    [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:styles[@"transform"]] origin:[WXConvert NSString:styles[@"transformOrigin"]] instance:self.weexInstance] :
+    [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:styles[@"transform"]] origin:styles[@"transformOrigin"] instance:self.weexInstance] :
     [[WXTransform alloc] initWithCSSValue:nil origin:nil instance:self.weexInstance];
     _boxShadow = styles[@"boxShadow"]?[WXConvert WXBoxShadow:styles[@"boxShadow"] scaleFactor:self.weexInstance.pixelScaleFactor]:nil;
     if (_boxShadow) {
@@ -172,7 +172,7 @@
     
     if (styles[@"transformOrigin"] || styles[@"transform"]) {
         id transform = styles[@"transform"] ? : self.styles[@"transform"];
-        id transformOrigin = styles[@"transformOrigin"] ? [WXConvert NSString:styles[@"transformOrigin"]] : [WXConvert NSString:self.styles[@"transformOrigin"]];
+        id transformOrigin = styles[@"transformOrigin"] ? : self.styles[@"transformOrigin"];
         _transform = [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:transform] origin:transformOrigin instance:self.weexInstance];
         if (!CGRectEqualToRect(self.calculatedFrame, CGRectZero)) {
             [_transform applyTransformForView:_view];


[4/4] incubator-weex git commit: * [ios] revert recycler merge

Posted by cx...@apache.org.
* [ios] revert recycler merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3621001f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3621001f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3621001f

Branch: refs/heads/0.11-dev
Commit: 3621001f16cbdfdc0ce6b7848fc771401def5550
Parents: 11352c7
Author: cxfeng <cx...@gmail.com>
Authored: Mon Mar 6 10:32:38 2017 +0800
Committer: cxfeng <cx...@gmail.com>
Committed: Mon Mar 6 10:32:38 2017 +0800

----------------------------------------------------------------------
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   9 +-
 .../java/com/taobao/weex/common/Constants.java  |  13 +-
 .../main/java/com/taobao/weex/dom/WXAttr.java   |  96 +---
 .../java/com/taobao/weex/dom/WXDomHandler.java  |   2 -
 .../java/com/taobao/weex/dom/WXDomManager.java  |   1 -
 .../java/com/taobao/weex/dom/WXDomModule.java   |   8 +-
 .../taobao/weex/dom/WXRecyclerDomObject.java    | 317 -----------
 .../weex/ui/component/WXBasicComponentType.java |   2 -
 .../com/taobao/weex/ui/component/WXHeader.java  |   4 +-
 .../ui/component/list/BasicListComponent.java   |  32 +-
 .../ui/component/list/ListComponentView.java    |   3 +
 .../ui/component/list/SimpleListComponent.java  |   6 +-
 .../weex/ui/component/list/WXListComponent.java |  91 +---
 .../listview/ExtendedLinearLayoutManager.java   |  25 -
 .../weex/ui/view/listview/WXRecyclerView.java   |  43 +-
 .../listview/adapter/ListBaseViewHolder.java    |   6 -
 .../adapter/RecyclerViewBaseAdapter.java        |  21 +-
 .../adapter/WXRecyclerViewOnScrollListener.java | 107 ++--
 .../ui/view/refresh/wrapper/BaseBounceView.java |  19 +-
 .../refresh/wrapper/BounceRecyclerView.java     |  23 +-
 .../refresh/wrapper/BounceScrollerView.java     |   1 -
 examples/vue/components/waterfall.vue           | 455 ----------------
 examples/vue/index.vue                          |   1 -
 ios/playground/Podfile                          |   2 +-
 ios/playground/WeexDemo/DemoDefine.h            |   2 +-
 ios/playground/WeexDemo/UIView+UIThreadCheck.m  |   2 +-
 ios/playground/WeexDemo/WXDemoViewController.m  |   3 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |  75 +--
 .../Component/Recycler/WXMultiColumnLayout.h    |  42 --
 .../Component/Recycler/WXMultiColumnLayout.m    | 388 --------------
 .../Component/Recycler/WXRecyclerComponent.h    |  12 -
 .../Component/Recycler/WXRecyclerComponent.m    | 525 -------------------
 .../Recycler/WXRecyclerDataController.h         |  34 --
 .../Recycler/WXRecyclerDataController.m         | 114 ----
 .../Recycler/WXRecyclerUpdateController.h       |  32 --
 .../Recycler/WXRecyclerUpdateController.m       | 248 ---------
 .../Recycler/WXSectionDataController.h          |  33 --
 .../Recycler/WXSectionDataController.m          |  81 ---
 .../WeexSDK/Sources/Component/WXCellComponent.h |  22 +-
 .../WeexSDK/Sources/Component/WXCellComponent.m |  27 +-
 .../Component/WXComponent+GradientColor.h       |  15 +-
 .../Component/WXComponent+GradientColor.m       |  15 +-
 .../Sources/Component/WXFooterComponent.h       |  13 -
 .../Sources/Component/WXFooterComponent.m       |  13 -
 .../Sources/Component/WXHeaderComponent.h       |  27 -
 .../Sources/Component/WXHeaderComponent.m       |  68 ---
 .../WeexSDK/Sources/Component/WXListComponent.h |  12 +
 .../WeexSDK/Sources/Component/WXListComponent.m |  71 ++-
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m |  18 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m    |   2 -
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |   2 +-
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |   8 +-
 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m   |   4 +-
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.h     |   2 -
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m     |  29 -
 ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h    |  38 --
 ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m    | 186 -------
 ios/sdk/WeexSDK/Sources/Utility/WXLength.h      |  13 +-
 ios/sdk/WeexSDK/Sources/Utility/WXLength.m      |  45 +-
 .../Sources/View/WXComponent+ViewManagement.m   |   4 +-
 60 files changed, 236 insertions(+), 3276 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/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 f7bbee7..9992681 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -143,10 +143,11 @@ import com.taobao.weex.dom.TextAreaEditTextDomObject;
 import com.taobao.weex.dom.WXDomObject;
 import com.taobao.weex.dom.WXDomRegistry;
 import com.taobao.weex.dom.WXListDomObject;
-import com.taobao.weex.dom.WXRecyclerDomObject;
 import com.taobao.weex.dom.WXScrollerDomObject;
 import com.taobao.weex.dom.WXSwitchDomObject;
 import com.taobao.weex.dom.WXTextDomObject;
+import com.taobao.weex.ui.component.list.SimpleListComponent;
+import com.taobao.weex.ui.module.WXModalUIModule;
 import com.taobao.weex.http.WXStreamModule;
 import com.taobao.weex.ui.ExternalLoaderComponentHolder;
 import com.taobao.weex.ui.IExternalComponentGetter;
@@ -175,11 +176,9 @@ import com.taobao.weex.ui.component.WXText;
 import com.taobao.weex.ui.component.WXVideo;
 import com.taobao.weex.ui.component.WXWeb;
 import com.taobao.weex.ui.component.list.HorizontalListComponent;
-import com.taobao.weex.ui.component.list.SimpleListComponent;
 import com.taobao.weex.ui.component.list.WXCell;
 import com.taobao.weex.ui.component.list.WXListComponent;
 import com.taobao.weex.ui.module.WXMetaModule;
-import com.taobao.weex.ui.module.WXModalUIModule;
 import com.taobao.weex.ui.module.WXTimerModule;
 import com.taobao.weex.ui.module.WXWebViewModule;
 import com.taobao.weex.utils.WXLogUtils;
@@ -353,7 +352,7 @@ public class WXSDKEngine {
         WXBasicComponentType.SLIDER_NEIGHBOR
       );
       registerComponent(SimpleListComponent.class,false,"simplelist");
-      registerComponent(WXListComponent.class, false,WXBasicComponentType.LIST,WXBasicComponentType.VLIST,WXBasicComponentType.RECYCLER,WXBasicComponentType.WATERFALL);
+      registerComponent(WXListComponent.class, false,WXBasicComponentType.LIST,WXBasicComponentType.VLIST);
       registerComponent(HorizontalListComponent.class,false,WXBasicComponentType.HLIST);
       registerComponent(WXBasicComponentType.CELL, WXCell.class, true);
       registerComponent(WXBasicComponentType.INDICATOR, WXIndicator.class, true);
@@ -393,8 +392,6 @@ public class WXSDKEngine {
       registerDomObject(WXBasicComponentType.VLIST, WXListDomObject.class);
       registerDomObject(WXBasicComponentType.HLIST, WXListDomObject.class);
       registerDomObject(WXBasicComponentType.SCROLLER, WXScrollerDomObject.class);
-      registerDomObject(WXBasicComponentType.RECYCLER, WXRecyclerDomObject.class);
-      registerDomObject(WXBasicComponentType.WATERFALL, WXRecyclerDomObject.class);
     } catch (WXException e) {
       WXLogUtils.e("[WXSDKEngine] register:", e);
     }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index 125ae3a..e6e61e9 100755
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -296,17 +296,13 @@ public class Constants {
     String RESIZE_MODE = "resizeMode";
     String SHOW_INDICATORS = "showIndicators";
     String AUTO_PLAY = "autoPlay";
+    String SHOW_SCROLLBAR = "showScrollbar";
     String SCROLL_DIRECTION = "scrollDirection";
     String SCOPE = "scope";
     String RECYCLE = "recycle";
     String LOADMORERETRY = "loadmoreretry";
     String LOADMOREOFFSET = "loadmoreoffset";
     String RECYCLE_IMAGE = "recycleImage";
-    String LAYOUT = "layout";
-    String COLUMN_WIDTH= "columnWidth";
-    String COLUMN_COUNT= "columnCount";
-    String COLUMN_GAP= "columnGap";
-    String SHOW_SCROLLBAR= "showScrollbar";
     String OVERFLOW = "overflow";
     String TYPE = "type";
     String PLACEHOLDER = "placeholder";
@@ -356,19 +352,12 @@ public class Constants {
 
     String INSERT_CELL_ANIMATION = "insertAnimation";
     String DELETE_CELL_ANIMATION = "deleteAnimation";
-    String AUTO = "auto";
-    String NORMAL = "normal";
   }
 
   public interface Value {
 
     int NAV_BAR_SHOWN = 0;
     int NAV_BAR_HIDDEN = 1;
-    int AUTO = -1;
-    int COLUMN_GAP_NORMAL = 32;
-    int COLUMN_COUNT_NORMAL = 1;
-    String MULTI_COLUMN= "multi-column";
-    String GRID= "grid";
     String STICKY = "sticky";
     String FIXED = "fixed";
     String LEFT = "left";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
index 3846319..a9ebf60 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
@@ -210,7 +210,6 @@ import android.text.TextUtils;
 
 import com.taobao.weex.common.Constants;
 import com.taobao.weex.common.WXImageSharpen;
-import com.taobao.weex.ui.view.listview.WXRecyclerView;
 import com.taobao.weex.utils.WXLogUtils;
 import com.taobao.weex.utils.WXUtils;
 import com.taobao.weex.utils.WXViewUtils;
@@ -219,8 +218,6 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import static java.lang.Boolean.parseBoolean;
-
 /**
  * store value of component attribute
  *
@@ -335,7 +332,7 @@ public class WXAttr implements Map<String, Object>,Cloneable {
       return true;
     }
     try {
-      return parseBoolean(String.valueOf(obj));
+      return Boolean.parseBoolean(String.valueOf(obj));
     } catch (Exception e) {
       WXLogUtils.e("[WXAttr] recycle:", e);
     }
@@ -349,7 +346,7 @@ public class WXAttr implements Map<String, Object>,Cloneable {
     }
 
     try {
-      return parseBoolean(String.valueOf(obj));
+      return Boolean.parseBoolean(String.valueOf(obj));
     } catch (Exception e) {
       WXLogUtils.e("[WXAttr] showIndicators:", e);
     }
@@ -363,7 +360,7 @@ public class WXAttr implements Map<String, Object>,Cloneable {
     }
 
     try {
-      return parseBoolean(String.valueOf(obj));
+      return Boolean.parseBoolean(String.valueOf(obj));
     } catch (Exception e) {
       WXLogUtils.e("[WXAttr] autoPlay:", e);
     }
@@ -412,7 +409,7 @@ public class WXAttr implements Map<String, Object>,Cloneable {
     }
 
     try {
-      return parseBoolean(String.valueOf(obj));
+      return Boolean.parseBoolean(String.valueOf(obj));
     } catch (Exception e) {
       WXLogUtils.e("[WXAttr] recycleImage:", e);
     }
@@ -440,91 +437,6 @@ public class WXAttr implements Map<String, Object>,Cloneable {
     return ret;
   }
 
-  public float getColumnWidth(){
-
-    Object obj = get(Constants.Name.COLUMN_WIDTH);
-    if (obj == null) {
-      return Constants.Value.AUTO;
-    }
-
-    String value = String.valueOf(obj);
-    if(Constants.Name.AUTO.equals(value)){
-      return Constants.Value.AUTO;
-    }
-
-    try {
-      float columnWidth = Float.parseFloat(value);
-      return columnWidth > 0 ? columnWidth : 0;
-    } catch (Exception e) {
-      WXLogUtils.e("[WXAttr] getColumnWidth:", e);
-    }
-    return Constants.Value.AUTO;
-  }
-
-  public int getColumnCount() {
-
-    Object obj = get(Constants.Name.COLUMN_COUNT);
-    if (obj == null) {
-      return Constants.Value.AUTO;
-    }
-
-    String value = String.valueOf(obj);
-    if(Constants.Name.AUTO.equals(value)){
-      return Constants.Value.AUTO;
-    }
-
-    try {
-      int columnCount = Integer.parseInt(value);
-      return columnCount > 0 ? columnCount : Constants.Value.AUTO;
-    } catch (Exception e) {
-      WXLogUtils.e("[WXAttr] getColumnCount:", e);
-      return Constants.Value.AUTO;
-    }
-  }
-
-  public float getColumnGap() {
-
-    Object obj = get(Constants.Name.COLUMN_GAP);
-    if (obj == null) {
-      return Constants.Value.COLUMN_GAP_NORMAL;
-    }
-
-    String value = String.valueOf(obj);
-    if (Constants.Name.NORMAL.equals(value)) {
-      return Constants.Value.COLUMN_GAP_NORMAL;
-    }
-
-    try {
-      float columnGap = Float.parseFloat(value);
-      return columnGap >= 0 ? columnGap : Constants.Value.AUTO;
-    } catch (Exception e) {
-      WXLogUtils.e("[WXAttr] getColumnGap:", e);
-    }
-    return Constants.Value.COLUMN_GAP_NORMAL;
-  }
-
-  public int getLayoutType(){
-    Object obj = get(Constants.Name.LAYOUT);
-    if (obj == null) {
-      return WXRecyclerView.TYPE_LINEAR_LAYOUT;
-    }
-
-    try {
-      switch(String.valueOf(obj)){
-        case Constants.Value.MULTI_COLUMN :
-          return  WXRecyclerView.TYPE_STAGGERED_GRID_LAYOUT;
-        case Constants.Value.GRID :
-          return  WXRecyclerView.TYPE_GRID_LAYOUT;
-        default:
-          return WXRecyclerView.TYPE_LINEAR_LAYOUT;
-      }
-    } catch (Exception e) {
-      WXLogUtils.e("[WXAttr] getLayoutType:", e);
-    }
-    return WXRecyclerView.TYPE_LINEAR_LAYOUT;
-  }
-
-
   @Override
   public boolean equals(Object o) {
     return map.equals(o);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
index 987d71b..dc8495e 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
@@ -210,7 +210,6 @@ import android.os.Message;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.taobao.weex.bridge.JSCallback;
-import com.taobao.weex.utils.WXLogUtils;
 
 /**
  * Handler for dom operations.
@@ -291,7 +290,6 @@ public class WXDomHandler implements Handler.Callback {
                                      (String) task.args.get(2));
         break;
       case MsgType.WX_DOM_BATCH:
-
         mWXDomManager.batch();
         mHasBatch = false;
         break;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java
index 6a8f534..d7ebaa7 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java
@@ -335,7 +335,6 @@ public final class WXDomManager {
    * Batch the execution of {@link WXDomStatement}
    */
   void batch() {
-
     throwIfNotDomThread();
     Iterator<Entry<String, WXDomStatement>> iterator = mDomRegistries.entrySet().iterator();
     while (iterator.hasNext()) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
index d7067ad..ae097fc 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
@@ -347,11 +347,7 @@ public final class WXDomModule extends WXModule {
           if (args == null) {
             return null;
           }
-          JSONObject option =null;
-          if(args.size()>1) {
-            option = (JSONObject) args.get(1);
-          }
-          scrollToElement((String) args.get(0),option);
+          scrollToElement((String) args.get(0), (JSONObject) args.get(1));
           break;
         case ADD_RULE:
           if (args == null) {
@@ -613,7 +609,7 @@ public final class WXDomModule extends WXModule {
    * @param options scroll option, like {offset:0, duration:300}
    */
   public void scrollToElement(String ref, JSONObject options) {
-    if (TextUtils.isEmpty(ref) ) {
+    if (TextUtils.isEmpty(ref) || options == null) {
       return;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
deleted file mode 100644
index 3ee0e06..0000000
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- *
- *                                  Apache License
- *                            Version 2.0, January 2004
- *                         http://www.apache.org/licenses/
- *
- *    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *    1. Definitions.
- *
- *       "License" shall mean the terms and conditions for use, reproduction,
- *       and distribution as defined by Sections 1 through 9 of this document.
- *
- *       "Licensor" shall mean the copyright owner or entity authorized by
- *       the copyright owner that is granting the License.
- *
- *       "Legal Entity" shall mean the union of the acting entity and all
- *       other entities that control, are controlled by, or are under common
- *       control with that entity. For the purposes of this definition,
- *       "control" means (i) the power, direct or indirect, to cause the
- *       direction or management of such entity, whether by contract or
- *       otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *       outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *       "You" (or "Your") shall mean an individual or Legal Entity
- *       exercising permissions granted by this License.
- *
- *       "Source" form shall mean the preferred form for making modifications,
- *       including but not limited to software source code, documentation
- *       source, and configuration files.
- *
- *       "Object" form shall mean any form resulting from mechanical
- *       transformation or translation of a Source form, including but
- *       not limited to compiled object code, generated documentation,
- *       and conversions to other media types.
- *
- *       "Work" shall mean the work of authorship, whether in Source or
- *       Object form, made available under the License, as indicated by a
- *       copyright notice that is included in or attached to the work
- *       (an example is provided in the Appendix below).
- *
- *       "Derivative Works" shall mean any work, whether in Source or Object
- *       form, that is based on (or derived from) the Work and for which the
- *       editorial revisions, annotations, elaborations, or other modifications
- *       represent, as a whole, an original work of authorship. For the purposes
- *       of this License, Derivative Works shall not include works that remain
- *       separable from, or merely link (or bind by name) to the interfaces of,
- *       the Work and Derivative Works thereof.
- *
- *       "Contribution" shall mean any work of authorship, including
- *       the original version of the Work and any modifications or additions
- *       to that Work or Derivative Works thereof, that is intentionally
- *       submitted to Licensor for inclusion in the Work by the copyright owner
- *       or by an individual or Legal Entity authorized to submit on behalf of
- *       the copyright owner. For the purposes of this definition, "submitted"
- *       means any form of electronic, verbal, or written communication sent
- *       to the Licensor or its representatives, including but not limited to
- *       communication on electronic mailing lists, source code control systems,
- *       and issue tracking systems that are managed by, or on behalf of, the
- *       Licensor for the purpose of discussing and improving the Work, but
- *       excluding communication that is conspicuously marked or otherwise
- *       designated in writing by the copyright owner as "Not a Contribution."
- *
- *       "Contributor" shall mean Licensor and any individual or Legal Entity
- *       on behalf of whom a Contribution has been received by Licensor and
- *       subsequently incorporated within the Work.
- *
- *    2. Grant of Copyright License. Subject to the terms and conditions of
- *       this License, each Contributor hereby grants to You a perpetual,
- *       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *       copyright license to reproduce, prepare Derivative Works of,
- *       publicly display, publicly perform, sublicense, and distribute the
- *       Work and such Derivative Works in Source or Object form.
- *
- *    3. Grant of Patent License. Subject to the terms and conditions of
- *       this License, each Contributor hereby grants to You a perpetual,
- *       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *       (except as stated in this section) patent license to make, have made,
- *       use, offer to sell, sell, import, and otherwise transfer the Work,
- *       where such license applies only to those patent claims licensable
- *       by such Contributor that are necessarily infringed by their
- *       Contribution(s) alone or by combination of their Contribution(s)
- *       with the Work to which such Contribution(s) was submitted. If You
- *       institute patent litigation against any entity (including a
- *       cross-claim or counterclaim in a lawsuit) alleging that the Work
- *       or a Contribution incorporated within the Work constitutes direct
- *       or contributory patent infringement, then any patent licenses
- *       granted to You under this License for that Work shall terminate
- *       as of the date such litigation is filed.
- *
- *    4. Redistribution. You may reproduce and distribute copies of the
- *       Work or Derivative Works thereof in any medium, with or without
- *       modifications, and in Source or Object form, provided that You
- *       meet the following conditions:
- *
- *       (a) You must give any other recipients of the Work or
- *           Derivative Works a copy of this License; and
- *
- *       (b) You must cause any modified files to carry prominent notices
- *           stating that You changed the files; and
- *
- *       (c) You must retain, in the Source form of any Derivative Works
- *           that You distribute, all copyright, patent, trademark, and
- *           attribution notices from the Source form of the Work,
- *           excluding those notices that do not pertain to any part of
- *           the Derivative Works; and
- *
- *       (d) If the Work includes a "NOTICE" text file as part of its
- *           distribution, then any Derivative Works that You distribute must
- *           include a readable copy of the attribution notices contained
- *           within such NOTICE file, excluding those notices that do not
- *           pertain to any part of the Derivative Works, in at least one
- *           of the following places: within a NOTICE text file distributed
- *           as part of the Derivative Works; within the Source form or
- *           documentation, if provided along with the Derivative Works; or,
- *           within a display generated by the Derivative Works, if and
- *           wherever such third-party notices normally appear. The contents
- *           of the NOTICE file are for informational purposes only and
- *           do not modify the License. You may add Your own attribution
- *           notices within Derivative Works that You distribute, alongside
- *           or as an addendum to the NOTICE text from the Work, provided
- *           that such additional attribution notices cannot be construed
- *           as modifying the License.
- *
- *       You may add Your own copyright statement to Your modifications and
- *       may provide additional or different license terms and conditions
- *       for use, reproduction, or distribution of Your modifications, or
- *       for any such Derivative Works as a whole, provided Your use,
- *       reproduction, and distribution of the Work otherwise complies with
- *       the conditions stated in this License.
- *
- *    5. Submission of Contributions. Unless You explicitly state otherwise,
- *       any Contribution intentionally submitted for inclusion in the Work
- *       by You to the Licensor shall be under the terms and conditions of
- *       this License, without any additional terms or conditions.
- *       Notwithstanding the above, nothing herein shall supersede or modify
- *       the terms of any separate license agreement you may have executed
- *       with Licensor regarding such Contributions.
- *
- *    6. Trademarks. This License does not grant permission to use the trade
- *       names, trademarks, service marks, or product names of the Licensor,
- *       except as required for reasonable and customary use in describing the
- *       origin of the Work and reproducing the content of the NOTICE file.
- *
- *    7. Disclaimer of Warranty. Unless required by applicable law or
- *       agreed to in writing, Licensor provides the Work (and each
- *       Contributor provides its Contributions) on an "AS IS" BASIS,
- *       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *       implied, including, without limitation, any warranties or conditions
- *       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *       PARTICULAR PURPOSE. You are solely responsible for determining the
- *       appropriateness of using or redistributing the Work and assume any
- *       risks associated with Your exercise of permissions under this License.
- *
- *    8. Limitation of Liability. In no event and under no legal theory,
- *       whether in tort (including negligence), contract, or otherwise,
- *       unless required by applicable law (such as deliberate and grossly
- *       negligent acts) or agreed to in writing, shall any Contributor be
- *       liable to You for damages, including any direct, indirect, special,
- *       incidental, or consequential damages of any character arising as a
- *       result of this License or out of the use or inability to use the
- *       Work (including but not limited to damages for loss of goodwill,
- *       work stoppage, computer failure or malfunction, or any and all
- *       other commercial damages or losses), even if such Contributor
- *       has been advised of the possibility of such damages.
- *
- *    9. Accepting Warranty or Additional Liability. While redistributing
- *       the Work or Derivative Works thereof, You may choose to offer,
- *       and charge a fee for, acceptance of support, warranty, indemnity,
- *       or other liability obligations and/or rights consistent with this
- *       License. However, in accepting such obligations, You may act only
- *       on Your own behalf and on Your sole responsibility, not on behalf
- *       of any other Contributor, and only if You agree to indemnify,
- *       defend, and hold each Contributor harmless for any liability
- *       incurred by, or claims asserted against, such Contributor by reason
- *       of your accepting any such warranty or additional liability.
- *
- *    END OF TERMS AND CONDITIONS
- *
- *    APPENDIX: How to apply the Apache License to your work.
- *
- *       To apply the Apache License to your work, attach the following
- *       boilerplate notice, with the fields enclosed by brackets "[]"
- *       replaced with your own identifying information. (Don't include
- *       the brackets!)  The text should be enclosed in the appropriate
- *       comment syntax for the file format. We also recommend that a
- *       file or class name and description of purpose be included on the
- *       same "printed page" as the copyright notice for easier
- *       identification within third-party archives.
- *
- *    Copyright 2016 Alibaba Group
- *
- *    Licensed 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.dom;
-
-import com.taobao.weex.WXEnvironment;
-import com.taobao.weex.common.Constants;
-import com.taobao.weex.dom.flex.Spacing;
-import com.taobao.weex.ui.component.WXBasicComponentType;
-import com.taobao.weex.utils.WXLogUtils;
-import com.taobao.weex.utils.WXViewUtils;
-
-import java.util.Map;
-
-/**
- * Created by zhengshihan on 2017/2/21.
- */
-
-public class WXRecyclerDomObject extends WXDomObject{
-
-
-    private int mColumnCount = Constants.Value.COLUMN_COUNT_NORMAL;
-    private float mColumnWidth = Constants.Value.AUTO;
-    private float mColumnGap = Constants.Value.COLUMN_GAP_NORMAL;
-    private boolean mIsPreCalculateCellWidth =false;
-
-    public int getLayoutType(){
-        return getAttrs().getLayoutType();
-    }
-
-    public float getColumnGap() {
-        return mColumnGap;
-    }
-
-    public int getColumnCount() {
-        return mColumnCount;
-    }
-
-    public float getColumnWidth() {
-        return mColumnWidth;
-    }
-    @Override
-    public void add(WXDomObject child, int index) {
-        super.add(child, index);
-
-        if (WXBasicComponentType.CELL.equals(child.getType())) {
-            if (!mIsPreCalculateCellWidth) {
-                preCalculateCellWidth();
-            }
-            child.getStyles().put(Constants.Name.WIDTH, mColumnWidth);
-        }
-    }
-
-    public void preCalculateCellWidth(){
-
-        if (getAttrs() != null) {
-            mColumnCount = getAttrs().getColumnCount();
-            mColumnWidth = getAttrs().getColumnWidth();
-            mColumnGap =  getAttrs().getColumnGap();
-
-            float availableWidth = getStyleWidth()-getPadding().get(Spacing.LEFT)-getPadding().get(Spacing.RIGHT);
-            availableWidth = WXViewUtils.getWebPxByWidth(availableWidth,getViewPortWidth());
-
-            if (Constants.Value.AUTO == mColumnCount && Constants.Value.AUTO == mColumnWidth) {
-                mColumnCount = Constants.Value.COLUMN_COUNT_NORMAL;
-            } else if (Constants.Value.AUTO == mColumnWidth && Constants.Value.AUTO != mColumnCount) {
-                mColumnWidth = (availableWidth - ((mColumnCount - 1) * mColumnGap)) / mColumnCount;
-                mColumnWidth = mColumnWidth > 0 ? mColumnWidth :0;
-            } else if (Constants.Value.AUTO != mColumnWidth && Constants.Value.AUTO == mColumnCount) {
-                mColumnCount = Math.round((availableWidth + mColumnGap) / (mColumnWidth + mColumnGap)-0.5f);
-                mColumnCount = mColumnCount > 0 ? mColumnCount :1;
-                mColumnWidth =((availableWidth + mColumnGap) / mColumnCount) - mColumnGap;
-            } else if(Constants.Value.AUTO != mColumnWidth && Constants.Value.AUTO != mColumnCount){
-                int columnCount = Math.round((availableWidth + mColumnGap) / (mColumnWidth + mColumnGap)-0.5f);
-                mColumnCount = columnCount > mColumnCount ? mColumnCount :columnCount;
-                mColumnWidth= ((availableWidth + mColumnGap) / mColumnCount) - mColumnGap;
-            }
-            mIsPreCalculateCellWidth = true;
-            if(WXEnvironment.isApkDebugable()) {
-                WXLogUtils.d("preCalculateCellWidth mColumnGap :" + mColumnGap + " mColumnWidth:" + mColumnWidth + " mColumnCount:" + mColumnCount);
-            }
-
-        }
-    }
-
-    public void updateRecyclerAttr(){
-        preCalculateCellWidth();
-        int count = getChildCount();
-        for(int i=0;i<count; i++){
-            WXDomObject domObject = getChild(i);
-            if(WXBasicComponentType.CELL.equals(domObject.getType())) {
-                getChild(i).getStyles().put(Constants.Name.WIDTH, mColumnWidth);
-            }
-        }
-    }
-
-    @Override
-    public void updateAttr(Map<String, Object> attrs) {
-        super.updateAttr(attrs);
-        if(attrs.containsKey(Constants.Name.COLUMN_COUNT)
-                || attrs.containsKey(Constants.Name.COLUMN_GAP)
-                || attrs.containsKey(Constants.Name.COLUMN_WIDTH)){
-            updateRecyclerAttr();
-        }
-    }
-
-    @Override
-    public void updateStyle(Map<String, Object> styles, boolean byPesudo) {
-        super.updateStyle(styles, byPesudo);
-        if(styles.containsKey(Constants.Name.PADDING)
-                ||styles.containsKey(Constants.Name.PADDING_LEFT)
-                || styles.containsKey(Constants.Name.PADDING_RIGHT)){
-            preCalculateCellWidth();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/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 0d47232..6d8da28 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
@@ -218,8 +218,6 @@ public class WXBasicComponentType {
   public static final String SLIDER = "slider";
   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";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
index 010dd5a..e988d46 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
@@ -223,9 +223,7 @@ public class WXHeader extends WXCell {
 
   public WXHeader(WXSDKInstance instance, WXDomObject node, WXVContainer parent, boolean lazy) {
     super(instance, node, parent, lazy);
-    if(WXBasicComponentType.LIST.equals((parent.getDomObject().getType()))){
-      setSticky(Constants.Value.STICKY);
-    }
+    setSticky(Constants.Value.STICKY);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/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 ccda8d6..142e22f 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
@@ -213,7 +213,6 @@ import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.ArrayMap;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
@@ -286,12 +285,6 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
   private static boolean mAllowCacheViewHolder = true;
   private static boolean mDownForBidCacheViewHolder = false;
 
-
-  protected int mLayoutType = WXRecyclerView.TYPE_LINEAR_LAYOUT;
-  protected int mColumnCount = 1;
-  protected float mColumnGap = 0;
-  protected float mColumnWidth = 0;
-
   private int mOffsetAccuracy = 10;
   private Point mLastReport = new Point(-1, -1);
 
@@ -321,7 +314,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
     int screenH = WXViewUtils.getScreenHeight(WXEnvironment.sApplication);
     int weexH = WXViewUtils.getWeexHeight(getInstanceId());
     int outHeight = height > (weexH >= screenH ? screenH : weexH) ? weexH - getAbsoluteY() : height;
-    return super.measure((int)(width+mColumnGap), outHeight);
+    return super.measure(width, outHeight);
   }
 
   public int getOrientation() {
@@ -685,22 +678,13 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
 
           RecyclerView.LayoutManager layoutManager;
           boolean beforeFirstVisibleItem = false;
-          layoutManager = getHostView().getInnerView().getLayoutManager();
-          if (layoutManager instanceof LinearLayoutManager || layoutManager instanceof GridLayoutManager) {
+          if ((layoutManager = getHostView().getInnerView().getLayoutManager()) instanceof LinearLayoutManager) {
             int fVisible = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
             int pos = mChildren.indexOf(cell);
 
             if (pos <= fVisible) {
               beforeFirstVisibleItem = true;
             }
-          } else if(layoutManager instanceof StaggeredGridLayoutManager){
-            int [] firstItems= new int[3];
-            int fVisible = ((StaggeredGridLayoutManager) layoutManager).findFirstVisibleItemPositions(firstItems)[0];
-            int pos = mChildren.indexOf(cell);
-
-            if (pos <= fVisible) {
-              beforeFirstVisibleItem = true;
-            }
           }
 
           int[] location = new int[2];
@@ -944,25 +928,16 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
     }
 
     if (holder.getComponent() != null && holder.getComponent() instanceof WXCell) {
-<<<<<<< HEAD
       if(holder.isRecycled()) {
         holder.bindData(component);
       }
-=======
-      holder.getComponent().bindData(component);
->>>>>>> 0.11-dev-feature-recycler
     }
 
   }
 
-  protected void markComponentUsable(){
-    for (WXComponent component : mChildren){
-      component.setUsing(false);
-    }
-  }
   /**
    * Create an instance of {@link ListBaseViewHolder} for the given viewType (not for the given
-   * index). This  markComponentUsable();method will look up for the first component that fits the viewType requirement and
+   * index). This method will look up for the first component that fits the viewType requirement and
    * doesn't be used. Then create the certain type of view, detach the view f[rom the component.
    *
    * @param parent   the ViewGroup into which the new view will be inserted
@@ -1258,6 +1233,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
 
             contentOffset.put(Constants.Name.X, - WXViewUtils.getWebPxByWidth(offsetX, getInstance().getViewPortWidth()));
             contentOffset.put(Constants.Name.Y, - WXViewUtils.getWebPxByWidth(offsetY, getInstance().getViewPortWidth()));
+
             event.put(Constants.Name.CONTENT_SIZE, contentSize);
             event.put(Constants.Name.CONTENT_OFFSET, contentOffset);
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
index b95ea9e..648c747 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
@@ -204,6 +204,9 @@
  */
 package com.taobao.weex.ui.component.list;
 
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
 import com.taobao.weex.ui.view.listview.WXRecyclerView;
 import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter;
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java
index 36b9ebb..4fb0e80 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java
@@ -224,12 +224,8 @@ public class SimpleListComponent extends BasicListComponent<SimpleRecyclerView>{
 
   @Override
   protected SimpleRecyclerView generateListView(Context context, int orientation) {
-    return generateListView(context,WXRecyclerView.TYPE_LINEAR_LAYOUT,orientation);
-  }
-
-  protected SimpleRecyclerView generateListView(Context context, int type,int orientation) {
     SimpleRecyclerView view = new SimpleRecyclerView(context);
-    view.initView(context, type, orientation);
+    view.initView(context, WXRecyclerView.TYPE_LINEAR_LAYOUT, orientation);
     return view;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
index 7e1d86d..3e68de1 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
@@ -208,24 +208,16 @@ import android.content.Context;
 
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.annotation.Component;
-import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
-import com.taobao.weex.dom.WXRecyclerDomObject;
-import com.taobao.weex.dom.flex.Spacing;
 import com.taobao.weex.ui.component.WXBaseRefresh;
-import com.taobao.weex.ui.component.WXBasicComponentType;
 import com.taobao.weex.ui.component.WXComponent;
-import com.taobao.weex.ui.component.WXComponentProp;
 import com.taobao.weex.ui.component.WXLoading;
 import com.taobao.weex.ui.component.WXRefresh;
 import com.taobao.weex.ui.component.WXVContainer;
-import com.taobao.weex.ui.view.listview.WXRecyclerView;
 import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder;
 import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView;
 import com.taobao.weex.utils.WXLogUtils;
 
-import java.util.Map;
-
 /**
  * Unlike other components, there is immutable bi-directional association between View and
  * ViewHolder, while only mutable and temporal uni-directional association between view and
@@ -237,36 +229,19 @@ import java.util.Map;
 
 public class WXListComponent extends BasicListComponent<BounceRecyclerView> {
   private String TAG = "WXListComponent";
-  private WXRecyclerDomObject mDomObject;
-  private float mPaddingLeft;
-  private float mPaddingRight;
 
   @Deprecated
   public WXListComponent(WXSDKInstance instance, WXDomObject dom, WXVContainer parent, String instanceId, boolean isLazy) {
     this(instance, dom, parent, isLazy);
   }
 
-
   public WXListComponent(WXSDKInstance instance, WXDomObject node, WXVContainer parent, boolean lazy) {
     super(instance, node, parent);
-    if (node != null && node instanceof WXRecyclerDomObject) {
-      mDomObject = (WXRecyclerDomObject) node;
-      mDomObject.preCalculateCellWidth();
-
-      if(WXBasicComponentType.WATERFALL.equals(node.getType())){
-        mLayoutType = WXRecyclerView.TYPE_STAGGERED_GRID_LAYOUT;
-      }else{
-        mLayoutType = mDomObject.getLayoutType();
-      }
-      updateRecyclerAttr();
-
-    }
   }
 
   @Override
   protected BounceRecyclerView generateListView(Context context, int orientation) {
-
-    return new BounceRecyclerView(context,mLayoutType,mColumnCount,mColumnGap,orientation);
+    return new BounceRecyclerView(context, orientation);
   }
 
   @Override
@@ -311,70 +286,8 @@ public class WXListComponent extends BasicListComponent<BounceRecyclerView> {
       }, 100);
       return true;
     }
-    return false;
-  }
-
-  private void updateRecyclerAttr(){
-    mColumnCount = mDomObject.getColumnCount();
-    mColumnGap = mDomObject.getColumnGap();
-    mColumnWidth = mDomObject.getColumnWidth();
-    mPaddingLeft =mDomObject.getPadding().get(Spacing.LEFT);
-    mPaddingRight =mDomObject.getPadding().get(Spacing.RIGHT);
-  }
-
-  @WXComponentProp(name = Constants.Name.COLUMN_WIDTH)
-  public void setColumnWidth(int columnCount)  {
-    if(mDomObject.getColumnWidth() != mColumnWidth){
-      markComponentUsable();
-      updateRecyclerAttr();
-      WXRecyclerView wxRecyclerView = getHostView().getInnerView();
-      wxRecyclerView.initView(getContext(), mLayoutType,mColumnCount,mColumnGap,getOrientation());
-    }
-  }
-
-  @WXComponentProp(name = Constants.Name.COLUMN_COUNT)
-  public void setColumnCount(int columnCount){
-    if(mDomObject.getColumnCount() != mColumnCount){
-      markComponentUsable();
-      updateRecyclerAttr();
-      WXRecyclerView wxRecyclerView = getHostView().getInnerView();
-      wxRecyclerView.initView(getContext(), mLayoutType,mColumnCount,mColumnGap,getOrientation());
-    }
-  }
-
-  @WXComponentProp(name = Constants.Name.COLUMN_GAP)
-  public void setColumnGap(float columnGap) throws InterruptedException {
-    if(mDomObject.getColumnGap() != mColumnGap) {
-      markComponentUsable();
-      updateRecyclerAttr();
-      WXRecyclerView wxRecyclerView = getHostView().getInnerView();
-      wxRecyclerView.initView(getContext(), mLayoutType, mColumnCount, mColumnGap, getOrientation());
-    }
-  }
-
-  @WXComponentProp(name = Constants.Name.SCROLLABLE)
-  public void setScrollable(boolean scrollable) {
-    WXRecyclerView inner = getHostView().getInnerView();
-    inner.setScrollable(scrollable);
-  }
-
-  @Override
-  public void updateProperties(Map<String, Object> props) {
-    super.updateProperties(props);
-    if(props.containsKey(Constants.Name.PADDING)
-            ||props.containsKey(Constants.Name.PADDING_LEFT)
-            || props.containsKey(Constants.Name.PADDING_RIGHT)){
-
-      if(mPaddingLeft !=mDomObject.getPadding().get(Spacing.LEFT)
-              || mPaddingRight !=mDomObject.getPadding().get(Spacing.RIGHT)) {
-
-        markComponentUsable();
-        updateRecyclerAttr();
-        WXRecyclerView wxRecyclerView = getHostView().getInnerView();
-        wxRecyclerView.initView(getContext(), mLayoutType, mColumnCount, mColumnGap, getOrientation());
-      }
-    }
 
+    return false;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java
index 80feb71..be8afae 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java
@@ -227,31 +227,6 @@ public class ExtendedLinearLayoutManager extends LinearLayoutManager{
     }
 
     @Override
-    public boolean supportsPredictiveItemAnimations() {
-        return false;
-    }
-
-    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
-        try {
-            super.onLayoutChildren(recycler, state);
-        } catch (IndexOutOfBoundsException e) {
-            e.printStackTrace();
-
-        }
-    }
-
-    @Override
-    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, RecyclerView.State state) {
-        try {
-            return super.scrollVerticallyBy(dy, recycler, state);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return 0;
-    }
-
-
-    @Override
     public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,
                                        int position) {
         if (smoothScroller == null) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
index 4352cfe..fe912af 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
@@ -204,9 +204,7 @@
  */
 package com.taobao.weex.ui.view.listview;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.OrientationHelper;
@@ -214,7 +212,6 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.MotionEvent;
 
-import com.taobao.weex.common.Constants;
 import com.taobao.weex.common.WXThread;
 import com.taobao.weex.ui.view.gesture.WXGesture;
 import com.taobao.weex.ui.view.gesture.WXGestureObservable;
@@ -225,6 +222,7 @@ public class WXRecyclerView extends RecyclerView implements WXGestureObservable
   public static final int TYPE_GRID_LAYOUT = 2;
   public static final int TYPE_STAGGERED_GRID_LAYOUT = 3;
   private WXGesture mGesture;
+
   private boolean scrollable = true;
 
   public WXRecyclerView(Context context) {
@@ -243,10 +241,6 @@ public class WXRecyclerView extends RecyclerView implements WXGestureObservable
   public boolean postDelayed(Runnable action, long delayMillis) {
     return super.postDelayed(WXThread.secure(action), delayMillis);
   }
-  public void initView(Context context, int type,int orientation) {
-    initView(context,type, Constants.Value.COLUMN_COUNT_NORMAL,Constants.Value.COLUMN_GAP_NORMAL,orientation);
-  }
-
 
   /**
    *
@@ -254,14 +248,39 @@ public class WXRecyclerView extends RecyclerView implements WXGestureObservable
    * @param type
    * @param orientation should be {@link OrientationHelper#HORIZONTAL} or {@link OrientationHelper#VERTICAL}
    */
-  @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-  public void initView(Context context, int type, int columnCount, float columnGap, int orientation) {
+  public void initView(Context context, int type,int orientation) {
     if (type == TYPE_GRID_LAYOUT) {
-      setLayoutManager(new GridLayoutManager(context, columnCount,orientation,false));
+      setLayoutManager(new GridLayoutManager(context, 2,orientation,false));
     } else if (type == TYPE_STAGGERED_GRID_LAYOUT) {
-      setLayoutManager(new StaggeredGridLayoutManager(columnCount, orientation));
+      setLayoutManager(new StaggeredGridLayoutManager(2, orientation));
     } else if (type == TYPE_LINEAR_LAYOUT) {
-      setLayoutManager(new ExtendedLinearLayoutManager(context,orientation,false));
+      setLayoutManager(new ExtendedLinearLayoutManager(context,orientation,false){
+
+        @Override
+        public boolean supportsPredictiveItemAnimations() {
+          return false;
+        }
+
+        public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+          try {
+            super.onLayoutChildren(recycler, state);
+          } catch (IndexOutOfBoundsException e) {
+             e.printStackTrace();
+
+          }
+        }
+
+        @Override
+        public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, RecyclerView.State state) {
+          try {
+            return super.scrollVerticallyBy(dy, recycler, state);
+          } catch (Exception e) {
+            e.printStackTrace();
+          }
+          return 0;
+        }
+
+      });
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java
index 7ef76bb..903ebd6 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java
@@ -208,7 +208,6 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.taobao.weex.ui.component.WXComponent;
-import com.taobao.weex.ui.component.WXHeader;
 
 import java.lang.ref.WeakReference;
 
@@ -252,11 +251,6 @@ public class ListBaseViewHolder extends RecyclerView.ViewHolder {
       isRecycled = false;
     }
   }
-    
-  public boolean isFullSpan() {
-
-    return mComponent != null && mComponent.get() instanceof WXHeader;
-  }
 
   public boolean canRecycled() {
     if (mComponent != null && mComponent.get() != null) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java
index 2b77146..9c89ed1 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java
@@ -205,7 +205,6 @@
 package com.taobao.weex.ui.view.listview.adapter;
 
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.ViewGroup;
 
 
@@ -214,6 +213,7 @@ import android.view.ViewGroup;
  */
 public class RecyclerViewBaseAdapter<T extends ListBaseViewHolder> extends RecyclerView.Adapter<T> {
 
+  private String TAG = "RecyclerViewBaseAdapter";
   private IRecyclerAdapterListener iRecyclerAdapterListener;
 
   public RecyclerViewBaseAdapter(IRecyclerAdapterListener Listener) {
@@ -222,6 +222,7 @@ public class RecyclerViewBaseAdapter<T extends ListBaseViewHolder> extends Recyc
 
   @Override
   public T onCreateViewHolder(ViewGroup parent, int viewType) {
+    //        WXLogUtils.d(TAG, "onCreateViewHolder viewType:" + viewType);
     if (iRecyclerAdapterListener != null) {
       return (T) iRecyclerAdapterListener.onCreateViewHolder(parent, viewType);
     }
@@ -230,21 +231,8 @@ public class RecyclerViewBaseAdapter<T extends ListBaseViewHolder> extends Recyc
   }
 
   @Override
-  public void onViewAttachedToWindow(T holder) {
-    super.onViewAttachedToWindow(holder);
-    if( holder !=null && holder.isFullSpan()){
-      ViewGroup.LayoutParams lp = holder.itemView.getLayoutParams();
-      if(lp != null
-              && lp instanceof StaggeredGridLayoutManager.LayoutParams
-              ) {
-        StaggeredGridLayoutManager.LayoutParams p = (StaggeredGridLayoutManager.LayoutParams) lp;
-        p.setFullSpan(true);
-      }
-    }
-  }
-
-  @Override
   public void onBindViewHolder(T viewHolder, int i) {
+    //        WXLogUtils.d(TAG, "onBindViewHolder position: " + i);
     if (iRecyclerAdapterListener != null) {
       iRecyclerAdapterListener.onBindViewHolder(viewHolder, i);
     }
@@ -252,6 +240,7 @@ public class RecyclerViewBaseAdapter<T extends ListBaseViewHolder> extends Recyc
 
   @Override
   public int getItemViewType(int position) {
+    //        WXLogUtils.d(TAG, "getItemViewType position:"+position);
     if (iRecyclerAdapterListener != null) {
       return iRecyclerAdapterListener.getItemViewType(position);
     }
@@ -273,6 +262,7 @@ public class RecyclerViewBaseAdapter<T extends ListBaseViewHolder> extends Recyc
 
   @Override
   public void onViewRecycled(T holder) {
+    //        WXLogUtils.d(TAG, "onViewRecycled position ");
     if (iRecyclerAdapterListener != null) {
       iRecyclerAdapterListener.onViewRecycled(holder);
     }
@@ -281,6 +271,7 @@ public class RecyclerViewBaseAdapter<T extends ListBaseViewHolder> extends Recyc
 
   @Override
   public boolean onFailedToRecycleView(T holder) {
+    //        WXLogUtils.d(TAG, "onFailedToRecycleView ");
     if (iRecyclerAdapterListener != null) {
       return iRecyclerAdapterListener.onFailedToRecycleView(holder);
     }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java
index 1cc3dbe..e9e0eb8 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java
@@ -225,27 +225,17 @@ public class WXRecyclerViewOnScrollListener extends RecyclerView.OnScrollListene
   /**
    * The last position
    */
-  private int[] mLastPositions;
-  /**
-   * The first position
-   */
-  private int[] mFirstPositions;
-
-
-  /**
-   * The location of last visible item
-   */
-  private int mLastVisibleItemPosition;
+  private int[] lastPositions;
 
   /**
    * The location of last visible item
    */
-  private int mFirstVisibleItemPosition;
+  private int lastVisibleItemPosition;
 
   /**
    * The state of scroll status
    */
-  private int mCurrentScrollState = 0;
+  private int currentScrollState = 0;
 
   private WeakReference<IOnLoadMoreListener> listener;
 
@@ -256,14 +246,14 @@ public class WXRecyclerViewOnScrollListener extends RecyclerView.OnScrollListene
   @Override
   public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
     super.onScrollStateChanged(recyclerView, newState);
-    mCurrentScrollState = newState;
+    currentScrollState = newState;
     RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
     int visibleItemCount = layoutManager.getChildCount();
     int totalItemCount = layoutManager.getItemCount();
 
     if (visibleItemCount != 0) {
-      int bottomOffset = (totalItemCount - mLastVisibleItemPosition - 1) * (recyclerView.getHeight()) / visibleItemCount;
-      if (visibleItemCount > 0 && mCurrentScrollState == RecyclerView.SCROLL_STATE_IDLE) {
+      int bottomOffset = (totalItemCount - lastVisibleItemPosition - 1) * (recyclerView.getHeight()) / visibleItemCount;
+      if (visibleItemCount > 0 && currentScrollState == RecyclerView.SCROLL_STATE_IDLE) {
         if (listener != null && listener.get() != null) {
           listener.get().onLoadMore(bottomOffset);
         }
@@ -276,49 +266,46 @@ public class WXRecyclerViewOnScrollListener extends RecyclerView.OnScrollListene
     super.onScrolled(recyclerView, dx, dy);
     RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
     IOnLoadMoreListener l;
-    if ((l = listener.get()) != null) {
-      l.onBeforeScroll(dx, dy);
+    if((l = listener.get()) != null){
+      l.onBeforeScroll(dx,dy);
     }
 
     //  int lastVisibleItemPosition = -1;
-    if (layoutManager instanceof LinearLayoutManager) {
-      layoutManagerType = LAYOUT_MANAGER_TYPE.LINEAR;
-      mLastVisibleItemPosition = ((LinearLayoutManager) layoutManager).findLastVisibleItemPosition();
-      listener.get().notifyAppearStateChange(((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition()
-              , mLastVisibleItemPosition
-              , dx
-              , dy);
-    } else if (layoutManager instanceof GridLayoutManager) {
-      layoutManagerType = LAYOUT_MANAGER_TYPE.GRID;
-      GridLayoutManager gridLayoutManager = ((GridLayoutManager) layoutManager);
-      mLastVisibleItemPosition = gridLayoutManager.findLastVisibleItemPosition();
-      listener.get().notifyAppearStateChange(((GridLayoutManager) layoutManager).findFirstVisibleItemPosition()
-              , mLastVisibleItemPosition
-              , dx
-              , dy);
-
-    } else if (layoutManager instanceof StaggeredGridLayoutManager) {
-      layoutManagerType = LAYOUT_MANAGER_TYPE.STAGGERED_GRID;
-      StaggeredGridLayoutManager staggeredGridLayoutManager = (StaggeredGridLayoutManager) layoutManager;
-      int newspanCount = staggeredGridLayoutManager.getSpanCount();
-      if (mLastPositions == null || newspanCount != mLastPositions.length ) {
-        mLastPositions = new int[newspanCount];
+    if (layoutManagerType == null) {
+      if (layoutManager instanceof LinearLayoutManager) {
+        layoutManagerType = LAYOUT_MANAGER_TYPE.LINEAR;
+      } else if (layoutManager instanceof GridLayoutManager) {
+        layoutManagerType = LAYOUT_MANAGER_TYPE.GRID;
+      } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+        layoutManagerType = LAYOUT_MANAGER_TYPE.STAGGERED_GRID;
+      } else {
+        throw new RuntimeException(
+            "Unsupported LayoutManager used. Valid ones are LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager");
       }
-      if (mFirstPositions == null || newspanCount != mFirstPositions.length) {
-        mFirstPositions = new int[newspanCount];
-      }
-      staggeredGridLayoutManager.findFirstVisibleItemPositions(mFirstPositions);
-      mFirstVisibleItemPosition = findMin(mFirstPositions);
-      staggeredGridLayoutManager.findLastVisibleItemPositions(mLastPositions);
-      mLastVisibleItemPosition = findMax(mLastPositions);
-      listener.get().notifyAppearStateChange(
-              mFirstVisibleItemPosition
-              , mLastVisibleItemPosition
-              , dx
-              , dy);
-    } else {
-      throw new RuntimeException(
-              "Unsupported LayoutManager used. Valid ones are LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager");
+    }
+
+    switch (layoutManagerType) {
+      case LINEAR:
+        lastVisibleItemPosition = ((LinearLayoutManager) layoutManager)
+            .findLastVisibleItemPosition();
+        listener.get().notifyAppearStateChange(((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition()
+            ,lastVisibleItemPosition
+            ,dx
+            ,dy);
+        break;
+      case GRID:
+        lastVisibleItemPosition = ((GridLayoutManager) layoutManager)
+            .findLastVisibleItemPosition();
+        break;
+      case STAGGERED_GRID:
+        StaggeredGridLayoutManager staggeredGridLayoutManager
+            = (StaggeredGridLayoutManager) layoutManager;
+        if (lastPositions == null) {
+          lastPositions = new int[staggeredGridLayoutManager.getSpanCount()];
+        }
+        staggeredGridLayoutManager.findLastVisibleItemPositions(lastPositions);
+        lastVisibleItemPosition = findMax(lastPositions);
+        break;
     }
   }
 
@@ -332,16 +319,6 @@ public class WXRecyclerViewOnScrollListener extends RecyclerView.OnScrollListene
     return max;
   }
 
-  private int findMin(int[] firstPositions) {
-    int min = firstPositions[0];
-    for (int value : firstPositions) {
-      if (value < min) {
-        min = value;
-      }
-    }
-    return min;
-  }
-
   public enum LAYOUT_MANAGER_TYPE {
     LINEAR,
     GRID,

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
index e6054bf..1809a78 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
@@ -230,22 +230,23 @@ public abstract class BaseBounceView<T extends View> extends FrameLayout {
 
     private int mOrientation = OrientationHelper.VERTICAL;
     protected WXSwipeLayout swipeLayout;
-    private T mInnerView;
+    private T innerView;
 
     public BaseBounceView(Context context,int orientation) {
         this(context, null,orientation);
     }
 
-    public BaseBounceView(Context context, AttributeSet attrs,int orientation) {
+    public BaseBounceView(Context context, AttributeSet attrs,int orientataion) {
         super(context, attrs);
-        mOrientation = orientation;
+        mOrientation = orientataion;
+        init(context);
     }
 
     public int getOrientation(){
         return mOrientation;
     }
 
-    public void init(Context context) {
+    private void init(Context context) {
         createBounceView(context);
     }
 
@@ -274,15 +275,15 @@ public abstract class BaseBounceView<T extends View> extends FrameLayout {
     }
 
     /**
-     * Init wipelayout
+     * Init Swipelayout
      */
     private WXSwipeLayout createBounceView(Context context) {
         swipeLayout = new WXSwipeLayout(context);
         swipeLayout.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
-        mInnerView = setInnerView(context);
-        if (mInnerView == null)
+        innerView = setInnerView(context);
+        if (innerView == null)
             return null;
-        swipeLayout.addView(mInnerView, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+        swipeLayout.addView(innerView, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
         addView(swipeLayout, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         return swipeLayout;
     }
@@ -291,7 +292,7 @@ public abstract class BaseBounceView<T extends View> extends FrameLayout {
      * @return the child of swipelayout : recyclerview or scrollview
      */
     public T getInnerView() {
-        return mInnerView;
+        return innerView;
     }
 
     public abstract T setInnerView(Context context);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
index abbdf0d..2d81b37 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
@@ -206,6 +206,8 @@ package com.taobao.weex.ui.view.refresh.wrapper;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.OrientationHelper;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -221,33 +223,24 @@ import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter;
 
 import java.util.Stack;
 
-
 public class BounceRecyclerView extends BaseBounceView<WXRecyclerView> implements ListComponentView,WXGestureObservable {
 
   private RecyclerViewBaseAdapter adapter = null;
   private Stack<View> headerViewStack = new Stack<>();
   private Stack<WXCell> headComponentStack = new Stack<>();
   private WXGesture mGesture;
-  private int mLayoutType = WXRecyclerView.TYPE_LINEAR_LAYOUT;
-  private int mColumnCount = 1;
-  private float mColumnGap = 1;
 
   @Override
   public boolean postDelayed(Runnable action, long delayMillis) {
     return super.postDelayed(WXThread.secure(action), delayMillis);
   }
 
-  public BounceRecyclerView(Context context,int type,int columnCount,float columnGap,int orientation) {
+  public BounceRecyclerView(Context context, int orientation) {
     super(context, orientation);
-    mLayoutType = type;
-    mColumnCount = columnCount;
-    mColumnGap = columnGap;
-    init(context);
   }
-  public BounceRecyclerView(Context context,int type,int orientation) {
-    super(context, orientation);
-    mLayoutType = type;
-    init(context);
+
+  public BounceRecyclerView(Context context, AttributeSet attrs) {
+    super(context, attrs, OrientationHelper.VERTICAL);
   }
 
   public void setRecyclerViewBaseAdapter(RecyclerViewBaseAdapter adapter) {
@@ -269,11 +262,11 @@ public class BounceRecyclerView extends BaseBounceView<WXRecyclerView> implement
     }
     return result;
   }
-
+    
   @Override
   public WXRecyclerView setInnerView(Context context) {
     WXRecyclerView wxRecyclerView = new WXRecyclerView(context);
-    wxRecyclerView.initView(context, mLayoutType,mColumnCount,mColumnGap,getOrientation());
+    wxRecyclerView.initView(context, WXRecyclerView.TYPE_LINEAR_LAYOUT, getOrientation());
     return wxRecyclerView;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java
index 7d8a990..cc30556 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java
@@ -219,7 +219,6 @@ public class BounceScrollerView extends BaseBounceView<WXScrollView> {
 
     public BounceScrollerView(Context context, int orientation, WXScroller waScroller) {
         super(context,orientation);
-        init(context);
         if (getInnerView() != null)
             getInnerView().setWAScroller(waScroller);
     }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/examples/vue/components/waterfall.vue
----------------------------------------------------------------------
diff --git a/examples/vue/components/waterfall.vue b/examples/vue/components/waterfall.vue
deleted file mode 100644
index 7bf42f9..0000000
--- a/examples/vue/components/waterfall.vue
+++ /dev/null
@@ -1,455 +0,0 @@
-<template>
-  <waterfall class="page"
-  v-bind:style="{padding:padding}"
-  :column-width="columnWidth" :column-count="columnCount" :column-gap="columnGap"
-  :show-scrollbar="showScrollbar" :scrollable="scrollable"
-  @scroll="recylerScroll"
-  >
-    <refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown" :display="refreshing ? 'show' : 'hide'">
-      <loading-indicator class="indicator"></loading-indicator>
-      <text class="refreshText">{{refreshText}}</text>
-    </refresh>
-    <header class="header" ref="header" v-if="showHeader">
-      <image class="banner" src="https://gw.alicdn.com/tps/TB1ESN1PFXXXXX1apXXXXXXXXXX-1000-600.jpg" resize="cover">
-        <div class="bannerInfo">
-          <image class="avatar" src="https://gw.alicdn.com/tps/TB1EP9bPFXXXXbpXVXXXXXXXXXX-150-110.jpg" resize="cover"></image>
-          <text class="name">Adam Cat</text>
-          <div class="titleWrap">
-            <text class="title">Genius</text>
-          </div>
-        </div>
-        <div class="bannerPhotoWrap">
-          <image class="bannerPhoto" v-for="photo in banner.photos" :src="photo.src"></image>
-        </div>
-      </image>
-    </header>
-    <header class="stickyHeader" @click="showOrRemoveHeader">
-      <div v-if="stickyHeaderType === 'none'" class="stickyWrapper">
-        <text class="stickyText">Sticky Header</text>
-      </div>
-      <div v-if="stickyHeaderType === 'appear'" class="stickyWrapper">
-        <div class="stickyTextImageWrapper">
-          <text class="stickyText">Last Appear:</text>
-          <image class="stickyImage" :src="appearImage"></image>
-        </div>
-        <div class="stickyTextImageWrapper">
-          <text class="stickyText">Last Disappear:</text>
-          <image class="stickyImage" :src="disappearImage"></image>
-        </div>
-      </div>
-      <div v-if="stickyHeaderType === 'scroll'" class="stickyWrapper">
-        <text class="stickyText">Content Offset:{{contentOffset}}</text>
-      </div>
-    </header>
-    <cell v-for="(item, index) in items" :key="item.src" class="cell">
-      <div class="item" @click="onItemclick(item.behaviour, index)" @appear="itemAppear(item.src)" @disappear="itemDisappear(item.src)">
-        <text v-if="item.name" class="itemName">{{item.name}}</text>
-        <image class="itemPhoto" :src="item.src"></image>
-        <text v-if="item.desc" class="itemDesc">{{item.desc}}</text>
-        <text v-if="item.behaviourName" class="itemClickBehaviour"> {{item.behaviourName}}</text>
-      </div>
-    </cell>
-    <div class="fixedItem" @click="scrollToTop">
-      <text class="fixedText">Top</text>
-    </div>
-  </waterfall>
-</template>
-
-<style>
-  .page {
-    background-color: #EFEFEF;
-  }
-  .refresh {
-    height: 128;
-    width: 750;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-  }
-  .refreshText {
-    color: #888888;
-    font-weight: bold;
-  }
-  .indicator {
-    color: #888888;
-    height: 40;
-    width: 40;
-    margin-right: 30;
-  }
-  .header {
-  }
-  .banner {
-    height: 377;
-    flex-direction: row;
-  }
-  .bannerInfo {
-    width:270;
-    align-items: center;
-    justify-content: center;
-  }
-  .avatar {
-    width: 148;
-    height: 108;
-    border-radius: 54;
-    border-width: 4;
-    border-color: #FFFFFF;
-    margin-bottom: 14;
-  }
-  .name {
-    font-weight: bold;
-    font-size:32;
-    color:#ffffff;
-    line-height:32;
-    text-align:center;
-    margin-bottom: 16;
-  }
-  .titleWrap {
-    width: 100;
-    height: 24;
-    margin-bottom: 10;
-    background-color: rgba(255,255,255,0.80);
-    border-radius: 12;
-    justify-content: center;
-    align-items: center;
-  }
-  .title {
-    font-size: 20;
-    color: #000000;
-  }
-  .bannerPhotoWrap {
-    width: 449;
-    height: 305;
-    background-color: #FFFFFF;
-    border-radius: 12;
-    margin-top: 35;
-    padding: 12;
-    flex-direction: row;
-    justify-content: space-between;
-    flex-wrap:wrap;
-  }
-  .bannerPhoto {
-    width: 137;
-    height: 137;
-    margin-bottom: 6;
-  }
-  .stickyHeader {
-    position: sticky;
-    height: 94;
-    flex-direction: row;
-    padding-bottom:6;
-  }
-  .stickyWrapper {
-    flex-direction: row;
-    background-color:#00cc99;
-    justify-content: center;
-    align-items: center;
-    flex:1;
-  }
-  .stickyTextImageWrapper {
-    flex:1;
-    justify-content: center;
-    align-items: center;
-    flex-direction: row;
-  }
-  .stickyText {
-    color: #FFFFFF;
-    font-weight: bold;
-    font-size:32;
-    margin-right: 12;
-  }
-  .stickyImage {
-    width: 64;
-    height: 64;
-    border-radius: 32;
-  }
-
-  .cell {
-    padding-top: 6;
-    padding-bottom: 6;
-  }
-  .item {
-    background-color: #FFFFFF;
-    align-items: center;
-  }
-  .itemName {
-    font-size:28;
-    color:#333333;
-    line-height:42;
-    text-align:left;
-    margin-top: 24;
-  }
-  .itemPhoto {
-    margin-top: 18;
-    width: 220;
-    height: 220;
-    margin-bottom: 18;
-  }
-  .itemDesc {
-    font-size:24;
-    margin:12;
-    color:#999999;
-    line-height:36;
-    text-align:left;
-  }
-  .itemClickBehaviour {
-    font-size:36;
-    color:#00cc99;
-    line-height:36;
-    text-align:center;
-    margin-top: 6;
-    margin-left: 24;
-    margin-right: 24;
-    margin-bottom: 30;
-  }
-
-  .fixedItem {
-    position: fixed;
-    width:78;
-    height:78;
-    background-color:#00cc99;
-    right: 32;
-    bottom: 32;
-    border-radius: 39;
-    align-items: center;
-    justify-content: center;
-  }
-  .fixedText {
-    font-size: 36;
-    color: white;
-    line-height: 36;
-  }
-
-</style>
-
-<script>
-  export default {
-    data: function() {
-      const items = [
-        {
-          src:'https://gw.alicdn.com/tps/TB1Jl1CPFXXXXcJXXXXXXXXXXXX-370-370.jpg',
-          name: 'Thomas Carlyle',
-          desc:'Genius only means hard-working all one\'s life',
-          behaviourName: 'Change count',
-          behaviour: 'changeColumnCount'
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1Hv1JPFXXXXa3XXXXXXXXXXXX-370-370.jpg',
-          desc:'The man who has made up his mind to win will never say "impossible "',
-          behaviourName: 'Change gap',
-          behaviour: 'changeColumnGap'
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1eNKuPFXXXXc_XpXXXXXXXXXX-370-370.jpg',
-          desc:'There is no such thing as a great talent without great will - power',
-          behaviourName: 'Show scrollbar',
-          behaviour: 'showScrollbar',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1DCh8PFXXXXX7aXXXXXXXXXXX-370-370.jpg',
-          name:'Addison',
-          desc:'Cease to struggle and you cease to live',
-          behaviourName: 'Change width',
-          behaviour: 'changeColumnWidth',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1ACygPFXXXXXwXVXXXXXXXXXX-370-370.jpg',
-          desc:'A strong man will struggle with the storms of fate',
-          behaviourName: 'Listen appear',
-          behaviour: 'listenAppear',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1IGShPFXXXXaqXVXXXXXXXXXX-370-370.jpg',
-          name:'Ruskin',
-          desc:'Living without an aim is like sailing without a compass',
-          behaviourName: 'Set scrollable',
-          behaviour: 'setScrollable',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1xU93PFXXXXXHaXXXXXXXXXXX-240-240.jpg',
-          behaviourName: 'waterfall padding',
-          behaviour: 'setPadding',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB19hu0PFXXXXaXaXXXXXXXXXXX-240-240.jpg',
-          name:'Balzac',
-          desc:'There is no such thing as a great talent without great will - power',
-          behaviourName: 'listen scroll',
-          behaviour: 'listenScroll',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1ux2vPFXXXXbkXXXXXXXXXXXX-240-240.jpg',
-          behaviourName: 'Remove cell',
-          behaviour: 'removeCell',
-        },
-        {
-          src:'https://gw.alicdn.com/tps/TB1tCCWPFXXXXa7aXXXXXXXXXXX-240-240.jpg',
-          behaviourName: 'Move cell',
-          behaviour: 'moveCell',
-        }
-      ]
-
-      let repeatItems = [];
-      for (let i = 0; i < 3; i++) {
-        repeatItems.push(...items)
-      }
-
-      return {
-        padding: 0,
-        refreshing: false,
-        refreshText: '\u2193   pull to refresh...',
-        columnCount: 2,
-        columnGap: 12,
-        columnWidth: 'auto',
-        contentOffset: '0',
-        showHeader: true,
-        showScrollbar: false,
-        scrollable: true,
-        showStickyHeader: false,
-        appearImage: null,
-        disappearImage: null,
-        stickyHeaderType: 'none',
-        banner: {
-          photos: [
-            {src:'https://gw.alicdn.com/tps/TB1JyaCPFXXXXc9XXXXXXXXXXXX-140-140.jpg'},
-            {src:'https://gw.alicdn.com/tps/TB1MwSFPFXXXXbdXXXXXXXXXXXX-140-140.jpg'},
-            {src:'https://gw.alicdn.com/tps/TB1U8avPFXXXXaDXpXXXXXXXXXX-140-140.jpg'},
-            {src:'https://gw.alicdn.com/tps/TB17Xh8PFXXXXbkaXXXXXXXXXXX-140-140.jpg'},
-            {src:'https://gw.alicdn.com/tps/TB1cTmLPFXXXXXRXXXXXXXXXXXX-140-140.jpg'},
-            {src:'https://gw.alicdn.com/tps/TB1oCefPFXXXXbVXVXXXXXXXXXX-140-140.jpg'}
-          ]
-        },
-        items: repeatItems
-      }
-    },
-
-    methods: {
-      recylerScroll: function(e) {
-        this.contentOffset = e.contentOffset.y
-      },
-      showOrRemoveHeader: function() {
-        this.showHeader = !this.showHeader
-      },
-      onItemclick: function (behaviour, index) {
-        console.log(`click...${behaviour} at index ${index}`)
-        switch (behaviour) {
-          case 'changeColumnCount':
-            this.changeColumnCount()
-            break
-          case 'changeColumnGap':
-            this.changeColumnGap()
-            break
-          case 'changeColumnWidth':
-            this.changeColumnWidth()
-            break
-          case 'showScrollbar':
-            this.showOrHideScrollbar()
-            break
-          case 'listenAppear':
-            this.listenAppearAndDisappear()
-            break
-          case 'setScrollable':
-            this.setScrollable()
-            break
-          case 'setPadding':
-            this.setRecyclerPadding()
-            break
-          case 'listenScroll':
-            this.listenScrollEvent()
-            break
-          case 'removeCell':
-            this.removeCell(index)
-            break
-          case 'moveCell':
-            this.moveCell(index)
-            break
-        }
-      },
-
-      itemAppear: function(src) {
-        this.appearImage = src;
-      },
-
-      itemDisappear: function(src) {
-        this.disappearImage = src;
-      },
-
-      changeColumnCount: function() {
-        if (this.columnCount === 2) {
-          this.columnCount = 3
-        } else {
-          this.columnCount = 2
-        }
-      },
-
-      changeColumnGap: function() {
-        if (this.columnGap === 12) {
-          this.columnGap = 'normal'
-        } else {
-          this.columnGap = 12
-        }
-      },
-
-      changeColumnWidth: function() {
-        if (this.columnWidth === 'auto') {
-          this.columnWidth = 600
-        } else {
-          this.columnWidth = 'auto'
-        }
-      },
-
-      showOrHideScrollbar: function() {
-        this.showScrollbar = !this.showScrollbar
-      },
-
-      setScrollable: function() {
-        this.scrollable = !this.scrollable
-      },
-
-      listenAppearAndDisappear: function() {
-        this.stickyHeaderType = (this.stickyHeaderType === 'appear' ? 'none' : 'appear')
-      },
-
-      listenScrollEvent: function() {
-        this.stickyHeaderType = (this.stickyHeaderType === 'scroll' ? 'none' : 'scroll')
-      },
-
-      scrollToTop: function() {
-        weex.requireModule('dom').scrollToElement(this.$refs.header)
-      },
-
-      setRecyclerPadding: function() {
-        this.padding = (this.padding == 0 ? 12 : 0);
-      },
-
-      removeCell: function(index) {
-        this.items.splice(index, 1)
-      },
-
-      moveCell: function(index) {
-        if (index == 0) {
-          this.items.splice(this.items.length - 1, 0, this.items.splice(index, 1)[0]);
-        } else {
-          this.items.splice(0, 0, this.items.splice(index, 1)[0]);
-        }
-      },
-
-      onrefresh (event) {
-        this.refreshing = true
-        this.refreshText = "loading..."
-        setTimeout(() => {
-          this.refreshing = false
-          this.refreshText = '\u2193   pull to refresh...'
-        }, 2000)
-      },
-
-      onpullingdown (event) {
-        // console.log(`${event.pullingDistance}`)
-        if (event.pullingDistance < -64) {
-          this.refreshText = '\u2191   release to refresh...'
-        } else {
-          this.refreshText = '\u2193   pull to refresh...'
-        }
-      }
-    }
-  }
-</script>

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/examples/vue/index.vue
----------------------------------------------------------------------
diff --git a/examples/vue/index.vue b/examples/vue/index.vue
index dffc5f3..80af3b8 100644
--- a/examples/vue/index.vue
+++ b/examples/vue/index.vue
@@ -19,7 +19,6 @@
           {name: root + '/components/input', title: 'Input'},
           {name: root + '/components/scroller', title: 'Scroller'},
           {name: root + '/components/list', title: 'List'},
-          {name: root + '/components/waterfall', title: 'Waterfall'},
           {name: root + '/components/slider', title: 'Slider'},
           {name: root + '/components/a', title: 'A'},
           {name: root + '/components/video', title: 'Video'},

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index c7be756..c8d1d35 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -1,4 +1,4 @@
-source 'git@github.com:CocoaPods/Specs.git'
+source 'git@github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'
 #inhibit_all_warnings!
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/playground/WeexDemo/DemoDefine.h
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/DemoDefine.h b/ios/playground/WeexDemo/DemoDefine.h
index fe07a7b..478ecb5 100644
--- a/ios/playground/WeexDemo/DemoDefine.h
+++ b/ios/playground/WeexDemo/DemoDefine.h
@@ -18,7 +18,7 @@
 
 #define DEMO_URL(path) [NSString stringWithFormat:@"http://%@:12580/%s", DEMO_HOST, #path]
 
-#define HOME_URL [NSString stringWithFormat:@"http://%@:12580/examples/build/vue/index.js", DEMO_HOST]
+#define HOME_URL [NSString stringWithFormat:@"http://%@:12580/examples/build/index.js", DEMO_HOST]
 
 #define BUNDLE_URL [NSString stringWithFormat:@"file://%@/bundlejs/index.js",[NSBundle mainBundle].bundlePath]
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/playground/WeexDemo/UIView+UIThreadCheck.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/UIView+UIThreadCheck.m b/ios/playground/WeexDemo/UIView+UIThreadCheck.m
index 579eab9..e499f53 100644
--- a/ios/playground/WeexDemo/UIView+UIThreadCheck.m
+++ b/ios/playground/WeexDemo/UIView+UIThreadCheck.m
@@ -10,7 +10,7 @@
 #import <WeexSDK/NSObject+WXSwizzle.h>
 
 #define WXCheckUIThread() NSAssert([NSThread isMainThread], \
-@"You must change UI on main thread!")
+@"You can not change UI on main thread!")
 
 @implementation UIView (UIThreadCheck)
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3621001f/ios/playground/WeexDemo/WXDemoViewController.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/WXDemoViewController.m b/ios/playground/WeexDemo/WXDemoViewController.m
index f962df0..d354078 100644
--- a/ios/playground/WeexDemo/WXDemoViewController.m
+++ b/ios/playground/WeexDemo/WXDemoViewController.m
@@ -94,8 +94,7 @@
 - (void)dealloc
 {
     [_instance destroyInstance];
-    
-#ifdef DEBUG
+#if DEBUG
     [_instance forceGarbageCollection];
 #endif