verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Version 23.8Beta Añadido try catch para que no se cierre al leer texto en pantalla Controlador

This commit is contained in:
Sergio De la torre 2023-03-07 11:25:36 +01:00
parent d92ff2ca32
commit 0deda2f72e
5 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.idea/workspace.xml
View File

@ -83,10 +83,12 @@
</select> </select>
</component> </component>
<component name="ChangeListManager"> <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$/.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/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/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/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -183,7 +185,7 @@
</option> </option>
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="testBeta" /> <entry key="$PROJECT_DIR$" value="testBeta_5336" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -229,28 +231,28 @@
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
<option name="showMembers" value="true" /> <option name="showMembers" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ApkExportedModule": "Gestor_Almacén.app", &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app", &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.cidr.known.project.marker": "true", &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
"cidr.known.project.marker": "true", &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
"com.google.services.firebase.aqiPopupShown": "true", &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
"last_opened_file_path": "C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app", &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app&quot;,
"project.structure.last.edited": "Modules", &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
"project.structure.proportion": "0.17", &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
"project.structure.side.proportion": "0.2", &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
"run.code.analysis.last.selected.profile": "pProject Default", &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle" &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
}, },
"keyToStringList": { &quot;keyToStringList&quot;: {
"ExportApk.BuildVariants": [ &quot;ExportApk.BuildVariants&quot;: [
"generalRelease" &quot;generalRelease&quot;
] ]
} }
}]]></component> }</component>
<component name="PsdUISettings"> <component name="PsdUISettings">
<option name="MODULE_TAB" value="Default Config" /> <option name="MODULE_TAB" value="Default Config" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" /> <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />

28
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -461,8 +461,10 @@ class CollectionFragment(
it.errorMessage, it.errorMessage,
it.isError, true it.isError, true
) )
}else{ } else {
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(
requireContext()
)
} }
} }
@ -1265,12 +1267,22 @@ class CollectionFragment(
storedBackPosition = 0 storedBackPosition = 0
// if (type != PRECHECKER) { // if (type != PRECHECKER) {
isMarking = false isMarking = false
viewModel.collectionTicketGet( try {
txtscan.toInt(), viewModel.collectionTicketGet(
getDataInt(SECTORFK), txtscan.toInt(),
print = "0", getDataInt(SECTORFK),
type print = "0",
) type
)
} catch (ex: Exception) {
binding.splashProgress.visibility = GONE
ma.messageWithSound(
getString(R.string.error),
isError = false,
isPlayed = false
)
}
if (type.equals(CONTROLADOR)) { if (type.equals(CONTROLADOR)) {
//Tarea #4280 cambiar a ticket_isOutClosureZone //Tarea #4280 cambiar a ticket_isOutClosureZone

3
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -214,6 +214,9 @@ class UbicadorFragment(
if (!binding.editMatricula.text.toString().isNullOrEmpty()) { 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) { if (!modeCheckUbication) {
binding.mainToolbar.toolbarTitle.text = binding.mainToolbar.toolbarTitle.text =
binding.editMatricula.text.toString() binding.editMatricula.text.toString()

1
app/src/main/res/values-es/strings.xml
View File

@ -541,5 +541,6 @@
<string name="expeditionMarkLost">Si activa este botón marca la expedición como Perdida</string> <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="expeditionMarkFound">Si activa este botón marca la expedición como Encontrada</string>
<string name="freelance">Porteador</string> <string name="freelance">Porteador</string>
<string name="errorScanned">Texto escaneado no válido</string>
</resources> </resources>

1
app/src/main/res/values/strings.xml
View File

@ -189,6 +189,7 @@
<string name="smarttags">SmartTags</string> <string name="smarttags">SmartTags</string>
<string name="userVehicleControl">User control vehicle</string> <string name="userVehicleControl">User control vehicle</string>
<string name="error">Error</string> <string name="error">Error</string>
<string name="errorScanned">Scanned text no valid</string>
<string name="sectors">Sectors</string> <string name="sectors">Sectors</string>
<string name="printers">Printers</string> <string name="printers">Printers</string>
<string name="androidid">Android_id</string> <string name="androidid">Android_id</string>