feat lilium
This commit is contained in:
parent
ea1384b7c4
commit
9a9e96c86c
|
@ -12,7 +12,9 @@ import androidx.datastore.preferences.preferencesDataStore
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import es.verdnatura.MobileApplication
|
import es.verdnatura.MobileApplication
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
|
import es.verdnatura.domain.ConstAndValues.BASEURLLILIUM
|
||||||
import es.verdnatura.domain.ConstAndValues.BASEURLSALIX
|
import es.verdnatura.domain.ConstAndValues.BASEURLSALIX
|
||||||
|
import es.verdnatura.domain.ConstAndValues.BASE_URL_LILIUM
|
||||||
import es.verdnatura.domain.ConstAndValues.BASE_URL_SALIX
|
import es.verdnatura.domain.ConstAndValues.BASE_URL_SALIX
|
||||||
import es.verdnatura.domain.ConstAndValues.NUMBEROFWAGONS
|
import es.verdnatura.domain.ConstAndValues.NUMBEROFWAGONS
|
||||||
import es.verdnatura.domain.ConstAndValues.PRINTERFK
|
import es.verdnatura.domain.ConstAndValues.PRINTERFK
|
||||||
|
@ -284,4 +286,13 @@ class DataStoreLocal(var mobileApplication: MobileApplication) {
|
||||||
}
|
}
|
||||||
return url
|
return url
|
||||||
}
|
}
|
||||||
|
fun getServerLilium(): String {
|
||||||
|
|
||||||
|
var url =
|
||||||
|
readDataStoreKey<String>(BASEURLLILIUM)
|
||||||
|
if (url.isBlank()) {
|
||||||
|
url = BASE_URL_LILIUM
|
||||||
|
}
|
||||||
|
return url
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -82,15 +82,19 @@ class ShelvingLogFragment(
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
val itemId = it.list[0].id
|
val itemId = it.list[0].id
|
||||||
|
println("web" to "${mobileApplication.dataStoreApp.getServerLilium()}/#!/shelving/$itemId/log")
|
||||||
|
|
||||||
ma.onPasillerosItemClickListener(
|
ma.onPasillerosItemClickListener(
|
||||||
PasillerosItemVO(
|
PasillerosItemVO(
|
||||||
title = getString(R.string.titleWebViewer),
|
title = getString(R.string.titleWebViewer),
|
||||||
),
|
),
|
||||||
|
|
||||||
entryPoint = Gson().toJson(
|
entryPoint = Gson().toJson(
|
||||||
mutableMapOf(
|
mutableMapOf(
|
||||||
"entryPoint" to itemId,
|
"entryPoint" to itemId,
|
||||||
"web" to "${mobileApplication.dataStoreApp.getServerSalix()}/#!/shelving/$itemId/log"
|
"web" to "${mobileApplication.dataStoreApp.getServerLilium()}/#/shelving/$itemId/log"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue