Merge branch 'master' of https://github.com/wangtun/wechatArticle

# Conflicts:
#	src/actions/loginActions.js

Author: xujie3949

.gitignore

@@ -39,3 +39,6 @@ buck-out/
 \.buckd/
 android/app/libs
 android/keystores/debug.keystore
+
+# react-native-swipeout need to modify
+!node_modules/react-native-swipeout

src/actions/loginActions.js

@@ -3,14 +3,15 @@
  */
 import { createAction } from 'redux-actions';
 import loginActionEnum from '../constants/loginActionEnum'
-import {api, callApi} from '../apis/api'
+import { api, callApi } from '../apis/api'
+import { Actions } from "react-native-router-flux";
 const loginActions = {
     login: createAction(loginActionEnum.LOGIN_REQUEST),
     loginRequest: (parameter)=> {
         return dispatch=> {
             callApi(
                 api.login(parameter),
-                (data)=>console.warn(data),
+                (data)=>Actions.ListView(),
                 (err)=>console.warn(err)
             );
         }

src/constants/appConfig.js

@@ -1,5 +1,5 @@
 const appConfig = {
-    serviceRoot: 'http://192.168.56.1:3000/'
+    serviceRoot: 'http://172.23.61.139:3000/'
 };
 
 export default appConfig;

src/containers/android/app.js

@@ -7,6 +7,7 @@ import { createStore, applyMiddleware, compose } from 'redux';
 import { Provider, connect } from 'react-redux';
 import { Router, Scene, Modal } from 'react-native-router-flux';
 import login from './../../containers/android/Login';
+import ListView from './../../containers/android/ListView';
 import main from './../../components/android/Main';
 import routeReducerCreator from './../../reducers/routeReducerCreator';
 import helper from './../../utils/helper'
@@ -30,6 +31,8 @@ class App extends React.Component {
                             </Scene>
                             <Scene key="main" direction="vertical" component={main} title="Main"
                                    hideNavBar/>
+                            <Scene key="ListView" direction="vertical" component={ListView} title="ListView"
+                                   hideNavBar/>
                         </Scene>
                         <Scene key="error" component={Error}/>
                     </Scene>