Showing
10 changed files
with
23 additions
and
12 deletions
@@ -35,7 +35,7 @@ export default class ContentFansListCell extends Component { | @@ -35,7 +35,7 @@ export default class ContentFansListCell extends Component { | ||
35 | <Text style={styles.startTimeText}>{data.createTime}</Text> | 35 | <Text style={styles.startTimeText}>{data.createTime}</Text> |
36 | </View> | 36 | </View> |
37 | <TouchableOpacity activeOpacity={1} style={styles.fanContainer} onPress={()=> {this.props.updateAttentionAction && this.props.updateAttentionAction(status,optUid)}}> | 37 | <TouchableOpacity activeOpacity={1} style={styles.fanContainer} onPress={()=> {this.props.updateAttentionAction && this.props.updateAttentionAction(status,optUid)}}> |
38 | - <Image style={styles.fanImage} source={resource}/> | 38 | + <Image style={styles.fanImage} resizeMode="contain" source={resource}/> |
39 | </TouchableOpacity> | 39 | </TouchableOpacity> |
40 | </View> | 40 | </View> |
41 | { this.props.showLine ? <View style={styles.lineView}/> : null } | 41 | { this.props.showLine ? <View style={styles.lineView}/> : null } |
@@ -84,13 +84,12 @@ let styles = StyleSheet.create({ | @@ -84,13 +84,12 @@ let styles = StyleSheet.create({ | ||
84 | }, | 84 | }, |
85 | nicknameText: { | 85 | nicknameText: { |
86 | fontSize: 14, | 86 | fontSize: 14, |
87 | - fontFamily: 'PingFang-SC-Medium', | 87 | + fontFamily: 'PingFang-SC-Regular', |
88 | color: 'black', | 88 | color: 'black', |
89 | - fontWeight: 'bold', | ||
90 | }, | 89 | }, |
91 | defaultReplyText :{ | 90 | defaultReplyText :{ |
92 | fontSize: 14, | 91 | fontSize: 14, |
93 | - fontFamily: 'PingFang-SC-Medium', | 92 | + fontFamily: 'PingFang-SC-Regular', |
94 | color: '#b0b0b0', | 93 | color: '#b0b0b0', |
95 | }, | 94 | }, |
96 | fanContainer: { | 95 | fanContainer: { |
@@ -108,7 +107,7 @@ let styles = StyleSheet.create({ | @@ -108,7 +107,7 @@ let styles = StyleSheet.create({ | ||
108 | marginLeft:15, | 107 | marginLeft:15, |
109 | marginRight: 0, | 108 | marginRight: 0, |
110 | width: width-15, | 109 | width: width-15, |
111 | - height: 1, | 110 | + height: 0.5, |
112 | backgroundColor: '#e0e0e0' | 111 | backgroundColor: '#e0e0e0' |
113 | }, | 112 | }, |
114 | }); | 113 | }); |
@@ -61,7 +61,12 @@ export default class ContentLikedListCell extends Component { | @@ -61,7 +61,12 @@ export default class ContentLikedListCell extends Component { | ||
61 | <View style={ styles.originView} > | 61 | <View style={ styles.originView} > |
62 | <Text style={styles.copyText}>原文</Text> | 62 | <Text style={styles.copyText}>原文</Text> |
63 | <YH_Image url={imageUrl} style={styles.imageStyle} /> | 63 | <YH_Image url={imageUrl} style={styles.imageStyle} /> |
64 | - <Text style={styles.originText} numberOfLines={1}>{rowData.content}</Text> | 64 | + {rowData.content ? |
65 | + <Text style={styles.originText} numberOfLines={1}>{rowData.content}</Text> | ||
66 | + : | ||
67 | + <View style={{height: 5}} /> | ||
68 | + } | ||
69 | + | ||
65 | </View> | 70 | </View> |
66 | </TouchableOpacity> | 71 | </TouchableOpacity> |
67 | 72 | ||
@@ -156,7 +161,7 @@ let styles = StyleSheet.create({ | @@ -156,7 +161,7 @@ let styles = StyleSheet.create({ | ||
156 | marginLeft:15, | 161 | marginLeft:15, |
157 | marginRight: 0, | 162 | marginRight: 0, |
158 | width: width-15, | 163 | width: width-15, |
159 | - height: 1, | 164 | + height: 0.5, |
160 | backgroundColor: '#e0e0e0' | 165 | backgroundColor: '#e0e0e0' |
161 | }, | 166 | }, |
162 | }); | 167 | }); |
@@ -57,7 +57,7 @@ export default class ContentMessageCell extends Component { | @@ -57,7 +57,7 @@ export default class ContentMessageCell extends Component { | ||
57 | <Text style={styles.subnameText}>{subName}</Text> | 57 | <Text style={styles.subnameText}>{subName}</Text> |
58 | </View> | 58 | </View> |
59 | <TouchableOpacity activeOpacity={1} style={styles.replyContainer} onPress={()=> this.props.jumpToShowKeyboard && this.props.jumpToShowKeyboard(rowData.userName, rowData.commentId)}> | 59 | <TouchableOpacity activeOpacity={1} style={styles.replyContainer} onPress={()=> this.props.jumpToShowKeyboard && this.props.jumpToShowKeyboard(rowData.userName, rowData.commentId)}> |
60 | - <Image style={styles.replyImage} source={require('../../images/content_reply.png')}/> | 60 | + <Image style={styles.replyImage} resizeMode="contain" source={require('../../images/content_reply.png')}/> |
61 | </TouchableOpacity> | 61 | </TouchableOpacity> |
62 | </View> | 62 | </View> |
63 | 63 | ||
@@ -82,7 +82,12 @@ export default class ContentMessageCell extends Component { | @@ -82,7 +82,12 @@ export default class ContentMessageCell extends Component { | ||
82 | <View style={ styles.originContainerView} > | 82 | <View style={ styles.originContainerView} > |
83 | <Text style={styles.copyText}>原文</Text> | 83 | <Text style={styles.copyText}>原文</Text> |
84 | <YH_Image url={imageUrl} style={styles.imageStyle} /> | 84 | <YH_Image url={imageUrl} style={styles.imageStyle} /> |
85 | - <Text style={styles.originText} numberOfLines={1}>{rowData.content}</Text> | 85 | + {rowData.content ? |
86 | + <Text style={styles.originText} numberOfLines={1}>{rowData.content}</Text> | ||
87 | + : | ||
88 | + <View style={{height: 5, backgroundColor: 'black'}} /> | ||
89 | + } | ||
90 | + | ||
86 | </View> | 91 | </View> |
87 | </TouchableOpacity> } | 92 | </TouchableOpacity> } |
88 | 93 | ||
@@ -212,7 +217,7 @@ let styles = StyleSheet.create({ | @@ -212,7 +217,7 @@ let styles = StyleSheet.create({ | ||
212 | marginLeft:15, | 217 | marginLeft:15, |
213 | marginRight: 0, | 218 | marginRight: 0, |
214 | width: width-15, | 219 | width: width-15, |
215 | - height: 1, | 220 | + height: 0.5, |
216 | backgroundColor: '#e0e0e0' | 221 | backgroundColor: '#e0e0e0' |
217 | }, | 222 | }, |
218 | }); | 223 | }); |
@@ -59,8 +59,10 @@ export default class ContentMessageTabView extends Component { | @@ -59,8 +59,10 @@ export default class ContentMessageTabView extends Component { | ||
59 | 59 | ||
60 | render() { | 60 | render() { |
61 | return <View style={[styles.container, this.props.style]}> | 61 | return <View style={[styles.container, this.props.style]}> |
62 | - <YH_Image style={styles.icon} onLayout={this.onImageLayout} | ||
63 | - url={YH_Image.getSlicedUrl(this.props.icon.uri, IMAGE_WIDTH, IMAGE_HEIGHT, 2)}/> | 62 | + <View style={{width: 56, height: 56, alignItems : 'center', justifyContent: 'center'}}> |
63 | + <YH_Image style={styles.icon} onLayout={this.onImageLayout} | ||
64 | + url={YH_Image.getSlicedUrl(this.props.icon.uri, IMAGE_WIDTH, IMAGE_HEIGHT, 2)}/> | ||
65 | + </View> | ||
64 | <Text style={styles.title}>{this.props.title}</Text> | 66 | <Text style={styles.title}>{this.props.title}</Text> |
65 | {this.props.badge > 0 && this.state.badgeX != INVALID_POSITION && this.state.badgeY != INVALID_POSITION && | 67 | {this.props.badge > 0 && this.state.badgeX != INVALID_POSITION && this.state.badgeY != INVALID_POSITION && |
66 | <View style={[styles.badgeContainer, {left: this.state.badgeX, top: this.state.badgeY}]} | 68 | <View style={[styles.badgeContainer, {left: this.state.badgeX, top: this.state.badgeY}]} |
-
Please register or login to post a comment