improve question & blink & comment add page.

breitning · breitning · commit 78acf83222d4 · 2016-09-20T21:48:44.000+08:00
diff --git a/source/common/index.js b/source/common/index.js
@@ -80,3 +80,7 @@ export function getFormatDate(date){
 export function splitStrToArray(str, char = ',', count = 3){
     return _.split(str, char, count);
 }
+
+export function numberValidator(str){
+    return true;
+}
diff --git a/source/component/header/home.js b/source/component/header/home.js
@@ -158,7 +158,7 @@ export const styles = StyleSheet.create({
 		opacity: 0.8
 	},
 	drawerMenu:{
-		top: StyleConfig.space_4 * 2,
+		bottom: StyleConfig.space_4 * 2,
 		left: StyleConfig.space_3
 	}
 });
diff --git a/source/view/blinkAdd.js b/source/view/blinkAdd.js
@@ -3,20 +3,23 @@ import {
   View,
   Text,
   Image,
+  Switch,
   TextInput,
   StyleSheet,
   TouchableOpacity
 } from 'react-native';
 
+import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import Icon from 'react-native-vector-icons/Ionicons';
-
 import * as ConfigAction from '../action/config';
 import * as UserAction from '../action/user';
 import { getImageSource } from '../common';
 import { Base64 } from '../common/base64';
 import Navbar from '../component/navbar';
+import Toast from '../component/toast';
+import Spinner from '../component/spinner';
 import { StyleConfig, ComponentStyles, CommonStyles } from '../style';
 
 const navTitle = "新增闪存";
