diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index d426b46a..2bd0ca9c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -12,16 +12,13 @@ import com.google.android.material.navigation.NavigationView; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; 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; @@ -169,7 +166,7 @@ public class MainActivity extends BaseActivity private void initGestMenu() { Menu menu = mBinding.navView.getMenu(); - ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); + ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION); List menuGroups = menuConfiguration.getGroups(); @@ -196,7 +193,7 @@ public class MainActivity extends BaseActivity } private MenuConfiguration.MenuItem getMenuItem(@IdRes int menuId) { - ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); + ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION); List menuGroups = menuConfiguration.getGroups(); @@ -315,7 +312,7 @@ public class MainActivity extends BaseActivity private void init(){ - ServerStatusChecker.getIstance().addCallback(value -> { + ServerStatusChecker.getInstance().addCallback(value -> { if(value && (!mIsOnline || firstCheckExecution)){ SettingsManager.loadDBVariables(() -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java index 8ea19d7e..f8787b21 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java @@ -12,6 +12,7 @@ public class BaseCustomConfiguration implements ICustomConfiguration { public static class Keys { public static int MENU_CONFIGURATION = 0; public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 1; + public static int CUSTOM_DYNAMIC_VERSION_PATH = 2; } protected HashMap configurations = new HashMap() {{ diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java index d5050fbf..aa7b6d9b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java @@ -59,7 +59,7 @@ public class ClassRouter { } - public static T getIstance(PATH path) { + public static T getInstance(PATH path) { try { if (!checkIClassExists(path)) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java index e3996587..2c40d281 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java @@ -12,7 +12,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString; public class ServerStatusChecker { - private static ServerStatusChecker istance = new ServerStatusChecker(); + private static ServerStatusChecker instance = new ServerStatusChecker(); private List> mCallback = new ArrayList<>(); @@ -47,17 +47,17 @@ public class ServerStatusChecker { public static void init(){ - istance.shouldExecute = true; + instance.shouldExecute = true; - istance.handler.post(istance.runnableCode); + instance.handler.post(instance.runnableCode); } public static void dispose() { - istance.shouldExecute = false; + instance.shouldExecute = false; } - public static ServerStatusChecker getIstance() { - return istance; + public static ServerStatusChecker getInstance() { + return instance; } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java index 930b4f6f..bca2182f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java @@ -4,7 +4,6 @@ import android.app.Activity; import android.app.DownloadManager; import android.content.BroadcastReceiver; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; @@ -12,23 +11,33 @@ import android.os.Build; import android.os.Environment; import com.github.javiersantos.appupdater.AppUpdater; -import com.github.javiersantos.appupdater.AppUpdaterUtils; -import com.github.javiersantos.appupdater.enums.AppUpdaterError; import com.github.javiersantos.appupdater.enums.Display; import com.github.javiersantos.appupdater.enums.UpdateFrom; -import com.github.javiersantos.appupdater.objects.Update; import java.io.File; -import androidx.core.content.FileProvider; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; +import it.integry.integrywmsnative.core.class_router.ClassRouter; +import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; import it.integry.integrywmsnative.core.settings.SettingsManager; public class UpdatesManager { public static void init(Activity context) { + String suffix; + ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); + try{ + suffix = customConfiguration.getConfig(BaseCustomConfiguration.Keys.CUSTOM_DYNAMIC_VERSION_PATH); + if (suffix == null){ + suffix = ""; + } + }catch (Exception e){ + suffix = ""; + } + String currentVersionUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/currentVersion"; - String currentDownloadUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/android-release_v2.apk"; + String currentDownloadUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/android-release"+suffix+"_v2.apk"; AppUpdater appUpdater = new AppUpdater(context) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index c8f80e5b..91f42d91 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -94,7 +94,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab private void init(){ - ServerStatusChecker.getIstance().addCallback(value -> { + ServerStatusChecker.getInstance().addCallback(value -> { if(value && mBindings.noConnectionTopLayout.isExpanded()){ collapseNoConnectionLayout(); @@ -215,7 +215,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab private void initGestMenu() { - ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); + ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION); List menuGroups = menuConfiguration.getGroups(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java index bd49de29..85f3f8c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java @@ -12,7 +12,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.ArrayAdapter; -import android.widget.Button; import android.widget.MultiAutoCompleteTextView; import com.annimon.stream.Stream; @@ -131,7 +130,7 @@ public class DialogVenditaFiltroAvanzato { } private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) { - IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getIstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA); + IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getInstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA); // bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> { // bindings.filledExposedDropdownDataCons.callOnClick(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java index 51f0fbed..a6c30e0f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java @@ -100,7 +100,7 @@ public class VenditaOrdineInevasoHelper { public List getListViewModelPerPosizione(List> groupedRighe, List mtbColrs) { - ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); + ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); List listModel = new ArrayList<>(); 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 2f7e445d..b0ba7938 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 @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.gest.vendita_ordine_inevaso.viewmodel; import android.app.Dialog; -import android.app.ProgressDialog; + import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableField; import androidx.recyclerview.widget.LinearLayoutManager; @@ -921,7 +921,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone(); - IOrdiniVendita ordiniVendita = ClassRouter.getIstance(ClassRouter.PATH.ORDINI_VENDITA); + IOrdiniVendita ordiniVendita = ClassRouter.getInstance(ClassRouter.PATH.ORDINI_VENDITA); ordiniVendita.distribuisciCollo(progress, cloneMtbColt, mTestateOrdini, mtbColts -> { diff --git a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java index 1b645f98..46389f8a 100644 --- a/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ b/dynamic_saporiveri_pv/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java @@ -7,6 +7,7 @@ public class CustomConfiguration extends BaseCustomConfiguration implements ICus public CustomConfiguration() { configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationSAPORIVERIPV()); + configurations.put(Keys.CUSTOM_DYNAMIC_VERSION_PATH,"_pv"); } }