From 84ce205ee633f7c1f18459e69464e2b0c31212f9 Mon Sep 17 00:00:00 2001
From: xuwenyang <xuwenyang@teddymobile.cn>
Date: Mon, 20 May 2019 22:16:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=202.=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BB=8A=E5=A4=A9=E6=97=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/diary/diaryBrief.js           |  40 ++++++--
 src/component/diary/diaryList.js            |   5 +-
 src/component/follow/followUserList.js      |   1 +
 src/component/loading.js                    |   2 +-
 src/component/notebook/notebookDiaryList.js |   5 +-
 src/component/notebook/notebookList.js      |   2 -
 src/component/userIcon.js                   |   4 +-
 src/component/userIntro.js                  | 105 ++++++++++++++++++++
 src/dataLoader/userDiaryData.js             |  24 +++++
 src/page/FollowPage.js                      |   4 +-
 src/page/HomePage.js                        |  23 +----
 src/page/UserPage.js                        |  28 +++---
 src/util/api.js                             |  11 ++
 13 files changed, 204 insertions(+), 50 deletions(-)
 create mode 100644 src/component/userIntro.js
 create mode 100644 src/dataLoader/userDiaryData.js

diff --git a/src/component/diary/diaryBrief.js b/src/component/diary/diaryBrief.js
index cd918c8..f89cba5 100644
--- a/src/component/diary/diaryBrief.js
+++ b/src/component/diary/diaryBrief.js
@@ -12,31 +12,53 @@ import DiaryActionIcon from './diaryActionIcon';
 
 export default class DiaryBrief extends Component {
 
+    constructor(props) {
+        super(props);
+
+        this.diary = props.diary;
+        this.editable = props.editable || false;
+
+        this.showField = ['icon', 'userName', 'subject', 'createdTime'];
+        if(props.showField && props.showField.length > 0) {
+            this.showField = props.showField
+        }
+    }
+
+    show(field) {
+        return this.showField.indexOf(field) >= 0;
+    }
+
     render() {
-      let diary = this.props.diary;
+      let diary = this.diary;
+      if(!diary) {
+        return null;
+      }
+
       let user = diary.user;
-      let editable = this.props.editable;
 
       return (
         <View style={[localStyle.box, this.props.style]}>
-            {(user && user.iconUrl)
+            {(user && user.iconUrl && this.show('icon'))
                 ? <UserIcon iconUrl={user.iconUrl}></UserIcon> : null}
 
             <View style={localStyle.body}>
                 <View style={localStyle.title}>
-                    {(user && user.name) 
+                    {(user && user.name && this.show('userName'))
                     ? ( <Text style={localStyle.titleName} numberOfLines={1}>
                             {user.name}
                         </Text>
                     ) : null}
-                    {(user && user.name)
+                    {(diary.notebook_subject && this.show('subject'))
                     ? ( <Text style={[localStyle.titleText, {flex: 1}]} numberOfLines={1}>
                             《{diary.notebook_subject}》
                         </Text>
                     ) : null}
-                    <Text style={localStyle.titleText}>
-                        {moment(diary.created).format('H:mm')}
-                    </Text>
+                    {(diary.created && this.show('createdTime'))
+                    ? ( <Text style={localStyle.titleText}>
+                            {moment(diary.created).format('H:mm')}
+                        </Text>
+                    ) : null}
+                    
                 </View>
 
                 <Text style={localStyle.content} numberOfLines={5}>
@@ -53,7 +75,7 @@ export default class DiaryBrief extends Component {
                     }
                     <View style={{flex: 1}} />
                     {
-                        editable
+                        this.editable
                         ? <DiaryActionIcon></DiaryActionIcon>
                         : null
                     }
diff --git a/src/component/diary/diaryList.js b/src/component/diary/diaryList.js
index 6d62dc1..cecc7f2 100644
--- a/src/component/diary/diaryList.js
+++ b/src/component/diary/diaryList.js
@@ -66,6 +66,7 @@ export default class DiaryList extends Component {
 
                         this.setState({
                             diaries: result.list ? result.list : [],
+                            hasMore: result.more,
                             refreshFailed: false
                         });
                     }
@@ -130,7 +131,9 @@ export default class DiaryList extends Component {
                     renderItem={({item}) => {
                         return (
                             <Touchable onPress={() => this.props.onDiaryPress(item)}>
-                                <DiaryBrief diary={item}></DiaryBrief>
+                                <DiaryBrief diary={item}
+                                    showField={this.props.showField}>
+                                </DiaryBrief>
                             </Touchable>
                         )
                     }}
diff --git a/src/component/follow/followUserList.js b/src/component/follow/followUserList.js
index 718f387..eeda3f6 100644
--- a/src/component/follow/followUserList.js
+++ b/src/component/follow/followUserList.js
@@ -53,6 +53,7 @@ export default class FollowUserList extends Component {
 
                         this.setState({
                             users: result.list ? result.list : [],
+                            hasMore: result.more,
                             refreshFailed: false
                         });
                     }
diff --git a/src/component/loading.js b/src/component/loading.js
index 1eb1852..252f619 100644
--- a/src/component/loading.js
+++ b/src/component/loading.js
@@ -22,7 +22,7 @@ export default class Loading extends Component {
             );
 
         } else {
-            return <View />
+            return null;
         }
     }
 }
diff --git a/src/component/notebook/notebookDiaryList.js b/src/component/notebook/notebookDiaryList.js
index 1b934e0..3496468 100644
--- a/src/component/notebook/notebookDiaryList.js
+++ b/src/component/notebook/notebookDiaryList.js
@@ -97,6 +97,7 @@ export default class NotebookDiaryList extends Component {
                         let diaries = this.formatDiaries(result.list);
                         this.setState({
                             diaries,
+                            hasMore: result.more,
                             refreshFailed: false
                         });
                     }
@@ -159,7 +160,9 @@ export default class NotebookDiaryList extends Component {
 
                 renderItem={(rowData) => {
                     return (<Touchable onPress={() => {}}>
-                        <DiaryBrief diary={rowData.item}></DiaryBrief>
+                        <DiaryBrief diary={rowData.item}
+                            showField={['createdTime']}>
+                        </DiaryBrief>
                     </Touchable>);
                 }}
 
diff --git a/src/component/notebook/notebookList.js b/src/component/notebook/notebookList.js
index a714392..19c38ab 100644
--- a/src/component/notebook/notebookList.js
+++ b/src/component/notebook/notebookList.js
@@ -60,8 +60,6 @@ export default class NotebookList extends Component {
         this.setState({refreshing: true});
         Api.getSelfNotebooks()
             .then(notebooks => {
-                console.log('get notebooks:', notebooks);
-                
                 let groups = this.createGroup(notebooks, this.itemsPerRow);
                 this.setState({
                     notebooks: groups
diff --git a/src/component/userIcon.js b/src/component/userIcon.js
index 694b7f5..18fa4c5 100644
--- a/src/component/userIcon.js
+++ b/src/component/userIcon.js
@@ -11,8 +11,10 @@ export default class UserIcon extends Component {
 
     render() {
         return (
-            <Avatar small rounded
+            <Avatar rounded
                 containerStyle={localStyle.container}
+                width={this.props.width || 40}
+                height={this.props.height || 40}
                 source={{uri: this.props.iconUrl}}
                 onPress={this.props.onPress ? this.props.onPress : this._defaultOnPress.bind(this)}
                 activeOpacity={0.7}
diff --git a/src/component/userIntro.js b/src/component/userIntro.js
new file mode 100644
index 0000000..b6b97cc
--- /dev/null
+++ b/src/component/userIntro.js
@@ -0,0 +1,105 @@
+import React, {Component} from 'react';
+import {StyleSheet, Text, View, ScrollView, InteractionManager} from 'react-native';
+import {Avatar} from "react-native-elements";
+import moment from 'moment';
+
+import Color from '../style/color';
+import Api from '../util/api';
+import Msg from '../util/msg';
+
+import UserIcon from './userIcon'
+import Loading from './loading'
+
+
+export default class UserIntro extends Component {
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            user: props.user,
+            isLoading: true
+        };
+    }
+
+    componentDidMount() {
+        InteractionManager.runAfterInteractions(() => {
+            this.loadUser();
+        });
+    }
+
+    loadUser() {
+        Api.getSelfInfoByStore()
+            .then(user => {
+                this.setState({
+                    user: user
+                });
+            })
+            .catch(e => {
+                Msg.showMsg('用户信息加载失败');
+            })
+            .done(() => {
+                this.setState({
+                    isLoading: false
+                })
+            });
+    }
+
+    render() {
+        const user = this.state.user;
+
+        return this.state.isLoading
+            ? <Loading visible={this.state.isLoading}></Loading>
+            : (
+                <ScrollView style={localStyle.container} automaticallyAdjustContentInsets={false}>
+                    <View style={localStyle.userIcon}>
+                        <UserIcon width={90} height={90} iconUrl={user.coverUrl} />
+                        <Text style={localStyle.userTitle}>{user.name}</Text>
+                    </View>
+
+                    {
+                        user.intro && user.intro.length > 0
+                        ? (<Text style={localStyle.introText}>{user.intro}</Text>) : null
+                    }
+                    
+                    <Text style={localStyle.joinTime}>
+                        {moment(user.created).format('YYYY年M月D日')}加入胶囊
+                    </Text>
+
+                </ScrollView>
+            );
+    }
+}
+
+const localStyle = StyleSheet.create({
+    container: {
+        flex: 1,
+        backgroundColor: 'white'
+    },
+    userIcon: {
+        height: 230,
+        backgroundColor: 'white',
+        alignItems: 'center',
+        justifyContent: 'center'
+    },
+    userTitle: {
+        fontSize: 22,
+        marginTop: 30,
+        fontWeight: 'bold',
+        color: '#000'
+    },
+    introText: {
+        padding: 15,
+        color: Color.text,
+        lineHeight: 24,
+        textAlign: 'center'
+    },
+    joinTime: {
+        marginTop: 30,
+        marginBottom:60,
+        padding: 15,
+        color: Color.inactiveText,
+        lineHeight: 20,
+        textAlign: 'center'
+    }
+});
diff --git a/src/dataLoader/userDiaryData.js b/src/dataLoader/userDiaryData.js
new file mode 100644
index 0000000..2c7e4b6
--- /dev/null
+++ b/src/dataLoader/userDiaryData.js
@@ -0,0 +1,24 @@
+import Api from '../util/api'
+
+
+const PAGE_SIZE = 21;
+
+export default class UserDiaryData {
+
+    constructor(userId = 0) {
+        this.userId = userId;
+    }
+
+    async refresh() {
+        if(this.userId === 0) {
+            let user = await Api.getSelfInfoByStore();
+            this.userId = user.id;
+        }
+
+        let list = await Api.getUserTodayDiaries(this.userId);
+        return {
+            list,
+            more: false
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/page/FollowPage.js b/src/page/FollowPage.js
index 71cb542..e7b1ccb 100644
--- a/src/page/FollowPage.js
+++ b/src/page/FollowPage.js
@@ -6,7 +6,7 @@ import Api from '../util/api'
 import {Icon} from '../style/icon'
 
 import DiaryList from '../component/diary/diaryList'
-import FollowListData from '../dataLoader/followDiaryData';
+import FollowDiaryData from '../dataLoader/followDiaryData';
 
 
 export default class FollowPage extends Component {
@@ -15,7 +15,7 @@ export default class FollowPage extends Component {
         super(props);
 
         Navigation.events().bindComponent(this);
-        this.dataSource = new FollowListData();
+        this.dataSource = new FollowDiaryData();
     }
 
     static options(passProps) {
diff --git a/src/page/HomePage.js b/src/page/HomePage.js
index 8af3f2d..5e547f5 100644
--- a/src/page/HomePage.js
+++ b/src/page/HomePage.js
@@ -5,14 +5,14 @@ import {Navigation} from 'react-native-navigation';
 import Api from '../util/api';
 
 import DiaryList from '../component/diary/diaryList'
-import HomeListData from '../dataLoader/homeDiaryData';
+import HomeDiaryData from '../dataLoader/homeDiaryData';
 
 
 export default class HomePage extends Component {
 
     constructor(props) {
         super(props);
-        this.dataSource = new HomeListData();
+        this.dataSource = new HomeDiaryData();
     }
 
     _onDiaryPress(diary) {
@@ -28,20 +28,11 @@ export default class HomePage extends Component {
         
     }
 
-    renderHeader() {
-        return (
-            <View style={localStyle.header}>
-                <Text style={localStyle.title}>胶囊日记</Text>
-            </View>
-        );
-    }
-
     render() {
         return (
           <View style={localStyle.wrap}>
                 <DiaryList ref={(r) => this.list = r}
                     dataSource={this.dataSource}
-                    header={this.renderHeader.bind(this)}
                     onDiaryPress={this._onDiaryPress.bind(this)}
 
                     navigator={this.props.navigator}
@@ -56,15 +47,5 @@ const localStyle = StyleSheet.create({
     wrap: {
         flex: 1,
         backgroundColor: '#fff'
-    },
-    header: {
-        paddingLeft: 20,
-        paddingTop: 20,
-        flexDirection: "row"
-    },
-    title: {
-        flex: 1,
-        fontSize: 30,
-        color: '#000'
     }
 });
diff --git a/src/page/UserPage.js b/src/page/UserPage.js
index b0f6644..8a819f1 100644
--- a/src/page/UserPage.js
+++ b/src/page/UserPage.js
@@ -11,17 +11,23 @@ import {Navigation} from 'react-native-navigation';
 import Api from '../util/api';
 import Color from '../style/color';
 
-import NotebookList from '../component/notebook/notebookList'
+import UserIntro from '../component/userIntro';
+import UserDiaryData from '../dataLoader/userDiaryData';
+import DiaryList from '../component/diary/diaryList';
+import NotebookList from '../component/notebook/notebookList';
 
 
 export default class UserPage extends Component {
 
     constructor(props) {
         super(props);
+
+        this.dataSource = new UserDiaryData();
+
         this.state = {
             index: 0,
             routes: [
-                { key: 'userInfo', title: '简介' },
+                { key: 'userIntro', title: '简介' },
                 { key: 'diary', title: '日记' },
                 { key: 'notebook', title: '日记本' }
             ]
@@ -68,8 +74,14 @@ export default class UserPage extends Component {
     };
 
     _renderScene = SceneMap({
-        userInfo: () => <View style={localStyle.container}><Text style={localStyle.welcome}>user info !</Text></View>,
-        diary: () => <View style={localStyle.container}><Text style={localStyle.welcome}>diary !</Text></View>,
+        userIntro: () => <UserIntro
+        />,
+        diary: () => <DiaryList
+            dataSource={this.dataSource}
+            onDiaryPress={() => {}}
+
+            navigator={this.props.navigator}
+        />,
         notebook: () => <NotebookList
             onNotebookPress={this._onNotebookPress.bind(this)}
             navigator={this.props.navigator}
@@ -100,14 +112,6 @@ export default class UserPage extends Component {
 }
 
 const localStyle = StyleSheet.create({
-    
-    welcome: {
-      fontSize: 20,
-      textAlign: 'center',
-      marginTop: 40
-    },
-
-
     container: {
         flex: 1
     },
diff --git a/src/util/api.js b/src/util/api.js
index 9535430..b636a22 100644
--- a/src/util/api.js
+++ b/src/util/api.js
@@ -25,6 +25,7 @@ async function login(username, password) {
 
     try {
         const userInfo = await getSelfInfo();
+
         await TokenManager.setUserInfo(userInfo);
         await TokenManager.setLoginPassword('');
 
@@ -90,6 +91,14 @@ async function getNotebookDiaries(id, page, page_size) {
             });
 }
 
+async function getSelfInfoByStore() {
+  return await TokenManager.getUserInfo();
+}
+
+async function getUserTodayDiaries(userId) {
+  return call('GET', '/users/' + userId + '/diaries/')
+}
+
 
 async function call(method, api, body, _timeout = 10000) {
     let token = await TokenManager.getUserToken();
@@ -177,10 +186,12 @@ export default {
     IS_IPHONEX,
 
     login,
+    getSelfInfoByStore,
 
     getTodayDiaries,
     getFollowDiaries,
     getNotebookDiaries,
+    getUserTodayDiaries,
     
     getDiaryComments,
     getSelfNotebooks,