v5.1.8
This commit is contained in:
Enrique Blasco
parent
3032f8b721
commit
f84bb08b5f
|
|
@ -12,9 +12,8 @@ android {
|
|||
applicationId "es.verdnatura"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
versionCode 26
|
||||
versionName "5.1.6"
|
||||
|
||||
versionCode 28
|
||||
versionName "5.1.8"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
package="es.verdnatura">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.PREVENT_POWER_KEY" />
|
||||
|
||||
<application
|
||||
android:name=".MobileApplication"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit
|
|||
|
||||
class ApiUtils {
|
||||
companion object {
|
||||
// const val BASE_URL:String = "http://192.168.1.115:8009/"
|
||||
// const val BASE_URL:String = "http://192.168.0.28:8009/"
|
||||
const val BASE_URL:String = "https://app.verdnatura.es/"
|
||||
fun getApiService():VerdnaturaService{
|
||||
val retrofit = Retrofit.Builder()
|
||||
|
|
@ -23,7 +23,7 @@ class ApiUtils {
|
|||
val client = OkHttpClient.Builder()
|
||||
.connectTimeout(10, TimeUnit.SECONDS)
|
||||
.writeTimeout(10, TimeUnit.SECONDS)
|
||||
.readTimeout(30, TimeUnit.SECONDS)
|
||||
.readTimeout(40, TimeUnit.SECONDS)
|
||||
.build()
|
||||
return client
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
package es.verdnatura.presentation.view.feature.collection.fragment
|
||||
|
||||
import android.app.KeyguardManager
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.media.MediaPlayer
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.view.View
|
||||
import android.view.inputmethod.EditorInfo
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
|
|
@ -42,6 +44,7 @@ import kotlinx.android.synthetic.main.activity_main.*
|
|||
import kotlinx.android.synthetic.main.fragment_collection.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
|
||||
|
||||
class CollectionFragment(
|
||||
var collection : CollectionVO = CollectionVO(),
|
||||
var type:String = SACADOR
|
||||
|
|
@ -72,6 +75,8 @@ class CollectionFragment(
|
|||
private var storedBackPosition : Int = 0
|
||||
private var tickets:ArrayList<String> = ArrayList()
|
||||
|
||||
private var myKM: KeyguardManager? = null
|
||||
|
||||
|
||||
companion object {
|
||||
fun newInstance(collection:CollectionVO,type:String) = CollectionFragment(collection,type)
|
||||
|
|
@ -97,9 +102,17 @@ class CollectionFragment(
|
|||
viewModel.collectionTicketGet(user,password,collection.collectionFk,sectorFk)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
scanRequest()
|
||||
}
|
||||
|
||||
override fun init() {
|
||||
customDialogList = CustomDialogList(requireContext())
|
||||
customDialogInput = CustomDialogInput(requireContext())
|
||||
|
|
@ -117,9 +130,9 @@ class CollectionFragment(
|
|||
}
|
||||
|
||||
override fun onPause() {
|
||||
super.onPause()
|
||||
goBack = true
|
||||
goBack2 = true
|
||||
super.onPause()
|
||||
}
|
||||
|
||||
private fun setToolBar(){
|
||||
|
|
@ -341,6 +354,7 @@ class CollectionFragment(
|
|||
|
||||
//SEARCH AND MARK
|
||||
private fun findSale(txtscan:String){
|
||||
goBack = false
|
||||
var index = 0
|
||||
var isBreak = false
|
||||
var isOk = false
|
||||
|
|
@ -382,11 +396,11 @@ class CollectionFragment(
|
|||
}
|
||||
if (!isOk) {
|
||||
if (txtscan.contains("-")){
|
||||
tickets.forEach {
|
||||
if (tickets.size > 0) {
|
||||
viewModel.parking(
|
||||
usuario = user,
|
||||
password = password,
|
||||
ticketFk = it,
|
||||
ticketFk = tickets[0],
|
||||
parking = txtscan
|
||||
)
|
||||
}
|
||||
|
|
@ -423,11 +437,11 @@ class CollectionFragment(
|
|||
//Lo escaneado no encontrado miramos si es parking o ticket
|
||||
if (!isOk){
|
||||
if (txtscan.contains("-")){
|
||||
tickets.forEach {
|
||||
if (tickets.size > 0) {
|
||||
viewModel.parking(
|
||||
usuario = user,
|
||||
password = password,
|
||||
ticketFk = it,
|
||||
ticketFk = tickets[0],
|
||||
parking = txtscan
|
||||
)
|
||||
}
|
||||
|
|
@ -1211,6 +1225,8 @@ class CollectionFragment(
|
|||
customDialog.dismiss()
|
||||
}.show()
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding,LoginViewModel> (LoginVi
|
|||
}else{
|
||||
customDialog.setTitle(getString(R.string.Actualizar)).setDescription(getString(R.string.updatemng)).setOkButton(getString(R.string.Actualizar)){
|
||||
val openURL = Intent(Intent.ACTION_VIEW)
|
||||
openURL.data = Uri.parse("https://app.verdnatura.es/bin/vn-pickingV2.apk")
|
||||
openURL.data = Uri.parse("https://app.verdnatura.es/bin/vn-picking.apk")
|
||||
startActivity(openURL)
|
||||
}.setKoButton("Cancelar"){
|
||||
customDialog.dismiss()
|
||||
|
|
|
|||
Loading…
Reference in New Issue