This commit is contained in:
bricezele 2023-03-14 20:56:24 +01:00
parent 41a3e2c75c
commit d118e520d5
14 changed files with 33 additions and 32 deletions

File diff suppressed because one or more lines are too long

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/datas/img/icon3.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
app/datas/img/icon3up.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
app/datas/img/iconsub3.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/datas/img/ilinklogo.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 925 B

BIN
app/datas/img/png/other_net.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/datas/img/png/user_place.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/datas/img/userplace.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/datas/img/users/man.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -17,8 +17,8 @@ class IMarker extends PureComponent {
latitude: parseFloat(data.latitude),
}
}
this.markerRef = null;
}
componentWillReceiveProps(nextProps) {
const duration = 500
const oldCoord = {
@ -32,21 +32,21 @@ class IMarker extends PureComponent {
if (oldCoord.longitude !== coord.longitude || oldCoord.latitude !== coord.latitude) {
if (Platform.OS === 'android') {
if (this.markerRef) {
this.markerRef._component.animateMarkerToCoordinate(
coord,
duration
);
if(this.markerRef._component) {
this.markerRef._component.animateMarkerToCoordinate(
coord,
duration
);
}
}
} else {
/*this.state.coordinate.timing({
cord,
duration
}).start();
*/
}
*/}
}
}
startAnimation() {
const initialValue = 0
const finalValue = 1
@ -61,11 +61,9 @@ class IMarker extends PureComponent {
}
).start();
}
handleViewRef = ref => this.view = ref;
render() {
const {data, network, isSelected} = this.props;
const { data, network, isSelected } = this.props;
const color = isSelected ? "#F48FB1A0" : "transparent"
const colorSup = isSelected ? "#F06292A0" : "transparent"
const display = isSelected ? "block" : "none";
@ -73,10 +71,7 @@ class IMarker extends PureComponent {
return (
<Marker.Animated
coordinate={this.state.coordinate.longitude ? this.state.coordinate : {
longitude: data.longitude,
latitude: data.latitude
}}
coordinate={this.state.coordinate.longitude ? this.state.coordinate : { longitude: data.longitude, latitude: data.latitude }}
id={data.id}
title={this.props.title}
ref={(re) => {
@ -92,10 +87,9 @@ class IMarker extends PureComponent {
);
}
return (<View/>)
return (<View />)
}
error(erro) {
console.log("on error render image");
console.log(erro);
@ -107,14 +101,17 @@ class IMarker extends PureComponent {
}
componentDidUpdate(prevProps, prevState, snapshot) {
if (this.props.isUser)
if (this.props.isUser) {
if (this.markerRef && this.props.isNeedFocus) {
this.markerRef._component.showCallout()
if(this.markerRef._component)
this.markerRef._component.showCallout()
}
}
}
getImage(data) {
const {isUser, network} = this.props;
const { isUser, network } = this.props;
if (isUser) {
return userposi
} else if (network && data.network === network.name) {
@ -124,7 +121,7 @@ class IMarker extends PureComponent {
}
getIcon(data) {
const {isSelected} = this.props
const { isSelected } = this.props
return isSelected ? (
<Animated.View style={{
width: 32,
@ -148,9 +145,9 @@ class IMarker extends PureComponent {
}
]
}}>
<Image style={{alignSelf: 'center'}} source={this.getImage(data)}/>
<Image style={{ alignSelf: 'center' }} source={this.getImage(data)} />
</Animated.View>
) : (<Image style={{alignSelf: 'center'}} source={this.getImage(data)}/>);
) : (<Image style={{ alignSelf: 'center' }} source={this.getImage(data)} />);
}
@ -166,7 +163,7 @@ class IMarker extends PureComponent {
easing: Easing.linear(),
useNativeDriver: true
}
), {iteration: -1}).start();
), { iteration: -1 }).start();
}
}
@ -176,7 +173,9 @@ const styles = StyleSheet.create({
width: 52,
height: 52
},
ring: {}
ring: {
}
});
export default IMarker;
export default IMarker;