Merge branch '5.4.1' of http://git.yoho.cn/mobile/YH_RNComponent into 5.4.1

@@ -21,13 +21,25 @@ import Announcement from '../floor/Announcement';
 import SingleImage from '../floor/SingleImage';
 import SingleNameImage from '../floor/SingleNameImage';
 import TrendsetterCollocation from '../floor/TrendsetterCollocation';
+import TrendgoodsTopic from '../floor/TrendgoodsTopic';
 import KidsBrandFloor from '../floor/KidsBrandFloor';
 import DivideImage from '../floor/DivideImage';
 import NewProductFloor from '../floor/NewProductFloor';
+import PopularSingleProduct from '../floor/PopularSingleProduct';
+import ShopRecommend from '../floor/ShopRecommend';
+import SixLinesFloor from '../floor/SixLinesFloor';
+import LivePicture from '../floor/LivePicture';
 import SmallPic from '../floor/SmallPic';
+import RecommendContentOne from '../floor/RecommendContentOne';
+import RecommendContentTwo from '../floor/RecommendContentTwo';
+import RecommendContentThree from '../floor/RecommendContentThree';
+import RecommendContentFive from '../floor/RecommendContentFive';
+import CustomBrands from '../floor/CustomBrands';
 import NewUserFloor from '../floor/NewUserFloor';
 import VipUserFloor from '../floor/VipUserFloor';
 import ActivityProductFloor from '../floor/ActivityProductFloor';
+import HotCategoryIndividualization from '../floor/HotCategoryIndividualization';
+
 
 export default class Home extends Component {
 
@@ -99,7 +111,6 @@ export default class Home extends Component {
                         backImage={rowData.get('back_image')}
                         data={rowData.get('data')}
                         number={rowData.get('number')}
-                        onPressAppIconItem={this.props.onPressAppIconItem}
                     />
                 );
             }
@@ -134,9 +145,65 @@ export default class Home extends Component {
                     />
                 );
             }
-            case 'trendsetterCollocation': {
+            case 'recommend_content_one': {
+                return (
+                    <RecommendContentOne 
+                        data={rowData.get('data')} 
+                        onPressRecommendSlideItem={this.props.onPressRecommendSlideItem}
+                        onPressRecommendListItem={this.props.onPressRecommendListItem}
+                    />
+                );
+            }
+            case 'recommend_content_two': {
                 return (
-                    <TrendsetterCollocation />
+                    <RecommendContentTwo 
+                        data={rowData.get('data')} 
+                        onPressRecommendSlideItem={this.props.onPressRecommendSlideItem}
+                        onPressRecommendListItem={this.props.onPressRecommendListItem}
+                    />
+                );
+            }
+            case 'recommend_content_three': {
+                return (
+                    <RecommendContentThree 
+                        data={rowData.get('data')} 
+                        onPressRecommendSlideItem={this.props.onPressRecommendSlideItem}
+                        onPressRecommendListItem={this.props.onPressRecommendListItem}
+                    />
+                );
+            }
+            case 'recommend_content_five': {
+                return (
+                    <RecommendContentFive 
+                        data={rowData.get('data')} 
+                        onPressRecommendSlideItem={this.props.onPressRecommendSlideItem}
+                        onPressRecommendListItem={this.props.onPressRecommendListItem}
+                    />
+                );
+            }
+            case 'trendsetter_collocation': {
+                return (
+                    <TrendsetterCollocation 
+                        data={rowData.get('data')}
+                        onPressTrendArticleItem={this.props.onPressTrendArticleItem}
+                        onPressTrendRecommendItem={this.props.onPressTrendRecommendItem}
+                    />
+                );
+            }
+            case 'trendgoods_topic': {
+                return (
+                    <TrendgoodsTopic 
+                        data={rowData.get('data')}
+                        onPressTrendTopicItem={this.props.onPressTrendTopicItem}
+                    />
+                );
+            }
+            case 'custom_brands': {
+                return (
+                    <CustomBrands
+                        data={rowData.get('data')} 
+                        onPressCustomBrandItem={this.props.onPressCustomBrandItem}
+                    />
                 );
             }
                 break;
@@ -154,29 +221,57 @@ export default class Home extends Component {
                 );
             }
             case 'divideImage': {
-                let data = rowData.get('data');
                 return (
-                    <DivideImage data={data}/>
+                    <DivideImage data={rowData.get('data')}/>
                 );
             }
             case 'NewProductFloor': {
-                let data = rowData.get('data');
                 return (
                     <NewProductFloor
-                        data={data}
+                        data={rowData.get('data')}
                         onPressImageItem={this.props.onPressImageItem}
                     />
                 );
             }
+            case 'popular_single_product':{
+                return (
+                  <PopularSingleProduct 
+                    data={rowData.get('data')}
+                    onPressImageItem={this.props.onPressImageItem}/>
+                )
+            }
+            case 'shopRecommend':{
+                return (
+                  <ShopRecommend data={JSON.stringify(rowData)} />
+                )
+            }
+            case 'sixLinesFloor':{
+                return (
+                  <SixLinesFloor 
+                    data={rowData.get('data')}
+                    onPressImageItem={this.props.onPressImageItem} />
+                )
+            }
+            case 'livePicture':{
+                return (                  
+                  <LivePicture 
+                    data={rowData.get('data')}
+                    onPressImageItem={this.props.onPressImageItem} />
+                )
+            }
             case 'vipUse':{
               return (
                 <VipUserFloor
-                  data={data}/>
+                  data={rowData.get('data')}/>
               );
             }
             case 'activityProductFloor':{
               return <ActivityProductFloor
-                data = {data}/>
+                data = {rowData.get('data')}/>
+            }
+            case 'hot_category_individualization':{
+              return <HotCategoryIndividualization
+                data = {rowData.get('data')}/>
             }
             default:
                 return null;
@@ -208,7 +303,7 @@ export default class Home extends Component {
         let {list, isFetching, isFirstLoad, favorite} = data;
 
         let floorList = list.toArray();
-        let favoriteList = favorite.toJS().list;
+        let favoriteList = favorite ? favorite.toJS().list : [];
 
         let dataSource = {
             floor: floorList,