1. 日记本全部日记列表

2. android更新react-native-vector-icons的font文件

src/component/diary/diaryBrief.js

@@ -19,15 +19,21 @@ export default class DiaryBrief extends Component {
 
       return (
         <View style={localStyle.box}>
-            <UserIcon iconUrl={user.iconUrl}></UserIcon>
+            {(user && user.iconUrl)
+                ? <UserIcon iconUrl={user.iconUrl}></UserIcon> : null}
+
             <View style={localStyle.body}>
                 <View style={localStyle.title}>
-                    <Text style={localStyle.titleName} numberOfLines={1}>
+                    {(user && user.name) 
-                        {user.name}
+                    ? ( <Text style={localStyle.titleName} numberOfLines={1}>
-                    </Text>
+                            {user.name}
-                    <Text style={[localStyle.titleText, {flex: 1}]} numberOfLines={1}>
+                        </Text>
-                        《{diary.notebook_subject}》
+                    ) : null}
-                    </Text>
+                    {(user && user.name)
+                    ? ( <Text style={[localStyle.titleText, {flex: 1}]} numberOfLines={1}>
+                            《{diary.notebook_subject}》
+                        </Text>
+                    ) : null}
                     <Text style={localStyle.titleText}>
                         {moment(diary.created).format('H:mm')}
                     </Text>
@@ -99,7 +105,7 @@ const localStyle = StyleSheet.create({
         alignItems: "center",
         width: '100%',
         height: 30,
-        marginTop: 5,
+        marginTop: 10,
         justifyContent: 'space-between'
     }
 });

src/component/notebook/notebook.js

@@ -17,46 +17,38 @@ export default class Notebook extends Component {
         let notebook = this.props.notebook;
         
         return (
-            <TouchableOpacity key={notebook.id} style={localStyle.container}
+            <View style={Api.IS_ANDROID ? localStyle.androidBox : localStyle.iosBox}>
-                activeOpacity={0.7}
+                <ImageBackground key={notebook.id}
-                onPress={() => {}}>
+                    style={localStyle.cover} imageStyle={{resizeMode: 'cover'}}
+                    source={{uri: notebook.coverUrl}}>
+                    
+                    {this.getLabel(notebook.isPublic)}
+                </ImageBackground>
 
-                <View style={Api.IS_ANDROID ? localStyle.androidBox : localStyle.iosBox}>
+                <View style={localStyle.banner}>
-                    <ImageBackground key={notebook.id}
+                    <View style={localStyle.subject}>
-                        style={localStyle.cover} imageStyle={{resizeMode: 'cover'}}
+                        <Text allowFontScaling={false}>{notebook.subject}</Text>
-                        source={{uri: notebook.coverUrl}}>
-                        
-                        {this.getLabel(notebook.isPublic)}
-                    </ImageBackground>
-
-                    <View style={localStyle.banner}>
-                        <View style={localStyle.subject}>
-                            <Text allowFontScaling={false}>{notebook.subject}</Text>
-                        </View>
-                        <Text style={localStyle.desc} allowFontScaling={false}>
-                            {notebook.isExpired ? '已过期' : '未过期'}
-                        </Text>
-                        <Text style={localStyle.desc} allowFontScaling={false}>
-                            {notebook.created}至{notebook.expired}
-                        </Text>
                     </View>
-
+                    <Text style={localStyle.desc} allowFontScaling={false}>
+                        {notebook.isExpired ? '已过期' : '未过期'}
+                    </Text>
+                    <Text style={localStyle.desc} allowFontScaling={false}>
+                        {notebook.created}至{notebook.expired}
+                    </Text>
                 </View>
-            </TouchableOpacity>
+            </View>
         );
     }
 }
 
 const localStyle = StyleSheet.create({
-    container: {
-        marginBottom: 15
-    },
     androidBox: {
         width: 140,
         elevation: 1,
         backgroundColor: '#fff',
         alignItems: 'center',
-        margin: 3
+        margin: 3,
+        marginBottom: 15
     },
     iosBox: {
         width: 140,
@@ -65,7 +57,8 @@ const localStyle = StyleSheet.create({
         shadowOffset: {width: 0, height: 0},
         backgroundColor: '#fff',
         alignItems: 'center',
-        margin: 3
+        margin: 3,
+        marginBottom: 15
     },
     privateLabel: {
         position: 'absolute',

src/component/notebook/notebookDiaryList.js

@@ -0,0 +1,216 @@
+import React, {Component} from 'react';
+import {
+    View,
+    StyleSheet,
+    Text,
+    SectionList,
+    InteractionManager,
+    TouchableOpacity,
+    ActivityIndicator
+} from 'react-native';
+import moment from 'moment'
+
+import Api from '../../util/api';
+import Color from '../../style/color';
+import Touchable from '../touchable';
+
+import DiaryBrief from '../diary/diaryBrief';
+import NotebookDiaryData from '../../dataLoader/notebookDiaryData';
+
+
+export default class NotebookDiaryList extends Component {
+
+    constructor(props) {
+        super(props);
+
+        this.dataSource = new NotebookDiaryData();
+        this.notebook =  props.notebook;
+
+        this.state = {
+            diaries: [],
+            hasMore: false,
+
+            refreshing: false,
+            refreshFailed: false
+        };
+    }
+
+    componentDidMount(){
+        InteractionManager.runAfterInteractions(() => {
+            this.refresh();
+        });
+    }
+
+    formatDiaries(diaries) {
+        let today = moment().format('YYYY年M月D日');
+        let reducedDiaries = diaries.reduce((maplist, item) => {
+            let [year, month, day] =
+                item.created.substr(0, 10).split('-')
+                .map(it => Number(it));
+
+            let date = `${year}年${month}月${day}日`;
+            if(date === today) {
+                date = '今天';
+            }
+
+            if(!maplist[date]) {
+                maplist[date] = [];
+            }
+
+            maplist[date].push(item);
+            
+            return maplist;
+
+        }, {});
+        console.log('reduce result:', reducedDiaries);
+
+        let result = [];
+        for(let key in reducedDiaries) {
+            result.push({
+                title: key,
+                data: reducedDiaries[key]
+            });
+        }
+
+        console.log('format result:', result);
+        return result;
+    }
+
+    refresh(loadMore = false) {
+        this.setState({refreshing: true});
+        this.dataSource.refresh(this.notebook.id, loadMore)
+                .then(result => {
+                    console.log('get notebook diaries:', result);
+
+                    if(!result) {
+                        throw {
+                            message: 'refresh no result'
+                        }
+
+                    } else {
+                        let diaries = this.formatDiaries(result.list);
+                        this.setState({
+                            diaries,
+                            hasMore: result.more,
+                            refreshFailed: false
+                        });
+                    }
+
+                }).catch(e => {
+                    this.setState({
+                        diaries: [],
+                        hasMore: false,
+                        refreshFailed: true
+                    });
+
+                }).done(() => {
+                    this.setState({
+                        refreshing: false
+                    });
+                });
+    }
+
+    loadMore() {
+        if (this.state.refreshing) {
+            return;
+        }
+
+        this.refresh(true);
+    }
+
+    render() {
+        return this.notebook ? (
+          <View style={localStyle.container}>
+            <SectionList
+                
+                keyExtractor={(item, index) => item.id}
+
+                sections={this.state.diaries}
+
+                renderItem={(rowData) => {
+                    return (<Touchable onPress={() => {}}>
+                        <DiaryBrief diary={rowData.item}></DiaryBrief>
+                    </Touchable>);
+                }}
+               
+                renderSectionHeader={(info) => {
+                    return (<View style={localStyle.sectionHeader}>
+                        <Text>{info.section.title}</Text>
+                    </View>);
+                }}
+
+                ListFooterComponent={this.renderFooter.bind(this)}
+
+                automaticallyAdjustContentInsets={true}
+
+                ItemSeparatorComponent={(sectionID, rowID, adjacentRowHighlighted) =>
+                    <View key={`${sectionID}-${rowID}`} style={localStyle.itemSeparator} />}
+                
+                SectionSeparatorComponent={() => <View style={localStyle.sectionSeparator} />}
+
+                onEndReached={this.state.hasMore ? this.loadMore.bind(this) : null}
+            />
+          </View>
+
+        ) : null;
+    }
+
+    renderFooter() {
+        if (this.state.refreshing || this.state.diaries.length === 0) {
+            return null;
+        }
+
+        if (this.state.refreshFailed) {
+            return (
+                <View style={localStyle.footer}>
+                    <TouchableOpacity style={{marginTop: 15}}
+                                      onPress={() => {this.loadMore();}}>
+                        <Text style={{color: Color.primary}}>加载失败,请点击重试</Text>
+                    </TouchableOpacity>
+                </View>
+            );
+        }
+
+        if (!this.state.hasMore) {
+            return (
+                <View style={localStyle.footer}>
+                    <Text style={{color: Color.inactiveText, fontSize: 12}}>——  THE END  ——</Text>
+                </View>
+            );
+        }
+
+        return (
+            <View style={localStyle.footer}>
+                <ActivityIndicator animating={true} color={Color.primary}
+                    size={Api.IS_ANDROID ? 'large' : 'small'}/>
+            </View>
+        );
+    }
+}
+
+const localStyle = StyleSheet.create({
+    container: {
+        flex: 1,
+        backgroundColor: 'white'
+    },
+    sectionHeader: {
+        backgroundColor: '#F9F9F9',
+        paddingHorizontal: 15,
+        paddingVertical: 8,
+        color: Color.text
+    },
+    itemSeparator: {
+        borderBottomWidth: StyleSheet.hairlineWidth,
+        borderColor: Color.line
+    },
+    sectionSeparator: {
+        borderBottomWidth: StyleSheet.hairlineWidth,
+        borderColor: Color.line
+    },
+    footer: {
+        height: 60,
+        justifyContent: 'center',
+        alignItems: 'center',
+        paddingBottom: 15
+    }
+});

src/component/notebook/notebookList.js

@@ -5,7 +5,8 @@ import {
     Text,
     FlatList,
     StyleSheet,
-    RefreshControl
+    RefreshControl,
+    TouchableOpacity
 } from 'react-native';
 
 import Api from '../../util/api';
@@ -72,11 +73,14 @@ export default class NotebookList extends Component {
     }
 
     _renderItem(notebook) {
-        
         return notebook ? (
-            <Notebook key={notebook.id} notebook={notebook} onPress={() => {}} />
+            <TouchableOpacity key={notebook.id} activeOpacity={0.7}
+                onPress={() => this.props.onNotebookPress(notebook)}>
+
+                <Notebook key={notebook.id} notebook={notebook} />
+
+            </TouchableOpacity>
         ) : null
-        
     }
 
     render() {

src/dataLoader/followDiaryData.js

@@ -3,7 +3,7 @@ import Api from '../util/api'
 
 const PAGE_SIZE = 21;
 
-export default class FollowListData {
+export default class FollowDiaryData {
     
     list: [];
     last_id: 0;

src/dataLoader/followedByUserData.js

@@ -1,7 +1,7 @@
 import Api from '../util/api'
 
 
-const PAGE_SIZE = 20;
+const PAGE_SIZE = 21;
 
 export default class FollowedByUserData {
     

src/dataLoader/followingUserData.js

@@ -1,7 +1,7 @@
 import Api from '../util/api'
 
 
-const PAGE_SIZE = 20;
+const PAGE_SIZE = 21;
 
 export default class FollowingUserData {
     

src/dataLoader/homeDiaryData.js

@@ -3,7 +3,7 @@ import Api from '../util/api'
 
 const PAGE_SIZE = 21;
 
-export default class HomeListData {
+export default class HomeDiaryData {
 
     list: [];
     last_id: 0;

src/dataLoader/notebookDiaryData.js

@@ -0,0 +1,30 @@
+import Api from '../util/api'
+
+
+const PAGE_SIZE = 21;
+
+export default class NotebookDiaryData {
+    
+    page: 1;
+    list: [];
+
+    async refresh(notebookId, loadMore = false) {
+        let page = !loadMore ? 1 : this.page + 1;
+        let data = await Api.getNotebookDiaries(notebookId, page, PAGE_SIZE);
+        let more = data.items.length === PAGE_SIZE;
+
+        if(!loadMore) {
+            this.page = page;
+            this.list = data.items.slice(0, PAGE_SIZE - 1);
+
+        } else if(data.items.length > 0) {
+            this.page = page;
+            this.list = this.list.concat(data.items.slice(0, PAGE_SIZE - 1));
+        }
+
+        return {
+            list: this.list,
+            more
+        };
+    }
+}

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/followListData';
+import FollowListData from '../dataLoader/followDiaryData';
 
 
 export default class FollowPage extends Component {

src/page/HomePage.js

@@ -5,7 +5,7 @@ import {Navigation} from 'react-native-navigation';
 import Api from '../util/api';
 
 import DiaryList from '../component/diary/diaryList'
-import HomeListData from '../dataLoader/homeListData';
+import HomeListData from '../dataLoader/homeDiaryData';
 
 
 export default class HomePage extends Component {

src/page/NotebookDetailPage.js

@@ -0,0 +1,21 @@
+import React, {Component} from 'react';
+import {StyleSheet, Text, View, ScrollView} from 'react-native';
+
+import Color from '../style/color';
+import NotebookDiaryList from '../component/notebook/notebookDiaryList';
+
+
+export default class NotebookDetailPage extends Component {
+
+    render() {
+        return (
+            <ScrollView style={{flex: 1}}>
+                <NotebookDiaryList notebook={this.props.notebook}></NotebookDiaryList>
+            </ScrollView>
+      );
+    }
+}
+
+const localStyle = StyleSheet.create({
+
+});

src/page/UserPage.js

@@ -6,6 +6,7 @@ import {
   TabBar,
   SceneMap
 } from 'react-native-tab-view';
+import {Navigation} from 'react-native-navigation';
 
 import Api from '../util/api';
 import Color from '../style/color';
@@ -27,6 +28,18 @@ export default class UserPage extends Component {
         };
     }
 
+    _onNotebookPress(notebook) {
+        Navigation.push(this.props.componentId, {
+            component: {
+                name: 'NotebookDetail',
+                passProps: {
+                    notebook: notebook
+                }
+            }
+        });
+        
+    }
+
     _renderLabel = props => ({route}) => {
         let routes = props.navigationState.routes;
         let index = props.navigationState.index;
@@ -58,7 +71,7 @@ export default class UserPage extends Component {
         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>,
         notebook: () => <NotebookList
-
+            onNotebookPress={this._onNotebookPress.bind(this)}
             navigator={this.props.navigator}
         />
     });

src/page/_list.js

@@ -3,6 +3,7 @@ DiaryDetail: require("./DiaryDetailPage.js").default,
 Follow: require("./FollowPage.js").default,
 FollowUser: require("./FollowUserPage.js").default,
 Home: require("./HomePage.js").default,
+NotebookDetail: require("./NotebookDetailPage.js").default,
 Notification: require("./NotificationPage.js").default,
 User: require("./UserPage.js").default,
 Write: require("./WritePage.js").default

src/util/api.js

@@ -73,11 +73,21 @@ async function getSelfNotebooks() {
 }
 
 async function getRelationUsers(page, page_size) {
-  return call('GET', `/relation?page=${page}&page_size=${page_size}`);
+    return call('GET', `/relation?page=${page}&page_size=${page_size}`);
 }
 
 async function getRelationReverseUsers(page, page_size) {
-  return call('GET', `/relation/reverse?page=${page}&page_size=${page_size}`);
+    return call('GET', `/relation/reverse?page=${page}&page_size=${page_size}`);
+}
+
+async function getNotebookDiaries(id, page, page_size) {
+    return call('GET', '/notebooks/' + id + '/diaries?page=' + page + '&page_size=' + page_size, null, 30000)
+            .then((json) => {
+                json.page = Number(json.page);
+                json.page_size = Number(json.page_size);
+
+                return json;
+            });
 }
 
 
@@ -170,6 +180,7 @@ export default {
 
     getTodayDiaries,
     getFollowDiaries,
+    getNotebookDiaries,
     
     getDiaryComments,
     getSelfNotebooks,