From 5d1555d7e98777771f6a9f42c3a5842ccaf21794 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt.verdnatura@gmail.com>
Date: Wed, 31 May 2023 14:07:54 +0200
Subject: [PATCH] refs #4678 pasar a picking

---
 .../verdnatura/es/repartoverdnatura/MainActivity.java | 10 ++++++----
 .../verdnatura/es/repartoverdnatura/UTILS/Utils.java  | 11 ++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
index eeb2976..1a7bc7c 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
@@ -193,7 +193,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
 /*
         Intent i = new Intent(this,ExpeditionInfoActivity.class);
         startActivity(i);*/
-        Utils.startPicking(this, "log");
+        Utils.startPicking(this, "log","");
 
     }
 
@@ -341,9 +341,11 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
 
     public void onLoadSelected(int pos) {
         // Intent i = new Intent(this,LoadVanActivity.class);
-        Intent i = new Intent(this, ExpeditionSummaryActivity.class);
+
+        Utils.startPicking(this, "summary",listaRutas.get(pos).getId());
+      /*  Intent i = new Intent(this, ExpeditionSummaryActivity.class);
         i.putExtra("route", listaRutas.get(pos));
-        startActivity(i);
+        startActivity(i);*/
     }
 
 
@@ -387,7 +389,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
 
     public void goToInfo(View v) {
         // startActivity(new Intent(this,InfoActivity.class));
-        Utils.startPicking(this, "info");
+        Utils.startPicking(this, "info","");
     }
 
     public void goToFound(View v) {
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
index f5f1744..0e0e665 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
@@ -219,7 +219,7 @@ public class Utils {
         editor.commit();
     }
 
-    public static void startPicking(Context context, String option) {
+    public static void startPicking(Context context, String option, String route) {
 
         Intent i = new Intent();
         //i.setClassName("es.verdnatura", "es.verdnatura.presentation.view.feature.login.activity.LoginActivity")
@@ -229,11 +229,13 @@ public class Utils {
             String packageName = context.getPackageName();
             PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
             versionName = packageInfo.versionName;
-            Toast.makeText(context,"Versión app:"+versionName,Toast.LENGTH_SHORT).show();
+            Toast.makeText(context,"Version app:"+versionName,Toast.LENGTH_SHORT).show();
         } catch (PackageManager.NameNotFoundException e) {
         }
 
-        if (versionName.contains("Beta")) {
+
+
+        if (versionName.contains("Beta") || versionName.contains("Alfa")) {
             i.setClassName(
                     "es.verdnatura.sfusion",
                     "es.verdnatura.presentation.view.feature.main.activity.MainActivity"
@@ -249,6 +251,9 @@ public class Utils {
         i.putExtra("password", getPass(context));
         i.putExtra("userfk", Utils.getIdUserLogin(context));
         i.putExtra("menu", option);
+        if (route!=null) {
+            i.putExtra("route",route);
+        }
         context.startActivity(i);