verdnatura/vn-delivery
verdnatura
/
vn-delivery
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refs #4678 pasar a picking

This commit is contained in:
Sergio De la torre 2023-05-31 14:07:54 +02:00
parent 26d0a65b2f
commit 5d1555d7e9
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
View File

@ -193,7 +193,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
/* /*
Intent i = new Intent(this,ExpeditionInfoActivity.class); Intent i = new Intent(this,ExpeditionInfoActivity.class);
startActivity(i);*/ 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) { public void onLoadSelected(int pos) {
// Intent i = new Intent(this,LoadVanActivity.class); // 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)); 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) { public void goToInfo(View v) {
// startActivity(new Intent(this,InfoActivity.class)); // startActivity(new Intent(this,InfoActivity.class));
Utils.startPicking(this, "info"); Utils.startPicking(this, "info","");
} }
public void goToFound(View v) { public void goToFound(View v) {

11
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
View File

@ -219,7 +219,7 @@ public class Utils {
editor.commit(); editor.commit();
} }
public static void startPicking(Context context, String option) { public static void startPicking(Context context, String option, String route) {
Intent i = new Intent(); Intent i = new Intent();
//i.setClassName("es.verdnatura", "es.verdnatura.presentation.view.feature.login.activity.LoginActivity") //i.setClassName("es.verdnatura", "es.verdnatura.presentation.view.feature.login.activity.LoginActivity")
@ -229,11 +229,13 @@ public class Utils {
String packageName = context.getPackageName(); String packageName = context.getPackageName();
PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0); PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
versionName = packageInfo.versionName; 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) { } catch (PackageManager.NameNotFoundException e) {
} }
if (versionName.contains("Beta")) {
if (versionName.contains("Beta") || versionName.contains("Alfa")) {
i.setClassName( i.setClassName(
"es.verdnatura.sfusion", "es.verdnatura.sfusion",
"es.verdnatura.presentation.view.feature.main.activity.MainActivity" "es.verdnatura.presentation.view.feature.main.activity.MainActivity"
@ -249,6 +251,9 @@ public class Utils {
i.putExtra("password", getPass(context)); i.putExtra("password", getPass(context));
i.putExtra("userfk", Utils.getIdUserLogin(context)); i.putExtra("userfk", Utils.getIdUserLogin(context));
i.putExtra("menu", option); i.putExtra("menu", option);
if (route!=null) {
i.putExtra("route",route);
}
context.startActivity(i); context.startActivity(i);