1.减少启动屏延时\n2.Dialog自定义视图

Author: TrustDec

src/modules/PopupDialog.js

@@ -4,7 +4,6 @@ import { View,Text,TouchableOpacity,StyleSheet } from "react-native";
 import PopupDialog,{ SlideAnimation,DialogTitle,ScaleAnimation,DialogButton } from 'react-native-popup-dialog';
 
 const dialogTitle = props => <DialogTitle {...props} />;
-//const dialogTitle = () => null;
 class PopupDialogView extends Component {
     render(){
         return(

src/navigators/index.js

@@ -23,7 +23,7 @@ class ReduxNavigation extends Component {
         BackHandler.addEventListener("hardwareBackPress", this.onBackButtonPressAndroid);
         setTimeout(()=>{
             SplashScreen.hide();
-        },2000);
+        },1500);
     }
     componentWillUnmount() {
         BackHandler.removeEventListener("hardwareBackPress", this.onBackButtonPressAndroid);
@@ -47,7 +47,6 @@ class ReduxNavigation extends Component {
     }
     render() {
         const { dispatch, nav, dialog, setTheme, theme } = this.props;
-        console.log(this.props);
         const navigation = addNavigationHelpers({
             dispatch,
             state: nav,
@@ -60,20 +59,8 @@ class ReduxNavigation extends Component {
                     show={dialog.isShow} 
                     confirmBtn={{title:'set dark',bgColor:'#188eee',disabled:theme.id === 'dark',onPress:this.props.setTheme}}
                     cancelBtn={{title:'关闭按钮',bgColor:'#9DABC0',onPress:this.props.hideDialog}}
-                    dialogTitle={<DialogTitle title="PopupDialog"/>}
+                    dialogTitle={dialog.dialogTitle}
                 >
-                    <View style={{marginTop:10}}>
-                        <Text style={theme.styles.navFont} >
-                            知止而后有定，定而后能静，静而后能安，安而后能虑，虑而后能得。物有本末，事有终始。知所先后，则近道矣。
-                        </Text>
-                        {
-                            theme.id !== 'default' && <Button
-                                onClick={this.props.setDefaultTheme}
-                                title={"默认颜色"}
-                                bgColor='#16A085'
-                            />
-                        }
-                    </View>
                     {dialog.children}
                 </PopupDialog>
             </View>

src/page/home/index.js

@@ -7,6 +7,7 @@ import { ColorUtils } from "../../equipment/ColorUtils";
 import * as CONFIG from "../../equipment/ComponentUtil";
 import ToastRoot from "../../modules/Toast";
 
+
 class HomeScreen extends Component {
     static navigationOptions = ({ navigation, navigationOptions }) => {
         const { params } = navigation.state;
@@ -105,7 +106,7 @@ const styles = StyleSheet.create({
 const mapStateToProps = () => ({});
 const mapDispatchToProps = (dispatch, ownProps) => {
     return {
-        showDialog: ()=>dispatch(dialogType.SHOW_DIALOG)
+        showDialog: () =>dispatch(dialogType.HOME_DIALOG)
     }
 };
 export default connect(mapStateToProps,mapDispatchToProps)(HomeScreen)

src/page/index.js

@@ -105,7 +105,7 @@ class LoginScreen extends Component {
                         bgColor='#16A085'
                     />
                     <Button
-                       onClick={this.props.showDialog.bind(this,{type:'SHOW_DIALOG',children:null})}
+                       onClick={this.props.showDialog}
                         title={"Dialog"}
                         bgColor='#188eee'
                     />
@@ -163,8 +163,9 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch, ownProps) => {
     return {
         actions: bindActionCreators(actionCreators, dispatch),
-        showDialog: (element)=>dispatch(element),
+        showDialog: () => dispatch(dialogType.LOGIN_DIALOG),
         hideDialog: ()=>dispatch(dialogType.HIDE_DIALOG),
+        setDefaultTheme:()=>dispatch({type:'DEFAULT_THEME'})
     }
 };
 export default connect(mapStateToProps,mapDispatchToProps)(LoginScreen)

src/redux/actions/dialogType.js

@@ -1,2 +1,19 @@
-export const SHOW_DIALOG = {type:"SHOW_DIALOG"};
-export const HIDE_DIALOG = {type:"HIDE_DIALOG"};
+import React from 'react';
+import ViewTest from '../../page/DialogModules/ViewTest'
+import { DialogTitle } from "react-native-popup-dialog";
+
+export const SHOW_DIALOG = "SHOW_DIALOG";
+export const HIDE_DIALOG = {
+    type: "HIDE_DIALOG"
+};
+
+export const LOGIN_DIALOG = {
+    type: SHOW_DIALOG,
+    children: <ViewTest routh="LOGIN"/>,
+    dialogTitle: <DialogTitle title="LOGIN"/>
+};
+
+export const HOME_DIALOG = {
+    type: SHOW_DIALOG,
+    children: <ViewTest routh="HOME"/>
+};

src/redux/reducers/dialog.js

@@ -1,14 +1,17 @@
-const initialState={
-    isShow:false,
-    children:null
+const initialState = {
+    isShow: false,
+    children: null,
+    dialogTitle: null
 };
 export default dialog = (state = initialState, action) => {
-    console.log(action)
     switch (action.type) {
         case 'SHOW_DIALOG':
-            return {isShow:true,children:action.children}
+            return Object.assign({}, initialState, {
+                isShow: true,
+                ...action
+            })
         case 'HIDE_DIALOG':
-            return {isShow:false,children:null}
+            return initialState
         default:
             return state
     }