diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
index 310aab93..8109b3a8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
@@ -88,20 +88,6 @@ public class AppContext {
private void initRecoverColli() {
ColliDataRecover.init(mContext);
-
- if(ColliDataRecover.thereIsAnExistantSession()){
- Integer recoveredMtbColtID = ColliDataRecover.getFirstSessionID();
- MtbColt recoveredMtbColt = ColliDataRecover.getSession(recoveredMtbColtID);
-
- if(recoveredMtbColt != null && recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA && !UtilityString.isNullOrEmpty(recoveredMtbColt.getFiltroOrdini())) {
- ColliMagazzinoRESTConsumer.distribuisciCollo(recoveredMtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE,
- mtbColts -> {
- ColliDataRecover.closeSession(recoveredMtbColtID);
-
- },
- ex -> UtilityExceptions.defaultException(mContext, ex));
- }
- }
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index cbc8f074..d61c11db 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -23,10 +23,17 @@ import butterknife.OnClick;
import de.hdodenhof.circleimageview.CircleImageView;
import it.integry.integrywmsnative.MainActivity;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
+import it.integry.integrywmsnative.core.data_recover.ColliDataRecover;
import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.core.wifi.WiFiCheckerViewHolder;
import it.integry.integrywmsnative.databinding.FragmentMainBinding;
import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
@@ -90,6 +97,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
initSessionData();
+ initRecuperoCollo();
}
private void initSessionData() {
@@ -101,6 +109,30 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
}
}
+ private void initRecuperoCollo() {
+ if(ColliDataRecover.thereIsAnExistantSession()){
+ startRecoverMode();
+
+ Integer recoveredMtbColtID = ColliDataRecover.getFirstSessionID();
+ MtbColt recoveredMtbColt = ColliDataRecover.getSession(recoveredMtbColtID);
+
+ if(recoveredMtbColt != null && recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA && !UtilityString.isNullOrEmpty(recoveredMtbColt.getFiltroOrdini())) {
+ ColliMagazzinoRESTConsumer.distribuisciCollo(recoveredMtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE,
+ mtbColts -> {
+ ColliDataRecover.closeSession(recoveredMtbColtID);
+ endRecoverMode();
+ },
+ ex -> {
+ UtilityExceptions.defaultException(getActivity(), ex);
+ endRecoverMode();
+ });
+ } else {
+ ColliDataRecover.closeSession(recoveredMtbColtID);
+ endRecoverMode();
+ }
+ }
+ }
+
private void collapseNoConnectionLayout(){
if(getActivity() != null) getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true));
}
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 6aa4f8c7..2ea257ff 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,143 +1,93 @@
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/full_white"
+ tools:context=".gest.main.MainFragment">
-
+ android:orientation="vertical">
-
+ android:background="@drawable/gray_detail_background"
+ app:el_duration="400"
+ app:el_expanded="false">
-
-
-
-
-
-
-
-
-
-
-
-
+ android:background="@color/red_600"
+ android:orientation="vertical"
+ android:paddingLeft="8dp"
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp">
+
+
+
+
+
+
+
+
+
+
+ android:layout_gravity="center_horizontal"
+ android:gravity="center_horizontal">
-
+ android:background="@color/colorPrimary"
+ android:paddingLeft="16dp"
+ android:paddingTop="16dp"
+ android:paddingRight="16dp"
+ android:paddingBottom="16dp">
+ android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+ android:textColor="@android:color/white"
+ tools:text="Android Studio" />
+ tools:text="android.studio@android.com" />
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+ android:clipToPadding="false"
+ android:orientation="horizontal"
+ android:weightSum="1"
+ android:padding="8dp">
-
+ android:orientation="vertical"
+ android:layout_weight="0.5">
-
+ android:layout_margin="8dp"
+ app:cardBackgroundColor="@android:color/white"
+ app:cardCornerRadius="4dp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:orientation="vertical"
+ android:padding="8dp">
-
-
+
-
+
+
+
-
+ android:layout_margin="8dp"
+ app:cardBackgroundColor="@android:color/white"
+ app:cardCornerRadius="4dp">
-
-
-
-
+ android:orientation="vertical"
+ android:padding="8dp">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -420,80 +409,79 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
@@ -504,172 +492,172 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index aa882d32..b97251cf 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -178,4 +178,7 @@
Scansiona un articolo per iniziare
Picking libero
+ Recupero dati
+ Attendi qualche istante
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2964c12b..7d294cc2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,5 +179,7 @@
Please press + button to start with picking
Scan an item to start
+ Recovering data
+ Wait a moment