diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt index 160e5901..97dc04a3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt @@ -57,12 +57,13 @@ class LoginFragment(var imageUri: Uri?) : customDialogList = CustomDialogList(requireContext()) customDialog = CustomDialog(requireContext()) + /*Tarea 4815*/ + createFolderSerial() saveIdentifiers() checkUser() //Tarea 5613 //viewModel.getAccessTokenConfigs() - /*Tarea 4815 - createFolderSerial()*/ + binding.buttonLogin.setOnClickListener { binding.splashProgress.visibility = View.VISIBLE viewModel.loginSalix( @@ -111,13 +112,15 @@ class LoginFragment(var imageUri: Uri?) : requireContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "/dataSerial" ) + if (!directory.exists()) { directory.mkdirs() } try { val filename = "serie.txt" val file = File(directory, filename) - saveData("serial", file.readText()) + //saveData("SERIALNUMBER", file.readText()) + mobileApplication.serialNumber = file.readText() } catch (ex: Exception) { "" } @@ -196,6 +199,7 @@ class LoginFragment(var imageUri: Uri?) : val AndroidId: String = Settings.Secure.getString(requireActivity().contentResolver, Settings.Secure.ANDROID_ID) + mobileApplication.androidId = AndroidId saveData(ANDROID_ID, AndroidId) } @@ -502,7 +506,7 @@ class LoginFragment(var imageUri: Uri?) : //test //saveTokenPref("RTymwJzRuVchAMY5u8xG2wpgcjPf7t0DQImLvMsTdNFmbFwDiVsa8lA6fr1XSaBo","2026-29-06") // local - //saveTokenPref("rpG3yNMdViFYDh1sZfeYRCUmuHZYmKW5EqzwHkckj0zFbszSZGTWbs8xNETHyvuw","2026-29-06") + //saveTokenPref("1ZGV1OGhpcrZZwvNALXnPeSVe0GCE4tgpKbv8nZu4EXay75QZrVY5GZDnpsqlxFz",it.ttl ) //Tarea 5613 borrar que se guarde /* saveUserAccesPref( binding.edittextUsername.text.toString(), @@ -551,6 +555,7 @@ class LoginFragment(var imageUri: Uri?) : private fun getInfoVersionNameApp(): String { val manager: PackageManager = requireContext().packageManager val info: PackageInfo = manager.getPackageInfo(requireContext().packageName, 0) + mobileApplication.versionName = info.versionName return info.versionName } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt index 5332d815..aa4d560a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt @@ -115,6 +115,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL //Tarea #4815 + private var myTimeUserInteraction = (System.currentTimeMillis() / 1000 / 3600) private var comeFromDelivery: Boolean? = null override fun getLayoutId(): Int = R.layout.activity_main @@ -1159,21 +1160,26 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } - /*Tarea 4815 - override fun onUserInteraction() - { + + /*Tarea 4815*/ + /* override fun onUserInteraction() { super.onUserInteraction() - if ((System.currentTimeMillis() / 1000 / 60 / 60) - miTime > 4) { - miTime = System.currentTimeMillis() / 1000 / 60 / 60 - val loginViewModel: LoginViewModel by viewModel() + if ((System.currentTimeMillis() / 1000 / 3600) - myTimeUserInteraction > 4) { + myTimeUserInteraction = System.currentTimeMillis() / 1000 + val loginViewModel = LoginViewModel(application as MobileApplication) loginViewModel.deviceLog_add( getString(R.string.logAppName), - "14.1Beta", - "android_id" + (application as MobileApplication).versionName, + if ((application as MobileApplication).serialNumber == "") { + (application as MobileApplication).androidId + } else { + (application as MobileApplication).serialNumber + } ) } + }*/ @RequiresApi(Build.VERSION_CODES.O)