From 89f8cbfcae30366c8221ed73f3b851d37b3ec59a Mon Sep 17 00:00:00 2001
From: CiufudeanDani <dani.ciufudean@safemobile.com>
Date: Fri, 18 Mar 2022 23:12:20 +0200
Subject: [PATCH] WIP

---
 .../safemobile/dispatch/HistoryActivity.java  | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
index afb3de2..f75c69d 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
@@ -3,7 +3,10 @@ package com.safemobile.dispatch;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
@@ -39,7 +42,9 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
     private Spinner spinnerVehicle;
     private ImageView changeMapType, checkTraffic, slideLayoutImage;
     private LinearLayout layoutTraffic, slidelayout, layoutVehicles;
+    private Button displayButton;
     private Date startDate, endDate;
+    private final Handler myHandler = new Handler();
 
     private ArrayList<Vehicle> allVehicle = new ArrayList<>();
     private ArrayList<String> allVehicleNames = new ArrayList<>();
@@ -76,6 +81,23 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         slidelayout = findViewById(R.id.slidelayout);
         slideLayoutImage = findViewById(R.id.slideLayoutImage);
         layoutVehicles = findViewById(R.id.layoutBig);
+        displayButton = findViewById(R.id.buttonDisplay);
+        displayButton.setOnClickListener(view -> {
+            googleMap.clear();
+            if (!AppParams.DEMO) {
+                parentTab.dropAllData =false;
+                parentTab.firstHistData = true;
+                parentTab.HistMsgList.clear();
+                parentTab.HistPosList.clear();
+
+//                request history
+                parentTab.executeNetworkStuff(new String[] {OperationCodes.GetHistoryPositions + "", allVehicle.get(spinnerVehicle.getSelectedItemPosition()).sc_id + "",
+                        (startDate.getTime()/ 1000L) + "", (endDate.getTime()/ 1000L) + ""});
+            } else {
+                parentTab.demoPositionsList();
+                displayHistory(parentTab.demoPositions);
+            }
+        });
 //        slidelayout.setOnTouchListener((v, event) -> {
 //            if (showVehicle) {
 //                layoutVehicles.setVisibility(View.GONE);
@@ -90,17 +112,13 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
 //        });
 
         setDate();
-
-        parentTab.executeNetworkStuff(new String[] {OperationCodes.GetHistoryPositions + "", allVehicle.get(spinnerVehicle.getSelectedItemPosition()).sc_id + "",
-                (startDate.getTime()/ 1000L) + "", (endDate.getTime()/ 1000L) + ""});
     }
 
-    private void displayHistory(ArrayList<HistPos> demoPositions) {
-        LatLng latLng = new LatLng(demoPositions.get(0).lat, demoPositions.get(0).lng);
+    private void displayHistory(ArrayList<HistPos> positions) {
+        LatLng latLng = null;
         PolylineOptions polylineOptions = new PolylineOptions();
         BitmapDescriptor markerIcon = BitmapDescriptorFactory.fromResource(R.drawable.bus);
-
-        for (HistPos pos : demoPositions) {
+        for (HistPos pos : positions) {
             latLng = new LatLng(pos.lat, pos.lng);
             polylineOptions.add(latLng);
 
@@ -110,7 +128,8 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         }
 
         Polyline polyline1 = googleMap.addPolyline(polylineOptions);
-        googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
+        if (latLng != null)
+            googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
     }
 
     private void setDate() {
@@ -176,7 +195,16 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
 
     }
 
+    final Runnable UpdateMapResults = new Runnable() {
+        public void run() {
+            Log.v("updateMap", parentTab.HistPosList.toString());
+            SM.Debug("Do the Display");
+            displayHistory(parentTab.HistPosList);
+        }
+    };
+
     public void UpdateMap() {
+        myHandler.post(UpdateMapResults);
         SM.Debug("Do the updateMAP post");
     }
 
@@ -196,8 +224,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
     public void onMapReady(@NonNull GoogleMap googleMap) {
         this.googleMap = googleMap;
 
-//        replace this with parentTab.HistPosList
         parentTab.demoPositionsList();
-        displayHistory(parentTab.demoPositions);
+        displayButton.performClick();
     }
 }
\ No newline at end of file