Merge branch 'master' of ssh://10.10.100.21/source/UU_RN_M

# Conflicts:
#	package.json

index.js

@@ -3,7 +3,8 @@
  */
 
 import {AppRegistry} from 'react-native';
-import App from './App';
+
 import {name as appName} from './app.json';
+import App from "./units/App";
 
 AppRegistry.registerComponent(appName, () => App);

package.json

@@ -7,17 +7,25 @@
     "test": "jest"
   },
   "dependencies": {
+    "axios": "^0.19.0",
     "react": "16.8.3",
     "react-native": "0.59.9",
     "react-native-code-push": "^5.6.1"
+    "react-native-gesture-handler": "^1.3.0",
+    "react-navigation": "^3.11.0",
+    "react-redux": "^7.1.0",
+    "redux": "^4.0.4",
+    "redux-thunk": "^2.3.0"
+
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/runtime": "^7.5.5",
+    "@babel/core": "^7.4.5",
+    "@babel/runtime": "^7.4.5",
     "babel-jest": "^24.8.0",
     "jest": "^24.8.0",
-    "metro-react-native-babel-preset": "^0.55.0",
-    "react-test-renderer": "16.8.3"
+    "metro-react-native-babel-preset": "^0.54.1",
+    "react-test-renderer": "16.8.3",
+    "redux-logger": "^3.0.6"
   },
   "jest": {
     "preset": "react-native"

readme.md

@@ -0,0 +1,24 @@
+
+# RN文档
+
+## 安装组件
+
+- redux
+- redux-thunk
+- redux-logger
+
+
+react-native-tab-navigator
+
+
+
+## 项目目录
+
+actions
+components
+pages
+containers
+constants
+reducers
+store
+utils

units/App.js

@@ -0,0 +1,13 @@
+import  React from 'react'
+import { Provider } from 'react-redux'
+
+import AppContainer from "./containers/AppContainer";
+import store from './store'
+
+export default class extends React.Component {
+    render () {
+        return (<Provider store={store}>
+            <AppContainer />
+        </Provider>)
+    }
+};

units/actions/actionTypes.js

@@ -0,0 +1,7 @@
+
+//功能模块BI
+export const CHANGE_BTN_TEXT = 'CHANGE_BTN_TEXT';
+
+//功能模块A
+
+//功能模块B

units/actions/bi/index.js

@@ -0,0 +1,8 @@
+import  * as T from "../actionTypes"
+
+export const changeBtnText=(text)=>{
+  return {
+      type:T.CHANGE_BTN_TEXT,
+      payload:text
+  }
+}

units/components/pages/DetailsScreen.js

@@ -0,0 +1,39 @@
+/**
+ * Created by Arison on 2019/6/11.
+ */
+import React from "react";
+import { View, Button,Text } from "react-native";
+
+export class DetailsScreen extends React.Component {
+    static navigationOptions = {
+        title: 'DetailsScreen',
+        headerBackTitle:'返回',//设置返回此页面的返回按钮文案，有长度限制
+    }
+
+
+    render() {
+        return (
+            <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
+                <Text  style={{marginBottom: 10}}>Details Screen</Text>
+                <View   style={{margin: 3}}>
+                    <Button
+                        title="再次进入详情界面"
+                        onPress={() => this.props.navigation.push('Details')}
+                    ></Button>
+                </View>
+                <View   style={{margin: 3}}>
+                <Button
+                    title="跳转到主界面"
+                    onPress={() => this.props.navigation.navigate('Home')}
+                />
+                </View>
+                <View   style={{margin: 3}}>
+                <Button
+                    title="返回"
+                    onPress={() => this.props.navigation.goBack()}
+                />
+                </View>
+            </View>
+        );
+    }
+}

units/components/pages/HomeScreen.js

@@ -0,0 +1,102 @@
+import React from "react";
+import {connect} from 'react-redux'
+import {View, Text, Button,TouchableHighlight,StyleSheet} from "react-native";
+import {changeBtnText} from "../../actions/bi/index";
+import YRHttpRequest from  "../../utils/network/fetch"
+import {API} from "../../utils/network/axios/api.config";
+
+class HomeScreen extends React.Component {
+
+    loadData=()=>{
+        //fetch请求
+        console.log("loadData():",API.TEST_GET);
+        YRHttpRequest.get(API.TEST_GET).then(res=>{
+            console.log("res.data=",res);
+        }).catch(err=>{
+            console.log("res.data=",err);
+        })
+        //axios请求
+        // console.log("loadData():",API.TEST_GET);
+        // sendGet({url:API.TEST_GET,params:{
+        //     name:'arison'
+        // }}).then(res=>{
+        //     console.log("res.data=",res);
+        // }).catch(err=>{
+        //     console.log("res.data=",err);
+        // })
+    }
+
+    render() {
+        const {navigation} = this.props;
+        return (
+            <View style={{flex: 1, alignItems: "center", justifyContent: "center"}}>
+                <Text style={{marginBottom: 10}}>Home Screen</Text>
+                <Button
+                    title="详情页"
+                    onPress={() => {
+                        navigation.navigate('Details', {name: '动态的'});
+                    }}
+                />
+
+                <Text style={{marginBottom: 10}}>{this.props.btnText}</Text>
+                <Button title="更新文字"
+                        onPress={() => {
+                             this.props.changeText("我的第一个ReactNative项目!");
+                        }}/>
+
+                <Button style={{marginBottom: 10}}
+                        title="断点调式" onPress={()=>{
+                    for (let i = 0; i < 10; i++) {
+                            console.log("i*i=",i*i);
+                    }
+                }}/>
+
+                <TouchableHighlight
+                    underlayColor="#FF00FF"
+                    activeOpacity={1}
+                    style={styles.button} onPress={this.loadData.bind(this)}>
+                    <Text style={styles.text} > Touch Here </Text>
+                </TouchableHighlight>
+
+            </View>
+        );
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        paddingHorizontal: 10
+    },
+    button: {
+        alignItems: 'center',
+        backgroundColor: '#DDDDDD',
+        borderRadius:5,
+        padding: 10,
+        margin:10
+    },
+    countContainer: {
+        alignItems: 'center',
+        padding: 10
+    },
+    countText: {
+        color: '#FF00FF'
+    },
+    text:{
+        fontWeight:'600',
+        color:'#FFFFFF'
+    }
+})
+
+const mapStateToProps = state => ({
+    btnText:state.pageMainReducer.btnText
+})
+
+const mapDispatchToProps = dispatch => ({
+    changeText:(text)=>{
+        dispatch(changeBtnText(text));
+    }
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(HomeScreen)

units/containers/AppContainer.js

@@ -0,0 +1,25 @@
+import { createStackNavigator, createAppContainer } from "react-navigation";
+import HomeScreen from "../components/pages/HomeScreen";
+import {DetailsScreen} from "../components/pages/DetailsScreen";
+
+export const AppNavigator = createStackNavigator({
+    Home: {
+        screen: HomeScreen,
+        navigationOptions: {//在这里定义每个页面的导航属性，静态配置
+            title: "首页",
+            headerBackTitle:'返回主界面',//设置返回此页面的返回按钮文案，有长度限制
+        }
+    },
+    Details:{
+        screen:DetailsScreen,
+        navigationOptions : {
+            title: '详情',
+            headerBackTitle:'返回',//设置返回此页面的返回按钮文案，有长度限制
+        }
+    }
+}, {
+    initialRouteName: 'Home',
+});
+
+
+export default createAppContainer(AppNavigator);

units/reducers/bi/pageMainReducer.js

@@ -0,0 +1,19 @@
+import * as T from "../../actions/actionTypes";
+
+const initialState = {
+    btnText: '',
+};
+
+const pageMainReducer = (state = initialState, action) => {
+    switch (action.type) {
+        case T.CHANGE_BTN_TEXT:
+            return {
+                ...state,
+                btnText: action.payload
+            };
+        default:
+            return state;
+    }
+};
+
+export default pageMainReducer;

units/reducers/index.js

@@ -0,0 +1,8 @@
+import { combineReducers } from 'redux'
+import pageMainReducer from "./bi/pageMainReducer";
+
+const rootReducer = combineReducers({
+    pageMainReducer
+})
+
+export default rootReducer

units/store/index.js

@@ -0,0 +1,17 @@
+/**
+ * Created by Arison on 2019/8/13.
+ */
+import {createStore, applyMiddleware} from 'redux'
+import AppReducers from '../reducers'
+import thunkMiddleware from 'redux-thunk'
+import loggerMiddleware from 'redux-logger'
+
+const middlewares=[
+    thunkMiddleware,
+    loggerMiddleware
+]
+
+const createStoreWithMiddleware = applyMiddleware(...middlewares)(createStore)
+const store = createStoreWithMiddleware(AppReducers)
+
+export default store

units/utils/network/axios/api.config.js

@@ -0,0 +1,30 @@
+let env = 'dev'
+// if ((/env=online/.test(window.location.href))) {
+//     env = 'online'
+// } else if ((/env=dev/.test(window.location.href))) {
+//     env = 'dev'
+// } else {
+//     env = 'dev' // 默认环境
+// }
+const SERVER_URL_LIST = {
+    online: { // 正式环境
+        SERVER_URL1: '',
+        SERVER_URL2: '',
+        SERVER_URL3: ''
+    },
+    dev: { // 测试环境
+        SERVER_URL1: 'https://www.yundashi168.com/',
+        SERVER_URL2: '',
+        SERVER_URL3: ''
+    }
+}
+
+//项目根路径
+export const SERVER_URL = SERVER_URL_LIST[env].SERVER_URL1;
+
+export const API = {
+    TEST_GET: SERVER_URL + 'wxService/getParam/app/json',
+    }
+
+
+export default SERVER_URL_LIST[env]

units/utils/network/axios/api.js

@@ -0,0 +1,11 @@
+import {sendGet, sendPost} from './axios.util'
+import {API} from './api.config'
+
+// export const login = () => sendPost({
+//     url: API.APP_LOGIN,
+//     params: {user_tel: '18995848321', password: '111111', client_type: 'H5'}
+// })
+
+export const testGet=()=>sendGet({
+    url:API.TEST_GET
+})

units/utils/network/axios/axios.config.js

@@ -0,0 +1,56 @@
+/*axios拦截*/
+import axios from 'axios'
+import config from './api.config'
+
+
+// 配置 axios，并生成实例
+const creatAxios1 = axios.create({
+    baseURL: config.SERVER_URL1,
+    withCredentials: true
+})
+
+
+// 拦截器配置
+creatAxios1.interceptors.request.use(configData => { // 请求拦截 在发送请求之前做些什么
+                                                     // 请求成功做的事情 configData 中包含：url、method等信息
+    return configData
+}, error => { // 请求失败做的事情
+    return Promise.reject(error)
+})
+
+
+creatAxios1.interceptors.response.use(response => { // 响应拦截 对响应数据做点什么
+                                                    // 响应成功做的事情
+    response.data.code = Number(response.data.code) // 将接口返回的状态值 code 处理为数字
+    return response
+}, error => { // 响应失败做的事情
+    return Promise.reject(error)
+})
+
+
+
+function sendAll (arr) { // 顺序和请求发送的顺序相同，使用 axios.spread 分割成多个单独的响应对象
+    if (Object.prototype.toString.call(arr) === '[object Array]') {
+        return axios.all(arr).then(axios.spread(function (...res) { // axios.all 是axios的静态方法，不是实例上的方法
+            // 请求全部都执行完成
+            return Promise.resolve(res)
+        }))
+    } else {
+        const error = new Error('参数错误！')
+        try {
+            throw error
+        } catch (e) {
+            // console.log(e)
+        }
+    }
+}
+
+export default {
+    creatAxios1,
+    sendAll
+}
+
+
+
+
+

units/utils/network/axios/axios.util.js

@@ -0,0 +1,40 @@
+import api from './axios.config'
+import config from './api.config'
+import React from 'react';
+
+
+function _apiFn(baseUrl) {
+    if (baseUrl === 'service2') {
+        api.creatAxios1.defaults.baseURL = config.SERVER_URL2
+    } else if (baseUrl === 'service3') {
+        api.creatAxios1.defaults.baseURL = config.SERVER_URL3
+    } else {
+        api.creatAxios1.defaults.baseURL = config.SERVER_URL1
+    }
+}
+
+export const sendGet = ({url, params, headers}) => { // get 请求
+    return api.creatAxios1.get(url, params, headers).then(res => res.data).catch(err => {
+        console.log(err);
+    });
+}
+
+export const sendPost = ({url, params, headers}) => { // post 请求
+    return api.creatAxios1.post(url, params, headers).then(res => res.data).catch(err => {
+        console.log(err);
+    });
+
+}
+
+/**
+ * 并发请求，同时发送多个请求，使用栗子：src/views/infoEntry/dragCard/dragCardService.js
+ * 顺序和请求发送的顺序相同
+ * @param {arr: [请求1,请求2...]}
+ */
+export const sendAll = ({arr}) => { // 并发请求
+    return new Promise((resolve, reject) => {
+        api.sendAll(arr).then(res => {
+            return resolve(res)
+        })
+    })
+}

units/utils/network/fetch/index.js

@@ -0,0 +1,64 @@
+class YRHttpRequest {
+    get(url) {
+        return new Promise((resolve, reject) => {
+            fetch(url,{
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                method: 'GET'
+            })
+                .then(res => res)
+                .then(data => resolve(data))
+                .catch(err => reject(err))
+
+        })
+    }
+
+    // post方式
+    post(url, data) {
+        return new Promise((resolve, reject) => {
+            fetch(url,{
+                method: 'POST',
+                headers: {
+                    'Content-type': 'application/json'
+                },
+                body: JSON.stringify(data)
+            }).then(res=>res.data);
+        })
+    }
+
+
+    //put 修改
+    put(url, data) {
+        return new Promise((resolve, reject) => {
+            fetch(url, {
+                method: 'PUT',
+                headers: {
+                    'Content-type': 'application/json'
+                },
+                body: JSON.stringify(data)
+            })
+                .then(res => res.json())
+                .then(data => resolve(data))
+                .catch(err => reject(err))
+
+        })
+    }
+
+    //delete
+    delete(url, data) {
+        return new Promise((resolve, reject) => {
+            fetch(url, {
+                method: 'DELETE',
+                headers: {
+                    'Content-type': 'application/json'
+                },
+                body: JSON.stringify(data)
+            })
+                .then(res => res.json())
+                .then(data => resolve('数据删除成功!'))
+                .catch(err => reject(err))
+        })
+    }
+}
+export default new YRHttpRequest();//ES6导出