Before switching to release
This commit is contained in:
Brice Zele
parent
1062a79778
commit
ff23733606
1
App.js
1
App.js
|
|
@ -438,6 +438,7 @@ export default class App extends React.Component {
|
|||
|
||||
goToScreen = (routeName, params, isReset = true) => {
|
||||
const {navigator} = this.refs;
|
||||
console.log("NAVIGATOR", navigator);
|
||||
if (typeof navigator !== 'undefined') {
|
||||
console.log("APP HAS LOADED", global.appHasLoaded);
|
||||
if (global.appHasLoaded) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7,7 +7,7 @@
|
|||
"test": "jest",
|
||||
"postinstall": "node ./fix-android/android-release-fix.js",
|
||||
"release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && rm -rf ./android/app/src/main/res/drawable-* && rm -rf ./android/app/src/main/res/raw/* && cd ./android && ./gradlew assembleRelease -x bundleReleaseJsAndAssets && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk",
|
||||
"debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/ && cd ./android && ./gradlew assembleDebug && cd .. && adb install ./android/app/build/outputs/apk/debug/app-debug.apk",
|
||||
"debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/ ; cd ./android ; sudo ./gradlew clean ; sudo ./gradlew assembleDebug ; cd .. && adb install ./android/app/build/outputs/apk/debug/app-debug.apk",
|
||||
"start-emulator": "emulator -avd Nexus_5X_API_29 -dns-server 8.8.8.8",
|
||||
"start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8",
|
||||
"run-debug": "cd android && ./gradlew clean && cd .. && react-native run-android",
|
||||
|
|
|
|||
|
|
@ -1384,10 +1384,10 @@ class Home extends BaseScreen {
|
|||
}}
|
||||
/>*/
|
||||
showInterticiel() {
|
||||
return (<InterticielAds
|
||||
closeIntersticiel={() => this.setState({isPubShow: false})}
|
||||
navigation={this.props.navigation}
|
||||
/>)
|
||||
return (<InterticielAds
|
||||
closeIntersticiel={() => this.setState({isPubShow: false})}
|
||||
navigation={this.props.navigation}
|
||||
/>)
|
||||
}
|
||||
|
||||
renderBottomHome() {
|
||||
|
|
@ -1707,7 +1707,7 @@ class Home extends BaseScreen {
|
|||
}}
|
||||
/>
|
||||
{this.makeCardSearch()}
|
||||
{this.showInterticiel()}
|
||||
{/*this.showInterticiel()*/}
|
||||
{this.makeSlidingUp()}
|
||||
{this.makeDialogLoader()}
|
||||
{this.makeDistanceDialog()}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
import React, { Component } from 'react';
|
||||
import React, {Component} from 'react';
|
||||
import {
|
||||
StyleSheet, View, Text, Image, ProgressBarAndroid,
|
||||
TouchableNativeFeedback, TouchableOpacity,
|
||||
PermissionsAndroid, NativeModules, StatusBar, Platform, Animated
|
||||
StyleSheet, View, Text, Image, ProgressBarAndroid,
|
||||
TouchableNativeFeedback, TouchableOpacity,
|
||||
PermissionsAndroid, NativeModules, StatusBar, Platform, Animated
|
||||
} from 'react-native';
|
||||
import { responsiveHeight, responsiveWidth, responsiveFontSize } from 'react-native-responsive-dimensions';
|
||||
import {responsiveHeight, responsiveWidth, responsiveFontSize} from 'react-native-responsive-dimensions';
|
||||
import I18n from 'react-native-i18n'
|
||||
|
||||
const theme = require('./../../utils/theme.json');
|
||||
const route = require('./../../route.json');
|
||||
import { readUser, getPasObject, getPubActiveObject } from '../../webservice/AuthApi';
|
||||
import { Bubbles, DoubleBounce, Bars, Pulse } from 'react-native-loader';
|
||||
import {readUser, getPasObject, getPubActiveObject} from '../../webservice/AuthApi';
|
||||
import {Bubbles, DoubleBounce, Bars, Pulse} from 'react-native-loader';
|
||||
import Configuration from "../../webservice/persistences/Configuration";
|
||||
import '../ads/InterticielAds'
|
||||
import * as Animatable from 'react-native-animatable';
|
||||
|
|
@ -17,264 +18,277 @@ import LottieView from 'lottie-react-native'; // if you have "esModuleInterop":
|
|||
import InterticielAds from '../ads/InterticielAds';
|
||||
import Overlay from 'react-native-elements'
|
||||
import DeviceInfo from 'react-native-device-info';
|
||||
|
||||
export default class SplashScreen extends Component {
|
||||
static navigatorStyle = {
|
||||
drawUnderNavBar: true,
|
||||
navBarHidden: true,
|
||||
drawUnderStatusBar: false,
|
||||
statusBarHidden: false,
|
||||
statusBarTextColorScheme: 'light',
|
||||
};
|
||||
static options(passProps) {
|
||||
return {
|
||||
statusBar: {
|
||||
visible: false,
|
||||
style: 'light' | 'dark',
|
||||
drawBehind: true
|
||||
},
|
||||
topBar: {
|
||||
title: {
|
||||
text: 'My Screen'
|
||||
},
|
||||
drawBehind: true,
|
||||
visible: false,
|
||||
animate: false
|
||||
}
|
||||
};
|
||||
}
|
||||
static navigatorStyle = {
|
||||
drawUnderNavBar: true,
|
||||
navBarHidden: true,
|
||||
drawUnderStatusBar: false,
|
||||
statusBarHidden: false,
|
||||
statusBarTextColorScheme: 'light',
|
||||
};
|
||||
|
||||
static options(passProps) {
|
||||
return {
|
||||
statusBar: {
|
||||
visible: false,
|
||||
style: 'light' | 'dark',
|
||||
drawBehind: true
|
||||
},
|
||||
topBar: {
|
||||
title: {
|
||||
text: 'My Screen'
|
||||
},
|
||||
drawBehind: true,
|
||||
visible: false,
|
||||
animate: false
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
//
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {};
|
||||
};
|
||||
|
||||
}
|
||||
};
|
||||
workUserResult(result) {
|
||||
console.log("SPLASHSCREEN PROPS", this.props);
|
||||
if (typeof this.props.navigation.state.params !== 'undefined') {
|
||||
if (result === null || result === undefined) {
|
||||
this.props.navigation.navigate("Auth");
|
||||
} else {
|
||||
switch (this.props.navigation.state.params.routeName) {
|
||||
case 'historyItemDetails':
|
||||
this.props.navigation.navigate(this.props.navigation.state.params.routeName, {
|
||||
item: this.props.navigation.state.params.params
|
||||
});
|
||||
break;
|
||||
|
||||
default:
|
||||
this.props.navigation.navigate(this.props.navigation.state.params.routeName, {
|
||||
id: this.props.navigation.state.params.params.id
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
workUserResult(result) {
|
||||
console.log("SPLASHSCREEN PROPS", this.props);
|
||||
if (typeof this.props.navigation.state.params !== 'undefined') {
|
||||
if (result === null || result === undefined) {
|
||||
this.props.navigation.navigate("Auth");
|
||||
} else {
|
||||
switch (this.props.navigation.state.params.routeName) {
|
||||
case 'historyItemDetails':
|
||||
this.props.navigation.navigate(this.props.navigation.state.params.routeName, {
|
||||
item: this.props.navigation.state.params.params
|
||||
});
|
||||
break;
|
||||
|
||||
} else {
|
||||
var way = "";
|
||||
var way2 = "";
|
||||
if (result === null || result === undefined) {
|
||||
way = "Auth"
|
||||
way2 = route.first
|
||||
} else {
|
||||
if (!result.category)
|
||||
way = "App"
|
||||
else {
|
||||
switch (result.category) {
|
||||
case 'geolocated': way = "AgentApp"
|
||||
break;
|
||||
case 'super': way = "adminApp"
|
||||
break
|
||||
default:
|
||||
way = "supAdminApp"
|
||||
}
|
||||
}
|
||||
way2 = route.login
|
||||
}
|
||||
this.props.navigation.navigate(way)
|
||||
}
|
||||
|
||||
/* Navigation.setStackRoot(route.stackRoot,
|
||||
{ component: {
|
||||
name: way,
|
||||
}
|
||||
|
||||
|
||||
default:
|
||||
this.props.navigation.navigate(this.props.navigation.state.params.routeName, {
|
||||
id: this.props.navigation.state.params.params.id
|
||||
});
|
||||
break;
|
||||
}
|
||||
);
|
||||
Navigation.showOverlay({
|
||||
component: {
|
||||
name: route.intersticielAds,
|
||||
id:"interticiel",
|
||||
options: {
|
||||
overlay: {
|
||||
interceptTouchOutside: false
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
var way = "";
|
||||
var way2 = "";
|
||||
if (result === null || result === undefined) {
|
||||
way = "Auth"
|
||||
way2 = route.first
|
||||
} else {
|
||||
if (!result.category)
|
||||
way = "App"
|
||||
else {
|
||||
switch (result.category) {
|
||||
case 'geolocated':
|
||||
way = "AgentApp"
|
||||
break;
|
||||
case 'super':
|
||||
way = "adminApp"
|
||||
break
|
||||
default:
|
||||
way = "supAdminApp"
|
||||
}
|
||||
}
|
||||
});*/
|
||||
way2 = route.login
|
||||
}
|
||||
console.log("SPLASHSCREEN PROPS WAY", way);
|
||||
this.props.navigation.navigate(way)
|
||||
}
|
||||
|
||||
}
|
||||
componentDidMount() {
|
||||
try {
|
||||
this.requestCameraPermission()
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
this.config = new Configuration();
|
||||
this.retrieveAndroidInformation()
|
||||
setTimeout(() => this.bounce(), 500)
|
||||
this.bounce()
|
||||
/* Navigation.setStackRoot(route.stackRoot,
|
||||
{ component: {
|
||||
name: way,
|
||||
}
|
||||
|
||||
}
|
||||
async requestCameraPermission() {
|
||||
try {
|
||||
const granted = await PermissionsAndroid.request(
|
||||
PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
|
||||
{
|
||||
'title': 'Cool Photo App Camera Permission',
|
||||
'message': 'Cool Photo App needs access to your camera ' +
|
||||
'so you can take awesome pictures.'
|
||||
|
||||
}
|
||||
);
|
||||
Navigation.showOverlay({
|
||||
component: {
|
||||
name: route.intersticielAds,
|
||||
id:"interticiel",
|
||||
options: {
|
||||
overlay: {
|
||||
interceptTouchOutside: false
|
||||
}
|
||||
}
|
||||
}
|
||||
});*/
|
||||
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
try {
|
||||
this.requestCameraPermission()
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
this.config = new Configuration();
|
||||
this.retrieveAndroidInformation()
|
||||
setTimeout(() => this.bounce(), 500)
|
||||
this.bounce()
|
||||
|
||||
}
|
||||
|
||||
async requestCameraPermission() {
|
||||
try {
|
||||
const granted = await PermissionsAndroid.request(
|
||||
PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
|
||||
{
|
||||
'title': 'Cool Photo App Camera Permission',
|
||||
'message': 'Cool Photo App needs access to your camera ' +
|
||||
'so you can take awesome pictures.'
|
||||
}
|
||||
)
|
||||
if (granted === PermissionsAndroid.RESULTS.GRANTED) {
|
||||
|
||||
} else {
|
||||
console.log("try get information else")
|
||||
|
||||
}
|
||||
} catch (err) {
|
||||
console.log("try get information error")
|
||||
console.log(err)
|
||||
}
|
||||
}
|
||||
|
||||
handleViewRef = ref => this.view = ref;
|
||||
|
||||
bounce = () => this.view.transition({translateX: 0}, {translateX: 700}, 5000);
|
||||
|
||||
render() {
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
<StatusBar
|
||||
translucent={true}
|
||||
/>
|
||||
<Image style={styles.logo} source={require('./../../datas/img/icon3up.png')}/>
|
||||
<View style={{flexDirection: 'row'}}>
|
||||
<Image style={styles.logo} source={require('./../../datas/img/iconsub3.png')}/>
|
||||
<Animatable.View
|
||||
style={{
|
||||
width: responsiveWidth(90),
|
||||
height: 92,
|
||||
backgroundColor: theme.primary,
|
||||
position: 'absolute',
|
||||
zIndex: 100
|
||||
}}
|
||||
ref={this.handleViewRef}>
|
||||
</Animatable.View>
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
retreiveIosInformation() {
|
||||
readUser().then((result) => {
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
}).catch((e) => {
|
||||
this.props.navigation.navigate("Auth")
|
||||
});
|
||||
return "";
|
||||
}
|
||||
|
||||
retrieveAndroidInformation() {
|
||||
getPasObject().then((data) => {
|
||||
console.warn(data);
|
||||
this.config.setCurrentPas(data)
|
||||
})
|
||||
|
||||
this.config._getData().then((lang) => {
|
||||
if (lang) {
|
||||
I18n.locale = lang
|
||||
readUser().then((result) => {
|
||||
console.warn(result)
|
||||
if (result) {
|
||||
getPubActiveObject(result['country_id']).then((data) => {
|
||||
console.warn(data)
|
||||
this.config.setPubActive(data);
|
||||
})
|
||||
}
|
||||
)
|
||||
if (granted === PermissionsAndroid.RESULTS.GRANTED) {
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
})
|
||||
} else {
|
||||
const code = DeviceInfo.getDeviceLocale();
|
||||
console.warn(code)
|
||||
I18n.locale = code.toLowerCase()
|
||||
readUser().then((result) => {
|
||||
console.warn(result)
|
||||
if (result) {
|
||||
getPubActiveObject(result['country_id']).then((data) => {
|
||||
console.warn(data)
|
||||
this.config.setPubActive(data);
|
||||
})
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
}).catch((e) => {
|
||||
this.setPubActive(data)
|
||||
});
|
||||
|
||||
} else {
|
||||
console.log("try get information else")
|
||||
}
|
||||
}).catch((e) => {
|
||||
console.warn(e.message)
|
||||
DeviceInfo.getDeviceLocale().then((code) => {
|
||||
console.warn(code)
|
||||
|
||||
}
|
||||
} catch (err) {
|
||||
console.log("try get information error")
|
||||
console.log(err)
|
||||
}
|
||||
}
|
||||
handleViewRef = ref => this.view = ref;
|
||||
I18n.locale = code.toLowerCase()
|
||||
readUser().then((result) => {
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
}).catch((e) => {
|
||||
this.props.navigation.navigate("Auth")
|
||||
});
|
||||
})
|
||||
|
||||
bounce = () => this.view.transition({ translateX: 0 }, { translateX: 700 }, 5000);
|
||||
})
|
||||
|
||||
render() {
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
<StatusBar
|
||||
translucent={true}
|
||||
/>
|
||||
<Image style={styles.logo} source={require('./../../datas/img/icon3up.png')} />
|
||||
<View style={{ flexDirection: 'row' }}>
|
||||
<Image style={styles.logo} source={require('./../../datas/img/iconsub3.png')} />
|
||||
<Animatable.View
|
||||
style={{ width: responsiveWidth(90), height: 92, backgroundColor: theme.primary, position: 'absolute', zIndex: 100 }}
|
||||
ref={this.handleViewRef}>
|
||||
</Animatable.View>
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
retreiveIosInformation() {
|
||||
readUser().then((result) => {
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
}).catch((e) => {
|
||||
this.props.navigation.navigate("Auth")
|
||||
});
|
||||
return "";
|
||||
}
|
||||
|
||||
retrieveAndroidInformation() {
|
||||
getPasObject().then((data) => {
|
||||
console.warn(data);
|
||||
this.config.setCurrentPas(data)
|
||||
})
|
||||
|
||||
this.config._getData().then((lang) => {
|
||||
if (lang) {
|
||||
I18n.locale = lang
|
||||
readUser().then((result) => {
|
||||
console.warn(result)
|
||||
if (result) {
|
||||
getPubActiveObject(result['country_id']).then((data) => {
|
||||
console.warn(data)
|
||||
this.config.setPubActive(data);
|
||||
})
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
})
|
||||
} else {
|
||||
const code = DeviceInfo.getDeviceLocale();
|
||||
console.warn(code)
|
||||
I18n.locale = code.toLowerCase()
|
||||
readUser().then((result) => {
|
||||
console.warn(result)
|
||||
if (result) {
|
||||
getPubActiveObject(result['country_id']).then((data) => {
|
||||
console.warn(data)
|
||||
this.config.setPubActive(data);
|
||||
})
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
}).catch((e) => {
|
||||
this.setPubActive(data)
|
||||
});
|
||||
|
||||
}
|
||||
}).catch((e) => {
|
||||
console.warn(e.message)
|
||||
DeviceInfo.getDeviceLocale().then((code) => {
|
||||
console.warn(code)
|
||||
|
||||
I18n.locale = code.toLowerCase()
|
||||
readUser().then((result) => {
|
||||
setTimeout(() => {
|
||||
this.workUserResult(result)
|
||||
}, 3000)
|
||||
}).catch((e) => {
|
||||
this.props.navigation.navigate("Auth")
|
||||
});
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
return ""
|
||||
}
|
||||
return ""
|
||||
}
|
||||
}
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: theme.primary,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
},
|
||||
logoContaner: {
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: theme.primary,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
},
|
||||
logoContaner: {
|
||||
|
||||
flexDirection: 'row',
|
||||
marginTop: responsiveHeight(20),
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
},
|
||||
logo: {
|
||||
width: responsiveWidth(90),
|
||||
resizeMode: 'contain'
|
||||
},
|
||||
lottie: {
|
||||
width: 48
|
||||
,
|
||||
height: 64
|
||||
},
|
||||
title: {
|
||||
fontSize: responsiveFontSize(4),
|
||||
alignSelf: 'center',
|
||||
fontWeight: 'bold',
|
||||
color: 'white',
|
||||
},
|
||||
})
|
||||
flexDirection: 'row',
|
||||
marginTop: responsiveHeight(20),
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
},
|
||||
logo: {
|
||||
width: responsiveWidth(90),
|
||||
resizeMode: 'contain'
|
||||
},
|
||||
lottie: {
|
||||
width: 48
|
||||
,
|
||||
height: 64
|
||||
},
|
||||
title: {
|
||||
fontSize: responsiveFontSize(4),
|
||||
alignSelf: 'center',
|
||||
fontWeight: 'bold',
|
||||
color: 'white',
|
||||
},
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue