Finish v1.29.1(305)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 304
+    def appVersionCode = 305
-    def appVersionName = '1.29.0'
+    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"

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() {

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);
     }

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();
 

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));
 

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)

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<History
         holder.binding.numCollo.setText(String.valueOf(ul.getNumCollo()));
         holder.binding.partitaMag.setText("(" + ul.getPartitaMag() + ")");
 
-        holder.binding.qtaVersata.setText(String.valueOf(ul.getQtaVersata()));
+        holder.binding.qtaVersata.setText(UtilityNumber.decimalToString(ul.getQtaVersata(), 2));
         holder.binding.untMisQtaVersata.setText(String.valueOf(ul.getUntMisVersata()));
 
         holder.binding.getRoot().setOnClickListener(v -> {

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" />
 

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"/>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/empty_view"
@@ -54,25 +56,25 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:gravity="center_horizontal"
-                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                android:orientation="vertical"
                 app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
                 app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="72dp"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_playlist_add_check_24dp"
+                    android:adjustViewBounds="true"
-                    android:adjustViewBounds="true"/>
+                    android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
+                    android:text="@string/no_item_in_recupera_materiale"
                     android:textColor="@android:color/black"
-                    android:textSize="18sp"
+                    android:textSize="18sp" />
-                    android:text="@string/no_item_in_recupera_materiale"/>
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/prod_recupero_materiale_list_header.xml

@@ -2,29 +2,17 @@
 
 <layout xmlns:tools="http://schemas.android.com/tools">
 
-    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical" android:layout_width="match_parent"
-        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+    <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/white"
-            android:layout_marginTop="16dp">
-
-        <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/recuper_materiale_main_list_group_header"
+        style="@style/TextAppearance.Material3.HeadlineSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            tools:text="LINEA1"
+        android:layout_marginHorizontal="16dp"
-            android:textSize="16sp"
+        android:layout_marginVertical="8dp"
-            android:textStyle="bold"
+        android:paddingTop="8dp"
         android:textAllCaps="true"
         android:textColor="@color/colorPrimary"
-            android:layout_marginStart="16dp"
+        tools:text="Linea 1" />
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"/>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
-    </androidx.appcompat.widget.LinearLayoutCompat>
 </layout>

app/src/main/res/layout/prod_recupero_materiale_list_item.xml

@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-    <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/white"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
 
-        <LinearLayout
+    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/left_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-            android:layout_alignParentStart="true"
+        android:paddingVertical="8dp"
         android:paddingEnd="8dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:orientation="vertical"
             android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp">
+            android:layout_marginEnd="16dp"
+            android:orientation="vertical">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
@@ -35,13 +28,14 @@
                 android:id="@+id/num_collo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    tools:text="22"
+                android:layout_gravity="center_vertical"
                 android:textColor="@android:color/black"
-                    android:textStyle="bold"
                 android:textSize="22sp"
-                    android:layout_gravity="center_vertical"/>
+                android:textStyle="bold"
+                tools:text="22" />
 
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,34 +47,31 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/cod_mart"
+                    style="@style/TextAppearance.Material3.TitleMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:textSize="18sp"
+                    tools:text="150101-040" />
-                        tools:text="150101-040"
-                        android:textColor="@android:color/black"
-                        />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/partita_mag"
+                    style="@style/TextAppearance.Material3.TitleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:textColor="@color/gray_700"
-                        tools:text="Lotto articolo"
-                        android:layout_marginStart="4dp"
-                        android:layout_toEndOf="@id/cod_mart"
-                        android:layout_toStartOf="@id/right_content"
                     android:layout_alignBottom="@id/cod_mart"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="6dp"
+                    android:layout_toStartOf="@id/right_content"
+                    android:layout_toEndOf="@id/cod_mart"
                     android:ellipsize="end"
                     android:singleLine="true"
-                        android:layout_marginEnd="6dp"
+                    tools:text="Lotto articolo" />
-                        />
 
                 <RelativeLayout
                     android:id="@+id/right_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
                     android:layout_alignBottom="@id/cod_mart"
+                    android:layout_alignParentEnd="true"
                     android:paddingEnd="8dp">
 
                     <androidx.appcompat.widget.LinearLayoutCompat
@@ -90,17 +81,17 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/qta_versata"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                                android:textSize="18sp"
                             tools:text="27" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/unt_mis_qta_versata"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
+                            android:layout_marginStart="2dp"
-                                android:textSize="18sp"
                             tools:text="PZ" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -112,18 +103,14 @@
                 android:id="@+id/descrizione"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    android:textColor="@color/gray_700"
-                    tools:text="Descrizione estesa articolo"
                 android:ellipsize="end"
                 android:singleLine="true"
-                    />
+                style="@style/TextAppearance.Material3.BodySmall"
+                tools:text="Descrizione estesa articolo" />
 
         </LinearLayout>
 
-        </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-
-    </RelativeLayout>
-
 </layout>

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 {
+//        try {
-            barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE,
+//            barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE,
-                    BarcodeReader.TRIGGER_CONTROL_MODE_CLIENT_CONTROL);
+//                    BarcodeReader.TRIGGER_CONTROL_MODE_CLIENT_CONTROL);
-        } catch (UnsupportedPropertyException e) {
+//        } catch (UnsupportedPropertyException e) {
-            throw new Exception("Failed to apply properties");
+//            throw new Exception("Failed to apply properties");
-        }
+//        }
 
         Map<String, Object> 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);