| @@ -50,21 +50,25 @@ var errorMsg = { | |||
| ERR_HEARTBEAT:'设备心跳数据错误' | |||
| } | |||
| var animationThemes = [ | |||
| // 滑入 | |||
| { | |||
| first:"slideInDown", | |||
| second:"slideInLeft", | |||
| third:"slideInRight" | |||
| }, | |||
| // 放大 | |||
| { | |||
| first:"zoomInDown", | |||
| second:"zoomInLeft", | |||
| third:"zoomInRight" | |||
| }, | |||
| // 翻转 | |||
| { | |||
| first:"fadeIn", | |||
| second:"fadeIn", | |||
| third:"fadeIn" | |||
| first:"flipInX", | |||
| second:"flipInY", | |||
| third:"flipInX" | |||
| }, | |||
| // 弹出 | |||
| { | |||
| first:"bounceInDown", | |||
| second:"bounceInLeft", | |||
| @@ -287,11 +291,9 @@ startAd() { | |||
| pageChangeCount =this.state.heartConfig.pageChangeInterval; | |||
| setInterval(()=>{ | |||
| hbRequestCount -=1000; | |||
| getAdDataCount -=1000; | |||
| pageChangeCount -=1000; | |||
| if (pageChangeCount <= 0) { //页面切换间隔 | |||
| if (this.state.contentDisplayStatus) { | |||
| this.setState({ contentDisplayStatus: false}) | |||
| @@ -352,7 +354,6 @@ getContentViewItemMerchantName(contentItem) { | |||
| return '多商户通用'; | |||
| else | |||
| return contentItem.target.merchantVoList[0].merchantName; | |||
| } | |||
| } | |||
| @@ -376,7 +377,6 @@ getContentViewItem(contentItem, annomation) { | |||
| <View style={styles.contentItemTopDetail}> | |||
| {/* 券的title */} | |||
| <Text style={styles.contentItemTopDetailTitle} numberOfLines={2} ellipsizeMode="tail">{contentItem.target.title}</Text> | |||
| {/* <Text style={styles.contentItemTopDetailRemark} numberOfLines={1} ellipsizeMode="tail">{contentItem.target.remark}</Text> */} | |||
| <View style={styles.contentItemTopDetailPrice}> | |||
| {/* 售价 */} | |||
| <View style={styles.contentItemTopDetailCurPrice}> | |||
| @@ -394,7 +394,7 @@ getContentViewItem(contentItem, annomation) { | |||
| {/* 优惠券底部商户名称 */} | |||
| <View style={styles.contentItemBottom}> | |||
| <Text style={styles.contentItemBottomMerchantName}>{merchantName}</Text> | |||
| <View style={styles.contentItemBottomPlacehold}></View> | |||
| <Text style={styles.contentItemBottomPlacehold}>{contentItem.target.merchantVoList[0].buildingName}{contentItem.target.merchantVoList[0].floorName}</Text> | |||
| <Text style={styles.contentItemBottomAction}>{actionText}</Text> | |||
| </View> | |||
| </ImageBackground> | |||
| @@ -464,7 +464,6 @@ render() { | |||
| </View> | |||
| <Text style={styles.bottomPlacehold}>{this.state.versionInfo}</Text> | |||
| {/* <Text style={styles.bottomPlacehold}>{this.state.heartConfig}</Text> */} | |||
| </View> | |||
| </ImageBackground> | |||
| ); | |||
| @@ -725,6 +724,8 @@ render() { | |||
| paddingRight: 79/PixelRatio.get(), | |||
| width:'100%', | |||
| height:'100%', | |||
| color:"black", | |||
| marginTop:10, | |||
| backgroundColor:'transparent', | |||
| }, | |||