| @@ -736,7 +736,6 @@ getAdView(){ | |||||
| <Text style={styles.bottomQrcode1Str}>公众号</Text> | <Text style={styles.bottomQrcode1Str}>公众号</Text> | ||||
| </View> | </View> | ||||
| <Text style={styles.bottomPlacehold}>{this.state.versionInfo}</Text> | <Text style={styles.bottomPlacehold}>{this.state.versionInfo}</Text> | ||||
| <<<<<<< Updated upstream | |||||
| </View> */ | </View> */ | ||||
| @@ -754,28 +753,6 @@ getAdView(){ | |||||
| loop={true} | loop={true} | ||||
| autoplayInterval={5000} | 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 | |||||
| ) | ) | ||||
| } | } | ||||
| } | } | ||||