From 1540c289c8f0c0de4edae294a7197d08f8bf0a18 Mon Sep 17 00:00:00 2001
From: Apalak Dutta <apalak@sentientgeeks.com>
Date: Wed, 28 Jun 2023 11:43:08 +0530
Subject: [PATCH] Bug fixes

---
 .../main/java/ru/Service/MyLocationService.java |  4 +++-
 .../java/ru/visionlab/constant/LatLong.java     |  6 ++++++
 .../main/java/ru/visionlab/constant/Url.java    |  1 +
 .../ru/visionlab/femdemo/CheckInActivity.java   | 17 +++++++++--------
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/LatLong.java

diff --git a/examples/example_bestshot/example/app/src/main/java/ru/Service/MyLocationService.java b/examples/example_bestshot/example/app/src/main/java/ru/Service/MyLocationService.java
index ca88100..31b522b 100644
--- a/examples/example_bestshot/example/app/src/main/java/ru/Service/MyLocationService.java
+++ b/examples/example_bestshot/example/app/src/main/java/ru/Service/MyLocationService.java
@@ -60,7 +60,7 @@ public class MyLocationService extends Service {
     private void trackGPS() {
         handler.postDelayed(runnable = new Runnable() {
             public void run() {
-                handler.postDelayed(runnable, delay);
+
                 System.out.println("Inside handler");
                             /*Intent intent = new Intent(MainActivity.this,MyLocationService.class);
                             startService(intent);*/
@@ -75,6 +75,8 @@ public class MyLocationService extends Service {
 
             }
         }, delay);
+        handler.postDelayed(runnable, delay);
+
     }
 
     @Override
diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/LatLong.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/LatLong.java
new file mode 100644
index 0000000..df7340b
--- /dev/null
+++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/LatLong.java
@@ -0,0 +1,6 @@
+package ru.visionlab.constant;
+
+public class LatLong {
+    public static final double newLat= 22.5118;
+    public static final double newLong= 88.4001;
+}
diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java
index dfd7439..c86e223 100644
--- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java
+++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/constant/Url.java
@@ -3,4 +3,5 @@ package ru.visionlab.constant;
 public class Url {
 
     public static final String Base_url= "https://reqres.in/api/";
+
 }
diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java
index d961710..a5ca32d 100644
--- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java
+++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java
@@ -36,6 +36,7 @@ import android.widget.Toast;
 
 import cn.pedant.SweetAlert.SweetAlertDialog;
 import ru.Service.MyLocationService;
+import ru.visionlab.constant.LatLong;
 import ru.visionlab.femdemo.login.LoginActivity;
 import ru.visionlab.femdemo.register.RegisterActivityNew;
 import ru.visionlab.femdemo.views.EmployeeActivity;
@@ -243,11 +244,10 @@ public class CheckInActivity extends AppCompatActivity {
                 double lat=LocationGps.getLatitude();
                 double longi=LocationGps.getLongitude();
 
-                double newLat = 22.5150;
-                double newLong = 88.3930;
+
 
                 float[] results = new float[1];
-                Location.distanceBetween(lat,longi,newLat,newLong,results);
+                Location.distanceBetween(lat,longi,LatLong.newLat,LatLong.newLong,results);
                 distance = results[0];
                 Toast.makeText(this,String.valueOf(distance)+" metres from location",Toast.LENGTH_SHORT).show();
                 if(distance > 400){
@@ -267,14 +267,10 @@ public class CheckInActivity extends AppCompatActivity {
                 double lat=LocationNetwork.getLatitude();
                 double longi=LocationNetwork.getLongitude();
 
-                double newLat = 22.5118;
-                double newLong = 88.4001;
 
-                /*double newLat = 22.5150;
-                double newLong = 88.3930;  */
 
                 float[] results = new float[1];
-                Location.distanceBetween(lat,longi,newLat,newLong,results);
+                Location.distanceBetween(lat,longi, LatLong.newLat,LatLong.newLong,results);
                 float distance = results[0];
                 Toast.makeText(this,String.valueOf(distance)+" metres from location",Toast.LENGTH_LONG).show();
                 if(distance > 400){
@@ -396,5 +392,10 @@ public class CheckInActivity extends AppCompatActivity {
                 .show();
     }
 
+    @Override
+    public void onBackPressed () {
+        Toast.makeText(CheckInActivity.this,"Ongoing process . Please logout to go back.",Toast.LENGTH_LONG).show();
+    }
+
 
 }
\ No newline at end of file