RenJuan
/
GT2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.0.7

This commit is contained in:
Ren Juan 2021-08-29 00:11:00 +00:00
parent de380df8d6
commit 183a97003e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Ejectable/GT2.tsx
View File

@ -4,7 +4,7 @@ import { Text, View } from './components/Themed';
import { StyleSheet } from 'react-native'; import { StyleSheet } from 'react-native';
import * as geolib from 'geolib'; import * as geolib from 'geolib';
export const ver:string = "2.06;" export const ver:string = "2.0.7"
var debug:number = 0; var debug:number = 0;
var endIsNigh:boolean = false; var endIsNigh:boolean = false;
var testCount = 0; var testCount = 0;
@ -14,6 +14,7 @@ export var locEnabled:boolean = false;
const heartbeat:number = 500; const heartbeat:number = 500;
const displayBeat:number = 3; const displayBeat:number = 3;
const ticksPerDS = 200;
const geoLibAccuracy:number = 0.1; const geoLibAccuracy:number = 0.1;
const minExpoAccuracy:number = 5; const minExpoAccuracy:number = 5;
@ -193,13 +194,14 @@ export class GT2 {
this.trip.loc.set(lat,lon); this.trip.loc.set(lat,lon);
if (Trips.startPoint.mLatitude == 0.0) Trips.startPoint.set(lat,lon); if (Trips.startPoint.mLatitude == 0.0) Trips.startPoint.set(lat,lon);
t = expoFix.coords['accuracy']; if (t < minExpoAccuracy ) return;
if (this.trip.lastFix.mLatitude == 0.0) this.trip.lastFix.set(lat,lon); if (this.trip.lastFix.mLatitude == 0.0)
this.trip.lastFix.set(lat,lon);
else else
{this.trip.ds += this.trip.lastFix.distanceTo(this.trip.loc); if ((this.trip.ticks % ticksPerDS) == 0) {
t = expoFix.coords['accuracy']; if (t < minExpoAccuracy ) return;
this.trip.ds += this.trip.lastFix.distanceTo(this.trip.loc);
this.trip.lastFix.set(lat,lon); this.trip.lastFix.set(lat,lon);
if (debug > 10) console.log('delta ' + this.trip.ds); if (debug > 10) console.log('delta ' + this.trip.ds);
@ -341,7 +343,7 @@ export class TripDisplay extends React.Component {
{Trips.getTripPanel() } {Trips.getTripPanel() }
</Text> </Text>
</View> ); </View> );
else; else
return( return(
<View> <View>
<Text style={styles.tripText}> <Text style={styles.tripText}>

4
Ejectable/app.json
View File

@ -2,7 +2,7 @@
"expo": { "expo": {
"name": "GT2 Green Travel Carbon App", "name": "GT2 Green Travel Carbon App",
"slug": "GT2standalone", "slug": "GT2standalone",
"version": "2.0.6", "version": "2.0.7",
"orientation": "default", "orientation": "default",
"description": "Travel Carbon Footprint (simplified version)", "description": "Travel Carbon Footprint (simplified version)",
"icon": "./assets/images/icon.png", "icon": "./assets/images/icon.png",
@ -22,7 +22,7 @@
"ios": { "ios": {
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "app.greentravel.gt2", "bundleIdentifier": "app.greentravel.gt2",
"buildNumber": "2", "buildNumber": "3",
"infoPlist": { "infoPlist": {
"UIBackgroundModes": [ "UIBackgroundModes": [
"location", "location",

2
Ejectable/screens/TripScreen.tsx
View File

@ -91,7 +91,7 @@ export default function TripScreen( { navigation }: RootTabScreenProps<'Trip'>)
<TripDisplay></TripDisplay> <TripDisplay></TripDisplay>
</View> </View>
); );
else; else
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Text style={styles.title}>Trip Control</Text> <Text style={styles.title}>Trip Control</Text>