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

Modificato build.gradle.

Browse Source 
Implementato flag per gestire il pick manuale.
This commit is contained in:
Giuseppe Scorrano 2020-01-28 19:36:57 +01:00
parent c5c0252242
commit 47a092b354
10 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@ -110,16 +110,15 @@ dependencies {
implementation 'com.squareup.retrofit2:retrofit:2.6.2' implementation 'com.squareup.retrofit2:retrofit:2.6.2'
implementation 'com.squareup.retrofit2:converter-gson:2.6.2' implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
implementation 'com.annimon:stream:1.2.1' implementation 'com.annimon:stream:1.2.1'
implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0' implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0' implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
implementation 'org.apache.commons:commons-text:1.6' implementation 'org.apache.commons:commons-text:1.6'
//kapt "androidx.lifecycle:lifecycle-compiler:2.0.0" //kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
implementation 'com.danielpuiu:ghostfish:2.0.0'
annotationProcessor "com.danielpuiu:ghostfish-compiler:2.0.0"
//MVVM //MVVM
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0" implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
implementation 'com.jakewharton.rxbinding2:rxbinding: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-support-v4:2.2.0'
implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7: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' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
//SQLite ROOM //SQLite ROOM
def room_version = "2.2.1" def room_version = "2.2.3"
implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version"

2
app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/GrigliaWrapper.java
View File

@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.data_store.db.wrappers; package it.integry.integrywmsnative.core.data_store.db.wrappers;
import androidx.room.ColumnInfo;
import androidx.room.Embedded; import androidx.room.Embedded;
import it.integry.integrywmsnative.core.data_store.db.entity.Griglia; import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
@ -8,6 +9,7 @@ public class GrigliaWrapper {
@Embedded @Embedded
private Griglia griglia; private Griglia griglia;
@ColumnInfo(name = "countArticoli")
private int countArticoli = 0; private int countArticoli = 0;
public Griglia getGriglia() { public Griglia getGriglia() {

28
app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
View File

@ -42,7 +42,7 @@ public class Converters {
return bindableBoolean.get(); return bindableBoolean.get();
} }
@BindingAdapter("app:binding") @BindingAdapter("binding")
public static void bindEditText(EditText view, final BindableString bindableString) { public static void bindEditText(EditText view, final BindableString bindableString) {
Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
if (pair == null || pair.first != bindableString) { 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) { public static void bindTextInputEditText(TextInputEditText view, final BindableString bindableString) {
Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
if (pair == null || pair.first != bindableString) { 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) { public static void bindAutoCompleteTextView(AutoCompleteTextView view, final BindableString bindableString) {
Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
if (pair == null || pair.first != bindableString) { 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) { public static void bindAutoCompleteTextView(AppCompatMultiAutoCompleteTextView view, final BindableString bindableString) {
Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
if (pair == null || pair.first != bindableString) { 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) { public static void bindTextView(AppCompatTextView view, final BindableString bindableString) {
Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
if (pair == null || pair.first != bindableString) { 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) { public static void bindTextInputEditText(TextInputEditText view, final BindableFloat bindableFloat) {
DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault()); DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault());
otherSymbols.setDecimalSeparator('.'); otherSymbols.setDecimalSeparator('.');
@ -186,7 +186,7 @@ public class Converters {
} }
} }
@BindingAdapter("app:binding") @BindingAdapter("binding")
public static void bindRadioGroup(RadioGroup view, final BindableBoolean bindableBoolean) { public static void bindRadioGroup(RadioGroup view, final BindableBoolean bindableBoolean) {
if (view.getTag(R.id.bound_observable) != bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) {
view.setTag(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); ((RadioButton) view.getChildAt(newValue ? 1 : 0)).setChecked(true);
} }
@BindingAdapter("app:checked") @BindingAdapter("checked")
public static void bindCheckbox(AppCompatCheckBox view, final BindableBoolean bindableBoolean) { public static void bindCheckbox(AppCompatCheckBox view, final BindableBoolean bindableBoolean) {
if (view.getTag(R.id.bound_observable) != bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) {
view.setTag(R.id.bound_observable, bindableBoolean); view.setTag(R.id.bound_observable, bindableBoolean);
@ -208,7 +208,7 @@ public class Converters {
view.setChecked(newValue); view.setChecked(newValue);
} }
@BindingAdapter("app:checked") @BindingAdapter("checked")
public static void bindCheckbox(CheckBox view, final BindableBoolean bindableBoolean) { public static void bindCheckbox(CheckBox view, final BindableBoolean bindableBoolean) {
if (view.getTag(R.id.bound_observable) != bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) {
view.setTag(R.id.bound_observable, bindableBoolean); view.setTag(R.id.bound_observable, bindableBoolean);
@ -218,17 +218,17 @@ public class Converters {
view.setChecked(newValue); view.setChecked(newValue);
} }
@BindingAdapter({"app:onClick"}) @BindingAdapter({"onClick"})
public static void bindOnClick(View view, final Runnable runnable) { public static void bindOnClick(View view, final Runnable runnable) {
view.setOnClickListener(v -> runnable.run()); view.setOnClickListener(v -> runnable.run());
} }
@BindingAdapter({"app:layout_constraintGuide_percent"}) @BindingAdapter({"layout_constraintGuide_percent"})
public static void bindFloatPercetageOnGuideline(View view, final float percentage) { public static void bindFloatPercetageOnGuideline(View view, final float percentage) {
((Guideline)view).setGuidelinePercent(percentage); ((Guideline)view).setGuidelinePercent(percentage);
} }
@BindingAdapter({"app:backgroundTintResID"}) @BindingAdapter({"backgroundTintResID"})
public static void bindBackgroundTintResId(View view, @ColorRes final int colorResId) { public static void bindBackgroundTintResId(View view, @ColorRes final int colorResId) {
view.setBackgroundTintList(ColorStateList.valueOf(ResourcesCompat.getColor(MainApplication.res, colorResId, null))); 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) { public static void bindCheckbox(LinearLayout view, final BindableBoolean bindableBoolean) {
if (view.getTag(R.id.bound_observable) != bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) {
view.setTag(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) { public static void bindView(View view, final BindableBoolean bindableBoolean) {
if (view.getTag(R.id.bound_observable) != bindableBoolean) { if (view.getTag(R.id.bound_observable) != bindableBoolean) {
view.setTag(R.id.bound_observable, bindableBoolean); view.setTag(R.id.bound_observable, bindableBoolean);

2
app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java
View File

@ -10,7 +10,7 @@ import it.integry.integrywmsnative.core.di.BindableBoolean;
public class ExpandableLayoutBinders { public class ExpandableLayoutBinders {
@BindingAdapter("app:el_expanded_bind") @BindingAdapter("el_expanded_bind")
public static void bindExpandableLayout(final ExpandableLayout view, final BindableBoolean bindableBoolean) { public static void bindExpandableLayout(final ExpandableLayout view, final BindableBoolean bindableBoolean) {
Pair<BindableBoolean, ExpandableLayout.OnExpansionUpdateListener> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableBoolean, ExpandableLayout.OnExpansionUpdateListener> pair = (Pair) view.getTag(R.id.bound_observable);

2
app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java
View File

@ -5,7 +5,7 @@ import com.google.android.material.textfield.TextInputLayout;
public class TextInputLayoutBinders { public class TextInputLayoutBinders {
@BindingAdapter("app:errorText") @BindingAdapter("errorText")
public static void setErrorMessage(TextInputLayout view, String errorMessage) { public static void setErrorMessage(TextInputLayout view, String errorMessage) {
view.setError(errorMessage); view.setError(errorMessage);
} }

10
app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
View File

@ -30,6 +30,7 @@ public class DBSettingsModel {
private boolean flagVersamentoDirettoProduzione; private boolean flagVersamentoDirettoProduzione;
private boolean flagAskPesoColloSpedizione; private boolean flagAskPesoColloSpedizione;
private boolean flagForceAllToColli; private boolean flagForceAllToColli;
private boolean flagSpedizioneEnableManualPick;
public List<String> getAvailableProfiles() { public List<String> getAvailableProfiles() {
return availableProfiles; return availableProfiles;
@ -190,4 +191,13 @@ public class DBSettingsModel {
this.flagVersamentoDirettoProduzione = flagVersamentoDirettoProduzione; this.flagVersamentoDirettoProduzione = flagVersamentoDirettoProduzione;
return this; return this;
} }
public boolean isFlagSpedizioneEnableManualPick() {
return flagSpedizioneEnableManualPick;
}
public DBSettingsModel setFlagSpedizioneEnableManualPick(boolean flagSpedizioneEnableManualPick) {
this.flagSpedizioneEnableManualPick = flagSpedizioneEnableManualPick;
return this;
}
} }

5
app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
View File

@ -234,6 +234,10 @@ public class SettingsManager {
.setGestName("PICKING") .setGestName("PICKING")
.setSection("PRODUZIONE") .setSection("PRODUZIONE")
.setKeySection("FLAG_VERSAMENTO_DIRETTO")); .setKeySection("FLAG_VERSAMENTO_DIRETTO"));
stbGestSetupList.add(new StbGestSetup()
.setGestName("PICKING")
.setSection("SPEDIZIONE")
.setKeySection("ENABLE_MANUAL_PICK"));
GestSetupRESTConsumer.getValues(stbGestSetupList, list -> { GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@ -251,6 +255,7 @@ public class SettingsManager {
dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "FLAG_ASK_PESO_COLLO", Boolean.class)); dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "FLAG_ASK_PESO_COLLO", Boolean.class));
dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "FLAG_USE_NEW_PICKING_LIST", Boolean.class)); dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "FLAG_USE_NEW_PICKING_LIST", Boolean.class));
dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "FLAG_VERSAMENTO_DIRETTO", 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(); if(onComplete != null) onComplete.run();
}, onFailed); }, onFailed);

1
app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java
View File

@ -58,7 +58,6 @@ public class DialogScanLisA {
} }
private void initBarcode() { private void initBarcode() {
int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()

3
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java
View File

@ -20,6 +20,7 @@ import java.util.List;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.CommonConst; 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.UtilityNumber;
import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
@ -213,7 +214,7 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
groupModelView.setOnClickListener(view -> { groupModelView.setOnClickListener(view -> {
if (mOrdineRowDispatch != null) { if (mOrdineRowDispatch != null && SettingsManager.iDB().isFlagSpedizioneEnableManualPick()) {
// rowItem.getOriginalModel().setTempEan128Model(null); // rowItem.getOriginalModel().setTempEan128Model(null);
mOrdineRowDispatch.onOrdineRowDispatch(rowItem.getOriginalModel()); mOrdineRowDispatch.onOrdineRowDispatch(rowItem.getOriginalModel());
} }

3
gradle.properties
View File

@ -12,10 +12,9 @@
# org.gradle.jvmargs=-Xmx1536m # org.gradle.jvmargs=-Xmx1536m
android.databinding.enableV2=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.enableSeparateAnnotationProcessing = true # android.enableSeparateAnnotationProcessing = true
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.