diff --git a/src/component/comment/comment.js b/src/component/comment/comment.js
index 2312f7a..8e64fa1 100644
--- a/src/component/comment/comment.js
+++ b/src/component/comment/comment.js
@@ -40,7 +40,7 @@ export default class Comment extends Component {
{
editable
- ?
+ ?
: null
}
diff --git a/src/component/comment/commentList.js b/src/component/comment/commentList.js
index 9dabc39..c716560 100644
--- a/src/component/comment/commentList.js
+++ b/src/component/comment/commentList.js
@@ -4,13 +4,16 @@ import {
ActivityIndicator,
StyleSheet,
FlatList,
- Text, View
+ Text,
+ View,
+ Alert
} from 'react-native';
import {Divider} from "react-native-elements";
import Touchable from '../touchable';
import Color from '../../style/color';
import Api from '../../util/api';
+import Msg from '../../util/msg'
import Comment from './comment';
@@ -21,6 +24,8 @@ export default class CommentList extends Component {
super(props);
this.diaryId = props.diaryId;
+ this.editable = props.editable || false;
+
this.state = {
comments: []
};
@@ -45,6 +50,41 @@ export default class CommentList extends Component {
}
}
+ _onCommentAction(comment) {
+ ActionSheet.showActionSheetWithOptions({
+ options:['删除回复', '取消'],
+ cancelButtonIndex: 1,
+ destructiveButtonIndex: 0
+
+ }, (index) => {
+ if(index == 0) {
+ Alert.alert('提示', '确认删除回复?', [
+ {
+ text: '删除',
+ style: 'destructive',
+ onPress: () => {
+ Api.deleteComment(comment.id)
+ .then(() => {
+ const filterComments = this.state.comments.filter(it => it.id !== comment.id);
+ this.setState({
+ comments: filterComments
+ });
+ })
+ .catch(e => {
+ Msg.showMsg('删除失败');
+ })
+ .done();
+ }
+ },
+ {
+ text: '取消',
+ onPress: () => {}
+ }
+ ]);
+ }
+ });
+ }
+
render() {
return (
@@ -59,7 +99,9 @@ export default class CommentList extends Component {
renderItem={({item}) => {
return (
{}}>
-
+ this._onCommentAction(item)}>
+
)
}}
diff --git a/src/component/diary/diaryBrief.js b/src/component/diary/diaryBrief.js
index 27de5e0..9a694f9 100644
--- a/src/component/diary/diaryBrief.js
+++ b/src/component/diary/diaryBrief.js
@@ -77,7 +77,7 @@ export default class DiaryBrief extends Component {
{
this.editable
?
+ onPress={this.props.onDiaryAction}>
: null
}
diff --git a/src/component/diary/diaryFull.js b/src/component/diary/diaryFull.js
index fe477d2..15a3d21 100644
--- a/src/component/diary/diaryFull.js
+++ b/src/component/diary/diaryFull.js
@@ -13,7 +13,9 @@ export default class DiaryFull extends Component {
constructor(props) {
super(props);
+
this.diary = props.diary;
+ this.editable = props.editable || false;
}
render() {
@@ -54,7 +56,7 @@ export default class DiaryFull extends Component {
-
+
);
diff --git a/src/component/diary/diaryList.js b/src/component/diary/diaryList.js
index ce426b9..0a0d94d 100644
--- a/src/component/diary/diaryList.js
+++ b/src/component/diary/diaryList.js
@@ -81,13 +81,17 @@ export default class DiaryList extends Component {
}
},
passProps: {
- diary: diary
+ diary: diary,
+ user: diary.user,
+
+ editable: this.editable,
+ onDiaryAction: this._onDiaryAction.bind(this)
}
}
});
}
- _onDeleteDiary(diary) {
+ _onDiaryAction(diary) {
ActionSheet.showActionSheetWithOptions({
options:['修改','删除', '取消'],
cancelButtonIndex: 2,
@@ -111,7 +115,8 @@ export default class DiaryList extends Component {
})
.catch(e => {
Msg.showMsg('日记删除失败');
- });
+ })
+ .done();
}},
{text: '取消', onPress: () => {}},
]);
@@ -127,6 +132,7 @@ export default class DiaryList extends Component {
this.setState({refreshing: true, refreshFailed: false});
this.dataSource.refresh()
.then(result => {
+ console.log('diary list result:', result);
if(!result) {
throw {
message: 'refresh diary no result'
@@ -202,7 +208,7 @@ export default class DiaryList extends Component {
data={this.state.diaries}
keyExtractor={(item, index) => {
- return item.id.toString()
+ return item.id.toString() + item.comment_count;
}}
renderItem={({item}) => {
@@ -213,7 +219,7 @@ export default class DiaryList extends Component {
editable={this.editable}
onUserIconPress={() => this._onUserIconPress(item)}
- onDeleteDiary={() => this._onDeleteDiary(item)}
+ onDiaryAction={() => this._onDiaryAction(item)}
>
diff --git a/src/page/DiaryDetailPage.js b/src/page/DiaryDetailPage.js
index 2d3881a..9736f14 100644
--- a/src/page/DiaryDetailPage.js
+++ b/src/page/DiaryDetailPage.js
@@ -1,18 +1,69 @@
import React, {Component} from 'react';
import {Platform, StyleSheet, Text, View, ScrollView} from 'react-native';
+import {Navigation} from 'react-native-navigation';
import Color from '../style/color';
+import {Icon} from '../style/icon';
+import Msg from '../util/msg';
+import Api from '../util/api'
+
import DiaryFull from '../component/diary/diaryFull';
import CommentInput from '../component/comment/commentInput'
export default class DiaryDetailPage extends Component {
+ constructor(props) {
+ super(props);
+ Navigation.events().bindComponent(this);
+
+ this.diary = props.diary;
+ this.user = props.user;
+
+ this.editable = props.editable || false;
+ this.onDiaryAction = props.onDiaryAction || (() => {});
+ }
+
+ static options(passProps) {
+ return {
+ topBar: {
+ title: {
+ text: '日记详情'
+ },
+ rightButtons: [{
+ id: 'navButtonMore',
+ icon: Icon.navButtonMore,
+
+ color: Color.primary // android
+ }]
+ }
+ };
+ }
+
+ navigationButtonPressed({buttonId}) {
+ if(this.editable) {
+ this.onDiaryAction();
+
+ } else {
+ ActionSheet.showActionSheetWithOptions({
+ options: ['举报', '取消'],
+ cancelButtonIndex: 1,
+ destructiveButtonIndex: 0
+
+ }, (index) => {
+ if(index == 0) {
+ // Api.report(this.diary.user_id, this.diary.id).done();
+ Msg.showMsg('举报成功，感谢你的贡献 :)');
+ }
+ });
+ }
+ }
+
render() {
return (
-
+
diff --git a/src/page/UserPage.js b/src/page/UserPage.js
index 4f45460..ccaba81 100644
--- a/src/page/UserPage.js
+++ b/src/page/UserPage.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import {StyleSheet, Text, View, Animated, DeviceEventEmitter} from 'react-native';
+import {StyleSheet, Text, View, Animated, DeviceEventEmitter, Alert} from 'react-native';
import {
PagerScroll,
TabView,
@@ -9,6 +9,7 @@ import {
import {Navigation} from 'react-native-navigation';
import Api from '../util/api';
+import {Icon} from '../style/icon'
import Event from "../util/event";
import Color from '../style/color';
@@ -22,6 +23,7 @@ export default class UserPage extends Component {
constructor(props) {
super(props);
+ Navigation.events().bindComponent(this);
this.user = props.user;
this.userId = this.user ? this.user.id : (props.userId || 0);
@@ -37,7 +39,89 @@ export default class UserPage extends Component {
};
}
+ static options(passProps) {
+ return passProps.user ? {
+ topBar: {
+ title: {
+ text: passProps.user.name
+ },
+ rightButtons: [{
+ id: 'followIcon',
+ icon: Icon.followIcon
+ }]
+ }
+ } : {
+ topBar: {
+ title: {
+ text: '我'
+ },
+ rightButtons: [{
+ id: 'setting',
+ icon: Icon.navButtonSetting,
+
+ color: Color.primary
+ }]
+ }
+ }
+ }
+
+ navigationButtonPressed({buttonId}) {
+ if(buttonId == 'followIcon') {
+ Api.addFollow(this.userId)
+ .then(() => {
+ Navigation.mergeOptions(this.props.componentId, {
+ topBar: {
+ rightButtons: [{
+ id: 'navButtonFollowSelected',
+ icon: Icon.navButtonFollowSelected
+ }]
+ }
+ });
+
+ Alert.alert('已关注');
+ })
+ .catch(e => {
+ Alert.alert('关注失败');
+ }).done();
+
+ } else if(buttonId == 'navButtonFollowSelected') {
+ Api.deleteFollow(this.userId)
+ .then(() => {
+ Navigation.mergeOptions(this.props.componentId, {
+ topBar: {
+ rightButtons: [{
+ id: 'followIcon',
+ icon: Icon.followIcon
+ }]
+ }
+ });
+
+ Alert.alert('已取消关注');
+ })
+ .catch(e => {
+ Alert.alert('取消关注失败');
+ }).done();
+ }
+ }
+
componentDidMount(){
+ if(this.userId) {
+ Api.getRelation(this.userId)
+ .then(re => {
+ this.followed = re;
+ if(this.followed) {
+ Navigation.mergeOptions(this.props.componentId, {
+ topBar: {
+ rightButtons: [{
+ id: 'navButtonFollowSelected',
+ icon: Icon.navButtonFollowSelected
+ }]
+ }
+ });
+ }
+ });
+ }
+
this.listener = DeviceEventEmitter.addListener(Event.updateNotebooks, (param) => {
this.notebookList.refresh();
});
diff --git a/src/util/api.js b/src/util/api.js
index 0ed8b4f..d88ea29 100644
--- a/src/util/api.js
+++ b/src/util/api.js
@@ -92,6 +92,10 @@ async function getDiaryComments(diaryId) {
return call('GET', '/diaries/' + diaryId + '/comments')
}
+async function deleteComment(id) {
+ return call('DELETE', '/comments/' + id)
+}
+
async function getSelfNotebooks() {
return call('GET', '/notebooks/my')
}
@@ -108,6 +112,10 @@ async function getRelationReverseUsers(page, page_size) {
return call('GET', `/relation/reverse?page=${page}&page_size=${page_size}`);
}
+async function getRelation(user_id) {
+ return call('GET', '/relation/' + user_id);
+}
+
async function deleteFollow(user_id) {
return call('DELETE', '/relation/' + user_id);
}
@@ -116,6 +124,11 @@ async function deleteFollowBy(user_id) {
return call('DELETE', '/relation/reverse/' + user_id);
}
+async function addFollow(user_id) {
+ return call('POST', '/relation/' + user_id);
+}
+
+
async function getMessagesHistory() {
return call('GET', '/tip/history');
}
@@ -156,6 +169,13 @@ async function deleteNotebook(id) {
return call('DELETE', '/notebooks/' + id)
}
+async function report(user_id, diary_id) {
+ return call('POST', '/reports/', {
+ user_id: user_id,
+ diary_id: diary_id,
+ });
+}
+
async function upload(method, api, body) {
let token = await TokenManager.getToken();
@@ -282,19 +302,24 @@ export default {
deleteDiary,
getDiaryComments,
+ deleteComment,
getSelfNotebooks,
getUserNotebooks,
getRelationUsers,
getRelationReverseUsers,
+ getRelation,
deleteFollow,
deleteFollowBy,
+ addFollow,
getMessagesHistory,
updateNotebookCover,
createNotebook,
updateNotebook,
- deleteNotebook
+ deleteNotebook,
+
+ report
}
\ No newline at end of file