- [x] [超展开] 回复功能

- [x] [章节] 回复功能
- [x] [人物] 回复功能

Author: czy0729

.eslintrc.js

@@ -2,12 +2,13 @@
  * @Author: czy0729
  * @Date: 2019-03-13 05:15:36
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-05-16 01:54:02
+ * @Last Modified time: 2019-06-17 12:01:10
  */
 module.exports = {
   root: true,
   globals: {
     require: true,
+    XMLHttpRequest: true,
     fetch: true, // react-native的fetch
     log: true // 测试打印函数, 能规避循环引用
   },

README.MD

@@ -28,24 +28,32 @@
 
 #### Todo 下个版本预定功能
 
-v0.6-alpha
-
-- [x] Expo 升级到了 SDK 33.0, 图片加载貌似会快点
-- [x] [首页收藏] 书籍类显示加入 Vol、Chap
-- [x] [条目] 书籍可以管理 Vol、Chap
-- [x] [条目] 书籍单行本列表
-- [x] [条目] 书籍喜欢 XXX 的会员大概会喜欢
-- [x] [标签条目] 页面
-- [ ] [超展开] 回复功能(不带表情)
-- [ ] [章节] 回复功能(不带表情)
-- [ ] [人物] 回复功能(不带表情)
+已知问题
+- [ ] 楼层内容某些情况偏移
+- [ ] 复杂的楼层内容显示不全
+- [ ] IOS端不能回复, 可能要用新方法获取和管理cookie
+
+v0.x
+- [ ] [登陆] 不使用webview, 尝试新的方式登陆
+- [ ] [条目] 尝试播放外源视频, 比如柠萌
 - [ ] [用户] 同步率
-- [ ] [用户] 关于 TA
+- [ ] [用户] 关于TA
 - [ ] [每日放送] 添加播放时间
 - [ ] [索引] 页面
 - [ ] [目录] 页面
+
+v0.6
+- [x] Expo 升级到了 SDK 33.0, 图片加载貌似会快点
+- [x] [首页收藏] 书籍类显示加入Vol、Chap
+- [x] [条目] 书籍可以管理Vol、Chap
+- [x] [条目] 书籍单行本列表
+- [x] [条目] 书籍喜欢XXX的会员大概会喜欢
+- [x] [标签条目] 页面
+- [x] [超展开] 回复功能
+- [x] [章节] 回复功能
+- [x] [人物] 回复功能
 - [x] 加入了春菜骚话
-- [ ] 输入时键盘位置占位
+- [x] 输入时键盘位置占位
 
 ---
 
@@ -83,10 +91,7 @@ npm config set registry https://registry.npmjs.org
 ```bash
 git clone https://github.com/czy0729/Bangumi
 cd ./Bangumi
-yarn // or npm i
-
-// SDK 33.0 第一次可能还要
-expo install @expo/vector-icons expo-blur expo-constants expo-file-system
+npm install // or yarn 因为后全面会替换掉node_modules的icon, 使用yarn可能会出现回退的现象
 ```
 
 ** 前置操作 **
@@ -97,10 +102,11 @@ expo install @expo/vector-icons expo-blur expo-constants expo-file-system
 
 ```bash
 npm start
-Run on iOS simulator
+// 之后点击在浏览器打开的Expo Developer Tools, 点击 Run on iOS simulator
 ```
 
 window 用法不详, 可以查阅 [Expo](https://github.com/expo/expo) 官方文档
+可以选择同一局域网真机扫码调试, 需先下载Expo App
 
 ---
 

app.json

@@ -31,4 +31,4 @@
     "description": "A React Native App for https://bangumi.tv ",
     "githubUrl": "https://github.com/czy0729/Bangumi"
   }
-}
+}

navigations/stacks/StackViewStyleInterpolator.js renamed to components/@react-navigation-stack/StackViewStyleInterpolator.js

@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2019-06-10 22:24:08
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-16 17:20:01
+ * @Last Modified time: 2019-06-17 22:53:07
  */
 import React from 'react'
 import { StyleSheet, ScrollView, View } from 'react-native'
