From 0deda2f72e62e438f3ec48bad71792cdbacd1d1e Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Tue, 7 Mar 2023 11:25:36 +0100
Subject: [PATCH] =?UTF-8?q?Version=2023.8Beta=20A=C3=B1adido=20try=20catch?=
 =?UTF-8?q?=20para=20que=20no=20se=20cierre=20al=20leer=20texto=20en=20pan?=
 =?UTF-8?q?talla=20Controlador?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 48 ++++++++++---------
 .../collection/fragment/CollectionFragment.kt | 28 +++++++----
 .../ubicador/fragment/UbicadorFragment.kt     |  3 ++
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e7a1c35..ca2f78bd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,10 +83,12 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.8Beta Modificado para app reparto">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.8Beta Modificado para app reparto para que abre versión si es beta o no">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -183,7 +185,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="testBeta" />
+        <entry key="$PROJECT_DIR$" value="testBeta_5336" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -229,28 +231,28 @@
     <option name="showLibraryContents" value="true" />
     <option name="showMembers" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ApkExportedModule": "Gestor_Almacén.app",
-    "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "cidr.known.project.marker": "true",
-    "com.google.services.firebase.aqiPopupShown": "true",
-    "last_opened_file_path": "C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.2",
-    "run.code.analysis.last.selected.profile": "pProject Default",
-    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
+    &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
   },
-  "keyToStringList": {
-    "ExportApk.BuildVariants": [
-      "generalRelease"
+  &quot;keyToStringList&quot;: {
+    &quot;ExportApk.BuildVariants&quot;: [
+      &quot;generalRelease&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Default Config" />
     <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
index f7b83c03..980f73e9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
@@ -461,8 +461,10 @@ class CollectionFragment(
                             it.errorMessage,
                             it.isError, true
                         )
-                    }else{
-                        (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
+                    } else {
+                        (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(
+                            requireContext()
+                        )
                     }
                 }
 
@@ -1265,12 +1267,22 @@ class CollectionFragment(
                     storedBackPosition = 0
                     //  if (type != PRECHECKER) {
                     isMarking = false
-                    viewModel.collectionTicketGet(
-                        txtscan.toInt(),
-                        getDataInt(SECTORFK),
-                        print = "0",
-                        type
-                    )
+                    try {
+                        viewModel.collectionTicketGet(
+                            txtscan.toInt(),
+                            getDataInt(SECTORFK),
+                            print = "0",
+                            type
+                        )
+
+                    } catch (ex: Exception) {
+                        binding.splashProgress.visibility = GONE
+                        ma.messageWithSound(
+                            getString(R.string.error),
+                            isError = false,
+                            isPlayed = false
+                        )
+                    }
 
                     if (type.equals(CONTROLADOR)) {
                         //Tarea #4280 cambiar a ticket_isOutClosureZone
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 4818e554..b10631d3 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -214,6 +214,9 @@ class UbicadorFragment(
                 if (!binding.editMatricula.text.toString().isNullOrEmpty()) {
 
 
+                    /*Tarea 5336 si aprueban cambiar
+                     if (!modeCheckUbication || (modeCheckUbication && binding.editMatricula.text.toString().length == 3 && !binding.editMatricula.text!![0].isDigit())) {*/
+
                     if (!modeCheckUbication) {
                         binding.mainToolbar.toolbarTitle.text =
                             binding.editMatricula.text.toString()
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8c8f0752..5e0dd1bc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -541,5 +541,6 @@
     <string name="expeditionMarkLost">Si activa este botón marca la expedición como Perdida</string>
     <string name="expeditionMarkFound">Si activa este botón marca la expedición como Encontrada</string>
     <string name="freelance">Porteador</string>
+    <string name="errorScanned">Texto escaneado no válido</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbcf343f..fdaffe09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,6 +189,7 @@
     <string name="smarttags">SmartTags</string>
     <string name="userVehicleControl">User control vehicle</string>
     <string name="error">Error</string>
+    <string name="errorScanned">Scanned text no valid</string>
     <string name="sectors">Sectors</string>
     <string name="printers">Printers</string>
     <string name="androidid">Android_id</string>