Notification OK when app closed

This commit is contained in:
Brice Zele 2020-09-30 07:03:08 +01:00
parent e126780bd9
commit b29b30ec6a
2 changed files with 25 additions and 17 deletions

1
App.js
View File

@ -440,6 +440,7 @@ class App extends React.Component {
goToScreen = (routeName, params, isReset = true) => { goToScreen = (routeName, params, isReset = true) => {
const { navigator } = this.refs; const { navigator } = this.refs;
console.log("APP HAS LOADED", global.appHasLoaded);
if (global.appHasLoaded) { if (global.appHasLoaded) {
navigator.dispatch({ navigator.dispatch({
type: "Navigation/NAVIGATE", type: "Navigation/NAVIGATE",

View File

@ -52,27 +52,34 @@ export default class SplashScreen extends Component {
} }
}; };
workUserResult(result) { workUserResult(result) {
var way = ""; console.log("SPLASHSCREEN PROPS", this.props);
var way2 = ""; if (this.props.navigation.state.params.hasOwnProperty('routeName')) {
if (result === null || result === undefined) { this.props.navigation.navigate(this.props.navigation.state.params.routeName, {
way = "Auth" id: this.props.navigation.state.params.params.id
way2 = route.first });
} else { } else {
if (!result.category) var way = "";
way = "App" var way2 = "";
else { if (result === null || result === undefined) {
switch (result.category) { way = "Auth"
case 'geolocated': way = "AgentApp" way2 = route.first
break; } else {
case 'super': way = "adminApp" if (!result.category)
break way = "App"
default: else {
way = "supAdminApp" switch (result.category) {
case 'geolocated': way = "AgentApp"
break;
case 'super': way = "adminApp"
break
default:
way = "supAdminApp"
}
} }
way2 = route.login
} }
way2 = route.login this.props.navigation.navigate(way)
} }
this.props.navigation.navigate(way)
/* Navigation.setStackRoot(route.stackRoot, /* Navigation.setStackRoot(route.stackRoot,
{ component: { { component: {