@@ -22,6 +22,8 @@ const maxHistoryCount = 7
 export default class FixedTextarea extends React.Component {
   static defaultProps = {
     value: '',
+    placeholder: '',
+    onClose: Function.prototype,
     onSubmit: Function.prototype // value => {}
   }
 
@@ -78,6 +80,9 @@ export default class FixedTextarea extends React.Component {
   }
 
   onBlur = () => {
+    const { onClose } = this.props
+    onClose()
+
     this.setState({
       showTextarea: false,
       showBgm: false,
@@ -143,6 +148,9 @@ export default class FixedTextarea extends React.Component {
   }
 
   clear = () => {
+    const { onClose } = this.props
+    onClose()
+
     this.setState({
       value: '',
       showTextarea: false
@@ -264,6 +272,7 @@ export default class FixedTextarea extends React.Component {
   }
 
   renderTextarea() {
+    const { placeholder } = this.props
     const { value, showTextarea, showBgm } = this.state
     const canSend = value !== ''
     return (
@@ -274,7 +283,7 @@ export default class FixedTextarea extends React.Component {
               ref={ref => (this.ref = ref)}
               style={styles.textarea}
               value={value}
-              placeholder='不吐槽一下吗'
+              placeholder={placeholder || '不吐槽一下吗'}
               rows={showTextarea || showBgm ? 6 : 1}
               selectionColor={_.colorMain}
               clear
@@ -310,9 +319,10 @@ export default class FixedTextarea extends React.Component {
           常用
         </Text>
         <Flex wrap='wrap'>
-          {history.map(item => (
+          {history.map((item, index) => (
             <Touchable
-              key={item}
+              // eslint-disable-next-line react/no-array-index-key
+              key={index}
               style={styles.bgm}
               onPress={() => this.onSelectBgm(item)}
             >

components/fixed-textarea.js

@@ -4,7 +4,7 @@
  * @Author: czy0729
  * @Date: 2019-04-29 19:54:57
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-17 01:10:05
+ * @Last Modified time: 2019-06-17 14:19:06
  */
 import React from 'react'
 import { StyleSheet, View, Image as RNImage, Text } from 'react-native'
@@ -107,13 +107,13 @@ export default class RenderHtml extends React.Component {
         // bgm表情, 表情调用本地资源
         if (alt.indexOf('(bgm') !== -1) {
           const index = parseInt(alt.replace(/\(bgm|\)/g, '')) - 23 // 偏移量
-          props.source =
-            parseInt(index) <= 100 ? bgm[index] : { uri: `${HOST}/${src}` }
           props.style = {
             width: 20,
-            height: 20,
-            resizeMode: 'contain'
+            height: 20
           }
+          props.source =
+            parseInt(index) <= 100 ? bgm[index] : { uri: `${HOST}/${src}` }
+          props.resizeMode = 'stretch'
 
           // 当后面还有连续表情的时候
           if (this.continuousBgmImagesCount) {
@@ -245,10 +245,12 @@ export default class RenderHtml extends React.Component {
     //   })
     // }
 
+    // 鬼知道CDN那边加了什么
+    const _html = html.replace(/data-cfsrc=/g, 'src=')
     return (
       <View style={style}>
         <HTML
-          html={html}
+          html={_html}
           baseFontStyle={baseFontStyle}
           onLinkPress={this.onLinkPress}
           {...this.generateConfig(imagesMaxWidth, baseFontStyle)}

components/render-html.js

@@ -3,7 +3,7 @@
  * @Author: czy0729
  * @Date: 2019-04-12 22:58:20
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-16 21:57:58
+ * @Last Modified time: 2019-06-18 00:11:30
  */
 import { MODEL_TIMELINE_SCOPE } from '@constants/model'
 import { urlStringify } from '@utils'
@@ -138,7 +138,7 @@ export const HTML_USER_COLLECTIONS = (
 /**
  * 回复帖子
  * @param {*} topicId       351116
- * @param {*} type          group/topic | subject/topic | subject/ep | person
+ * @param {*} type          group/topic | subject/topic | subject/ep | person | character
  * ---------- config ----------
  * @param {*} content       (bgm38) 来一个38
  * @param {*} related_photo 0

constants/html.js

@@ -3,7 +3,7 @@
  * @Author: czy0729
  * @Date: 2019-02-22 01:25:31
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-14 21:09:55
+ * @Last Modified time: 2019-06-18 01:11:33
  */
 import { Platform } from 'react-native'
 import Constants from 'expo-constants'
@@ -30,7 +30,7 @@ export const GITHUB_URL = 'https://github.com/czy0729/Bangumi'
 export const GITHUB_RELEASE_URL = `${GITHUB_URL}/releases`
 export const GITHUB_RELEASE_REPOS_URL =
   'https://api.github.com/repos/czy0729/Bangumi/releases'
-export const GITHUB_RELEASE_VERSION = '0.5-alpha' // since 20190602
+export const GITHUB_RELEASE_VERSION = '0.6-alpha' // since 20190618
 
 // 图片
 // 白

constants/index.js

@@ -2,16 +2,16 @@
  * @Author: czy0729
  * @Date: 2019-06-02 14:42:28
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-16 19:55:15
+ * @Last Modified time: 2019-06-18 00:35:07
  */
 export default {
-  initialRouteName: 'HomeTab', // HomeTab
-  initialRouteParams: {
-    subjectId: 18007, // 238923 100444 204135
-    topicId: 'group/350926', // ep/768491
-    userId: 419012,
-    monoId: 'character/7454', // character/70323 person/5745
-    type: 'anime',
-    tag: '水树奈奈'
-  }
+  initialRouteName: 'HomeTab' // HomeTab
+  // initialRouteParams: {
+  //   subjectId: 18007, // 238923 100444 204135
+  //   topicId: 'group/346386', // ep/768491
+  //   userId: 419012,
+  //   monoId: 'character/7454', // character/70323 person/5745
+  //   type: 'anime',
+  //   tag: '水树奈奈'
+  // }
 }

navigations.js

@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2019-03-29 10:38:12
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-16 20:16:47
+ * @Last Modified time: 2019-06-17 01:41:51
  */
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
@@ -45,7 +45,7 @@ const HomeTab = createBottomTabNavigator(
     Rakuen
   },
   {
-    initialRouteName: 'Rakuen',
+    initialRouteName: 'Home',
     tabBarComponent: props => {
       if (IOS) {
         return (

navigations/index.js

@@ -2,12 +2,12 @@
  * @Author: czy0729
  * @Date: 2019-04-24 18:50:55
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-17 00:33:26
+ * @Last Modified time: 2019-06-17 09:48:15
  */
 import { StyleSheet, Platform } from 'react-native'
+import StackViewStyleInterpolator from '@components/@react-navigation-stack/StackViewStyleInterpolator'
 import { IOS } from '@constants'
 import { wind, colorTitle, colorBorder } from '@styles'
-import StackViewStyleInterpolator from './StackViewStyleInterpolator'
 
 const config = {
   headerMode: 'screen',

navigations/stacks/config.js

@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2019-05-11 17:19:56
  * @Last Modified by: czy0729
- * @Last Modified time: 2019-06-03 01:00:07
+ * @Last Modified time: 2019-06-18 00:34:38
  */
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
@@ -14,7 +14,9 @@ import {
   Image,
   HeaderPlaceholder,
   RenderHtml,
-  Divider
+  Divider,
+  Touchable,
+  Iconfont
 } from '@components'
 import { SectionTitle } from '@screens/_'
 import { IOS } from '@constants'
@@ -25,9 +27,9 @@ import Jobs from './jobs'
 
 const maxSize = _.window.width - _.wind * 2
 
-const Info = (props, { $ }) => {
+const Info = (props, { $, navigation }) => {
   const { name, nameCn, cover, info, detail } = $.mono
-  const { _name, _image } = $.params
+  const { monoId, _name, _image } = $.params
   return (
     <>
       {!IOS && <HeaderPlaceholder />}
@@ -59,15 +61,33 @@ const Info = (props, { $ }) => {
       <Voice style={_.mt.md} />
       <Works style={_.mt.md} />
       <Jobs style={_.mt.md} />
-      <SectionTitle style={[styles.title, _.mt.lg, _.mb.md]}>
+      <SectionTitle
+        style={[styles.title, _.mt.lg, _.mb.md]}
+        right={
+          <Touchable
+            onPress={() => {
+              const type = monoId.includes('character/') ? 'crt' : 'prsn'
+              navigation.push('Topic', {
+                topicId: `${type}/${monoId.match(/\d+/g)[0]}`
+              })
+            }}
+          >
+            <Flex>
+              <Text type='sub'>去吐槽</Text>
+              <Iconfont name='right' size={16} />
+            </Flex>
+          </Touchable>
+        }
+      >
         吐槽箱
       </SectionTitle>
     </>
   )
 }
 
 Info.contextTypes = {
-  $: PropTypes.object
+  $: PropTypes.object,
+  navigation: PropTypes.object
 }
 
 export default observer(Info)