From 47a092b3546b6ec39c6f46bef3d7ecb8dc3c6a98 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 28 Jan 2020 19:36:57 +0100 Subject: [PATCH 1/2] Modificato build.gradle. Implementato flag per gestire il pick manuale. --- app/build.gradle | 15 +++++----- .../db/wrappers/GrigliaWrapper.java | 2 ++ .../integrywmsnative/core/di/Converters.java | 28 +++++++++---------- .../di/binders/ExpandableLayoutBinders.java | 2 +- .../di/binders/TextInputLayoutBinders.java | 2 +- .../core/settings/DBSettingsModel.java | 10 +++++++ .../core/settings/SettingsManager.java | 5 ++++ .../dialogs/DialogScanLisA.java | 23 ++++++++------- .../MainListOrdineVenditaInevasoAdapter.java | 3 +- gradle.properties | 3 +- 10 files changed, 54 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4b4e3072..505e566c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,16 +110,15 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.6.2' implementation 'com.squareup.retrofit2:converter-gson:2.6.2' implementation 'com.annimon:stream:1.2.1' - implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0' + implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0' implementation 'org.apache.commons:commons-text:1.6' //kapt "androidx.lifecycle:lifecycle-compiler:2.0.0" - implementation 'com.danielpuiu:ghostfish:2.0.0' - annotationProcessor "com.danielpuiu:ghostfish-compiler:2.0.0" + //MVVM - implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' - implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0" + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0" implementation 'com.jakewharton.rxbinding2:rxbinding:2.2.0' implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.2.0' implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.2.0' @@ -143,7 +142,7 @@ dependencies { implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' //SQLite ROOM - def room_version = "2.2.1" + def room_version = "2.2.3" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/GrigliaWrapper.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/GrigliaWrapper.java index 0640a799..9273c89a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/GrigliaWrapper.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/GrigliaWrapper.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.data_store.db.wrappers; +import androidx.room.ColumnInfo; import androidx.room.Embedded; import it.integry.integrywmsnative.core.data_store.db.entity.Griglia; @@ -8,6 +9,7 @@ public class GrigliaWrapper { @Embedded private Griglia griglia; + @ColumnInfo(name = "countArticoli") private int countArticoli = 0; public Griglia getGriglia() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java index 79bc45ae..2bbd3e2c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java @@ -42,7 +42,7 @@ public class Converters { return bindableBoolean.get(); } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindEditText(EditText view, final BindableString bindableString) { Pair pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != bindableString) { @@ -63,7 +63,7 @@ public class Converters { } } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindTextInputEditText(TextInputEditText view, final BindableString bindableString) { Pair pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != bindableString) { @@ -84,7 +84,7 @@ public class Converters { } } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindAutoCompleteTextView(AutoCompleteTextView view, final BindableString bindableString) { Pair pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != bindableString) { @@ -105,7 +105,7 @@ public class Converters { } } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindAutoCompleteTextView(AppCompatMultiAutoCompleteTextView view, final BindableString bindableString) { Pair pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != bindableString) { @@ -126,7 +126,7 @@ public class Converters { } } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindTextView(AppCompatTextView view, final BindableString bindableString) { Pair pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != bindableString) { @@ -147,7 +147,7 @@ public class Converters { } } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindTextInputEditText(TextInputEditText view, final BindableFloat bindableFloat) { DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault()); otherSymbols.setDecimalSeparator('.'); @@ -186,7 +186,7 @@ public class Converters { } } - @BindingAdapter("app:binding") + @BindingAdapter("binding") public static void bindRadioGroup(RadioGroup view, final BindableBoolean bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) { view.setTag(R.id.bound_observable, bindableBoolean); @@ -196,7 +196,7 @@ public class Converters { ((RadioButton) view.getChildAt(newValue ? 1 : 0)).setChecked(true); } - @BindingAdapter("app:checked") + @BindingAdapter("checked") public static void bindCheckbox(AppCompatCheckBox view, final BindableBoolean bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) { view.setTag(R.id.bound_observable, bindableBoolean); @@ -208,7 +208,7 @@ public class Converters { view.setChecked(newValue); } - @BindingAdapter("app:checked") + @BindingAdapter("checked") public static void bindCheckbox(CheckBox view, final BindableBoolean bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) { view.setTag(R.id.bound_observable, bindableBoolean); @@ -218,17 +218,17 @@ public class Converters { view.setChecked(newValue); } - @BindingAdapter({"app:onClick"}) + @BindingAdapter({"onClick"}) public static void bindOnClick(View view, final Runnable runnable) { view.setOnClickListener(v -> runnable.run()); } - @BindingAdapter({"app:layout_constraintGuide_percent"}) + @BindingAdapter({"layout_constraintGuide_percent"}) public static void bindFloatPercetageOnGuideline(View view, final float percentage) { ((Guideline)view).setGuidelinePercent(percentage); } - @BindingAdapter({"app:backgroundTintResID"}) + @BindingAdapter({"backgroundTintResID"}) public static void bindBackgroundTintResId(View view, @ColorRes final int colorResId) { view.setBackgroundTintList(ColorStateList.valueOf(ResourcesCompat.getColor(MainApplication.res, colorResId, null))); } @@ -236,7 +236,7 @@ public class Converters { - @BindingAdapter("app:visibility") + @BindingAdapter("visibility") public static void bindCheckbox(LinearLayout view, final BindableBoolean bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) { view.setTag(R.id.bound_observable, bindableBoolean); @@ -253,7 +253,7 @@ public class Converters { } - @BindingAdapter("app:visibility") + @BindingAdapter("visibility") public static void bindView(View view, final BindableBoolean bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) { view.setTag(R.id.bound_observable, bindableBoolean); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java index be166fae..edb18f37 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java @@ -10,7 +10,7 @@ import it.integry.integrywmsnative.core.di.BindableBoolean; public class ExpandableLayoutBinders { - @BindingAdapter("app:el_expanded_bind") + @BindingAdapter("el_expanded_bind") public static void bindExpandableLayout(final ExpandableLayout view, final BindableBoolean bindableBoolean) { Pair pair = (Pair) view.getTag(R.id.bound_observable); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java index 852a3132..cc974d49 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java @@ -5,7 +5,7 @@ import com.google.android.material.textfield.TextInputLayout; public class TextInputLayoutBinders { - @BindingAdapter("app:errorText") + @BindingAdapter("errorText") public static void setErrorMessage(TextInputLayout view, String errorMessage) { view.setError(errorMessage); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index ef2a1734..0c735dfd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -30,6 +30,7 @@ public class DBSettingsModel { private boolean flagVersamentoDirettoProduzione; private boolean flagAskPesoColloSpedizione; private boolean flagForceAllToColli; + private boolean flagSpedizioneEnableManualPick; public List getAvailableProfiles() { return availableProfiles; @@ -190,4 +191,13 @@ public class DBSettingsModel { this.flagVersamentoDirettoProduzione = flagVersamentoDirettoProduzione; return this; } + + public boolean isFlagSpedizioneEnableManualPick() { + return flagSpedizioneEnableManualPick; + } + + public DBSettingsModel setFlagSpedizioneEnableManualPick(boolean flagSpedizioneEnableManualPick) { + this.flagSpedizioneEnableManualPick = flagSpedizioneEnableManualPick; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 37d5d32a..5c81a4c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -234,6 +234,10 @@ public class SettingsManager { .setGestName("PICKING") .setSection("PRODUZIONE") .setKeySection("FLAG_VERSAMENTO_DIRETTO")); + stbGestSetupList.add(new StbGestSetup() + .setGestName("PICKING") + .setSection("SPEDIZIONE") + .setKeySection("ENABLE_MANUAL_PICK")); GestSetupRESTConsumer.getValues(stbGestSetupList, list -> { @@ -251,6 +255,7 @@ public class SettingsManager { dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "FLAG_ASK_PESO_COLLO", Boolean.class)); dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "FLAG_USE_NEW_PICKING_LIST", Boolean.class)); dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "FLAG_VERSAMENTO_DIRETTO", Boolean.class)); + dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "ENABLE_MANUAL_PICK", Boolean.class)); if(onComplete != null) onComplete.run(); }, onFailed); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java index 122b63dc..1f9268da 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java @@ -41,7 +41,7 @@ public class DialogScanLisA { mOnDialogDismiss = null; mContext = context; mHelper = new OrdineAcquistoPvHelper(context); - LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); + LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mGriglia = null; mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_scan_codice_griglia, null, false); @@ -58,7 +58,6 @@ public class DialogScanLisA { } - private void initBarcode() { int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() @@ -80,15 +79,15 @@ public class DialogScanLisA { final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); Context context = mContext; RunnableArgs mOnError = exception -> { - mContext.runOnUiThread(()->{ + mContext.runOnUiThread(() -> { progressDialog.dismiss(); - UtilityExceptions.defaultException(context,exception); + UtilityExceptions.defaultException(context, exception); BarcodeManager.enable(); }); }; - RunnableArgs onGrigliaAvailable = griglia->{ - mContext.runOnUiThread(()->{ + RunnableArgs onGrigliaAvailable = griglia -> { + mContext.runOnUiThread(() -> { progressDialog.dismiss(); mGriglia = griglia; mDialog.dismiss(); @@ -97,14 +96,14 @@ public class DialogScanLisA { GrigliaRepository repository = new GrigliaRepository(); - repository.findByCodAlis(data.getStringValue(),griglia->{ - if (griglia != null){ + repository.findByCodAlis(data.getStringValue(), griglia -> { + if (griglia != null) { griglia.getGriglia().setCountArticoli(griglia.getCountArticoli()); - mHelper.updateGriglia(griglia.getGriglia(), onGrigliaAvailable,mOnError); - }else{ - mHelper.downloadAndSaveLisA(data.getStringValue(), onGrigliaAvailable,mOnError); + mHelper.updateGriglia(griglia.getGriglia(), onGrigliaAvailable, mOnError); + } else { + mHelper.downloadAndSaveLisA(data.getStringValue(), onGrigliaAvailable, mOnError); } - },mOnError); + }, mOnError); }; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java index afbf16ae..17106f62 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java @@ -20,6 +20,7 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; @@ -213,7 +214,7 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter { - if (mOrdineRowDispatch != null) { + if (mOrdineRowDispatch != null && SettingsManager.iDB().isFlagSpedizioneEnableManualPick()) { // rowItem.getOriginalModel().setTempEan128Model(null); mOrdineRowDispatch.onOrdineRowDispatch(rowItem.getOriginalModel()); } diff --git a/gradle.properties b/gradle.properties index 4f4a0725..4e834d2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,10 +12,9 @@ # org.gradle.jvmargs=-Xmx1536m -android.databinding.enableV2=true android.useAndroidX=true android.enableJetifier=true -android.enableSeparateAnnotationProcessing = true +# android.enableSeparateAnnotationProcessing = true # When configured, Gradle will run in incubating parallel mode. From 4bf47833ef3b1dd1bc886ef4453b4e090cdf2edf Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 28 Jan 2020 19:37:41 +0100 Subject: [PATCH 2/2] -> v1.12.0 (129) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 505e566c..5c9b7bd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 128 - def appVersionName = '1.11.9' + def appVersionCode = 129 + def appVersionName = '1.12.0' signingConfigs { release {