diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6f38cf6b..6d4c0e1e 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
index 9aa69d84..d39f1b0e 100644
--- a/.idea/dbnavigator.xml
+++ b/.idea/dbnavigator.xml
@@ -25,9 +25,17 @@
+
+
+
+
+
+
+
+
@@ -50,7 +58,94 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -180,8 +275,6 @@
-
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ec14ee73..947b3bad 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,13 +9,14 @@
-
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 10118312..4896e0c9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ac3cae90..97fed5af 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,13 +4,14 @@
-
+
+
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 71fac694..6c4702c4 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 519e6f6d..4c1272ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,16 +95,16 @@ dependencies {
})
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.orhanobut:logger:2.2.0'
- implementation 'com.google.firebase:firebase-core:17.2.0'
+ implementation 'com.google.firebase:firebase-core:17.2.1'
implementation 'com.google.firebase:firebase-crash:16.2.1'
implementation 'com.google.firebase:firebase-perf:19.0.1'
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.1.0-beta01'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
implementation 'androidx.cardview:cardview:1.0.0'
- implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
+ implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
implementation 'androidx.preference:preference:1.1.0'
implementation 'com.squareup.okhttp3:okhttp:4.2.2'
implementation 'com.squareup.retrofit2:retrofit:2.6.2'
@@ -142,7 +142,7 @@ dependencies {
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
//SQLite ROOM
- def room_version = "2.2.0"
+ def room_version = "2.2.1"
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -153,8 +153,9 @@ dependencies {
//Barcode
implementation project(':pointmobilescannerlibrary')
implementation project(':zebrascannerlibrary')
- implementation project(path: ':barcode_base_library')
+ implementation project(path: ':barcode_base_android_library')
implementation project(path: ':honeywellscannerlibrary')
+ implementation project(':keyobardemulatorscannerlibrary')
}
repositories {
mavenCentral()
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index f03bde21..d426b46a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -15,14 +15,15 @@ import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.SearchView;
+import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
+import android.widget.Toast;
import androidx.fragment.app.FragmentTransaction;
-import androidx.recyclerview.widget.GridLayoutManager;
import java.util.List;
@@ -31,6 +32,7 @@ import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
@@ -41,26 +43,12 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.update.UpdatesManager;
import it.integry.integrywmsnative.core.utility.UtilitySettings;
import it.integry.integrywmsnative.databinding.ActivityMainBinding;
-import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding;
-import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.gest.login.LoginActivity;
import it.integry.integrywmsnative.gest.main.MainFragment;
-import it.integry.integrywmsnative.gest.ordini_acquisto_pv.OrdiniAcquistoElencoFragment;
-import it.integry.integrywmsnative.gest.main.MenuListAdapter;
-import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
-import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
-import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
-import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
-import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
-import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
-import it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment;
-import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
-import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
-import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
-public class MainActivity extends AppCompatActivity
+public class MainActivity extends BaseActivity
implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
private ActivityMainBinding mBinding;
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplication.java b/app/src/main/java/it/integry/integrywmsnative/MainApplication.java
index d8a19578..9a2f8280 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplication.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplication.java
@@ -62,6 +62,7 @@ public class MainApplication extends Application {
public static OrdineDao getOrdiniRepository(){
return appDb.ordineDao();
}
+
public static ArticoloOrdineDao getArticoliOrdineRepository(){
return appDb.articoloOrdineDao();
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
index 477cd90c..da5608bf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
@@ -15,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import it.integry.integrywmsnative.core.context.MainContext;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.PermissionsHelper;
@@ -22,7 +23,7 @@ import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
import it.integry.integrywmsnative.gest.login.LoginActivity;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-public class SplashActivity extends AppCompatActivity {
+public class SplashActivity extends BaseActivity {
private ActivitySplashBinding mBinding;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java b/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java
index 5f6efa2d..e3bf14d4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java
@@ -26,7 +26,8 @@ public class CommonConst {
public static class Mail {
public static String[] forErrorsDebug = {
- "g.scorrano@integry.it"
+ "g.scorrano@integry.it",
+ "v.castellana@integry.it"
};
public static String[] forErrors = {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java
index a8b03bae..624f4b3c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java
@@ -1,7 +1,7 @@
package it.integry.integrywmsnative.core.barcode_reader;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
public class BarcodeCallbackDTO {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
index 4b8c5f2f..a66082b7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
@@ -1,6 +1,6 @@
package it.integry.integrywmsnative.core.barcode_reader;
-import android.content.Context;
+import android.view.KeyEvent;
import androidx.appcompat.app.AppCompatActivity;
@@ -8,11 +8,12 @@ import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
-import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
+import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader;
import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
import it.integry.zebrascannerlibrary.ZebraBarcodeReader;
@@ -29,7 +30,8 @@ public class BarcodeManager {
private static Class extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
PointMobileBarcodeReader.class,
ZebraBarcodeReader.class,
- HoneyWellBarcodeReader.class
+ HoneyWellBarcodeReader.class,
+ KeyboardEmulatorBarcodeReader.class
};
@@ -55,7 +57,7 @@ public class BarcodeManager {
} catch (Exception e) {
- UtilityLogger.errorMe(e);
+ UtilityExceptions.defaultException(context,e);
}
}
@@ -97,6 +99,11 @@ public class BarcodeManager {
}
+ public static boolean onKeyDown(int keyCode, KeyEvent keyEvent){
+ mCurrentBarcodeInterface.onKeyEvent(keyEvent);
+ return true;
+ }
+
public static BarcodeReaderInterface getCurrentBarcodeInterface() {
return mCurrentBarcodeInterface;
}
@@ -146,4 +153,5 @@ public class BarcodeManager {
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
index 69622a10..1b658568 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
@@ -17,7 +17,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class}, version = 1)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class}, version = 3, exportSchema = false)
@TypeConverters({
DateConverter.class
})
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java
index 504cafe2..7b1c20f0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java
@@ -1,7 +1,9 @@
package it.integry.integrywmsnative.core.data_store.db.dao;
import androidx.room.Dao;
+import androidx.room.Insert;
import androidx.room.Query;
+import androidx.room.Update;
import java.util.List;
@@ -11,4 +13,15 @@ import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
public interface ArticoloGrigliaDao {
@Query("SELECT * from articoli_griglia")
List getAll();
+ @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE cod_mart = :codMart AND id_griglia = :idGriglia")
+ Integer getIdArticoloByGrigliaAndCodMart(int idGriglia, String codMart);
+
+ @Insert
+ void insertAll(List articoli);
+ @Insert
+ Long insert(ArticoloGriglia articolo);
+ @Update
+ void updateAll(List articoli);
+ @Update
+ void update(ArticoloGriglia articolo);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java
index b3764e7d..864966db 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java
@@ -1,7 +1,10 @@
package it.integry.integrywmsnative.core.data_store.db.dao;
import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
import androidx.room.Query;
+import androidx.room.Update;
import java.util.List;
@@ -12,4 +15,22 @@ import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
public interface GrigliaDao {
@Query("SELECT * from griglie")
List getAll();
+
+ @Query("SELECT *, COUNT(articoli_griglia.articolo_griglia_id) as countArticoli from griglie LEFT JOIN articoli_griglia ON (griglie.griglia_id = articoli_griglia.id_griglia) where cod_alis = :codAlis GROUP BY griglie.griglia_id")
+ Griglia findByCodAlis(String codAlis);
+
+ @Insert
+ long insert(Griglia griglia);
+
+ @Update
+ void update(Griglia griglia);
+
+ @Insert
+ void insertAll(Griglia... griglie);
+
+ @Update
+ void updateAll(Griglia... griglie);
+
+ @Delete
+ void delete(Griglia griglia);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/OrdineDao.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/OrdineDao.java
index 862da7d3..c8b76fe2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/OrdineDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/OrdineDao.java
@@ -7,9 +7,13 @@ import java.util.List;
import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
@Dao
public interface OrdineDao {
- @Query("SELECT * from ordini")
+ @Query("SELECT * from ordini ")
List getAll();
+
+ @Query("SELECT ordini.*, griglie.* from ordini inner join griglie ON id_griglia = griglie.griglia_id")
+ List getAllTrasnmitted();
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java
index e29db4e3..763941be 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java
@@ -3,22 +3,27 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.ForeignKey;
+import androidx.room.Index;
import androidx.room.PrimaryKey;
@Entity(
tableName = "articoli_griglia",
+ indices = {
+ @Index(value = "id_griglia"),
+ },
foreignKeys = {
@ForeignKey(
entity = Griglia.class,
- parentColumns = "uid",
+ parentColumns = "griglia_id",
childColumns = "id_griglia",
onDelete = ForeignKey.CASCADE
)
}
)
public class ArticoloGriglia {
- @PrimaryKey
- private int uid;
+ @PrimaryKey(autoGenerate = true)
+ @ColumnInfo(name = "articolo_griglia_id")
+ private int articoloGrigliaId;
@ColumnInfo(name = "cod_mart")
private String codMart;
@@ -50,12 +55,12 @@ public class ArticoloGriglia {
@ColumnInfo(name = "id_griglia")
private int idGriglia;
- public int getUid() {
- return uid;
+ public int getArticoloGrigliaId() {
+ return articoloGrigliaId;
}
- public void setUid(int uid) {
- this.uid = uid;
+ public void setArticoloGrigliaId(int articoloGrigliaId) {
+ this.articoloGrigliaId = articoloGrigliaId;
}
public String getCodMart() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
index 09a2c1ac..5fe50c30 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
@@ -3,22 +3,27 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.ForeignKey;
+import androidx.room.Index;
import androidx.room.PrimaryKey;
@Entity(
tableName = "articoli_ordine",
+ indices = {
+ @Index(value = "id_ordine")
+ },
foreignKeys = {
@ForeignKey(
entity = Ordine.class,
- parentColumns = "uid",
+ parentColumns = "ordine_id",
childColumns = "id_ordine",
onDelete = ForeignKey.CASCADE
)
}
)
public class ArticoloOrdine {
- @PrimaryKey
- private int uid;
+ @PrimaryKey(autoGenerate = true)
+ @ColumnInfo(name = "articolo_ordine_id")
+ private int articoloOrdineId;
@ColumnInfo(name = "cod_mart")
private String codMart;
@@ -50,12 +55,12 @@ public class ArticoloOrdine {
@ColumnInfo(name = "id_ordine")
private int idOrdine;
- public int getUid() {
- return uid;
+ public int getArticoloOrdineId() {
+ return articoloOrdineId;
}
- public void setUid(int uid) {
- this.uid = uid;
+ public void setArticoloOrdineId(int articoloOrdineId) {
+ this.articoloOrdineId = articoloOrdineId;
}
public String getCodMart() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java
index 81a6e317..093507c0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java
@@ -2,23 +2,43 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
import androidx.room.PrimaryKey;
-@Entity(tableName ="griglie")
+@Entity(tableName ="griglie",
+ indices = {
+ @Index(value = "cod_alis", unique = true)
+ }
+)
public class Griglia {
- @PrimaryKey
- private int uid;
+ @PrimaryKey(autoGenerate = true)
+ @ColumnInfo(name = "griglia_id")
+ private int grigliaId;
+ @ColumnInfo(name = "cod_alis")
+ private String codAlis;
@ColumnInfo(name = "descr_lisa")
private String descrLisa;
@ColumnInfo(name = "descr_depo")
private String descrDepo;
+ @Ignore
+ private int countArticoli = 0;
- public int getUid() {
- return uid;
+ public int getGrigliaId() {
+ return grigliaId;
}
- public void setUid(int uid) {
- this.uid = uid;
+
+ public void setGrigliaId(int grigliaId) {
+ this.grigliaId = grigliaId;
+ }
+
+ public String getCodAlis() {
+ return codAlis;
+ }
+
+ public void setCodAlis(String codAlis) {
+ this.codAlis = codAlis;
}
public String getDescrLisa() {
@@ -36,4 +56,12 @@ public class Griglia {
public void setDescrDepo(String descrDepo) {
this.descrDepo = descrDepo;
}
+
+ public int getCountArticoli() {
+ return countArticoli;
+ }
+
+ public void setCountArticoli(int countArticoli) {
+ this.countArticoli = countArticoli;
+ }
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java
index e3de6492..a0f9a2e4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java
@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.data_store.db.entity;
+import androidx.annotation.Nullable;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
@@ -12,24 +13,32 @@ import java.util.Date;
public class Ordine {
- @PrimaryKey
- private int uid;
+ @PrimaryKey(autoGenerate = true)
+ @ColumnInfo(name = "ordine_id")
+ private int ordineId;
- @ColumnInfo(name = "data_cons")
+ @ColumnInfo(name = "data_ord")
private Date dataOrd;
@ColumnInfo(name = "annotazioni")
private String annotazioni;
+ @ColumnInfo(name = "transmitted")
+ private boolean transmitted = false;
+
+ @ColumnInfo(name = "transmission_date")
+ @Nullable
+ private Date transmissionDate;
+
@ColumnInfo(name = "id_griglia")
private int idGriglia;
- public int getUid() {
- return uid;
+ public int getOrdineId() {
+ return ordineId;
}
- public void setUid(int uid) {
- this.uid = uid;
+ public void setOrdineId(int ordineId) {
+ this.ordineId = ordineId;
}
public Date getDataOrd() {
@@ -55,4 +64,21 @@ public class Ordine {
public void setIdGriglia(int idGriglia) {
this.idGriglia = idGriglia;
}
+
+ public boolean isTransmitted() {
+ return transmitted;
+ }
+
+ public void setTransmitted(boolean transmitted) {
+ this.transmitted = transmitted;
+ }
+
+ @Nullable
+ public Date getTransmissionDate() {
+ return transmissionDate;
+ }
+
+ public void setTransmissionDate(@Nullable Date transmissionDate) {
+ this.transmissionDate = transmissionDate;
+ }
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/ArticoliGrigliaRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/ArticoliGrigliaRepository.java
new file mode 100644
index 00000000..76b10e76
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/ArticoliGrigliaRepository.java
@@ -0,0 +1,47 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.view_model.ArticoloDTO;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class ArticoliGrigliaRepository extends Repository{
+
+ ArticoloGrigliaDao mRepository;
+
+ public ArticoliGrigliaRepository() {
+ this.mRepository = MainApplication.getArticoliGrigliaRepository();
+ }
+
+ public void saveArticoliToGriglia(List articoli, Runnable onSuccess, RunnableArgs onFail) {
+ execute(()->{
+ try{
+ List toUpdate = new ArrayList<>();
+ List toInsert = new ArrayList<>();
+ for (ArticoloGriglia art : articoli){
+
+ Integer id = mRepository.getIdArticoloByGrigliaAndCodMart(art.getIdGriglia(),art.getCodMart());
+ if (id != null){
+ art.setArticoloGrigliaId(id);
+ toUpdate.add(art);
+ }else{
+ toInsert.add(art);
+ }
+ }
+ mRepository.insertAll(toInsert);
+ mRepository.updateAll(toUpdate);
+ onSuccess.run();
+
+
+ }catch (Exception e){
+ onFail.run(e);
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/GrigliaRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/GrigliaRepository.java
new file mode 100644
index 00000000..33896dff
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/GrigliaRepository.java
@@ -0,0 +1,55 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class GrigliaRepository extends Repository{
+
+ private GrigliaDao mRepository;
+
+ public GrigliaRepository() {
+ this.mRepository = MainApplication.getGrigliaRepository();
+ }
+
+ public void selectAll(RunnableArgs> onSuccess, RunnableArgs onError){
+ Runnable query = ()->{
+ try{
+ onSuccess.run(mRepository.getAll());
+ }catch (Exception e){
+ onError.run(e);
+ }
+ };
+ execute(query);
+ }
+
+ public void findByCodAlis(String codAlis ,RunnableArgs onSuccess, RunnableArgs onError){
+ Runnable query = ()->{
+ try{
+ onSuccess.run(mRepository.findByCodAlis(codAlis));
+ }catch (Exception e){
+ onError.run(e);
+ }
+ };
+ execute(query);
+ }
+
+
+ public void saveGriglia(Griglia griglia, RunnableArgs onSuccess,RunnableArgs onFail) {
+ execute(()->{
+ try{
+ if (griglia.getGrigliaId() <= 0){
+ griglia.setGrigliaId((int) mRepository.insert(griglia));
+ }else{
+ mRepository.update(griglia);
+ }
+ onSuccess.run(griglia.getGrigliaId());
+ }catch (Exception e){
+ onFail.run(e);
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/OrdineRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/OrdineRepository.java
new file mode 100644
index 00000000..c22b925b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/OrdineRepository.java
@@ -0,0 +1,41 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class OrdineRepository extends Repository{
+
+ OrdineDao mRepository;
+
+ public OrdineRepository() {
+ this.mRepository = MainApplication.getOrdiniRepository();
+ }
+
+ public void selectAll(RunnableArgs> onSuccess, RunnableArgs onError){
+ Runnable query = ()->{
+ try{
+ onSuccess.run(mRepository.getAll());
+ }catch (Exception e){
+ onError.run(e);
+ }
+ };
+ execute(query);
+ }
+ public void selectAllTransmitted(RunnableArgs> onSuccess, RunnableArgs onError){
+ Runnable query = ()->{
+ try{
+ onSuccess.run(mRepository.getAllTrasnmitted());
+ }catch (Exception e){
+ onError.run(e);
+ }
+ };
+ execute(query);
+ }
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/Repository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/Repository.java
new file mode 100644
index 00000000..7e8ec7ee
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/Repository.java
@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+public class Repository {
+
+
+ public void execute(Runnable query){
+ new Thread(query).start();
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloDTO.java
new file mode 100644
index 00000000..7aa4b6e7
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloDTO.java
@@ -0,0 +1,119 @@
+package it.integry.integrywmsnative.core.data_store.db.view_model;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
+
+public class ArticoloDTO {
+
+ private String codMart;
+
+
+ private String descrizione;
+
+
+ private String untMis;
+
+
+ private float qtaCnf;
+
+
+ private String barcode;
+
+
+ private int merceDaRic;
+
+
+ private float mediaSett;
+
+
+ private String flagQtaMultipla;
+
+ private int qtaMinOrdinabile;
+
+ public String getCodMart() {
+ return codMart;
+ }
+
+ public void setCodMart(String codMart) {
+ this.codMart = codMart;
+ }
+
+ public String getDescrizione() {
+ return descrizione;
+ }
+
+ public void setDescrizione(String descrizione) {
+ this.descrizione = descrizione;
+ }
+
+ public String getUntMis() {
+ return untMis;
+ }
+
+ public void setUntMis(String untMis) {
+ this.untMis = untMis;
+ }
+
+ public float getQtaCnf() {
+ return qtaCnf;
+ }
+
+ public void setQtaCnf(float qtaCnf) {
+ this.qtaCnf = qtaCnf;
+ }
+
+ public String getBarCode() {
+ return barcode;
+ }
+
+ public void setBarCode(String barCode) {
+ this.barcode = barCode;
+ }
+
+ public int getMerceDaRic() {
+ return merceDaRic;
+ }
+
+ public void setMerceDaRic(int merceDaRic) {
+ this.merceDaRic = merceDaRic;
+ }
+
+ public float getMediaSett() {
+ return mediaSett;
+ }
+
+ public void setMediaSett(float mediaSett) {
+ this.mediaSett = mediaSett;
+ }
+
+ public String getFlagQtaMultipla() {
+ return flagQtaMultipla;
+ }
+
+ public void setFlagQtaMultipla(String flagQtaMultipla) {
+ this.flagQtaMultipla = flagQtaMultipla;
+ }
+
+ public int getQtaMinOrdinabile() {
+ return qtaMinOrdinabile;
+ }
+
+ public void setQtaMinOrdinabile(int qtaMinOrdinabile) {
+ this.qtaMinOrdinabile = qtaMinOrdinabile;
+ }
+
+
+ public ArticoloGriglia toArticoloGriglia(){
+ ArticoloGriglia result = new ArticoloGriglia();
+ result.setBarCode(this.getBarCode());
+ result.setDescrizione(this.getDescrizione());
+ result.setCodMart(this.getCodMart());
+ result.setUntMis(this.getUntMis());
+ result.setQtaCnf(this.getQtaCnf());
+ result.setMerceDaRic(this.getMerceDaRic());
+ result.setMediaSett(this.getMediaSett());
+ result.setFlagQtaMultipla(this.getFlagQtaMultipla());
+ result.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
+
+ return result;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/GrigliaDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/GrigliaDTO.java
new file mode 100644
index 00000000..9c0b4184
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/GrigliaDTO.java
@@ -0,0 +1,36 @@
+package it.integry.integrywmsnative.core.data_store.db.view_model;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
+
+public class GrigliaDTO {
+ private String descrLisa;
+ private String descrDepo;
+ private List grigliaAcquistiChild;
+
+
+ public String getDescrLisa() {
+ return descrLisa;
+ }
+
+ public void setDescrLisa(String descrLisa) {
+ this.descrLisa = descrLisa;
+ }
+
+ public String getDescrDepo() {
+ return descrDepo;
+ }
+
+ public void setDescrDepo(String descrDepo) {
+ this.descrDepo = descrDepo;
+ }
+
+ public List getGrigliaAcquistiChild() {
+ return grigliaAcquistiChild;
+ }
+
+ public void setGrigliaAcquistiChild(List grigliaAcquistiChild) {
+ this.grigliaAcquistiChild = grigliaAcquistiChild;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/OrdineWithGriglia.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/OrdineWithGriglia.java
new file mode 100644
index 00000000..aaf1337b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/OrdineWithGriglia.java
@@ -0,0 +1,48 @@
+package it.integry.integrywmsnative.core.data_store.db.view_model;
+
+import androidx.room.Embedded;
+import androidx.room.Ignore;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+
+public class OrdineWithGriglia {
+
+ @Embedded
+ private Ordine ordine;
+ @Embedded
+ private Griglia griglia;
+
+ @Ignore
+ public BindableBoolean selected;
+
+ public OrdineWithGriglia() {
+ this.selected = new BindableBoolean(false);
+ }
+
+ public Ordine getOrdine() {
+ return ordine;
+ }
+
+ public void setOrdine(Ordine ordine) {
+ this.ordine = ordine;
+ }
+
+ public Griglia getGriglia() {
+ return griglia;
+ }
+
+ public void setGriglia(Griglia griglia) {
+ this.griglia = griglia;
+ }
+
+ public boolean isSelected() {
+ return selected.get();
+ }
+
+ public OrdineWithGriglia setSelected(boolean selected) {
+ this.selected.set(selected);
+ return this;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
new file mode 100644
index 00000000..2169fd3c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -0,0 +1,20 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import android.view.KeyEvent;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+
+public class BaseActivity extends AppCompatActivity {
+
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+ if (event.getDeviceId() != -1 && event.getDeviceId() != 0 && event.getAction() == KeyEvent.ACTION_DOWN){
+ BarcodeManager.onKeyDown(event.getKeyCode(),event);
+ return false;
+ }
+ return super.dispatchKeyEvent(event);
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java
new file mode 100644
index 00000000..11bfe361
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.KeyEvent;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+
+public class BaseDialog extends Dialog {
+
+
+ public BaseDialog(@NonNull Context context) {
+ super(context);
+ }
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+ if (event.getDeviceId() != -1 && event.getDeviceId() != 0 && event.getAction() == KeyEvent.ACTION_DOWN){
+ BarcodeManager.onKeyDown(event.getKeyCode(),event);
+ return false;
+ }
+ return super.dispatchKeyEvent(event);
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
index 0a4eeff4..34036200 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
@@ -1,10 +1,10 @@
package it.integry.integrywmsnative.core.rest.consumers;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.rest.RESTBuilder;
import it.integry.integrywmsnative.core.rest.model.Ean128Model;
import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index 118e39ab..1d10f38f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -1,7 +1,6 @@
package it.integry.integrywmsnative.core.rest.consumers;
import android.app.Dialog;
-import android.app.ProgressDialog;
import android.content.Context;
import com.annimon.stream.Stream;
@@ -15,10 +14,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.CommonModelConsts;
import it.integry.integrywmsnative.core.model.MtbAart;
@@ -26,11 +23,13 @@ import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
new file mode 100644
index 00000000..717813d8
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java
@@ -0,0 +1,40 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import android.util.Log;
+
+import it.integry.integrywmsnative.core.data_store.db.view_model.GrigliaDTO;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+import static br.com.zbra.androidlinq.Linq.stream;
+
+public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
+
+
+ public static void getArticoliListino(String codAlis, RunnableArgs onSuccess, RunnableArgs onFailed) {
+
+ PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class);
+ ordiniARestService
+ .getArticoliListino(codAlis, SettingsManager.i().userSession.profileDB, SettingsManager.i().user.username, SettingsManager.i().user.password)
+ .enqueue(new Callback>() {
+ @Override
+ public void onResponse(Call> call, Response> response) {
+ analyzeAnswer(response,"getArticoliListino",onSuccess,onFailed);
+ }
+
+ @Override
+ public void onFailure(Call> call, Throwable t) {
+ Log.e("getArticoliListino_pv", t.toString());
+ UtilityLogger.errorMe(new Exception(t));
+ onFailed.run(new Exception(t));
+ }
+ });
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumerService.java
new file mode 100644
index 00000000..ec53b2e2
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumerService.java
@@ -0,0 +1,18 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.view_model.GrigliaDTO;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.http.Header;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+
+public interface PVOrdiniAcquistoRESTConsumerService {
+
+ @POST("SM2GetElencoArticoli")
+ Call> getArticoliListino(@Query("chiaveGriglia") String codAlis, @Query("profileDb") String profileDb, @Header("username") String username, @Header("password") String password);
+
+ @POST("SM2SaveTerminalino")
+ Call> saveOrdine(@Query("barcode") String barcodeProd,@Query("profileDb") String profileDb, @Header("username") String username, @Header("password") String password);
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
index 88a572ac..c4b53366 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
@@ -4,10 +4,10 @@ import com.annimon.stream.Stream;
import java.util.Calendar;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeType;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
-import it.integry.plugins.barcode_base_library.model.BarcodeType;
public class UtilityBarcode {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java
index 9fc4607c..e1095e65 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
@@ -26,7 +27,7 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel.Ac
import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
-public class AccettazioneOrdineInevasoActivity extends AppCompatActivity {
+public class AccettazioneOrdineInevasoActivity extends BaseActivity {
public ActivityAccettazioneOrdineInevasoBinding bindings;
private AccettazioneOrdineAccettazioneInevasoViewModel mAccettazioneOrdineInevasoViewModel;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
index 53aca59d..4fb27caf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
@@ -54,7 +54,7 @@ import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBot
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import static br.com.zbra.androidlinq.Linq.stream;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
index 2c75f894..4632345a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
@@ -8,13 +8,14 @@ import android.content.Intent;
import android.os.Bundle;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.data_cache.DataCache;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding;
import it.integry.integrywmsnative.gest.contenuto_bancale.viewmodel.ContenutoBancaleViewModel;
-public class ContenutoBancaleActivity extends AppCompatActivity {
+public class ContenutoBancaleActivity extends BaseActivity {
public ActivityContenutoBancaleBinding bindings;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
index b034afea..6cff0929 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.data_cache.DataCache;
import it.integry.integrywmsnative.core.model.MtbColt;
@@ -17,7 +18,7 @@ import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding;
import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity;
import it.integry.integrywmsnative.gest.lista_bancali.viewmodel.ListaBancaliViewModel;
-public class ListaBancaliActivity extends AppCompatActivity {
+public class ListaBancaliActivity extends BaseActivity {
private static class Key {
private static final String MtbColtsKey = "mtbColtsKey";
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java
index 4ee41cf6..4f4f53e9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java
@@ -6,11 +6,12 @@ import android.os.Bundle;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.context.MainContext;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.utility.UtilityWindow;
import it.integry.integrywmsnative.databinding.ActivityLoginBinding;
import it.integry.integrywmsnative.gest.login.viewmodel.LoginViewModel;
-public class LoginActivity extends AppCompatActivity {
+public class LoginActivity extends BaseActivity {
private MainContext mainContext = new MainContext(this);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/OrdiniAcquistoElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/OrdiniAcquistoElencoFragment.java
deleted file mode 100644
index 31f67925..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/OrdiniAcquistoElencoFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package it.integry.integrywmsnative.gest.ordini_acquisto_pv;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.databinding.FragmentMainVersamentoMerceBinding;
-import it.integry.integrywmsnative.gest.ordini_acquisto_pv.core.OrdiniAcquistoElencoHelper;
-
-public class OrdiniAcquistoElencoFragment extends Fragment implements ITitledFragment {
-
- private FragmentMainVersamentoMerceBinding mBinding;
- private OrdiniAcquistoElencoHelper mHelper;
-
- public OrdiniAcquistoElencoFragment() {
- // Required empty public constructor
- }
-
- public static OrdiniAcquistoElencoFragment newInstance() {
- OrdiniAcquistoElencoFragment fragment = new OrdiniAcquistoElencoFragment();
- Bundle args = new Bundle();
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
- // Inflate the layout for this fragment
-
- mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_pv_ordini_acquisto, container, false);
-
-
- //init();
- return mBinding.getRoot();
- }
-
- @Override
- public void onCreateActionBar(AppCompatTextView titleText, Context context) {
- titleText.setText(context.getText(R.string.pv_elenco_ordiniA_title_fragment).toString());
- }
-}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/PVOrdiniAcquistoGrigliaFragment.java
new file mode 100644
index 00000000..67945929
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/PVOrdiniAcquistoGrigliaFragment.java
@@ -0,0 +1,73 @@
+package it.integry.integrywmsnative.gest.ordini_acquisto_pv;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableString;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.databinding.FragmentPvOrdiniAcquistoBinding;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.core.OrdiniAcquistoElencoHelper;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.dialogs.DialogScanLisA;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+
+public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitledFragment {
+
+ private FragmentPvOrdiniAcquistoBinding mBinding;
+ private OrdiniAcquistoElencoHelper mHelper;
+ private Griglia mGriglia;
+
+
+ public PVOrdiniAcquistoGrigliaFragment() {
+ }
+
+ public static PVOrdiniAcquistoGrigliaFragment newInstance() {
+ PVOrdiniAcquistoGrigliaFragment fragment = new PVOrdiniAcquistoGrigliaFragment();
+ Bundle args = new Bundle();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+
+ mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_pv_ordini_acquisto, container, false);
+
+ init();
+ return mBinding.getRoot();
+ }
+
+ private void init() {
+
+ BarcodeManager.enable();
+ DialogScanLisA.make(getActivity(), griglia -> {
+ if(griglia == null) {
+ ((IPoppableActivity) getActivity()).pop();
+ } else {
+ setGriglia(griglia);
+ }
+ }).show();
+
+ }
+
+ @Override
+ public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+ titleText.setText(context.getText(R.string.pv_elenco_ordiniA_title_fragment).toString());
+ }
+
+ private void setGriglia(Griglia griglia){
+ mGriglia = griglia;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/PVOrdiniAcquistoTransmittedListFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/PVOrdiniAcquistoTransmittedListFragment.java
new file mode 100644
index 00000000..ec82aa7a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/PVOrdiniAcquistoTransmittedListFragment.java
@@ -0,0 +1,117 @@
+package it.integry.integrywmsnative.gest.ordini_acquisto_pv;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
+import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
+import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
+import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.databinding.FragmentPvOrdiniATrasmessiElencoBinding;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.core.OrdineAcquistoPvTransmittedListAdapter;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.core.OrdiniAcquistoElencoHelper;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog.DialogOrdineProduzioneFiltroAvanzato;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+
+public class PVOrdiniAcquistoTransmittedListFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment {
+
+ private FragmentPvOrdiniATrasmessiElencoBinding mBinding;
+ private OrdiniAcquistoElencoHelper mHelper;
+ private ElevatedToolbar mToolbar;
+ private OrdineAcquistoPvTransmittedListAdapter mAdapter;
+
+ private List mOriginalOrderList;
+ private List mRenderedOrderList = new ArrayList<>();
+
+ private AppCompatTextView mAppBarTitle;
+
+ private DialogOrdineProduzioneFiltroAvanzato.DialogOrdineProduzioneFiltroAvanzatoViewModel mAppliedFilterViewModel;
+
+ public PVOrdiniAcquistoTransmittedListFragment() {
+ // Required empty public constructor
+ }
+
+ public static PVOrdiniAcquistoTransmittedListFragment newInstance() {
+ PVOrdiniAcquistoTransmittedListFragment fragment = new PVOrdiniAcquistoTransmittedListFragment();
+ Bundle args = new Bundle();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+
+ mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_pv_ordini_a_trasmessi_elenco, container, false);
+ mBinding.setView(this);
+
+
+ //init();
+ return mBinding.getRoot();
+ }
+
+ @Override
+ public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+ titleText.setText(context.getText(R.string.pv_elenco_ordiniA_title_fragment).toString());
+ }
+
+ @Override
+ public void setScrollToolbar(ElevatedToolbar toolbar) {
+
+ }
+
+ @Override
+ public void setOnPreDestroy(Runnable onPreDestroy) {
+
+ }
+
+ @Override
+ public void onFilterClick() {
+
+ }
+
+ private void init(){
+ final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity());
+
+ OrdineRepository repository = new OrdineRepository();
+
+ repository.selectAllTransmitted((ordini)->{
+ mOriginalOrderList = ordini;
+ mBinding.ordiniAEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE);
+ refreshRenderedOrdini(ordini);
+ initRecyclerView();
+ progress.dismiss();
+ },(e)->{
+ progress.dismiss();
+ String errorMessage = e.getMessage();
+ DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
+ });
+
+ }
+
+ private void initRecyclerView() {
+ mAdapter = new OrdineAcquistoPvTransmittedListAdapter(getActivity(), mRenderedOrderList);
+ mBinding.ordineAMainList.setAdapter(mAdapter);
+ }
+
+ private void refreshRenderedOrdini(List ordini) {
+ mRenderedOrderList.clear();
+ if(ordini != null) mRenderedOrderList.addAll(ordini);
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdineAcquistoPvTransmittedListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdineAcquistoPvTransmittedListAdapter.java
new file mode 100644
index 00000000..d519cf6f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdineAcquistoPvTransmittedListAdapter.java
@@ -0,0 +1,133 @@
+package it.integry.integrywmsnative.gest.ordini_acquisto_pv.core;
+
+import android.content.Context;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.annimon.stream.Stream;
+import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.databinding.FragmentOrdineAPvTransmittedListModelBinding;
+import it.integry.integrywmsnative.databinding.FragmentOrdiniAPvListSingleItemBinding;
+import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider;
+
+public class OrdineAcquistoPvTransmittedListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider {
+
+
+ private Context mContext;
+
+ private List mOriginalDataset;
+ private List mDataset;
+
+
+ static class SubheaderHolder extends RecyclerView.ViewHolder {
+
+ FragmentOrdineAPvTransmittedListModelBinding binding;
+
+ SubheaderHolder(FragmentOrdineAPvTransmittedListModelBinding binding) {
+ super(binding.getRoot());
+ this.binding = binding;
+ }
+
+ }
+
+ static class SingleItemViewHolder extends RecyclerView.ViewHolder {
+
+ FragmentOrdiniAPvListSingleItemBinding binding;
+
+ SingleItemViewHolder(FragmentOrdiniAPvListSingleItemBinding binding) {
+ super(binding.getRoot());
+ this.binding = binding;
+ }
+ }
+
+
+ public OrdineAcquistoPvTransmittedListAdapter(Context context, List myDataset) {
+ mContext = context;
+ mOriginalDataset = myDataset;
+ mDataset = orderItems(myDataset);
+ }
+
+ public void updateItems(List updatedDataset) {
+ mDataset.clear();
+ mDataset.addAll(orderItems(updatedDataset));
+ notifyDataSetChanged();
+ notifyDataChanged();
+ }
+
+
+ private List orderItems(List dataset) {
+ return Stream.of(dataset)
+ .distinctBy(OrdineWithGriglia::getGriglia)
+ .sortBy(x -> UtilityDate.formatDate(x.getOrdine().getDataOrd(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))
+ .toList();
+
+ }
+
+
+
+ @Override
+ public SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
+ FragmentOrdineAPvTransmittedListModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_ordine_a_pv_transmitted__list_model, parent, false);
+ return new SubheaderHolder(binding);
+ }
+
+ @Override
+ public SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+ FragmentOrdiniAPvListSingleItemBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_ordini_a_pv__list_single_item, parent, false);
+ return new SingleItemViewHolder(binding);
+ }
+
+
+ @Override
+ public void onBindSubheaderViewHolder(OrdineAcquistoPvTransmittedListAdapter.SubheaderHolder subheaderHolder, int nextItemPosition) {
+ subheaderHolder.binding.ordineAPvMainListGroupHeader.setText(mDataset.get(nextItemPosition).getGriglia().getCodAlis());
+
+ }
+
+ @Override
+ public void onBindItemViewHolder(OrdineAcquistoPvTransmittedListAdapter.SingleItemViewHolder h, int itemPosition) {
+ final OrdineWithGriglia ordine = mDataset.get(itemPosition);
+ final OrdineAcquistoPvTransmittedListAdapter.SingleItemViewHolder holder = h;
+
+
+ String testataOrdString = String.format(mContext.getString(R.string.ord_acq_testata), String.valueOf(ordine.getOrdine().getOrdineId()), UtilityDate.formatDate(ordine.getOrdine().getDataOrd(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+
+ holder.binding.badge1.setText(ordine.getOrdine().isTransmitted() ? "TRASMESSO" : "NON TRASMESSO");
+
+ holder.binding.descriptionMain.setText(Html.fromHtml(testataOrdString));
+
+
+ holder.binding.getRoot().setOnClickListener(v -> {
+ //TODO: aprire descrizione Ordine
+ });
+
+ }
+
+
+ @Override
+ public boolean onPlaceSubheaderBetweenItems(int position) {
+ return !(this.mDataset.get(position).getGriglia().getGrigliaId() == this.mDataset.get(position + 1).getGriglia().getGrigliaId());
+
+ }
+
+ @Override
+ public int getItemSize() {
+ return mDataset.size();
+ }
+
+ @Override
+ public String getSectionTitle(int position) {
+ return null;
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdiniAcquistoElencoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdiniAcquistoElencoHelper.java
index 380d2480..28ec5c47 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdiniAcquistoElencoHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/core/OrdiniAcquistoElencoHelper.java
@@ -9,4 +9,5 @@ public class OrdiniAcquistoElencoHelper {
public OrdiniAcquistoElencoHelper(Context context) {
this.mContext = context;
}
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/dialogs/DialogScanLisA.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/dialogs/DialogScanLisA.java
new file mode 100644
index 00000000..0f3e4f2e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/dialogs/DialogScanLisA.java
@@ -0,0 +1,106 @@
+package it.integry.integrywmsnative.gest.ordini_acquisto_pv.dialogs;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+
+import androidx.databinding.DataBindingUtil;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.expansion.BaseDialog;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.databinding.DialogScanCodiceGrigliaBinding;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.helper.OrdineAcquistoPvHelper;
+
+public class DialogScanLisA {
+
+ private Context mContext;
+
+ private Dialog mDialog;
+
+ private DialogScanCodiceGrigliaBinding mBinding;
+
+ private RunnableArgs mOnDialogDismiss;
+
+ private OrdineAcquistoPvHelper mHelper;
+
+ private DialogScanLisA(Context context, RunnableArgs onDialogDismiss) {
+ mOnDialogDismiss = null;
+ mContext = context;
+ mHelper = new OrdineAcquistoPvHelper(context);
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+
+ mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_scan_codice_griglia, null, false);
+
+ mDialog = new BaseDialog(context);
+ mDialog.setContentView(mBinding.getRoot());
+ mDialog.setCanceledOnTouchOutside(false);
+// mDialog.setCancelable(false);
+ mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+ init(onDialogDismiss);
+ initBarcode();
+ }
+
+ public static Dialog make(Context context, RunnableArgs onDialogDismiss) {
+ return new DialogScanLisA(context, onDialogDismiss).mDialog;
+ }
+
+
+ private void init(RunnableArgs onDialogDismiss) {
+ mOnDialogDismiss = onDialogDismiss;
+ }
+
+ private void initBarcode() {
+
+ int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+ .setOnScanSuccessfull(onScanSuccessfull)
+ .setOnScanFailed(ex -> UtilityExceptions.defaultException(mContext, ex, false)));
+
+ mDialog.setOnDismissListener(dialog -> {
+ BarcodeManager.removeCallback(barcodeIstanceID);
+ BarcodeManager.enable();
+ mOnDialogDismiss.run(null);
+ });
+ }
+
+
+ private RunnableArgs onScanSuccessfull = data -> {
+ BarcodeManager.disable();
+ final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+ RunnableArgs mOnError = exception -> {
+ UtilityExceptions.defaultException(mContext,exception,progressDialog);
+ BarcodeManager.enable();
+ };
+ GrigliaRepository repository = new GrigliaRepository();
+ repository.findByCodAlis(data.getStringValue(),griglia->{
+ if (griglia != null){
+ if (griglia.getCountArticoli() >0){
+ mOnDialogDismiss.run(griglia);
+ }else{
+ mHelper.updateGriglia(griglia,(grigliaEntity)->{
+ progressDialog.dismiss();
+ mOnDialogDismiss.run(grigliaEntity);
+ },mOnError);
+ }
+ }else{
+ mHelper.downloadAndSaveLisA(data.getStringValue(),(grigliaEntity)->{
+ progressDialog.dismiss();
+ mOnDialogDismiss.run(grigliaEntity);
+ },mOnError);
+ }
+ },mOnError);
+
+
+ };
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/helper/OrdineAcquistoPvHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/helper/OrdineAcquistoPvHelper.java
new file mode 100644
index 00000000..f436f304
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_acquisto_pv/helper/OrdineAcquistoPvHelper.java
@@ -0,0 +1,59 @@
+package it.integry.integrywmsnative.gest.ordini_acquisto_pv.helper;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliGrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.view_model.ArticoloDTO;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
+
+public class OrdineAcquistoPvHelper {
+
+ private Context mContext;
+ private GrigliaRepository mGrigliaRepository;
+ private ArticoliGrigliaRepository mArticoliGrigliaRepository;
+
+ public OrdineAcquistoPvHelper(Context mContext) {
+ this.mContext = mContext;
+ this.mGrigliaRepository = new GrigliaRepository();
+ this.mArticoliGrigliaRepository = new ArticoliGrigliaRepository();
+ }
+
+ public void downloadAndSaveLisA(String codAlis, RunnableArgs onSave, RunnableArgs onFail) {
+ Griglia griglia = new Griglia();
+ griglia.setCodAlis(codAlis);
+ updateGriglia(griglia, onSave, onFail);
+ }
+
+ public void updateGriglia(Griglia griglia, RunnableArgs onSave, RunnableArgs onFail) {
+ PVOrdiniAcquistoRESTConsumer.getArticoliListino(griglia.getCodAlis(), dto -> {
+ if (dto.getGrigliaAcquistiChild().size() <= 0) {
+ Exception e = new Exception("La griglia selezionata (" + griglia.getCodAlis() + ") non esiste o non presenta articoli");
+ onFail.run(e);
+ return;
+ }
+ griglia.setDescrLisa(dto.getDescrLisa());
+ griglia.setDescrDepo(dto.getDescrDepo());
+ mGrigliaRepository.saveGriglia(griglia, id -> {
+ saveLisAToGriglia(dto.getGrigliaAcquistiChild(), griglia, onSave, onFail);
+ }, onFail);
+
+ }, onFail);
+ }
+
+ public void saveLisAToGriglia(List articoli, Griglia griglia, RunnableArgs onSave, RunnableArgs onFail) {
+ List articoliGriglia = new ArrayList<>();
+ for (ArticoloDTO articolo : articoli) {
+ ArticoloGriglia toSave = articolo.toArticoloGriglia();
+ toSave.setIdGriglia(griglia.getGrigliaId());
+ articoliGriglia.add(toSave);
+ }
+ mArticoliGrigliaRepository.saveArticoliToGriglia(articoliGriglia, () -> onSave.run(griglia), onFail);
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
index a3a9e88f..3498a8d7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
@@ -58,7 +58,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class PickingLiberoViewModel implements IRecyclerItemClicked {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
index ff6f589f..44b86440 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
@@ -48,9 +49,9 @@ import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShould
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-public class PickingResiActivity extends AppCompatActivity implements IOnColloClosedCallback {
+public class PickingResiActivity extends BaseActivity implements IOnColloClosedCallback {
private List mDocumentiResiList;
public ObservableList mDtbDocrList;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java
index 858e3042..120d1d0a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java
@@ -151,7 +151,7 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi
public void refreshOrdini(List ordini) {
mRenderedOrderList.clear();
- mRenderedOrderList.addAll(ordini);
+ if (ordini != null && ordini.size() > 0) mRenderedOrderList.addAll(ordini);
}
private void initRecyclerView() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java
index 428cd6b9..eeec67d8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java
@@ -49,7 +49,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class ProdRecuperoMaterialeViewModel {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
index ec933196..7d993376 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
@@ -64,8 +64,8 @@ import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuanti
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNo;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
-import it.integry.plugins.barcode_base_library.model.BarcodeType;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeType;
public class RettificaGiacenzeViewModel implements IRecyclerItemClicked {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
index 85bbfcbd..3947ef7f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
@@ -28,7 +28,7 @@ import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class VenditaViewModel {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java
index d6c75f4f..7a0f2a75 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java
@@ -10,6 +10,7 @@ import android.view.MenuItem;
import java.util.ArrayList;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
@@ -24,7 +25,7 @@ import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.viewmodel.VenditaOrdineInevasoViewModel;
import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
-public class VenditaOrdineInevasoActivity extends AppCompatActivity {
+public class VenditaOrdineInevasoActivity extends BaseActivity {
private ActivityVenditaOrdineInevasoBinding mBindings;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index 85a6fda9..2f7e445d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -69,7 +69,7 @@ import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShould
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArt;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IOnOrdineVenditaRowDispatched {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
index 7159ef10..42743606 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
@@ -2,13 +2,13 @@ package it.integry.integrywmsnative.gest.versamento_merce.viewmodel;
import android.app.Activity;
import android.app.Dialog;
-import android.app.ProgressDialog;
import android.content.Context;
-import androidx.databinding.ObservableArrayList;
-import androidx.databinding.ObservableField;
import android.text.Html;
import android.text.SpannableString;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableField;
+
import com.annimon.stream.Stream;
import java.math.BigDecimal;
@@ -16,10 +16,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeType;
import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
@@ -28,6 +27,9 @@ import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -42,8 +44,6 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
-import it.integry.plugins.barcode_base_library.model.BarcodeType;
public class VersamentoMerceViewModel {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java
index ed58ea00..b5fcd238 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java
@@ -9,13 +9,16 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.ProgressBar;
+import androidx.databinding.DataBindingUtil;
+
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.databinding.DialogProgressBinding;
public class DialogProgress {
private Context mContext;
-
+ private DialogProgressBinding mBinding;
private Dialog mDialog;
@@ -29,19 +32,19 @@ public class DialogProgress {
mContext = context;
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
- View currentView = inflater.inflate(R.layout.dialog_progress, null, false);
+ mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_progress, null, false);
final Thread[] progressBarThread = new Thread[1];
mDialog = new Dialog(mContext);
- mDialog.setContentView(currentView);
+ mDialog.setContentView(mBinding.getRoot());
mDialog.setCanceledOnTouchOutside(false);
mDialog.setCancelable(false);
mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
mDialog.setOnShowListener(dialog -> {
// ((ProgressBar) currentView.findViewById(R.id.progressBar)).setIndeterminate(true);
- progressBarThread[0] = UtilityProgress.makeProgressBarIndeterminate(currentView.findViewById(R.id.progressBar));
+ progressBarThread[0] = UtilityProgress.makeProgressBarIndeterminate(mBinding.progressBar);
});
mDialog.setOnDismissListener(dialog -> {
@@ -49,4 +52,8 @@ public class DialogProgress {
});
}
+ public void setSubtitle(String subtitle){
+ mBinding.setSubtitle(subtitle);
+ }
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java
index 785e53da..9698bf7d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java
@@ -32,7 +32,7 @@ import it.integry.integrywmsnative.core.utility.UtilityPosizione;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.databinding.DialogAskPositionOfLuBinding;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class DialogAskPositionOfLU {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
index 94e0ea14..df51cafc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
@@ -34,7 +34,7 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsLayoutBinding;
import it.integry.integrywmsnative.view.dialogs.DialogCommon;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class DialogChooseArtsFromListaArts {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index 87406539..8f9b41d6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -47,7 +47,7 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class DialogInputQuantity {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java
index 014288c0..dbf24689 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java
@@ -27,7 +27,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogScanArtBinding;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class DialogScanArt {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java
index 7f468796..d378336e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java
@@ -1,28 +1,28 @@
package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu;
import android.app.Dialog;
-import android.app.ProgressDialog;
import android.content.Context;
-import androidx.databinding.DataBindingUtil;
-
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.text.SpannableString;
import android.view.LayoutInflater;
import android.view.View;
+import androidx.databinding.DataBindingUtil;
+
import com.annimon.stream.Stream;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@@ -30,7 +30,6 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogScanOrCreateLuBinding;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
public class DialogScanOrCreateLU {
diff --git a/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.png b/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.png
new file mode 100644
index 00000000..c46805ee
Binary files /dev/null and b/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.png differ
diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml
index 3275cdc9..2a9fa222 100644
--- a/app/src/main/res/layout/dialog_progress.xml
+++ b/app/src/main/res/layout/dialog_progress.xml
@@ -1,8 +1,15 @@
-
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml b/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml
new file mode 100644
index 00000000..fd2b2a4b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pv_ordini_a_trasmessi_elenco.xml b/app/src/main/res/layout/fragment_pv_ordini_a_trasmessi_elenco.xml
new file mode 100644
index 00000000..5c9bf84b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pv_ordini_a_trasmessi_elenco.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml b/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml
index 27c88901..a58ae36f 100644
--- a/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml
+++ b/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml
@@ -5,14 +5,209 @@
xmlns:fab="http://schemas.android.com/apk/res-auto">
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 6ca92a2a..3cd7d677 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -258,8 +258,10 @@
Punto Vendita
Dynamic SaporiVeri
SaporiVeri PV
- Ordini di acquisto
+ Genera ordini di acqusito
+ Ordini di acquisto trasmessi
Ordini di Acquisto
+ Ordini trasmessi
Seleziona Griglia
Scansiona il codice a barre di una griglia
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index e93ff724..afd797c8 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -24,6 +24,7 @@
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9c2eb08..32723e73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -267,8 +267,10 @@
Dynamic SaporiVeri
SaporiVeri PV
Sale point
- Purchase orders
+ Generate purchase orders
+ Transmitted purchase orders
Purchase Orders
+ Transmitted Orders
Select grid
scan the barcode for the wanted grid
diff --git a/barcode_base_android_library/.gitignore b/barcode_base_android_library/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/barcode_base_android_library/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle
new file mode 100644
index 00000000..68c6efcb
--- /dev/null
+++ b/barcode_base_android_library/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion 28
+
+
+ defaultConfig {
+ minSdkVersion 21
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles 'consumer-rules.pro'
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/barcode_base_android_library/consumer-rules.pro b/barcode_base_android_library/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/barcode_base_android_library/proguard-rules.pro b/barcode_base_android_library/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/barcode_base_android_library/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/barcode_base_android_library/src/androidTest/java/it/integry/barcode_base_android_library/ExampleInstrumentedTest.java b/barcode_base_android_library/src/androidTest/java/it/integry/barcode_base_android_library/ExampleInstrumentedTest.java
new file mode 100644
index 00000000..f430e9e7
--- /dev/null
+++ b/barcode_base_android_library/src/androidTest/java/it/integry/barcode_base_android_library/ExampleInstrumentedTest.java
@@ -0,0 +1,27 @@
+package it.integry.barcode_base_android_library;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+ assertEquals("it.integry.barcode_base_android_library.test", appContext.getPackageName());
+ }
+}
diff --git a/barcode_base_android_library/src/main/AndroidManifest.xml b/barcode_base_android_library/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..f560fa39
--- /dev/null
+++ b/barcode_base_android_library/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
diff --git a/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/exception/BarcodeAdapterNotFoundException.java b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/exception/BarcodeAdapterNotFoundException.java
new file mode 100644
index 00000000..78def51d
--- /dev/null
+++ b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/exception/BarcodeAdapterNotFoundException.java
@@ -0,0 +1,9 @@
+package it.integry.barcode_base_android_library.exception;
+
+public class BarcodeAdapterNotFoundException extends Exception {
+
+ public BarcodeAdapterNotFoundException(String adapterName) {
+ super("L'adapter " + adapterName + " non รจ stato rilevato sul dispositivo corrente");
+ }
+
+}
diff --git a/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/extension/RunnableArgs.java b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/extension/RunnableArgs.java
new file mode 100644
index 00000000..303dabb3
--- /dev/null
+++ b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/extension/RunnableArgs.java
@@ -0,0 +1,7 @@
+package it.integry.barcode_base_android_library.extension;
+
+public interface RunnableArgs {
+
+ void run(T data);
+
+}
\ No newline at end of file
diff --git a/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/interfaces/BarcodeReaderInterface.java b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/interfaces/BarcodeReaderInterface.java
new file mode 100644
index 00000000..7b8c48b9
--- /dev/null
+++ b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/interfaces/BarcodeReaderInterface.java
@@ -0,0 +1,24 @@
+package it.integry.barcode_base_android_library.interfaces;
+
+
+import android.view.KeyEvent;
+
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.extension.RunnableArgs;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+
+public interface BarcodeReaderInterface {
+
+ boolean isRightAdapter();
+
+ void init(Runnable onDeviceReady) throws BarcodeAdapterNotFoundException;
+
+ void deinit();
+
+ void register(RunnableArgs onScanSuccessfull, RunnableArgs onScanFailed);
+
+ String getAdapterName();
+
+ void onKeyEvent(KeyEvent keyEvent);
+
+}
diff --git a/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeScanDTO.java b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeScanDTO.java
new file mode 100644
index 00000000..ddde65c3
--- /dev/null
+++ b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeScanDTO.java
@@ -0,0 +1,55 @@
+package it.integry.barcode_base_android_library.model;
+
+public class BarcodeScanDTO {
+
+ private BarcodeType type;
+ private String stringValue;
+ private byte[] byteValue;
+ private String name;
+ private int decodingTime;
+
+ public BarcodeType getType() {
+ return type;
+ }
+
+ public BarcodeScanDTO setType(BarcodeType type) {
+ this.type = type;
+ return this;
+ }
+
+ public String getStringValue() {
+ return stringValue;
+ }
+
+ public BarcodeScanDTO setStringValue(String stringValue) {
+ this.stringValue = stringValue;
+ return this;
+ }
+
+ public byte[] getByteValue() {
+ return byteValue;
+ }
+
+ public BarcodeScanDTO setByteValue(byte[] byteValue) {
+ this.byteValue = byteValue;
+ return this;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public BarcodeScanDTO setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public int getDecodingTime() {
+ return decodingTime;
+ }
+
+ public BarcodeScanDTO setDecodingTime(int decodingTime) {
+ this.decodingTime = decodingTime;
+ return this;
+ }
+}
diff --git a/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeType.java b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeType.java
new file mode 100644
index 00000000..566fe580
--- /dev/null
+++ b/barcode_base_android_library/src/main/java/it/integry/barcode_base_android_library/model/BarcodeType.java
@@ -0,0 +1,91 @@
+package it.integry.barcode_base_android_library.model;
+
+public enum BarcodeType {
+
+ NIL(0),
+ AIRLINE_2OF5_13_DIGIT(1),
+ AIRLINE_2OF5_15_DIGIT(2),
+ AZTEC(3),
+ AUSTRALIAN_POSTAL(4),
+ BOOKLAND_EAN(5),
+ BPO(6),
+ CANPOST(7),
+ CHINAPOST(8),
+ CHINESE_2OF5(9),
+ CODABAR(10),
+ CODABLOCK(11),
+ CODE11(12),
+ CODE128(13),
+ CODE16K(14),
+ CODE32(15),
+ CODE39(16),
+ CODE49(17),
+ CODE93(18),
+ COMPOSITE(19),
+ COUPON_CODE(20),
+ DATAMATRIX(21),
+ DISCRETE_2OF5(22),
+ DUTCH_POSTAL(23),
+ EAN128(24),
+ EAN13(25),
+ EAN8(26),
+ GS1_DATABAR_14(27),
+ GS1_DATABAR_EXPANDED(28),
+ GS1_DATABAR_LIMITED(29),
+ HONGKONG_2OF5(30),
+ IATA_2OF5(31),
+ IDTAG(32),
+ INTERLEAVED_2OF5(33),
+ ISBT128(34),
+ JAPANESE_POSTAL(35),
+ KOREAN_POSTAL(36),
+ MATRIX_2OF5(37),
+ MAXICODE(38),
+ MESA(39),
+ MICRO_PDF417(40),
+ MICRO_QR(41),
+ MSI(42),
+ NEC_2OF5(43),
+ OCR(44),
+ PDF417(45),
+ PLESSEY(46),
+ POSICODE(47),
+ POST_US4(48),
+ QR(49),
+ STRAIGHT_2OF5(50),
+ STANDARD_2OF5(51),
+ TELEPEN(52),
+ TLCODE39(53),
+ TRIOPTIC(54),
+ UK_POSTAL(55),
+ UPCA(56),
+ UPCE(57),
+ UPCE1(58),
+ US_PLANET(59),
+ US_POSTNET(60),
+ USPS_4CB(61),
+ RSS(62),
+ LABEL(63),
+ HANXIN(64),
+ GRIDMATRIX(65),
+ INFO_MAIL(66),
+ INTELLIGENT_MAIL(67),
+ SWEDENPOST(68),
+ LAST(69);
+
+ private Integer text;
+ BarcodeType(Integer text) {
+ this.text = text;
+ }
+ public Integer getValue() {
+ return this.text;
+ }
+
+ public static BarcodeType fromInt(Integer text) {
+ for (BarcodeType b : BarcodeType.values()) {
+ if (b.text.equals(text)) return b;
+ }
+ return null;
+ }
+
+}
diff --git a/barcode_base_android_library/src/main/res/values/strings.xml b/barcode_base_android_library/src/main/res/values/strings.xml
new file mode 100644
index 00000000..cd6d432a
--- /dev/null
+++ b/barcode_base_android_library/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ barcode_base_android_library
+
diff --git a/barcode_base_android_library/src/test/java/it/integry/barcode_base_android_library/ExampleUnitTest.java b/barcode_base_android_library/src/test/java/it/integry/barcode_base_android_library/ExampleUnitTest.java
new file mode 100644
index 00000000..392f4995
--- /dev/null
+++ b/barcode_base_android_library/src/test/java/it/integry/barcode_base_android_library/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package it.integry.barcode_base_android_library;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/exception/BarcodeAdapterNotFoundException.java b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/exception/BarcodeAdapterNotFoundException.java
index 063a539d..78def51d 100644
--- a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/exception/BarcodeAdapterNotFoundException.java
+++ b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/exception/BarcodeAdapterNotFoundException.java
@@ -1,4 +1,4 @@
-package it.integry.plugins.barcode_base_library.exception;
+package it.integry.barcode_base_android_library.exception;
public class BarcodeAdapterNotFoundException extends Exception {
diff --git a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/extension/RunnableArgs.java b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/extension/RunnableArgs.java
index c0cfd124..303dabb3 100644
--- a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/extension/RunnableArgs.java
+++ b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/extension/RunnableArgs.java
@@ -1,4 +1,4 @@
-package it.integry.plugins.barcode_base_library.extension;
+package it.integry.barcode_base_android_library.extension;
public interface RunnableArgs {
diff --git a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java
index 0451cb2e..41863b49 100644
--- a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java
+++ b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java
@@ -1,8 +1,9 @@
-package it.integry.plugins.barcode_base_library.interfaces;
+package it.integry.barcode_base_android_library.interfaces;
-import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
-import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+
+import it.integry.barcode_base_android_library.extension.RunnableArgs;
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public interface BarcodeReaderInterface {
@@ -16,4 +17,6 @@ public interface BarcodeReaderInterface {
String getAdapterName();
+ //void onKeyEvent(KeyEvent keyEvent);
+
}
diff --git a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeScanDTO.java b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeScanDTO.java
index 5ac0a3f2..ddde65c3 100644
--- a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeScanDTO.java
+++ b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeScanDTO.java
@@ -1,4 +1,4 @@
-package it.integry.plugins.barcode_base_library.model;
+package it.integry.barcode_base_android_library.model;
public class BarcodeScanDTO {
diff --git a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeType.java b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeType.java
index 67b65c01..566fe580 100644
--- a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeType.java
+++ b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeType.java
@@ -1,4 +1,4 @@
-package it.integry.plugins.barcode_base_library.model;
+package it.integry.barcode_base_android_library.model;
public enum BarcodeType {
diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java
index 38d6d9c5..948f4a6e 100644
--- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java
+++ b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationSAPORIVERIPV.java
@@ -1,7 +1,8 @@
package it.integry.wms.dynamic_customization.extensions;
import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
-import it.integry.integrywmsnative.gest.ordini_acquisto_pv.OrdiniAcquistoElencoFragment;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.PVOrdiniAcquistoGrigliaFragment;
+import it.integry.integrywmsnative.gest.ordini_acquisto_pv.PVOrdiniAcquistoTransmittedListFragment;
public class MenuConfigurationSAPORIVERIPV extends BaseMenuConfiguration {
@@ -15,10 +16,16 @@ public class MenuConfigurationSAPORIVERIPV extends BaseMenuConfiguration {
.addItem(new MenuItem()
.setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto)
- .setTitleText(it.integry.integrywmsnative.R.string.purchase_orders)
+ .setTitleText(it.integry.integrywmsnative.R.string.generate_orders)
.setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
- .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_purchasing_orders)
- .setFragmentClass(OrdiniAcquistoElencoFragment.newInstance()))
+ .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+ .setFragmentClass(PVOrdiniAcquistoGrigliaFragment.newInstance()))
+ .addItem(new MenuItem()
+ .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi)
+ .setTitleText(it.integry.integrywmsnative.R.string.transmitted_orders)
+ .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
+ .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
+ .setFragmentClass(PVOrdiniAcquistoTransmittedListFragment.newInstance()))
);
diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle
index b141d6c4..d20fd416 100644
--- a/honeywellscannerlibrary/build.gradle
+++ b/honeywellscannerlibrary/build.gradle
@@ -30,9 +30,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
- implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
- implementation project(path: ':barcode_base_library')
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+ implementation project(path: ':barcode_base_android_library')
}
diff --git a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java
index 719f5d01..fda391e6 100644
--- a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java
+++ b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java
@@ -1,10 +1,7 @@
package it.integry.honeywellscannerlibrary;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
import android.os.Build;
+import android.view.KeyEvent;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
@@ -22,10 +19,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
-import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
-import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.extension.RunnableArgs;
+import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class HoneyWellBarcodeReader implements BarcodeReaderInterface {
@@ -110,9 +107,10 @@ public class HoneyWellBarcodeReader implements BarcodeReaderInterface {
return "Honeywell";
}
+ @Override
+ public void onKeyEvent(KeyEvent keyEvent) {
-
-
+ }
private void registerListenersInternal() {
diff --git a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneywellBarcodeTypeMapper.java b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneywellBarcodeTypeMapper.java
index 103b276f..85a36c50 100644
--- a/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneywellBarcodeTypeMapper.java
+++ b/honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneywellBarcodeTypeMapper.java
@@ -2,7 +2,7 @@ package it.integry.honeywellscannerlibrary;
import android.util.Log;
-import it.integry.plugins.barcode_base_library.model.BarcodeType;
+import it.integry.barcode_base_android_library.model.BarcodeType;
public class HoneywellBarcodeTypeMapper {
diff --git a/keyboardemulatorscannerlibrary/.gitignore b/keyboardemulatorscannerlibrary/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/keyboardemulatorscannerlibrary/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/keyboardemulatorscannerlibrary/build.gradle b/keyboardemulatorscannerlibrary/build.gradle
new file mode 100644
index 00000000..68bb7760
--- /dev/null
+++ b/keyboardemulatorscannerlibrary/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'java-library'
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
diff --git a/keyboardemulatorscannerlibrary/src/main/java/it/integry/keyboardemulatorscannerlibrary/KeyboardEmulator.java b/keyboardemulatorscannerlibrary/src/main/java/it/integry/keyboardemulatorscannerlibrary/KeyboardEmulator.java
new file mode 100644
index 00000000..fab77668
--- /dev/null
+++ b/keyboardemulatorscannerlibrary/src/main/java/it/integry/keyboardemulatorscannerlibrary/KeyboardEmulator.java
@@ -0,0 +1,4 @@
+package it.integry.keyboardemulatorscannerlibrary;
+
+public class KeyboardEmulator {
+}
diff --git a/keyobardemulatorscannerlibrary/.gitignore b/keyobardemulatorscannerlibrary/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle
new file mode 100644
index 00000000..998707aa
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion 28
+
+
+
+ defaultConfig {
+ minSdkVersion 21
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles 'consumer-rules.pro'
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+ implementation project(':barcode_base_android_library')
+}
diff --git a/keyobardemulatorscannerlibrary/consumer-rules.pro b/keyobardemulatorscannerlibrary/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/keyobardemulatorscannerlibrary/proguard-rules.pro b/keyobardemulatorscannerlibrary/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/keyobardemulatorscannerlibrary/src/androidTest/java/it/integry/keyobardemulatorscannerlibrary/ExampleInstrumentedTest.java b/keyobardemulatorscannerlibrary/src/androidTest/java/it/integry/keyobardemulatorscannerlibrary/ExampleInstrumentedTest.java
new file mode 100644
index 00000000..fce0e162
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/src/androidTest/java/it/integry/keyobardemulatorscannerlibrary/ExampleInstrumentedTest.java
@@ -0,0 +1,27 @@
+package it.integry.keyobardemulatorscannerlibrary;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+ assertEquals("it.integry.keyobardemulatorscannerlibrary.test", appContext.getPackageName());
+ }
+}
diff --git a/keyobardemulatorscannerlibrary/src/main/AndroidManifest.xml b/keyobardemulatorscannerlibrary/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..71b0d304
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
diff --git a/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java b/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java
new file mode 100644
index 00000000..e98db0ec
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java
@@ -0,0 +1,111 @@
+package it.integry.keyobardemulatorscannerlibrary;
+
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.util.regex.Pattern;
+
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.extension.RunnableArgs;
+import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeType;
+
+public class KeyboardEmulatorBarcodeReader implements BarcodeReaderInterface {
+
+ private String barcode;
+ private RunnableArgs mOnScanSuccessfull;
+ private RunnableArgs mOnScanFailed;
+ private String mTextBarcode = "";
+ private long mLastCharInsertTime = 0;
+
+
+ public KeyboardEmulatorBarcodeReader(AppCompatActivity context) {
+
+ }
+
+ @Override
+ public boolean isRightAdapter() {
+ return true;
+ }
+
+ @Override
+ public void init(Runnable onDeviceReady) throws BarcodeAdapterNotFoundException {
+ onDeviceReady.run();
+ }
+
+ @Override
+ public void deinit() {
+
+ }
+
+ @Override
+ public void register(RunnableArgs onScanSuccessfull, RunnableArgs onScanFailed) {
+ mOnScanSuccessfull = onScanSuccessfull;
+ mOnScanFailed = onScanFailed;
+ }
+
+ @Override
+ public String getAdapterName() {
+ return "KeyboardEmulator";
+ }
+
+ @Override
+ public void onKeyEvent(KeyEvent keyEvent) {
+
+ if (keyEvent.getEventTime() - mLastCharInsertTime > 500){
+ mLastCharInsertTime =keyEvent.getEventTime();
+ mTextBarcode = "";
+ }
+ if (keyEvent.getKeyCode() != KeyEvent.KEYCODE_ENTER){
+ if (keyEvent.getKeyCode() != KeyEvent.KEYCODE_SHIFT_LEFT){
+ mLastCharInsertTime =keyEvent.getEventTime();
+ mTextBarcode+= (char) keyEvent.getUnicodeChar();
+ }
+ }else{
+ if (mTextBarcode.length() > 0){
+
+ BarcodeType barcodeType = decodeBarcode(mTextBarcode);
+ BarcodeScanDTO barcodeScanDTO = new BarcodeScanDTO()
+ .setByteValue(mTextBarcode.getBytes())
+ .setStringValue(mTextBarcode)
+ .setType(barcodeType)
+ .setName(barcodeType != null ? barcodeType.toString():"");
+
+ mOnScanSuccessfull.run(barcodeScanDTO);
+ }
+ }
+
+ }
+
+ public BarcodeType decodeBarcode(String barcode){
+/*
+ Pattern patternUPCA = Pattern.compile("^[0-9]{12}$");
+ Pattern patternUPCE = Pattern.compile("^[0-1][0-9]{7}$");
+ Pattern patternUPCE1 = Pattern.compile("");
+ Pattern patternEAN8 = Pattern.compile("^[0-9]{8}$");
+ Pattern patternEAN13 = Pattern.compile("^[0-9]{13}$");
+ Pattern patternCODE11 = Pattern.compile("");
+ Pattern patternCODE39 = Pattern.compile("");
+ if(){
+ return BarcodeType.CODE11;
+ }else if(){
+ return BarcodeType.CODE39;
+ }else if(){
+ return BarcodeType.EAN13;
+ }else if(){
+ return BarcodeType.EAN8;
+ }else if(){
+ return BarcodeType.UPCA;
+ }else if(){
+ return BarcodeType.UPCE;
+ }else if(false){
+ return BarcodeType.UPCE1;
+ }else{
+ return BarcodeType.CODE128;
+ }*/
+ return BarcodeType.CODE128;
+ }
+}
diff --git a/keyobardemulatorscannerlibrary/src/main/res/values/strings.xml b/keyobardemulatorscannerlibrary/src/main/res/values/strings.xml
new file mode 100644
index 00000000..58df4bae
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ keyobardemulatorscannerlibrary
+
diff --git a/keyobardemulatorscannerlibrary/src/test/java/it/integry/keyobardemulatorscannerlibrary/ExampleUnitTest.java b/keyobardemulatorscannerlibrary/src/test/java/it/integry/keyobardemulatorscannerlibrary/ExampleUnitTest.java
new file mode 100644
index 00000000..a20714c8
--- /dev/null
+++ b/keyobardemulatorscannerlibrary/src/test/java/it/integry/keyobardemulatorscannerlibrary/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package it.integry.keyobardemulatorscannerlibrary;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle
index 7e740b20..c6082bf5 100644
--- a/pointmobilescannerlibrary/build.gradle
+++ b/pointmobilescannerlibrary/build.gradle
@@ -7,7 +7,7 @@ android {
defaultConfig {
minSdkVersion 21
- targetSdkVersion 27
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
@@ -26,9 +26,9 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
- implementation project(':barcode_base_library')
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+ implementation project(':barcode_base_android_library')
}
diff --git a/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java b/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
index 94736d90..51092164 100644
--- a/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
+++ b/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
@@ -1,10 +1,9 @@
package it.integry.pointmobilescannerlibrary;
-import android.app.Application;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.util.Log;
+import android.view.KeyEvent;
import androidx.appcompat.app.AppCompatActivity;
@@ -13,11 +12,11 @@ import java.nio.charset.StandardCharsets;
import device.common.DecodeResult;
import device.common.ScanConst;
import device.sdk.ScanManager;
-import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
-import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
-import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
-import it.integry.plugins.barcode_base_library.model.BarcodeType;
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.extension.RunnableArgs;
+import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeType;
public class PointMobileBarcodeReader implements BarcodeReaderInterface {
@@ -79,8 +78,10 @@ public class PointMobileBarcodeReader implements BarcodeReaderInterface {
return "PointMobile";
}
+ @Override
+ public void onKeyEvent(KeyEvent keyEvent) {
-
+ }
public static class ScanResultReceiver extends BroadcastReceiver {
diff --git a/settings.gradle b/settings.gradle
index 99353927..75c1404c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis', ':dynamic_saporiveri_pv'
+include ':app', ':pointmobilescannerlibrary', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis', ':dynamic_saporiveri_pv', ':keyobardemulatorscannerlibrary', ':barcode_base_android_library'
diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle
index f15207a1..949854b3 100644
--- a/zebrascannerlibrary/build.gradle
+++ b/zebrascannerlibrary/build.gradle
@@ -27,9 +27,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
- implementation project(path: ':barcode_base_library')
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+ implementation project(path: ':barcode_base_android_library')
}
diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
index 56a9ef0f..ce276390 100644
--- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
+++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
@@ -5,13 +5,14 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
+import android.view.KeyEvent;
import androidx.appcompat.app.AppCompatActivity;
-import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
-import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
-import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
-import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.barcode_base_android_library.extension.RunnableArgs;
+import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
public class ZebraBarcodeReader implements BarcodeReaderInterface {
@@ -66,8 +67,10 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface {
return "Zebra";
}
+ @Override
+ public void onKeyEvent(KeyEvent keyEvent) {
-
+ }
private BroadcastReceiver myBroadcastReceiver = new BroadcastReceiver() {
diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
index 6aee097f..a59ce5df 100644
--- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
+++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
@@ -2,7 +2,7 @@ package it.integry.zebrascannerlibrary;
import android.util.Log;
-import it.integry.plugins.barcode_base_library.model.BarcodeType;
+import it.integry.barcode_base_android_library.model.BarcodeType;
public class ZebraBarcodeTypeMapper {