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

Finish v1_0_29(32)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-01-31 10:16:19 +01:00
commit 37735d7188
6 changed files with 9 additions and 8 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 = 31 def appVersionCode = 32
def appVersionName = '1.0.28' def appVersionName = '1.0.29'
signingConfigs { signingConfigs {
release { release {

3
app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
View File

@ -22,6 +22,7 @@ import it.integry.integrywmsnative.core.di.BindableString;
import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityServer; import it.integry.integrywmsnative.core.utility.UtilityServer;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.login.LoginActivity;
import it.integry.integrywmsnative.gest.login.core.LoginHelper; import it.integry.integrywmsnative.gest.login.core.LoginHelper;
import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
@ -119,7 +120,7 @@ public class LoginViewModel {
SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles); SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles);
SettingsManager.i().createUserSession(); SettingsManager.i().createUserSession();
SettingsManager.i().user.fullname = loginDTO.full_name; SettingsManager.i().user.fullname = !UtilityString.isNullOrEmpty(loginDTO.full_name) ? loginDTO.full_name : username.get();
mActivity.runOnUiThread(() -> onLoginSuccess( mActivity.runOnUiThread(() -> onLoginSuccess(

4
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
View File

@ -82,9 +82,9 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment {
} }
@Override @Override
public void onDetach() { public void onDestroyView() {
BarcodeManager.removeCallback(barcodeScannerIstanceID); BarcodeManager.removeCallback(barcodeScannerIstanceID);
super.onDetach(); super.onDestroyView();
} }
} }

4
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
View File

@ -96,10 +96,10 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme
} }
@Override @Override
public void onDetach() { public void onDestroyView() {
mRettificaGiacenzeViewModel.closeLU(false, false); mRettificaGiacenzeViewModel.closeLU(false, false);
BarcodeManager.removeCallback(barcodeScannerIstanceID); BarcodeManager.removeCallback(barcodeScannerIstanceID);
super.onDetach(); super.onDestroyView();
} }
@Override @Override