@@ -27,12 +30,44 @@ class BlinkAddPage extends Component {
   constructor (props) {
     super(props);
     this.state = {
-      commentContent:''
+      blinkContent:'',
+      blinkStatus: true,
+      pending: false
+    };
+  }
+
+  blinkValidator(){
+    let blinkContent = this.state.blinkContent;
+    let message ;
+    if(!_.trim(blinkContent)){
+        message = "请输入闪存内容";
+    }
+
+    if(message){
+       this.refs.toast.show({
+         message: message
+       });
+       return false;
     }
+
+    return {
+      Content: blinkContent,
+      IsPrivate: !this.state.blinkStatus
+    };
   }
 
   onBlinkSendPress(){
-    this.props.router.pop();
+    let blinkData = this.blinkValidator();
+    if(blinkData){
+        console.info("onBlinkSendPress");
+        console.info(blinkData);
+    }
+  }
+
+  onBlinkStatusPress(val){
+    this.setState({
+      blinkStatus: val
+    });
   }
 
   renderNavbar(){
@@ -44,23 +79,35 @@ class BlinkAddPage extends Component {
     )
   }
 
-  renderBlinkInput(){
+  renderBlinkContent(){
       return (
           <View style={[ CommonStyles.p_a_3 ]}>
               <TextInput 
-                  ref="txtComment"
+                  ref="txtBlink"
+                  maxLength = { 1000 }
                   multiline = { true }
-                  style={ [ComponentStyles.input, styles.input] }
-                  blurOnSubmit= {true}
+                  style={ [ComponentStyles.input, styles.txtBlinkContent] }
                   placeholder={'请输入闪存内容...'}
                   placeholderTextColor={ StyleConfig.color_gray }
                   underlineColorAndroid = { 'transparent' }
-                  onChangeText = {(val)=>this.setState({commentContent: val})}
-                  value={ this.state.commentContent } />
+                  onChangeText = {(val)=>this.setState({blinkContent: val})}
+                  value={ this.state.blinkContent } />
           </View>
       )
   }
 
+  renderBlinkStatus(){
+    return (
+         <View style={[ CommonStyles.p_a_3, CommonStyles.flexRow, CommonStyles.flexItemsMiddle, CommonStyles.flexItemsBetween, ComponentStyles.panel_bg ]}>
+              <Text style={[ CommonStyles.text_gray, CommonStyles.font_xs ]}>
+                是否公开
+              </Text>
+              <Switch value={ this.state.blinkStatus }
+                onValueChange={(value) => this.onBlinkStatusPress(value) }/>
+         </View>
+    )
+  }
+
   renderUserInfo(){
     return (
          <View style={[ CommonStyles.flexRow, CommonStyles.flexItemsMiddle ]}>
@@ -97,30 +144,30 @@ class BlinkAddPage extends Component {
     )
   }
 
-  renderBlinkMessage(){
-    return (
-      <View style={[CommonStyles.p_a_4]}>
-        <Text style={[ CommonStyles.font_xs, CommonStyles.text_gray, CommonStyles.text_center ]}>
-          请输入闪存内容
-        </Text>
-      </View>
-    )
+  renderPending(){
+    if(this.state.pending === true){
+      return (
+        <Spinner style={ ComponentStyles.pending_container }/>
+      )
+    }
   }
 
   render() {
     return (
       <View style={ ComponentStyles.container }>
         { this.renderNavbar() }
-        { this.renderBlinkInput() }
+        { this.renderBlinkStatus() }
+        { this.renderBlinkContent() }
         { this.renderBlinkOp() }
-        { this.renderBlinkMessage() }
+        { this.renderPending() }
+        <Toast ref="toast"/>
       </View>
     );
   }
 }
 
 const styles = StyleSheet.create({
-  input:{
+  txtBlinkContent:{
     width: StyleConfig.screen_width - ( StyleConfig.space_3 * 2 ),
     height: StyleConfig.screen_height / 5,
     textAlign: "left", 
diff --git a/source/view/commentAdd.js b/source/view/commentAdd.js
@@ -8,15 +8,17 @@ import {
   TouchableOpacity
 } from 'react-native';
 
+import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import Icon from 'react-native-vector-icons/Ionicons';
-
 import * as ConfigAction from '../action/config';
 import * as UserAction from '../action/user';
 import { getImageSource } from '../common';
 import { Base64 } from '../common/base64';
 import Navbar from '../component/navbar';
+import Toast from '../component/toast';
+import Spinner from '../component/spinner';
 import { StyleConfig, ComponentStyles, CommonStyles } from '../style';
 
 const navTitle = "新增回应";
@@ -31,8 +33,29 @@ class CommentAddPage extends Component {
     }
   }
 
+  commentValidator(){
+    let commentContent = this.props.commentContent,
+        message;
+    if(!_.trim(commentContent)){
+        message = '请输入回应内容';
+    }
+    if(message){
+        this.refs.toast.show({
+          message: message
+        });
+        return false;
+    }
+    return {
+      Content: commentContent
+    };
+  }
+
   onCommentSendPress(){
-    this.props.router.pop();
+    let commentData = this.commentValidator();
+    if(commentData){
+      console.info("onCommentSendPress");
+      console.info(commentData);
+    }
   }
 
   renderNavbar(){
@@ -58,7 +81,6 @@ class CommentAddPage extends Component {
     )
   }
 
-
   renderSourceContent(data){
     let sourceContent = data.Title || data.Content;
     return (
@@ -134,14 +156,12 @@ class CommentAddPage extends Component {
     )
   }
 
-  renderCommentMessage(){
-    return (
-      <View style={[CommonStyles.p_a_4]}>
-        <Text style={[ CommonStyles.font_xs, CommonStyles.text_gray, CommonStyles.text_center ]}>
-          请输入评论内容
-        </Text>
-      </View>
-    )
+  renderPending(){
+    if(this.state.pending === true){
+      return (
+        <Spinner style={ ComponentStyles.pending_container }/>
+      )
+    }
   }
 
   render() {
@@ -151,7 +171,8 @@ class CommentAddPage extends Component {
         { this.renderSource() }
         { this.renderCommentInput() }
         { this.renderCommentOp() }
-        { this.renderCommentMessage() }
+        { this.renderPending() }
+        <Toast ref="toast"/>
       </View>
     );
   }
diff --git a/source/view/login.js b/source/view/login.js
@@ -52,11 +52,13 @@ class LoginPage extends Component {
       if(!_.trim(username)){
           message = "请输入登录用户名";
       }
-      if(!_.trim(password)){
+      else if(!_.trim(password)){
           message = "请输入登录密码";
       }
       if(message){
-          this.refs.toast.show(message);
+          this.refs.toast.show({
+            message: message
+          });
           return false;
       }
       username = this.encryptData(username);
diff --git a/source/view/questionAdd.js b/source/view/questionAdd.js

Original file line number	Diff line number	Diff line change
`@@ -80,3 +80,7 @@ export function getFormatDate(date){`
`80`	`80`	`export function splitStrToArray(str, char = ',', count = 3){`
`81`	`81`	`return _.split(str, char, count);`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+export function numberValidator(str){`
	`85`	`+ return true;`
	`86`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ export const styles = StyleSheet.create({`
`158`	`158`	`opacity: 0.8`
`159`	`159`	`},`
`160`	`160`	`drawerMenu:{`
`161`		`- top: StyleConfig.space_4 * 2,`
	`161`	`+ bottom: StyleConfig.space_4 * 2,`
`162`	`162`	`left: StyleConfig.space_3`
`163`	`163`	`}`
`164`	`164`	`});`
Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,13 @@ class LoginPage extends Component {`
`52`	`52`	`if(!_.trim(username)){`
`53`	`53`	`message = "请输入登录用户名";`
`54`	`54`	`}`
`55`		`- if(!_.trim(password)){`
	`55`	`+ else if(!_.trim(password)){`
`56`	`56`	`message = "请输入登录密码";`
`57`	`57`	`}`
`58`	`58`	`if(message){`
`59`		`- this.refs.toast.show(message);`
	`59`	`+ this.refs.toast.show({`
	`60`	`+ message: message`
	`61`	`+ });`
`60`	`62`	`return false;`
`61`	`63`	`}`
`62`	`64`	`username = this.encryptData(username);`