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

feat: refs #8300 crashlytics

This commit is contained in:
Sergio De la torre 2025-02-07 16:51:50 +01:00
parent 1943296492
commit a97b823695
5 changed files with 19 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
View File

@ -135,7 +135,10 @@ class SaleAdapter(
if (sale.originalQuantity != sale.quantity) { if (sale.originalQuantity != sale.quantity) {
layoutError.visibility = VISIBLE layoutError.visibility = VISIBLE
txtError.text = txtError.text =
binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity buildString {
append(binding.root.context.getString(R.string.originalQuantity))
append(sale.originalQuantity)
}

32
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -43,7 +43,7 @@ import kotlinx.coroutines.runBlocking
import java.util.Date import java.util.Date
import kotlin.system.exitProcess import kotlin.system.exitProcess
class LoginFragment() : class LoginFragment :
BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginViewModel::class) { BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginViewModel::class) {
private lateinit var customDialogInput: CustomDialogInput private lateinit var customDialogInput: CustomDialogInput
@ -170,36 +170,6 @@ class LoginFragment() :
} }
} }
/* private fun getDevicePDA(): Int? {
return try {
Settings.Global.getString(
mobileApplication.contentResolver, Settings.Global.DEVICE_NAME
).toInt()
} catch (ex: Exception) {
null
}
}*/
/* private fun createFolderSerial() {
val directory = File(
requireContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "/dataSerial"
)
if (!directory.exists()) {
directory.mkdirs()
}
try {
val filename = "serial.txt"
val file = File(directory, filename)
mobileApplication.serialNumber = file.readText()
} catch (ex: Exception) {
d("VERDNATURA:", getString(R.string.errorFile))
}
}*/
private fun setAdapter(listWorkForms: List<WorkForms>) { private fun setAdapter(listWorkForms: List<WorkForms>) {
workFormAdapter = WorkFormAdapter(listWorkForms, object : OnWorkFormsItemRowClickListener { workFormAdapter = WorkFormAdapter(listWorkForms, object : OnWorkFormsItemRowClickListener {

36
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -3,7 +3,6 @@ package es.verdnatura.presentation.view.feature.main.activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.media.MediaPlayer import android.media.MediaPlayer
import android.os.Build
import android.util.AttributeSet import android.util.AttributeSet
import android.util.Log.e import android.util.Log.e
import android.view.Menu import android.view.Menu
@ -11,7 +10,6 @@ import android.view.View
import android.widget.Toast import android.widget.Toast
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.activity.OnBackPressedDispatcherOwner import androidx.activity.OnBackPressedDispatcherOwner
import androidx.annotation.RequiresApi
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
@ -174,7 +172,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
@RequiresApi(Build.VERSION_CODES.O)
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
try { try {
@ -203,9 +200,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
return super.onCreateView(name, context, attrs) return super.onCreateView(name, context, attrs)
} }
@RequiresApi(Build.VERSION_CODES.O) @OptIn(DelicateCoroutinesApi::class)
override fun init() { override fun init() {
mperror = MediaPlayer.create((this), R.raw.error) mperror = MediaPlayer.create((this), R.raw.error)
mpok = MediaPlayer.create((this), R.raw.ok) mpok = MediaPlayer.create((this), R.raw.ok)
mpErrorRepeat = MediaPlayer.create((this), R.raw.errorrepeat) mpErrorRepeat = MediaPlayer.create((this), R.raw.errorrepeat)
@ -245,11 +241,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
networkUtils = NetworkUtilsApp(this, application as MobileApplication) networkUtils = NetworkUtilsApp(this, application as MobileApplication)
} }
@RequiresApi(Build.VERSION_CODES.O)
private fun startRepeatingTask(myInterval: Long) { private fun startRepeatingTask(myInterval: Long) {
scheduledExecutor = Executors.newSingleThreadScheduledExecutor() scheduledExecutor = Executors.newSingleThreadScheduledExecutor()
scheduledFuture = scheduledExecutor?.scheduleAtFixedRate( scheduledFuture = scheduledExecutor?.scheduleWithFixedDelay(
{ {
runOnUiThread { runOnUiThread {
checkTokenRenew() checkTokenRenew()
@ -258,13 +253,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
) )
} }
@RequiresApi(Build.VERSION_CODES.O)
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
scheduledExecutor?.shutdown() scheduledExecutor?.shutdown()
} }
@RequiresApi(Build.VERSION_CODES.O)
private fun setFragments() { private fun setFragments() {
try { try {
val uriImage = intent.data val uriImage = intent.data
@ -412,7 +405,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleCorridors) -> { getString(R.string.titleCorridors) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments() deleteFragments()
addFragment( addFragment(
PasilleroFragment.newInstance(getString(R.string.main), true), PasilleroFragment.newInstance(getString(R.string.main), true),
R.id.main_frame_layout, R.id.main_frame_layout,
@ -424,7 +417,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.verticket) -> { getString(R.string.verticket) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments() deleteFragments()
addFragment( addFragment(
ShowTicketFragment.newInstance(getString(R.string.main)), ShowTicketFragment.newInstance(getString(R.string.main)),
R.id.main_frame_layout, R.id.main_frame_layout,
@ -436,7 +429,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.Parking) -> { getString(R.string.Parking) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments() deleteFragments()
addFragment( addFragment(
ParkingFragment.newInstance(getString(R.string.main)), ParkingFragment.newInstance(getString(R.string.main)),
R.id.main_frame_layout, R.id.main_frame_layout,
@ -448,7 +441,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.Ajustes) -> { getString(R.string.Ajustes) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments() deleteFragments()
addFragment( addFragment(
AjustesFragment.newInstance(), AjustesFragment.newInstance(),
R.id.main_frame_layout, R.id.main_frame_layout,
@ -467,7 +460,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleCorridors) -> { getString(R.string.titleCorridors) -> {
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
delete_Fragments() deleteFragments()
addFragment( addFragment(
PasilleroFragment.newInstance(getString(R.string.main), true), PasilleroFragment.newInstance(getString(R.string.main), true),
R.id.main_frame_layout, R.id.main_frame_layout,
@ -483,7 +476,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
} }
fun delete_Fragments() { private fun deleteFragments() {
fm.fragments.forEach { fm.fragments.forEach {
val fragment: Fragment? = supportFragmentManager.findFragmentByTag(it.tag.toString()) val fragment: Fragment? = supportFragmentManager.findFragmentByTag(it.tag.toString())
if (fragment != null) supportFragmentManager.beginTransaction().remove(fragment) if (fragment != null) supportFragmentManager.beginTransaction().remove(fragment)
@ -491,12 +484,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
} }
@RequiresApi(Build.VERSION_CODES.O)
override fun onPasillerosItemClickListener( override fun onPasillerosItemClickListener(
item: PasillerosItemVO, entryPoint: String, param: Any? item: PasillerosItemVO, entryPoint: String, param: Any?
) { ) {
val itemTitle = getString(item.title!!) when (val itemTitle = getString(item.title!!)) {
when (itemTitle) {
//BUFFERS //BUFFERS
getString(R.string.titlePalletizar) -> { getString(R.string.titlePalletizar) -> {
@ -1113,10 +1104,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
fun openFragmentPickers(delete: Boolean) { fun openFragmentPickers(delete: Boolean) {
//delete_Fragments() //deleteFragments()
fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
if (delete) { if (delete) {
delete_Fragments() deleteFragments()
} }
addFragment( addFragment(
SacadorFragment.newInstance("PREPARED"), SacadorFragment.newInstance("PREPARED"),
@ -1195,14 +1186,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
userFk = (application as MobileApplication).userId!! userFk = (application as MobileApplication).userId!!
) )
} catch (ex: Exception) { } catch (ex: Exception) {
ex.message!!.toast(this) ex.message?.toast(this)
} }
} }
} }
@RequiresApi(Build.VERSION_CODES.O) private fun checkTokenRenew() {
fun checkTokenRenew() {
val renewPeriod = mobileApplication.dataStoreApp.readDataStoreKey<Long>(RENEWPERIOD) val renewPeriod = mobileApplication.dataStoreApp.readDataStoreKey<Long>(RENEWPERIOD)
val min = minOf(mobileApplication.dataStoreApp.readDataStoreKey(TTL), renewPeriod) * 1000 val min = minOf(mobileApplication.dataStoreApp.readDataStoreKey(TTL), renewPeriod) * 1000
if (Date().time < (min + mobileApplication.dataStoreApp.readDataStoreKey<Long>(TOKENCREATED))) { if (Date().time < (min + mobileApplication.dataStoreApp.readDataStoreKey<Long>(TOKENCREATED))) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
View File

@ -772,7 +772,7 @@ class EndSacadorFragment(
requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
lManager.hideSoftInputFromWindow( lManager.hideSoftInputFromWindow(
customDialogList.getEditTextTwo().windowToken, customDialogList.getEditTextTwo().windowToken,
InputMethodManager.SHOW_IMPLICIT InputMethodManager.HIDE_IMPLICIT_ONLY
) )
}) })

1
gradle/libs.versions.toml
View File

@ -39,7 +39,6 @@ firebaseCrashlytics = "3.0.3"
android-image-picker = { module = "com.github.esafirm:android-image-picker", version.ref = "androidImagePicker" } android-image-picker = { module = "com.github.esafirm:android-image-picker", version.ref = "androidImagePicker" }
#android #android
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
#preferences #preferences