From d6331e64470c0780f4dd1e56926945a8bf525502 Mon Sep 17 00:00:00 2001 From: xuwenyang Date: Fri, 31 May 2019 20:42:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=97=A5=E8=AE=B0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=202.=20=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=9A=E5=90=AF=E5=8A=A8=E5=AF=86=E7=A0=81=EF=BC=8C=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=8F=8D=E9=A6=88=EF=BC=8C=E5=85=B3=E4=BA=8E=EF=BC=8C?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=203.=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=AE=80=E4=BB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 5 +- index.js | 83 ++++-- src/Icon.png | Bin 0 -> 5726 bytes src/component/diary/diaryAction.js | 61 +++++ src/component/diary/diaryBrief.js | 8 +- src/component/diary/diaryList.js | 56 +--- src/component/image/imageAction.js | 2 +- src/component/notebook/notebookDiaryList.js | 3 +- src/component/passwordInput.js | 142 ++++++++++ src/component/userIcon.js | 9 +- src/component/userIntro.js | 17 +- src/page/AboutPage.js | 60 +++++ src/page/DiaryDetailPage.js | 61 +++-- src/page/FeedbackPage.js | 70 +++++ src/page/FollowPage.js | 1 - src/page/NotebookDetailPage.js | 16 +- src/page/PasswordPage.js | 208 +++++++++++++++ src/page/SettingPage.js | 272 ++++++++++++++++++++ src/page/UserInfoEditPage.js | 187 ++++++++++++++ src/page/UserIntroEditPage.js | 126 +++++++++ src/page/UserNameEditPage.js | 137 ++++++++++ src/page/UserPage.js | 24 +- src/page/WritePage.js | 1 - src/page/_list.js | 7 + src/updateInfo.js | 11 + src/util/api.js | 60 ++++- src/util/event.js | 6 +- 27 files changed, 1518 insertions(+), 115 deletions(-) create mode 100644 src/Icon.png create mode 100644 src/component/diary/diaryAction.js create mode 100644 src/component/passwordInput.js create mode 100644 src/page/AboutPage.js create mode 100644 src/page/FeedbackPage.js create mode 100644 src/page/PasswordPage.js create mode 100644 src/page/SettingPage.js create mode 100644 src/page/UserInfoEditPage.js create mode 100644 src/page/UserIntroEditPage.js create mode 100644 src/page/UserNameEditPage.js create mode 100644 src/updateInfo.js diff --git a/App.js b/App.js index 760cf7c..f13860a 100644 --- a/App.js +++ b/App.js @@ -13,7 +13,10 @@ import { Animated, LayoutAnimation, InteractionManager, - Alert, StatusBar, DeviceEventEmitter, Linking + Alert, + StatusBar, + DeviceEventEmitter, + Linking } from 'react-native'; import {Input} from "react-native-elements"; import {Navigation} from 'react-native-navigation'; diff --git a/index.js b/index.js index 27b645d..a4e8a09 100644 --- a/index.js +++ b/index.js @@ -19,6 +19,60 @@ for(let pageName in PageList) { Navigation.registerComponent(pageName, () => PageList[pageName]); } +function loginByAccount() { + Navigation.setRoot({ + root: { + stack: { + children: [{ + component: { + name: 'Timepill', + options: { + topBar: { + visible: false, + + // hide top bar for android + drawBehind: true, + animate: true + } + } + } + }] + } + } + }); +} + +function loginByPassword() { + Navigation.setRoot({ + root: { + stack: { + children: [{ + component: { + name: 'Password', + options: { + topBar: { + title: { + text: '请输入密码' + } + }, + bottomTabs: { + visible: false, + + // hide bottom tab for android + drawBehind: true, + animate: true + } + }, + passProps: { + type: 'login' + } + } + }] + } + } + }); +} + Navigation.events().registerAppLaunchedListener(async () => { try { @@ -30,29 +84,16 @@ Navigation.events().registerAppLaunchedListener(async () => { let token = await Token.getUserToken(); // let token; if(!token) { - Navigation.setRoot({ - root: { - stack: { - children: [{ - component: { - name: 'Timepill', - options: { - topBar: { - visible: false, - - // hide top bar for android - drawBehind: true, - animate: true - } - } - } - }] - } - } - }); + loginByAccount(); } else { - Navigation.setRoot(BottomNav.config()); + const password = await Token.getLoginPassword(); + if(password) { + loginByPassword(); + + } else { + Navigation.setRoot(BottomNav.config()); + } } }); diff --git a/src/Icon.png b/src/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4b83166dd3ce4dabbce52698e867083f34f53b GIT binary patch literal 5726 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 literal 0 HcmV?d00001 diff --git a/src/component/diary/diaryAction.js b/src/component/diary/diaryAction.js new file mode 100644 index 0000000..ecd0e64 --- /dev/null +++ b/src/component/diary/diaryAction.js @@ -0,0 +1,61 @@ +import React, {Component} from 'react'; +import {DeviceEventEmitter, Alert} from 'react-native'; +import {Navigation} from 'react-native-navigation'; + +import Api from '../../util/api'; +import Msg from '../../util/msg'; +import Event from '../../util/event'; + + +function action(componentId, diary, callbacks) { + ActionSheet.showActionSheetWithOptions({ + options:['修改','删除', '取消'], + cancelButtonIndex: 2, + destructiveButtonIndex: 1 + + }, (index) => { + if(index === 0) { + Navigation.push(componentId, { + component: { + name: 'Write', + options: { + bottomTabs: { + visible: false, + + // hide bottom tab for android + drawBehind: true, + animate: true + } + }, + passProps: { + diary: diary + } + } + }); + + } else if (index === 1) { + Alert.alert('提示', '确认删除日记?', [ + {text: '删除', style: 'destructive', onPress: () => { + Api.deleteDiary(diary.id) + .then(() => { + DeviceEventEmitter.emit(Event.updateDiarys, 'del'); + + Msg.showMsg('日记已删除'); + if(callbacks && callbacks.onDelete){ + callbacks.onDelete(); + } + }) + .catch(e => { + Msg.showMsg('日记删除失败' + e.message); + }) + .done(); + }}, + {text: '取消', onPress: () => {}}, + ]); + } + }); +} + +export default { + action +} \ No newline at end of file diff --git a/src/component/diary/diaryBrief.js b/src/component/diary/diaryBrief.js index fe38fbe..4702d86 100644 --- a/src/component/diary/diaryBrief.js +++ b/src/component/diary/diaryBrief.js @@ -7,6 +7,8 @@ import Color from '../../style/color'; import UserIcon from '../userIcon'; import Photo from '../photo'; +import DiaryAction from './diaryAction'; + export default class DiaryBrief extends Component { @@ -26,6 +28,10 @@ export default class DiaryBrief extends Component { return this.showField.indexOf(field) >= 0; } + onDiaryAction() { + DiaryAction.action(this.props.componentId, this.diary); + } + render() { let diary = this.diary; if(!diary) { @@ -79,7 +85,7 @@ export default class DiaryBrief extends Component { { this.editable - ? + ? diff --git a/src/component/diary/diaryList.js b/src/component/diary/diaryList.js index 98ef05e..c469707 100644 --- a/src/component/diary/diaryList.js +++ b/src/component/diary/diaryList.js @@ -90,62 +90,12 @@ export default class DiaryList extends Component { diary: diary, user: diary.user, - editable: this.editable, - onDiaryAction: this._onDiaryAction.bind(this) + editable: this.editable } } }); } - _onDiaryAction(diary) { - ActionSheet.showActionSheetWithOptions({ - options:['修改','删除', '取消'], - cancelButtonIndex: 2, - destructiveButtonIndex: 1 - - }, (index) => { - if(index === 0) { - Navigation.push(this.props.componentId, { - component: { - name: 'Write', - options: { - bottomTabs: { - visible: false, - - // hide bottom tab for android - drawBehind: true, - animate: true - } - }, - passProps: { - diary: diary - } - } - }); - - } else if (index === 1) { - Alert.alert('提示', '确认删除日记?', [ - {text: '删除', style: 'destructive', onPress: () => { - Api.deleteDiary(diary.id) - .then(() => { - let filterDiaries = this.state.diaries.filter((it) => it.id !== diary.id); - this.setState({ - diaries: filterDiaries - }); - - Msg.showMsg('日记已删除'); - }) - .catch(e => { - Msg.showMsg('日记删除失败'); - }) - .done(); - }}, - {text: '取消', onPress: () => {}}, - ]); - } - }); - } - _onPhotoPress(photoUrl) { Navigation.push(this.props.componentId, { component: { @@ -253,12 +203,12 @@ export default class DiaryList extends Component { renderItem={({item}) => { return ( this._onDiaryPress(item)}> - this._onUserIconPress(item)} - onDiaryAction={() => this._onDiaryAction(item)} onPhotoPress={() => this._onPhotoPress(item.photoUrl)} > diff --git a/src/component/image/imageAction.js b/src/component/image/imageAction.js index 3f4077f..889ad91 100644 --- a/src/component/image/imageAction.js +++ b/src/component/image/imageAction.js @@ -13,7 +13,7 @@ async function resize(uri, oWidth, oHeight, maxPixel) { height = Math.sqrt(oHeight * maxPixel / oWidth); } - const newUri = await ImageResizer.createResizedImage(uri, width, height); + const newUri = await ImageResizer.createResizedImage(uri, width, height, 'JPEG', 75); return 'file://' + newUri.uri; } diff --git a/src/component/notebook/notebookDiaryList.js b/src/component/notebook/notebookDiaryList.js index ec3ba3e..88746cd 100644 --- a/src/component/notebook/notebookDiaryList.js +++ b/src/component/notebook/notebookDiaryList.js @@ -169,7 +169,8 @@ export default class NotebookDiaryList extends Component { }, passProps: { diary: diary, - editable: this.editable + editable: this.editable, + expired: this.notebook.isExpired } } }); diff --git a/src/component/passwordInput.js b/src/component/passwordInput.js new file mode 100644 index 0000000..28a2b05 --- /dev/null +++ b/src/component/passwordInput.js @@ -0,0 +1,142 @@ +import React, {Component} from 'react'; +import { + StyleSheet, + View, + TextInput, + TouchableHighlight, + InteractionManager, + Keyboard, + Alert +} from 'react-native'; + +import Api from '../util/api' + + +export default class PasswordInput extends Component { + + constructor(props) { + super(props); + + this.state = { + text: '' + }; + } + + componentDidMount() { + + InteractionManager.runAfterInteractions(() => { + this._onPress(); + }); + + } + + componentWillUnMount() { + Keyboard.dismiss(); + } + + clear() { + this.setState({ + text: '' + }) + } + + _onPress() { + + setTimeout(() => { + this.inputText.focus(); + }, 500); + + } + + render() { + return ( + + + this.inputText = r} + style={localStyle.textInput} + + maxLength={this.props.maxLength} + autoFocus={false} + keyboardType={Api.IS_IOS ? "number-pad" : 'numeric'} + blurOnSubmit={false} + + value={this.state.text} + onChangeText={ + (text) => { + this.setState({text}); + if(text.length === this.props.maxLength) { + this.props.onEnd(text); + } + } + } + /> + { + this._getInputItem() + } + + + ) + + } + + _getInputItem() { + let inputItem = []; + let text = this.state.text; + + for(let i=0; i + {i < text.length ? : null} + + ); + } else { + inputItem.push( + + {i < text.length ? : null} + ) + } + } + + return inputItem; + } +} + +const localStyle = StyleSheet.create({ + container: { + alignItems: 'center', + flexDirection: 'row', + borderWidth: 1, + borderColor: '#ccc', + backgroundColor: '#fff', + borderRadius: 5 + }, + textInput: { + position: 'absolute', + top: 0, + left: 0, + width: 1, + height:1, + padding: 0, + margin: 0 + }, + inputItem: { + height: 45, + width: 45, + justifyContent: 'center', + alignItems: 'center', + backgroundColor: 'white' + }, + inputItemBorderLeftWidth: { + borderLeftWidth: 1, + borderColor: '#ccc' + }, + iconStyle: { + width: 16, + height: 16, + backgroundColor: '#222', + borderRadius: 8 + } +}); \ No newline at end of file diff --git a/src/component/userIcon.js b/src/component/userIcon.js index 18fa4c5..483bd70 100644 --- a/src/component/userIcon.js +++ b/src/component/userIcon.js @@ -5,6 +5,13 @@ import {Avatar} from "react-native-elements"; export default class UserIcon extends Component { + constructor(props) { + super(props); + this.state = { + iconUrl : props.iconUrl + }; + } + _defaultOnPress() { // empty } @@ -15,7 +22,7 @@ export default class UserIcon extends Component { containerStyle={localStyle.container} width={this.props.width || 40} height={this.props.height || 40} - source={{uri: this.props.iconUrl}} + source={{uri: this.state.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 index 94a5acd..4784a59 100644 --- a/src/component/userIntro.js +++ b/src/component/userIntro.js @@ -23,14 +23,19 @@ export default class UserIntro extends Component { } componentDidMount() { - InteractionManager.runAfterInteractions(() => { - this.loadUser(); - }); + Api.getSelfInfoByStore() + .then(user => { + this.selfInfo = user; + + InteractionManager.runAfterInteractions(() => { + this.refresh(); + }); + }); } - loadUser() { - let user = this.state.user; - (user ? Api.getUserInfo(user.id) : Api.getSelfInfoByStore()) + refresh() { + let userId = this.state.user ? this.state.user.id : this.selfInfo.id; + Api.getUserInfo(userId) .then(user => { this.setState({ user: user diff --git a/src/page/AboutPage.js b/src/page/AboutPage.js new file mode 100644 index 0000000..75c853e --- /dev/null +++ b/src/page/AboutPage.js @@ -0,0 +1,60 @@ +import React, { Component } from 'react'; +import { + StyleSheet, + View, + Text, + Image, + DeviceEventEmitter +} from 'react-native'; + +import Api from '../util/api'; +import TokenManager from '../util/token'; +import Event from '../util/event'; +import Color from '../style/color'; +import UpdateInfo from '../updateInfo'; + + +export default class AboutPage extends Component { + + constructor(props) { + super(props); + + this.state = { + info: null, + news: UpdateInfo + }; + } + + static options(passProps) { + return { + topBar: { + title: { + text: '关于' + } + } + }; + } + + componentDidMount() { + TokenManager.setUpdateVersion(UpdateInfo.version) + .then(() => { + DeviceEventEmitter.emit(Event.updateNewsRead); + }); + } + + render() { + const label = this.state.info ? ` (${this.state.info.label})` : null; + + return ( + + + + 版本: {Api.VERSION}{label} + {this.state.news.date} 更新日志 + {this.state.news.info} + + + ); + } +} \ No newline at end of file diff --git a/src/page/DiaryDetailPage.js b/src/page/DiaryDetailPage.js index 4ab81af..72553e1 100644 --- a/src/page/DiaryDetailPage.js +++ b/src/page/DiaryDetailPage.js @@ -18,7 +18,8 @@ import Api from '../util/api' import Event from '../util/event'; import DiaryFull from '../component/diary/diaryFull'; -import CommentInput from '../component/comment/commentInput' +import DiaryAction from '../component/diary/diaryAction'; +import CommentInput from '../component/comment/commentInput'; export default class DiaryDetailPage extends Component { @@ -35,31 +36,40 @@ export default class DiaryDetailPage extends Component { user: props.user, editable: props.editable || false, + expired: props.expired || false, needScrollToBottom: false } - - this.onDiaryAction = props.onDiaryAction || (() => {}); } static options(passProps) { - return { - topBar: { - title: { - text: '日记详情' - }, - rightButtons: [{ - id: 'navButtonMore', - icon: Icon.navButtonMore, - - color: Color.primary // android - }] + let topBar = { + title: { + text: '日记详情' } + } + + if(!passProps.expired) { + topBar.rightButtons = [{ + id: 'navButtonMore', + icon: Icon.navButtonMore, + + color: Color.primary // android + }] + } + + return { + topBar }; } navigationButtonPressed({buttonId}) { - if(this.state.editable) { - this.onDiaryAction(this.state.diary); + if(this.state.editable || this.state.diary.user_id == this.state.selfInfo.id) { + let componentId = this.props.componentId; + DiaryAction.action(componentId, this.state.diary, { + onDelete: () => { + Navigation.pop(componentId); + } + }); } else { ActionSheet.showActionSheetWithOptions({ @@ -90,7 +100,9 @@ export default class DiaryDetailPage extends Component { }).done(); this.diaryListener = DeviceEventEmitter.addListener(Event.updateDiarys, (param) => { - this.refreshDiary(); + if(param != 'del') { + this.refreshDiary(); + } }); this.commentListener = DeviceEventEmitter.addListener(Event.updateComments, (param) => { @@ -131,6 +143,15 @@ export default class DiaryDetailPage extends Component { } render() { + if(!this.state.selfInfo || !this.state.diary) { + return null; + } + + let isMine = false; + if(this.state.selfInfo.id == this.state.diary.user_id) { + isMine = true; + } + return ( this.scroll = r} @@ -144,16 +165,16 @@ export default class DiaryDetailPage extends Component { > this.diaryFull = r} + {...this.props} diary={this.state.diary} refreshData={() => this.state.diary} - editable={this.state.editable} - {...this.props} + editable={this.state.editable || isMine} > { - this.state.selfInfo && this.state.diary ? ( + !this.state.expired ? ( this.commentInput = r} diary={this.state.diary} selfInfo={this.state.selfInfo} diff --git a/src/page/FeedbackPage.js b/src/page/FeedbackPage.js new file mode 100644 index 0000000..15aa8a0 --- /dev/null +++ b/src/page/FeedbackPage.js @@ -0,0 +1,70 @@ +import React, { Component } from 'react'; +import { + StyleSheet, + View, + Text, + DeviceEventEmitter, + TextInput +} from 'react-native'; +import {Navigation} from 'react-native-navigation'; +import {Button} from "react-native-elements"; + +import Color from '../style/color'; +import Api from '../util/api'; +import Msg from '../util/msg'; + + +export default class FeedbackPage extends Component { + + constructor(props) { + super(props); + + this.state = { + content: '' + } + } + + static options(passProps) { + return { + topBar: { + title: { + text: '意见反馈' + } + } + }; + } + + send() { + Api.feedback(this.state.content) + .then(() => { + Msg.showMsg('感谢反馈 ：）'); + Navigation.pop(this.props.componentId); + }) + .catch(e => { + Msg.showMsg('反馈失败'); + }) + .done(); + } + + render() { + return ( + + this.setState({content: text})} + /> +