信息展示

liuzhaoxia · liuzhaoxia · commit 232927fef5cf · 2016-07-29T18:51:34.000+08:00
diff --git a/src/actions/articleInfoActions.js b/src/actions/articleInfoActions.js
@@ -13,19 +13,39 @@ const articleInfoActions = {
         return dispatch=> {
             callApi(
                 api.getArticleInfo(data),
-                (data)=>dispatch(articleInfoActions.requestArticleSuccess(data)),
+                (data)=>dispatch(articleInfoActions.getArticleInfoRequest(data)),
                 (err)=>console.warn(err)
             );
         }
     },
-    requestArticleSuccess: (data)=> {
+    getArticleInfoRequest: (data)=> {
         return dispatch=> {
             dispatch(
                 articleInfoActions.setArticleData(data)
             );
+            dispatch(Actions.ArticleInfo());
+        }
+    },
+    updateArticleInfoById: (data)=> {
+        return dispatch=> {
+            callApi(
+                api.updateArticleInfo(data),
+                (data)=>dispatch(articleInfoActions.getArticleInfoRequest(data)),
+                (err)=>console.warn(err)
+            );
+        }
+    },
+    addArticleInfoById: (data)=> {
+        return dispatch=> {
+            callApi(
+                api.updateArticleInfo(data),
+                (data)=>dispatch(articleInfoActions.getArticleInfoRequest(data)),
+                (err)=>console.warn(err)
+            );
         }
     }
 
+
 }
 
 export default articleInfoActions;
diff --git a/src/actions/listViewActions.js b/src/actions/listViewActions.js
@@ -11,12 +11,10 @@ const listViewActions = {
     setListView:createAction(listViewActionEnum.SET_LIST_VIEW),
     toDesOfList: (data)=> {
         return dispatch=> {
+            let p={tableName:"article",condition:"id = "+data};
             dispatch(
-                listViewActions.setListView(data)
-            );
-            dispatch(
-                articleInfoAction.setArticleId(data),
-                Actions.ArticleInfo()
+                articleInfoAction.getArticleInfoById(p)
+
             );
         }
     },
diff --git a/src/apis/api.js b/src/apis/api.js
@@ -16,6 +16,16 @@ const api = {
         `${appConfig.serviceRoot}test/sql/select`,
         fetchMethod.Get,
         {parameter: parameter}
+    ),
+    updateArticleInfo: (parameter)=> createFetch(
+        `${appConfig.serviceRoot}test/sql/update`,
+        fetchMethod.Get,
+        {parameter: parameter}
+    ),
+    addArticleInfo: (parameter)=> createFetch(
+        `${appConfig.serviceRoot}test/sql/add`,
+        fetchMethod.Get,
+        {parameter: parameter}
     )
 };
 
