diff --git a/app/build.gradle b/app/build.gradle index c5138b8b..1ab9fb5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 304 - def appVersionName = '1.29.0' + def appVersionCode = 305 + def appVersionName = '1.29.1' signingConfigs { release { @@ -31,12 +31,12 @@ android { } } - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "it.integry.integrywmsnative" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode appVersionCode versionName appVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java index 8958745e..3897532f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java @@ -99,7 +99,21 @@ public class UtilityDate { public static Date getDateInstance() { - return getCalendarInstance().getTime(); + return getDateInstance(false); + } + + + public static Date getDateInstance(boolean removeTime) { + var calendar = getCalendarInstance(); + + if(removeTime) { + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + } + + return calendar.getTime(); } public static Calendar getCalendarInstance() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java index 085b1a09..f3ec20ca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java @@ -35,6 +35,7 @@ public class UtilityNumber { decimalFormat.setMaximumFractionDigits(decimal); decimalFormat.setDecimalFormatSymbols(otherSymbols); decimalFormat.setGroupingUsed(false); + decimalFormat.setMinimumFractionDigits(2); return decimalFormat.format(floatValue); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java index 53076e0e..157e0091 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java @@ -277,7 +277,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett getSupportFragmentManager() .beginTransaction() .add(R.id.frame_layout_container, - ProdRecuperoMaterialeFragment.newInstance(mViewModel.getLineaProd().getCodJfas(), DATA_KEY_FRAGMENT_LISTENER)) + ProdRecuperoMaterialeFragment.newInstance(null, DATA_KEY_FRAGMENT_LISTENER)) .addToBackStack("ProdRecuperoMaterialeFragment") .commit(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java index 5be7785c..508c4d2a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java @@ -9,10 +9,8 @@ import android.view.View; import android.view.ViewGroup; import androidx.appcompat.widget.AppCompatTextView; -import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; @@ -88,7 +86,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_recupero_materiale, container, false); + mBinding = FragmentProdRecuperoMaterialeBinding.inflate(inflater, container, false); MainApplication.appComponent .prodRecuperoMaterialeComponent() @@ -168,8 +166,6 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl private void initRecyclerView() { this.mViewModel.getOrderList().observe(getViewLifecycleOwner(), this::refreshList); - mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(getActivity())); - HistoryULsListAdapter adapter = new HistoryULsListAdapter(getActivity(), mHistoryULMutableData) .setOnItemClicked(data -> this.mViewModel.dispatchItem(data.getOriginalModel(), null)); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java index 18276dc9..c465c62f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java @@ -247,6 +247,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer { .setCodCol(restDTO.getCodCol()) .setCodTagl(restDTO.getCodTagl()) .setCodJfas(restDTO.getCodJfas()) + .setDescrizioneArt(restDTO.getDescrizioneArt()) .setDescrizioneFase(restDTO.getDescrizioneFase()) .setQtaCol(qtaColTot) .setNumCnf(numCnfColTot) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java index 5a36b45d..fd503ac2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java @@ -15,6 +15,7 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.view.ExtendedSectionedRecyclerView; +import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListHeaderBinding; import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListItemBinding; @@ -99,7 +100,7 @@ public class HistoryULsListAdapter extends ExtendedSectionedRecyclerView { diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml index c60edf24..7fe0fe54 100644 --- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml +++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml @@ -81,12 +81,12 @@ android:id="@+id/add_extra_items_toolbar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="5dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:adjustViewBounds="true" android:background="?attr/selectableItemBackground" android:onClick="@{()->viewModel.settings()}" + android:padding="6dp" android:src="@drawable/ic_settings_24dp" android:tint="@color/colorPrimaryGray" /> diff --git a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml index 41d9485b..1dce94ef 100644 --- a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml +++ b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml @@ -22,7 +22,9 @@ android:background="@android:color/white" android:id="@+id/prod_recupero_materiale_main_list" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/prod_recupero_materiale_list_item"/> + android:adjustViewBounds="true" + android:src="@drawable/ic_playlist_add_check_24dp" /> + android:textSize="18sp" /> diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_header.xml b/app/src/main/res/layout/prod_recupero_materiale_list_header.xml index b673fa1e..93825056 100644 --- a/app/src/main/res/layout/prod_recupero_materiale_list_header.xml +++ b/app/src/main/res/layout/prod_recupero_materiale_list_header.xml @@ -2,29 +2,17 @@ - - + - - - - diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml index aa35556a..8611989c 100644 --- a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml +++ b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml @@ -1,129 +1,116 @@ - + android:orientation="horizontal" + android:paddingVertical="8dp" + android:paddingEnd="8dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:orientation="vertical"> - + android:layout_gravity="center_horizontal" + android:layout_marginBottom="-8dp" + android:text="@string/logistic_unit" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center_vertical" + android:textColor="@android:color/black" + android:textSize="22sp" + android:textStyle="bold" + tools:text="22" /> + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java index 02b7877f..b0856d36 100644 --- a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java +++ b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java @@ -9,7 +9,6 @@ import com.honeywell.aidc.BarcodeFailureEvent; import com.honeywell.aidc.BarcodeReadEvent; import com.honeywell.aidc.BarcodeReader; import com.honeywell.aidc.ScannerUnavailableException; -import com.honeywell.aidc.UnsupportedPropertyException; import java.util.ArrayList; import java.util.HashMap; @@ -124,12 +123,12 @@ public class HoneyWellBarcodeReader implements BarcodeReaderInterface { // set the trigger mode to client control - try { - barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE, - BarcodeReader.TRIGGER_CONTROL_MODE_CLIENT_CONTROL); - } catch (UnsupportedPropertyException e) { - throw new Exception("Failed to apply properties"); - } +// try { +// barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE, +// BarcodeReader.TRIGGER_CONTROL_MODE_CLIENT_CONTROL); +// } catch (UnsupportedPropertyException e) { +// throw new Exception("Failed to apply properties"); +// } Map properties = new HashMap<>(); @@ -146,7 +145,8 @@ public class HoneyWellBarcodeReader implements BarcodeReaderInterface { properties.put(BarcodeReader.PROPERTY_EAN_13_CHECK_DIGIT_TRANSMIT_ENABLED, true); properties.put(BarcodeReader.PROPERTY_UPC_A_CHECK_DIGIT_TRANSMIT_ENABLED, true); - properties.put(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE, BarcodeReader.TRIGGER_CONTROL_MODE_AUTO_CONTROL); + properties.put(BarcodeReader.PROPERTY_TRIGGER_SCAN_MODE, BarcodeReader.TRIGGER_SCAN_MODE_READ_ON_RELEASE); +// properties.put(BarcodeReader.PROPERTY_TRIGGER_SCAN_DELAY, 500); // Apply the settings barcodeReader.setProperties(properties);