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