diff --git a/src/containers/android/CustomButton.js b/src/containers/android/CustomButton.js
@@ -17,14 +17,15 @@ class CustomButton extends React.Component {
                 style={styles.button}
                  underlineColorAndroid='transparent'
                 onPress={this.props.onPress}>
-                <Text style={styles.dateT}>{this.props.text}</Text>
+                <Text ref="pickerDate" style={styles.dateT}>{this.props.text}</Text>
             </TouchableHighlight>
         );
     }
 }
 class DataPickerDemo extends Component {
     constructor(props){
         super(props);
+
         this.state={
             presetDate: new Date(2016, 3, 5),
             allDate: new Date(2020, 4, 5),
@@ -53,9 +54,10 @@ class DataPickerDemo extends Component {
     }
 
     render() {
+        let date=this.props.Times;
         return (
             <View>
-                <CustomButton text={this.state.minText}
+                <CustomButton text={date}
                               onPress={this.showPicker.bind(this, 'min', {date: this.state.minDate,minDate:new Date()})}/>
             </View>
         );
diff --git a/src/containers/android/ListView.js b/src/containers/android/ListView.js
@@ -2,11 +2,11 @@
  * Created by zhaohang on 2016/7/25.
  */
 import React ,{Component}from 'react';
-import {View, Text, StyleSheet,TextInput,Image,ListView} from "react-native";
+import {View, Text, StyleSheet,TextInput,Image,ListView,TouchableHighlight} from "react-native";
 import { connect } from 'react-redux'
 import Button from "react-native-button";
 import Swipeout  from "react-native-swipeout";
-import loginActions from '../../actions/loginActions'
+import listViewActions from '../../actions/listViewActions'
 import  {bindActionCreators} from 'redux'
 const styles = StyleSheet.create({
     row: {
@@ -34,27 +34,49 @@ const styles = StyleSheet.create({
 class listView extends Component {
     constructor(props) {
         super(props);
-        let ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
+        //let ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
         this.state = {
-            dataSource :ds.cloneWithRows([{
-                url: '../image/logo.png', title: '第四代活塞,谁发的第四代活塞,谁发的第四代活塞,谁发的', author: '张三', data: '2016-01-01'
-            }, {
-                url: '/src/image/login.png',
-                title: '库克将怒火几年级',
-                author: 'lily',
-                data: '2016-08-08'
-            }])
+            pageNum:1
         };
+        this.getAllList = this.getAllList.bind(this);
+        this.pressRow = this.pressRow.bind(this);
+    }
+    componentWillReceiveProps(nextProps) {
+        this.setState({
+        });
+    }
+
+    componentWillMount() {
+        //控件加载的时候先发起服务请求
+        this.props.getListRequest(1);
+    }
+    pressRow(id) {
+        this.props.toDesOfList(id);
+    }
+    getAllList() {
+        const pageNum = this.state.pageNum;
+
+        const pageTotal = Math.ceil(this.props.state.totalNum/10);
+        if (pageNum<pageTotal) {
+            this.state.pageNum = pageNum+1;
+            this.setState({pageNum: this.state.pageNum});
+            this.props.getListRequest(pageNum+1);
+        }
+
     }
     render() {
+        let data = this.props.state.listData;
+        let ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2});
+        let dataSource = ds.cloneWithRows(data);
         return (
-            <ListView
-                dataSource={this.state.dataSource}
-                renderRow={(rowData) =>
-            <Swipeout right={[{text:'删除',backgroundColor:'red'}]} backgroundColor={'#FFF'}>
+            <ListView  enableEmptySections = {true} onEndReached = {this.getAllList} onEndReachedThreshold = {20}
+                       dataSource={dataSource}
+                       renderRow={(rowData) =>
+                 <Swipeout right={[{text:'删除',backgroundColor:'red'}]} backgroundColor={'#FFF'}>
+                 <TouchableHighlight onPress={() => this.pressRow(rowData.id)}>
                 <View style={styles.row}>
                     <View>
-                        <Image style={styles.thumb} source={require('../../image/login.png')} />
+                        <Image style={styles.thumb} source={{uri:rowData.image}} />
                     </View>
                     <View>
                         <View>
@@ -64,12 +86,15 @@ class listView extends Component {
                         </View>
                         <View>
                              <Text style={styles.desc}>
-                                  {rowData.author}  {rowData.data}
+                                  {rowData.author}  {rowData.date}
                              </Text>
                         </View>
                     </View>
                 </View>
+                </TouchableHighlight>
             </Swipeout>
+
+
             }
             />
         );
@@ -78,13 +103,12 @@ class listView extends Component {
 
 function mapStateToProps(state) {
     return {
-        state:{
-        }
+        state:state.listViewReducer
     }
 }
 
 function mapDispatchToProps(dispatch) {
-    return bindActionCreators(loginActions, dispatch);
+    return bindActionCreators(listViewActions, dispatch);
 }
 
 export default connect(
diff --git a/src/containers/android/MessInfo.js b/src/containers/android/MessInfo.js
@@ -38,46 +38,72 @@ const styles = StyleSheet.create({
         alignSelf: 'center',
         borderBottomColor:'#FFFFFF',
         borderBottomWidth:1
+
     },
-    buttonview: {
+    textView: {
         backgroundColor: '#1DBAF1',
         margin: 20,
         borderRadius: 6,
-        justifyContent: 'center',
-        alignItems: 'center'
+        width:75
     },
-    logintext: {
+    infoText: {
         fontSize: 17,
         color: '#FFFFFF',
         marginTop: 10,
-        marginBottom: 10
-    },
+        marginBottom: 10,
+        width:70
+    }
 });
 class MessInfo extends React.Component {
     // 初始化模拟数据
     constructor(props) {
         super(props);
         this.state={
             language:"",
-            infoDataId:this.props.infoDataId,
             infoData:this.props.infoData
         };
+        this.updateArticle=this.updateArticle.bind(this);
+        this.backListView=this.backListView.bind(this);
+        this.addArticle=this.addArticle.bind(this);
+    }
+
+    updateArticle(){
+        let title = this.refs.title._lastNativeText;
+        let url = this.refs.url._lastNativeText;
+        let author=this.refs.author._lastNativeText;
+        let pickerDate=this.refs.pickerDate.value;
+        let p={
+            tableName:"article",
+            filed:" title="+title+",url="+url+",author="+author+",type="+this.state.language,
+            condition:"id = "+this.state.infoData.id
+        };
+        this.props.updateArticleInfoById(p);
+    }
+
+    backListView(){
+
+    }
+
+    addArticle(){
+        let title = this.refs.title._lastNativeText;
+        let url = this.refs.url._lastNativeText;
+        let author=this.refs.author._lastNativeText;
+        let pickerDate=this.refs.pickerDate.value;
+        let p={
+            tableName:"article",
+            filed:" title="+title+",url="+url+",author="+author+",type="+this.state.language,
+            condition:"id = "+this.state.infoData.id
+        };
+        this.props.addArticleInfoById(p);
     }
 
     componentWillReceiveProps(nextProps) {
         this.setState({
-            infoDataId:nextProps.infoDataId,
             infoData:nextProps.infoData
         });
     }
 
-    componentWillMount() {
-        //控件加载的时候先发起服务请求
-        //var p={tableName:"article",condition:"id = "+this.state.infoDataId}
-        alert(114);
-        var p={tableName:"article",condition:"id = 114"}
-        this.props.getArticleInfoById(p);
-    }
+
 
     render(){
         return (
@@ -87,7 +113,9 @@ class MessInfo extends React.Component {
                         <Text style={styles.textTitle}>文章名称:</Text>
                     </View>
                     <View style={{borderBottomColor:'#FFFFFF',borderBottomWidth:1}}>
-                           <TextInput placeholder="请输入文章名称" placeholderTextColor ='#E0E0E0' underlineColorAndroid='transparent'  style={styles.inputText} value={this.state.infoData.title}>
+                           <TextInput placeholder="请输入文章名称" placeholderTextColor ='#E0E0E0'
+                                      underlineColorAndroid='transparent'  style={styles.inputText}
+                                      value={this.state.infoData.title} ref="title">
 
                            </TextInput>
                     </View>
@@ -99,7 +127,11 @@ class MessInfo extends React.Component {
                     </View>
                     <View style={{borderBottomColor:'#FFFFFF',borderBottomWidth:1}}>
 
-                            <TextInput placeholder="请输入文章链接" placeholderTextColor ='#E0E0E0' underlineColorAndroid='transparent' style={styles.inputText}></TextInput>
+                            <TextInput placeholder="请输入文章链接" placeholderTextColor ='#E0E0E0'
+                                       underlineColorAndroid='transparent' style={styles.inputText}
+                                       value={this.state.infoData.url} ref="url">
+
+                            </TextInput>
 
                     </View>
                 </View>
@@ -111,11 +143,13 @@ class MessInfo extends React.Component {
                         <Picker
                             mode={'dropdown'}
                             prompt="请选择文章类型"
+                            ref="type"
                             style={styles.inputText} placeholderTextColor ='#E0E0E0' underlineColorAndroid='transparent'
-                            selectedValue={this.state.language}
+                            selectedValue={this.state.infoData.type}
                             onValueChange={(lang) =>this.setState({language: lang})}>
-                            <Picker.Item label="测试" value="test" />
-                            <Picker.Item label="开发" value="js" />
+                            <Picker.Item label="测试" value="0" />
+                            <Picker.Item label="开发" value="1" />
+                            <Picker.Item label="杂记" value="2" />
                         </Picker>
                     </View>
                 </View>
@@ -124,7 +158,11 @@ class MessInfo extends React.Component {
                         <Text style={styles.textTitle}>文章作者:</Text>
                     </View>
                     <View style={{borderBottomColor:'#FFFFFF',borderBottomWidth:1}}>
-                        <TextInput placeholder="请输入文章作者" placeholderTextColor ='#E0E0E0' underlineColorAndroid='transparent' style={styles.inputText}></TextInput>
+                        <TextInput placeholder="请输入文章作者" placeholderTextColor ='#E0E0E0'
+                                   underlineColorAndroid='transparent' style={styles.inputText}
+                                   value={this.state.infoData.author} ref="author">
+
+                        </TextInput>
 
                     </View>
                 </View>
@@ -133,7 +171,7 @@ class MessInfo extends React.Component {
                         <Text style={styles.textTitle}>发表时间:</Text>
                     </View>
                     <View style={{borderBottomColor:'#FFFFFF',borderBottomWidth:1}}>
-                        <DataPickerDemo underlineColorAndroid='transparent'/>
+                        <DataPickerDemo Times={this.state.infoData.date}   underlineColorAndroid='transparent'/>
                     </View>
                 </View>
                 <View style={styles.container}>
@@ -146,11 +184,14 @@ class MessInfo extends React.Component {
                 </View>
 
                 <View style={styles.container}>
-                    <View style={styles.buttonview}>
-                        <Text style={styles.logintext} onPress={this.login}>修改</Text>
+                    <View style={styles.textView}>
+                        <Text style={styles.infoText} onPress={this.updateArticle}>修改</Text>
+                    </View>
+                    <View style={styles.textView}>
+                        <Text style={styles.infoText} onPress={this.addArticle}>新增</Text>
                     </View>
-                    <View style={styles.buttonview}>
-                        <Text style={styles.logintext} onPress={this.login}>返回</Text>
+                    <View style={styles.textView}>
+                        <Text style={styles.infoText} onPress={this.backListView}>返回</Text>
                     </View>
                 </View>
 
@@ -162,7 +203,6 @@ class MessInfo extends React.Component {
 
 function mapStateToProps(state) {
     return {
-        infoDataId:state.articleInfoReducer.infoDataId,
         infoData:state.articleInfoReducer.infoData
     }
 }
diff --git a/src/reducers/articleInfoReducer.js b/src/reducers/articleInfoReducer.js
diff --git a/src/reducers/listViewReducer.js b/src/reducers/listViewReducer.js
