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

Fix load dei dati post-login

Browse Source
This commit is contained in:
Gius95 2019-01-03 18:32:30 +01:00
parent c118a87f88
commit 92bdb1fa14
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/it/integry/integrywmsnative/MainActivity.java
View File

@ -236,6 +236,8 @@ public class MainActivity extends AppCompatActivity
// new SpannableString("Trovato adattatore " + BarcodeManager.getCurrentBarcodeInterface().getAdapterName() + " installato nel sistema"), // new SpannableString("Trovato adattatore " + BarcodeManager.getCurrentBarcodeInterface().getAdapterName() + " installato nel sistema"),
// null, null).show(); // null, null).show();
} }
//Preload done in splashPage
onDBLoaded();
ServerStatusChecker.getIstance().addCallback(value -> { ServerStatusChecker.getIstance().addCallback(value -> {
if(value && (!mIsOnline || firstCheckExecution)){ if(value && (!mIsOnline || firstCheckExecution)){

12
app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
View File

@ -10,6 +10,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.PermissionsHelper; import it.integry.integrywmsnative.core.utility.PermissionsHelper;
import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.login.LoginActivity;
@ -63,10 +64,19 @@ public class SplashActivity extends AppCompatActivity {
if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){ if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
startLoginActivity(); startLoginActivity();
} else { } else {
startMainActivity(); initFirstData(this::startMainActivity);
} }
} }
private void initFirstData(Runnable onComplete) {
SettingsManager.reloadDBVariables(onComplete, ex -> {
DialogSimpleMessageHelper.makeErrorDialog(this,
new SpannableString(ex.getMessage()), null, null).show();
}
);
}

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

@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO;
import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableBoolean;
import it.integry.integrywmsnative.core.di.BindableString; 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.UtilityServer; import it.integry.integrywmsnative.core.utility.UtilityServer;
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;
@ -235,10 +236,21 @@ public class LoginViewModel {
SettingsManager.update(); SettingsManager.update();
mActivity.finish(); ProgressDialog loadingProgress = UtilityProgress.createDefaultProgressDialog(mActivity);
SettingsManager.reloadDBVariables(() -> {
loadingProgress.dismiss();
mActivity.finish();
Intent myIntent = new Intent(mActivity, MainActivity.class); Intent myIntent = new Intent(mActivity, MainActivity.class);
mActivity.startActivity(myIntent); mActivity.startActivity(myIntent);
},ex -> {
loadingProgress.dismiss();
DialogSimpleMessageHelper.makeErrorDialog(mActivity,
new SpannableString(ex.getMessage()), null, null).show();
}
);
} }
} }