|
|
@@ -737,7 +737,6 @@ getAdView(){ |
|
|
|
<Text style={styles.bottomQrcode1Str}>公众号</Text> |
|
|
|
</View> |
|
|
|
<Text style={styles.bottomPlacehold}>{this.state.versionInfo}</Text> |
|
|
|
<<<<<<< Updated upstream |
|
|
|
</View> */ |
|
|
|
|
|
|
|
|
|
|
@@ -755,28 +754,6 @@ getAdView(){ |
|
|
|
loop={true} |
|
|
|
autoplayInterval={5000} |
|
|
|
/> |
|
|
|
======= |
|
|
|
</View> |
|
|
|
</ImageBackground> |
|
|
|
); |
|
|
|
} else if (this.state.adType == 1) { |
|
|
|
return( |
|
|
|
<View style={styles.adTypeSwiper02}> |
|
|
|
<Carousel |
|
|
|
ref={'carousel01'} |
|
|
|
data={adDataList} |
|
|
|
renderItem={this.setAdSwiperItemDom} |
|
|
|
sliderWidth={1080} |
|
|
|
itemWidth={1080} |
|
|
|
itemHeight={1920} |
|
|
|
sliderHeight={1920} |
|
|
|
activeSlideOffset={0} |
|
|
|
autoplay={true} |
|
|
|
loop={true} |
|
|
|
autoplayInterval={2500} |
|
|
|
/> |
|
|
|
</View> |
|
|
|
>>>>>>> Stashed changes |
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
@@ -1350,22 +1327,11 @@ MyPage = CodePush(codePushOptions)(MyPage); |
|
|
|
height: '100%', |
|
|
|
}, |
|
|
|
|
|
|
|
<<<<<<< Updated upstream |
|
|
|
carouselItemWrap: { |
|
|
|
flex: 1, |
|
|
|
width: '100%', |
|
|
|
backgroundColor: 'transparent', |
|
|
|
alignItems: 'center', |
|
|
|
======= |
|
|
|
onlyAdSwiperItem:{ |
|
|
|
width: '100%', |
|
|
|
height: '100%', |
|
|
|
}, |
|
|
|
|
|
|
|
onlyAdTypeItemImg:{ |
|
|
|
width: '100%', |
|
|
|
height: '100%', |
|
|
|
>>>>>>> Stashed changes |
|
|
|
} |
|
|
|
|
|
|
|
}); |