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

refs #6295 feat:serialNumber

This commit is contained in:
Sergio De la torre 2024-02-28 09:37:38 +01:00
parent 2c476e0bf2
commit c9624beb7f
2 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/es/verdnatura/MobileApplication.kt
View File

@ -48,7 +48,7 @@ class MobileApplication : Application(), InteceptorListener {
var renewInterval: Long = 0 var renewInterval: Long = 0
var userPassword: String? = null var userPassword: String? = null
var hasNetwork: Boolean = true var hasNetwork: Boolean = true
var serialNumber: String = "" var serialNumber: String? = ""
var versionName: String = "" var versionName: String = ""
var androidId: String = "" var androidId: String = ""
var mperror: MediaPlayer? = null var mperror: MediaPlayer? = null

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

@ -46,6 +46,9 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
val operatorAdd: LiveData<ResponseItemVO> val operatorAdd: LiveData<ResponseItemVO>
get() = _operatorAdd get() = _operatorAdd
private val _serialNumber by lazy { MutableLiveData<String?>() }
val serialNumber: LiveData<String?> = _serialNumber
private val _versionappitem by lazy { MutableLiveData<versionApp>() } private val _versionappitem by lazy { MutableLiveData<versionApp>() }
val versionappitem: LiveData<versionApp> val versionappitem: LiveData<versionApp>
get() = _versionappitem get() = _versionappitem
@ -63,7 +66,8 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
private val _renewTokenResponse by lazy { MutableLiveData<RenewToken>() } private val _renewTokenResponse by lazy { MutableLiveData<RenewToken>() }
val renewTokenResponse: LiveData<RenewToken> val renewTokenResponse: LiveData<RenewToken>
get() = _renewTokenResponse get() = _renewTokenResponse
val loadAccessConfigSalixList: LiveData<Event<accessConfigSalixList>> = _accessConfigSalixList.map { Event(it) } val loadAccessConfigSalixList: LiveData<Event<accessConfigSalixList>> =
_accessConfigSalixList.map { Event(it) }
fun loginSalix(user: String, password: String) { fun loginSalix(user: String, password: String) {
salix.login(LoginSalixVO(user, password)) salix.login(LoginSalixVO(user, password))
@ -139,7 +143,7 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
} }
fun getCurrentUserData( fun getCurrentUserData(
appName: String, versionApp: String, androidId: String, serialnumber: String? = null appName: String, versionApp: String, androidId: String, serialNumber: String? = null
) { ) {
salix.getCurrentUserData().enqueue(object : SalixCallback<DataUserSalix>(context) { salix.getCurrentUserData().enqueue(object : SalixCallback<DataUserSalix>(context) {
override fun onSuccess(response: Response<DataUserSalix>) { override fun onSuccess(response: Response<DataUserSalix>) {
@ -150,7 +154,7 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
versionApp = versionApp, versionApp = versionApp,
android_id = androidId, android_id = androidId,
userFk = app.userId!!, userFk = app.userId!!,
serialnumber = serialnumber serialnumber = serialNumber
) )
//Tarea 5870 //Tarea 5870
operator_getDataSalix(app.userId!!) operator_getDataSalix(app.userId!!)
@ -159,18 +163,18 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
}) })
} }
/* fun deviceLog_add( fun getSerialNumber(
app: String, versionApp: String, android_id: String, userFk :Int device: Int
) { ) {
//Tarea 4815 salix.getSerialNumber("""{"where":{"id":$device},"fields":"serialNumber"}""")
salix.deviceLogInsert(DeviceLogSalix(android_id = android_id,nameApp= app,versionApp= versionApp, serialNumber = null, userFk = userFk)) .enqueue(object : SalixCallback<List<JsonObject>>(context) {
override fun onSuccess(response: Response<List<JsonObject>>) {
.enqueue(object : SilexCallback<Unit>(context) { _serialNumber.value = response.body()?.firstOrNull()?.get("serialNumber")?.asString
override fun onSuccess(response: Response<Unit>) { }
} })
}) }
}*/
fun deviceLog_addSalix( fun deviceLog_addSalix(
app: String, versionApp: String, android_id: String, userFk: Int, serialnumber: String? app: String, versionApp: String, android_id: String, userFk: Int, serialnumber: String?
@ -187,10 +191,10 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
) )
).enqueue(object : SalixCallback<Unit>(context) { ).enqueue(object : SalixCallback<Unit>(context) {
override fun onSuccess(response: Response<Unit>) { override fun onSuccess(response: Response<Unit>) {
} }
}) })
} }
@ -198,37 +202,37 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
//Tarea 6276 //Tarea 6276
// salix.getVersion(nameApp) // salix.getVersion(nameApp)
silex.getVersion(nameApp).enqueue(object : SilexCallback<versionApp>(context) { silex.getVersion(nameApp).enqueue(object : SilexCallback<versionApp>(context) {
override fun onSuccess(response: Response<versionApp>) { override fun onSuccess(response: Response<versionApp>) {
if (response.body() != null) { if (response.body() != null) {
_versionappitem.value = response.body()?.let { _versionappitem.value = response.body()?.let {
versionApp( versionApp(
it.appname, it.appname,
it.version, it.version,
it.IsVersionCritical, it.IsVersionCritical,
it.url, it.url,
isError = false, isError = false,
errorMessage = "" errorMessage = ""
)
}
} else {
_versionappitem.value = versionApp(
"", "", isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), response.message()
)
) )
}
}
override fun onError(t: Throwable) { }
} else {
_versionappitem.value = versionApp( _versionappitem.value = versionApp(
nameApp, "", isError = true, errorMessage = getMessageFromAllResponse( "", "", isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), t.message!! nameofFunction(this), response.message()
) )
) )
} }
}) }
override fun onError(t: Throwable) {
_versionappitem.value = versionApp(
nameApp, "", isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
)
}
})
} }
fun getListFromJSON(json: JsonObject): MutableList<itemsExpeditionDynamics> { fun getListFromJSON(json: JsonObject): MutableList<itemsExpeditionDynamics> {
@ -343,35 +347,35 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
) { ) {
salix.renewToken().enqueue(object : SalixCallback<RenewToken>(context) { salix.renewToken().enqueue(object : SalixCallback<RenewToken>(context) {
override fun onSuccess(response: Response<RenewToken>) { override fun onSuccess(response: Response<RenewToken>) {
val renewToken = response.body() val renewToken = response.body()
runBlocking { runBlocking {
(context as MobileApplication).dataStoreApp.editDataStoreKey( (context as MobileApplication).dataStoreApp.editDataStoreKey(
TOKEN, renewToken!!.id TOKEN, renewToken!!.id
) )
(context).dataStoreApp.editDataStoreKey( (context).dataStoreApp.editDataStoreKey(
TTL, renewToken!!.ttl TTL, renewToken!!.ttl
) )
(context).dataStoreApp.editDataStoreKey( (context).dataStoreApp.editDataStoreKey(
TOKENCREATED, Date().time TOKENCREATED, Date().time
)
}
_renewTokenResponse.value = renewToken
}
override fun onError(t: Throwable) {
_renewTokenResponse.value = RenewToken(
"", 0, true, getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
) )
} }
}) _renewTokenResponse.value = renewToken
}
override fun onError(t: Throwable) {
_renewTokenResponse.value = RenewToken(
"", 0, true, getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
)
}
})
} }
} }