Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1_0_31(34)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-02-05 11:11:58 +01:00
commit e797f8dfad
7 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 33 def appVersionCode = 34
def appVersionName = '1.0.30' def appVersionName = '1.0.31'
signingConfigs { signingConfigs {
release { release {

1
app/src/main/AndroidManifest.xml
View File

@ -16,6 +16,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"

13
app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java
View File

@ -20,14 +20,19 @@ public class RESTBuilder {
} }
public static <T> T getService(final Class<T> service, int timeout) { public static <T> T getService(final Class<T> service, int timeout) {
// return getService(service, "192.168.2.13", 8080); // return getService(service, "192.168.2.13", 8080);
return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, timeout); return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, true, timeout);
} }
public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors) { public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors) {
return getService(service, host, port, addInterceptors, 30); return getService(service, host, port, addInterceptors, true, 30);
} }
public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, int timeout){ public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, boolean addEmsApi) {
return getService(service, host, port, addInterceptors, addEmsApi, 30);
}
public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout){
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS); clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS);
@ -38,7 +43,7 @@ public class RESTBuilder {
OkHttpClient client = clientBuilder.build(); OkHttpClient client = clientBuilder.build();
String endpoint = "http://" + host + ":" + port + "/ems-api/"; String endpoint = "http://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : "");
Retrofit retrofit = new Retrofit.Builder() Retrofit retrofit = new Retrofit.Builder()
.baseUrl(endpoint) .baseUrl(endpoint)

2
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java
View File

@ -66,7 +66,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) { public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
Log.e("ProcessSql", t.toString()); Log.e("ProcessSql", t.toString());
callback.onFailed(new Exception(t)); callback.onFailed(new Exception(t));
UtilityLogger.errorMe(new Exception(t)); UtilityLogger.errorMe(new Exception(t), nativeSql);
} }
}); });

10
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java
View File

@ -31,16 +31,22 @@ public class UtilityLogger {
} }
public static void errorMe(Exception ex) { public static void errorMe(Exception ex) {
errorMe(ex, null, null); errorMe(ex, null, null, null);
} }
public static void errorMe(Exception ex, Runnable onComplete, RunnableArgs<Exception> onFailed) { public static void errorMe(Exception ex, String additionalText) {
errorMe(ex, additionalText, null, null);
}
public static void errorMe(Exception ex, String additionalText, Runnable onComplete, RunnableArgs<Exception> onFailed) {
String message = UtilityResources.readRawTextFile(R.raw.error_mail); String message = UtilityResources.readRawTextFile(R.raw.error_mail);
message = message.replace("#exception_name#", ex.getMessage()); message = message.replace("#exception_name#", ex.getMessage());
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
ex.printStackTrace(new PrintWriter(sw)); ex.printStackTrace(new PrintWriter(sw));
if(additionalText != null) sw.append("\n").append(additionalText);
message = message.replace("#stacktrace#", sw.toString()); message = message.replace("#stacktrace#", sw.toString());
String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB; String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB;

2
app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java
View File

@ -38,7 +38,7 @@ public class LoginHelper {
String host = CommonConst.Login.Azienda.host; String host = CommonConst.Login.Azienda.host;
int port = CommonConst.Login.Azienda.port; int port = CommonConst.Login.Azienda.port;
LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false); LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false, true);
service.loginAzienda(mCodAzienda).enqueue(new Callback<ServiceRESTResponse<LoginAziendaDTO>>() { service.loginAzienda(mCodAzienda).enqueue(new Callback<ServiceRESTResponse<LoginAziendaDTO>>() {
@Override @Override
public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) { public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) {