added different plugin location for ios

enad-Q1-HMG
umasoodch 5 years ago
parent f59dcae7e2
commit a08865467d

@ -56,8 +56,8 @@ export class AttendScanService {
this.permissions.requestLocationAutherization().then(granted => { this.permissions.requestLocationAutherization().then(granted => {
this.location = granted as boolean; this.location = granted as boolean;
if (this.location) { if (this.location) {
this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
if (this.platform.is('android')) { if (this.platform.is('android')) {
this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
if (resp && (resp.latitude && resp.longitude)) { if (resp && (resp.latitude && resp.longitude)) {
if (resp.isFromMockProvider || resp.mockLocationsEnabled) { if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
this.isFakeLocationUsed = true; this.isFakeLocationUsed = true;
@ -65,19 +65,25 @@ export class AttendScanService {
this.lat = resp.latitude; this.lat = resp.latitude;
this.longt = resp.longitude; this.longt = resp.longitude;
this.attendance(); this.attendance();
} else {
this.common.presentAlert(this.ts.trPK('home', 'position-error'));
} }
}, (error) => {
this.common.presentAlert(this.ts.trPK('home', 'position-error'));
});
} else { } else {
if (resp && (resp.latitude && resp.longitude)) { this.geolocation.getCurrentPosition({maximumAge: 3000, timeout: 10000, enableHighAccuracy: true}).then(resp => {
this.lat = resp.latitude; if(resp && resp.coords.latitude && resp.coords.longitude) {
this.longt = resp.longitude; this.lat = resp.coords.latitude;
this.longt = resp.coords.longitude;
this.attendance(); this.attendance();
} else { } else {
this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
} }
} }).catch(error => {
}, (error) => {
this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
}); });
}
} else { } else {
return false; return false;
} }

@ -245,8 +245,8 @@ export class HomePage implements OnInit {
this.permissions.requestLocationAutherization().then(granted => { this.permissions.requestLocationAutherization().then(granted => {
this.location = granted as boolean; this.location = granted as boolean;
if (this.location) { if (this.location) {
this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
if (this.platform.is('android')) { if (this.platform.is('android')) {
this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
if (resp && (resp.latitude && resp.longitude)) { if (resp && (resp.latitude && resp.longitude)) {
if (resp.isFromMockProvider || resp.mockLocationsEnabled) { if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
this.isFakeLocationUsed = true; this.isFakeLocationUsed = true;
@ -254,19 +254,25 @@ export class HomePage implements OnInit {
this.lat = resp.latitude; this.lat = resp.latitude;
this.longt = resp.longitude; this.longt = resp.longitude;
this.attendance(); this.attendance();
} else {
this.common.presentAlert(this.ts.trPK('home', 'position-error'));
} }
}, (error) => {
this.common.presentAlert(this.ts.trPK('home', 'position-error'));
});
} else { } else {
if (resp && (resp.latitude && resp.longitude)) { this.geolocation.getCurrentPosition({maximumAge: 3000, timeout: 10000, enableHighAccuracy: true}).then(resp => {
this.lat = resp.latitude; if(resp && resp.coords.latitude && resp.coords.longitude) {
this.longt = resp.longitude; this.lat = resp.coords.latitude;
this.longt = resp.coords.longitude;
this.attendance(); this.attendance();
} else { } else {
this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
} }
} }).catch(error => {
}, (error) => {
this.common.presentAlert(this.ts.trPK('home', 'position-error')); this.common.presentAlert(this.ts.trPK('home', 'position-error'));
}); });
}
} else { } else {
return false; return false;
} }

Loading…
Cancel
Save