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

refs #4632 cambiado el tipo de las imagenes a img/png

This commit is contained in:
Alexandre Riera 2023-03-09 08:42:44 +01:00
parent 6529423e2a
commit 29c49b3089
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,7 +423,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
String token = Utils.getTokenUser(getApplicationContext()); String token = Utils.getTokenUser(getApplicationContext());
File file = new File(data.getSign()); File file = new File(data.getSign());
MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>(); Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", data.getTickets().toString()); queryMap.put("tickets", data.getTickets().toString());
queryMap.put("location", new Gson().toJson(data.getLocation())); queryMap.put("location", new Gson().toJson(data.getLocation()));
@ -449,15 +449,15 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
}else{ }else{
//Log.i("ERROR","error al guardar"); //Log.i("ERROR","error al guardar");
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion)); //Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
//Utils.showErrorDialog(that,response.message()); Utils.showErrorDialog(that,response.message());
} }
} }
@Override @Override
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that,t.getMessage());
} }
}); });
} }
@ -469,7 +469,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
final MainActivity that = this; final MainActivity that = this;
String token = Utils.getTokenUser(getApplicationContext()); String token = Utils.getTokenUser(getApplicationContext());
File file = new File(data.getSign()); File file = new File(data.getSign());
MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>(); Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", data.getTickets().toString()); queryMap.put("tickets", data.getTickets().toString());
queryMap.put("location", new Gson().toJson(data.getLocation())); queryMap.put("location", new Gson().toJson(data.getLocation()));
@ -486,7 +486,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
confirmSavePos(null); confirmSavePos(null);
} else { } else {
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that,response.message());
} }
} }
@ -494,7 +494,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
@Override @Override
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); Utils.showErrorDialog(that,t.getMessage());
} }
}); });
}else{ }else{

2
app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java
View File

@ -68,7 +68,7 @@ public class NetworkStateReveiver extends BroadcastReceiver {
//Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); //Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
String token = Utils.getTokenUser(this.context); String token = Utils.getTokenUser(this.context);
File file = new File(listData.get(pos).getSign()); File file = new File(listData.get(pos).getSign());
MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>(); Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", listData.get(pos).getTickets().toString()); queryMap.put("tickets", listData.get(pos).getTickets().toString());
queryMap.put("location", new Gson().toJson(listData.get(pos).getLocation())); queryMap.put("location", new Gson().toJson(listData.get(pos).getLocation()));

3
app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
View File

@ -250,7 +250,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
String token = Utils.getTokenUser(getApplicationContext()); String token = Utils.getTokenUser(getApplicationContext());
File file = new File(data.getSign()); File file = new File(data.getSign());
MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file));
Map<String, String> queryMap = new HashMap<>(); Map<String, String> queryMap = new HashMap<>();
queryMap.put("tickets", data.getTickets().toString()); queryMap.put("tickets", data.getTickets().toString());
queryMap.put("location", new Gson().toJson(data.getLocation())); queryMap.put("location", new Gson().toJson(data.getLocation()));
@ -274,6 +274,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
}else{ }else{
// Log.i("ERROR","error al guardar"); // Log.i("ERROR","error al guardar");
Utils.showErrorDialog(that,response.message());
saveLocal(data); saveLocal(data);
} }
} }

2
app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
View File

@ -134,7 +134,6 @@ public class Tickets extends AppCompatActivity {
} else { } else {
//Log.i("ERROR", "error al guardar"); //Log.i("ERROR", "error al guardar");
Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion));
getData(pos); getData(pos);
} }
} }
@ -143,6 +142,7 @@ public class Tickets extends AppCompatActivity {
public void onFailure(Call<Void> call, Throwable t) { public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
getData(pos); getData(pos);
Utils.showErrorDialog(that,t.getMessage());
} }
}); });
} else { } else {