Merge branch '5.5.0' into 5.5.1

Conflicts:
	js/mine/containers/MineContainer.js

@@ -397,9 +397,6 @@ export default class BrandStore extends Component {
                             this.props.onEndReached && this.props.onEndReached();
                         }
                     }}
-                    onChangeVisibleRows={this._onChangeVisibleRows}
-                    onMomentumScrollBegin={this._onMomentumScrollBegin}
-                    onMomentumScrollEnd={this._onMomentumScrollEnd}
                 />
 
                 {productList.isFilter ?

@@ -88,7 +88,7 @@ class BrandStoreContainer extends Component {
         this.props.actions.getShopCouponList();
         this.props.actions.getShopResources();
         this.props.actions.getFavoriteState();
-        this.props.actions.setShowSimilarGuider(true);
+        // this.props.actions.setShowSimilarGuider(true);
 
         ReactNative.NativeModules.YH_CommonHelper.logEvent('YB_BRAND_SHOP_L', {SHOP_ID: this.props.brandStore.shopId, BRAND_ID: this.props.brandStore.resource.brandBrowse.brandId});
     }

@@ -627,7 +627,7 @@ export default class Home extends Component {
                     dataSource={['新品到着', '人气单品']}
                     onSelectdIndex={selectIndex}
                     onClickSort={(index) => {
-                        this.lifeStyleTabBarY && this.listView.scrollTo({x: 0, y: this.lifeStyleTabBarY, animated: true});
+                        this.lifeStyleTabBarY && this.listView.scrollTo({x: 0, y: this.lifeStyleTabBarY, animated: false});
                         this.props.onClickSort && this.props.onClickSort(index);
                     }}
                     onLayout={(event) => {
@@ -727,15 +727,15 @@ export default class Home extends Component {
                                 this.listView && this.listView.yh_updateVisibleSubViews();//ios 专用
                             }}//ios 专用
                             onEndReached={() => {
+                                console.log('onEndReachedonEndReachedonEndReached')
                                 this.props.onEndReached && this.props.onEndReached();
                             }}
                             renderFooter={this._renderFooter}
                             onScroll={this._onScroll}
                             initialListSize={50}
                             pageSize={50}
-                            onChangeVisibleRows={this._onChangeVisibleRows}
-                            onMomentumScrollBegin={this._onMomentumScrollBegin}
-                            onMomentumScrollEnd={this._onMomentumScrollEnd}
+                            scrollRenderAheadDistance={2000}
+                            onEndReachedThreshold={2000}
                         />
                         :
                         <ListView

@@ -109,7 +109,7 @@ class HomeContainer extends Component {
     componentDidMount() {
         this.props.actions.loadChannelCachedData();
         this.home && this.home.trigggePullToRefresh();
-        this.props.actions.setShowSimilarGuider(true);
+        // this.props.actions.setShowSimilarGuider(true);
     }
 
     componentWillUnmount() {
@@ -329,6 +329,7 @@ let styles = StyleSheet.create({
     container: {
         width,
         height: height - 64 - 49,
+        flex: 1,
     },
 });
 

@@ -154,9 +154,6 @@ export default class MineList extends React.Component {
                             this.props.onMineCenterRefresh && this.props.onMineCenterRefresh();
                         }
                     }}
-                    onChangeVisibleRows={this._onChangeVisibleRows}
-                    onMomentumScrollBegin={this._onMomentumScrollBegin}
-                    onMomentumScrollEnd={this._onMomentumScrollEnd}
                 />
             </View>
         );

@@ -90,8 +90,8 @@ class MineContainer extends Component {
         this.props.actions.getProductListForMineCenter();
         this.props.actions.onMineCenterRefresh();
         this.props.actions.getMineAllIcon();
-        this.props.actions.setShowSimilarGuider(true);
         this.props.actions.getMineResource();
+        // this.props.actions.setShowSimilarGuider(true);
     }
 
     componentWillUnmount() {

@@ -422,9 +422,6 @@ export default class NewArrival extends Component {
                             this.setState({showBackToTopButton: true});
                         }
                     }}
-                    onChangeVisibleRows={this._onChangeVisibleRows}
-                    onMomentumScrollBegin={this._onMomentumScrollBegin}
-                    onMomentumScrollEnd={this._onMomentumScrollEnd}
                 />
                 {productList.isFilter ?
                     <NewArrivalCategoryList

@@ -70,7 +70,7 @@ class NewArrivalContainer extends Component {
     componentDidMount() {
         this.props.actions.getTopInfo();
         this.props.actions.getProductList();
-        this.props.actions.setShowSimilarGuider(true);
+        // this.props.actions.setShowSimilarGuider(true);
     }
 
     componentWillUnmount() {

@@ -248,9 +248,6 @@ export default class RedBrand extends Component {
                             this.props.onEndReached && this.props.onEndReached();
                         }
                     }}
-                    onChangeVisibleRows={this._onChangeVisibleRows}
-                    onMomentumScrollBegin={this._onMomentumScrollBegin}
-                    onMomentumScrollEnd={this._onMomentumScrollEnd}
                 />
 
                 {productList.isFilter ?

@@ -66,7 +66,7 @@ class RedPersonBrandContainer extends Component {
         this.props.actions.getShopCouponList();
         this.props.actions.getFavoriteCount();
         this.props.actions.getFavoriteState();
-        this.props.actions.setShowSimilarGuider(true);
+        // this.props.actions.setShowSimilarGuider(true);
     }
 
     componentWillUnmount() {