feat loginApp #refs 6868

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

@@ -38,9 +38,7 @@ import es.verdnatura.presentation.view.feature.login.adapter.WorkFormAdapter
 import es.verdnatura.presentation.view.feature.login.model.WorkForms
 import es.verdnatura.presentation.view.feature.main.activity.MainActivity
 import kotlinx.coroutines.runBlocking
-import java.text.SimpleDateFormat
 import java.util.Date
-import java.util.Locale
 import kotlin.system.exitProcess
 
 class LoginFragment(private var imageUri: Uri?) :
@@ -71,6 +69,17 @@ class LoginFragment(private var imageUri: Uri?) :
                 password = binding.edittextPassword.text.toString()
 
             )
+            //Tarea 6868
+   /*         viewModel.loginApp(
+                LoginApp(
+                    user = binding.edittextUsername.text.toString(),
+                    password = binding.edittextPassword.text.toString(),
+                    deviceId = getDevicePDA(),
+                    androidId =   mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID),
+                    versionApp = getInfoVersionNameApp(),
+                    nameApp = getString(R.string.nameApp),
+                )
+            )*/
         }
 
         if (mobileApplication.dataStoreApp.readDataStoreKey<String>(TOKEN)
@@ -326,7 +335,7 @@ class LoginFragment(private var imageUri: Uri?) :
                     if (it.version == getInfoVersionNameApp()) {
                         goToMain()
                     } else {
-
+                        mobileApplication.clearApplicationData()
                         customDialog.setTitle(getString(R.string.Actualizar))
                             .setDescription(getString(R.string.updatemng)).setOkButton(
                                 getString(

app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt

@@ -20,6 +20,8 @@ import es.verdnatura.presentation.common.Event
 import es.verdnatura.presentation.common.ResponseItemVO
 import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.DeviceLogSalix
 import es.verdnatura.presentation.view.feature.login.model.DataUserSalix
+import es.verdnatura.presentation.view.feature.login.model.LoginApp
+import es.verdnatura.presentation.view.feature.login.model.LoginAppData
 import es.verdnatura.presentation.view.feature.login.model.LoginDevice
 import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO
 import es.verdnatura.presentation.view.feature.login.model.OperatorSalix
@@ -33,10 +35,14 @@ import retrofit2.Response
 import java.util.Date
 
 class LoginViewModel(val context: Context) : BaseViewModel(context) {
+
     private val _loginSalixItem by lazy { MutableLiveData<LoginSalixVO>() }
     val loginSalixItem: LiveData<LoginSalixVO>
         get() = _loginSalixItem
 
+    private val _loginApp by lazy { MutableLiveData<LoginAppData>() }
+    val loginApp: LiveData<LoginAppData> = _loginApp
+
     private val _devicelogresponse by lazy { MutableLiveData<ResponseItemVO>() }
     val devicelogresponse: LiveData<ResponseItemVO>
         get() = _devicelogresponse
@@ -117,6 +123,32 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
+    fun loginApp(
+        login: LoginApp,
+
+    ) {
+        salix.loginApp(login)
+            .enqueue(object : SalixCallback<LoginAppData>(context) {
+                override fun onSuccess(response: Response<LoginAppData>) {
+
+                        _loginApp.value = response.body()
+                }
+
+                override fun onError(t: Throwable) {
+                   /* val loginSalixVO = LoginAppData(
+                        user,
+                        password,
+                        "",
+                        isError = true,
+                        errorMessage = getMessageFromAllResponse(
+                            nameofFunction(this), t.message!!
+                        )
+                    )
+                    _loginSalixItem.value = loginSalixVO*/
+                }
+            })
+    }
+
     fun deviceCheckLogin(userId: Int, androidId: String) {
         // FALTA EL USUARI
         /* fun deviceCheckLogin(androidId: String) {

app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt

@@ -9,6 +9,33 @@ class LoginSalixVO(
     var isError: Boolean = false,
     var errorMessage: String = ""
 )
+data class LoginApp(
+    val user: String ,
+    val password: String,
+    val deviceId: Int?,
+    val androidId:String,
+    val versionApp:String,
+    val nameApp:String
+
+)
+data class LoginAppData(
+    val id: Int,
+    val token: String,
+    val ttl: Long,
+    val numberOfWagons: Int,
+    var warehouseFk: Int,
+    val itemPackingTypeFk: String,
+    val printer: Printer,
+    val train: Train,
+    val sector: Sector,
+    val name: String,
+    val nickname: String,
+    val serialNumber: String,
+    val isVersionCritical: Boolean,
+    val version: String,
+    val vIsAuthorized: String,
+    val vMessage: String,
+    )
 
 class DataUserSalix(
     val id: Int? = null,
@@ -38,6 +65,7 @@ class SalixGrupo(
     val message: String = ""
 
 )
+
 //Tarea 5870
 class OperatorSalix(
     val sector: Sector? = null,
@@ -48,11 +76,11 @@ class OperatorSalix(
     val isError: Boolean = false,
     var errorMessage: String = ""
 )
+
 data class Sector(val id: Int, val description: String, val warehouseFk: Int)
 data class Printer(val id: Int, val name: String)
 data class Train(val id: Int, val name: String)
 
-
 class accessConfigSalix(
     val id: Number = 0,
     val renewPeriod: Long = 0,