diff --git a/psnine/container/shared/MessageItem.js b/psnine/container/shared/MessageItem.js index 80dc55d..2a2c9d1 100644 --- a/psnine/container/shared/MessageItem.js +++ b/psnine/container/shared/MessageItem.js @@ -38,9 +38,9 @@ export default class ComplexComment extends React.PureComponent { return ( onPress(rowData)} @@ -111,6 +111,6 @@ const styles = StyleSheet.create({ }, a: { fontWeight: '300', - color: idColor, // make links coloured pink + color: accentColor, // make links coloured pink }, }); \ No newline at end of file diff --git a/psnine/container/shared/SimpleComment.js b/psnine/container/shared/SimpleComment.js index f0a2e65..b481a13 100644 --- a/psnine/container/shared/SimpleComment.js +++ b/psnine/container/shared/SimpleComment.js @@ -30,7 +30,7 @@ import { let screen = Dimensions.get('window'); const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = screen; -export default class ComplexComment extends React.PureComponent { +export default class extends React.PureComponent { constructor(props) { super(props) @@ -116,7 +116,7 @@ export default class ComplexComment extends React.PureComponent { { url } ] })} - imagePaddingOffset={30 + 50} + imagePaddingOffset={30 + 50 + 10} /> diff --git a/psnine/container/user/Message.js b/psnine/container/user/Message.js index 3d4ff09..fc01684 100644 --- a/psnine/container/user/Message.js +++ b/psnine/container/user/Message.js @@ -54,11 +54,11 @@ class Message extends Component { } else if (URL.includes('/qa/')) { type = 'QaTopic' replyType = 'qa' - } else if (URL.includes('/psnid/') && URL.includes('/comment')) { + } else if (URL.includes('/psnid/') && URL.includes('#comment')) { type = 'Home' replyType = '' navigation.navigate(type, { - URL: URL.replace('/comment', ''), + URL: URL.replace(/#comment-\d+$/, ''), title: rowData.psnid }); return diff --git a/psnine/parser/user/message.js b/psnine/parser/user/message.js index 2b4c2f8..3f4d029 100644 --- a/psnine/parser/user/message.js +++ b/psnine/parser/user/message.js @@ -11,7 +11,7 @@ export default function (html) { return $(this).text() }))[1] const text = $this.text() - let content = $this.find('.content').html() + let content = $this.find('.content').html().replace(/.*?<\/a>/, '') const psnid = $this.find('a.psnnode').text() const url = $this.find('a.psnnode').prev().attr('href') const matchedComment = url.match(/comment\-(\d+)$/) diff --git a/psnine/root.js b/psnine/root.js index c7799ea..c1306f2 100644 --- a/psnine/root.js +++ b/psnine/root.js @@ -43,11 +43,9 @@ class Root extends React.Component { constructor(props) { super(props); - // let hour = ~~moment().format('HH'); - this.state = { text: '', - isNightMode: false,//hour >= 22 || hour < 7, + isNightMode: false, tipBarMarginBottom: new Animated.Value(0), progress: new Animated.Value(0), isLoadingAsyncStorage: true, @@ -64,7 +62,7 @@ class Root extends React.Component { }, isNightMode: false }, - loadingText: '\n正在加载配置' + loadingText: 'PSNINE\nP9 · 酷玩趣友' }; this.dayModeInfo = { @@ -227,7 +225,7 @@ class Root extends React.Component { ref={animation => { this.animation = animation; }} style={{ width: SCREEN_WIDTH, - height: SCREEN_HEIGHT - StatusBar.currentHeight * 3, + height: SCREEN_HEIGHT - StatusBar.currentHeight * 6, }} progress={progress} source={require('./animations/LottieLogo1.json')} @@ -235,7 +233,7 @@ class Root extends React.Component { = navigation.state.index) { return { opacity: 1 } @@ -93,7 +88,7 @@ export function transitionConfig( const translateX = 0; const translateY = position.interpolate({ inputRange, - outputRange: ([SCREEN_WIDTH, 0, 0, 0]), + outputRange: ([SCREEN_WIDTH/2, 0, 0, 0]), }); return {