Authored by 于良

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

@@ -6,6 +6,7 @@ import Swiper from 'react-native-swiper'; @@ -6,6 +6,7 @@ import Swiper from 'react-native-swiper';
6 import HeadTitleCell from '../cell/HeadTitleCell'; 6 import HeadTitleCell from '../cell/HeadTitleCell';
7 import YH_Image from '../../../common/components/YH_Image'; 7 import YH_Image from '../../../common/components/YH_Image';
8 import Immutable, {Map} from 'immutable'; 8 import Immutable, {Map} from 'immutable';
  9 +import RecyclerSwiper from '../../../common/recycler-swiper/recyclerswiper';
9 10
10 const { 11 const {
11 View, 12 View,
@@ -17,6 +18,8 @@ const { @@ -17,6 +18,8 @@ const {
17 Platform, 18 Platform,
18 } = ReactNative; 19 } = ReactNative;
19 20
  21 +const YH_Swiper = (Platform.OS === 'ios') ? Swiper : RecyclerSwiper;
  22 +
20 export default class TrendgoodsTopic extends React.Component { 23 export default class TrendgoodsTopic extends React.Component {
21 24
22 constructor(props) { 25 constructor(props) {
@@ -84,7 +87,7 @@ export default class TrendgoodsTopic extends React.Component { @@ -84,7 +87,7 @@ export default class TrendgoodsTopic extends React.Component {
84 return ( 87 return (
85 <View style={styles.container}> 88 <View style={styles.container}>
86 <HeadTitleCell yh_exposureData={yh_exposureData_more} title={title.title} moreUrl={title.more_url} onPressTitleMore={this.props.onPressTitleMore} /> 89 <HeadTitleCell yh_exposureData={yh_exposureData_more} title={title.title} moreUrl={title.more_url} onPressTitleMore={this.props.onPressTitleMore} />
87 - <Swiper 90 + <YH_Swiper
88 showsButtons={false} 91 showsButtons={false}
89 loop={true} 92 loop={true}
90 autoplay={true} 93 autoplay={true}
@@ -127,7 +130,7 @@ export default class TrendgoodsTopic extends React.Component { @@ -127,7 +130,7 @@ export default class TrendgoodsTopic extends React.Component {
127 </TouchableOpacity> 130 </TouchableOpacity>
128 ); 131 );
129 })} 132 })}
130 - </Swiper> 133 + </YH_Swiper>
131 </View> 134 </View>
132 ); 135 );
133 } 136 }