Version 9 Arreglado vuelta atrás controlador
This commit is contained in:
parent
13ca9e5c47
commit
aa27073b22
|
@ -14,14 +14,11 @@ android {
|
||||||
minSdkVersion 21 //21
|
minSdkVersion 21 //21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 133
|
versionCode 133
|
||||||
versionName = "9.2Beta"
|
versionName = "9"
|
||||||
//versionName = "9.1Beta" versionCode 132
|
//versionName = "9.2Beta" versionCode 133
|
||||||
//versionName = "9Beta"// versionCode 131
|
//versionName = "9" versionCode 133
|
||||||
//versionName = "8.9" versionCode 130
|
|
||||||
//versionName = "8.9Beta" versionCode 129
|
|
||||||
//versionName = "8.8Beta" versioncode 128
|
|
||||||
//versionName = "8.7Beta" versionCode 127
|
|
||||||
//versionName = "8.8Beta"
|
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 133,
|
"versionCode": 133,
|
||||||
"versionName": "9.2Beta",
|
"versionName": "9",
|
||||||
"outputFile": "app-release.apk"
|
"outputFile": "app-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
Binary file not shown.
|
@ -152,7 +152,7 @@ class CollectionFragment(
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
|
|
||||||
if (type==CONTROLADOR && storedBackPosition!=0){
|
if (type==CONTROLADOR && storedBackPosition!=0){
|
||||||
setListPosition(storedBackPosition, true)}
|
setListPosition(storedBackPosition, false)}
|
||||||
super.onResume()
|
super.onResume()
|
||||||
scanRequest()
|
scanRequest()
|
||||||
}
|
}
|
||||||
|
@ -783,7 +783,7 @@ class CollectionFragment(
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
saleAdapter!!.notifyDataSetChanged()
|
saleAdapter!!.notifyDataSetChanged()
|
||||||
setListPosition(storedPosition, false)
|
|
||||||
|
|
||||||
goBack = false
|
goBack = false
|
||||||
}
|
}
|
||||||
|
@ -1365,6 +1365,7 @@ class CollectionFragment(
|
||||||
//saleTrackingReplace(position,newType)
|
//saleTrackingReplace(position,newType)
|
||||||
}else{
|
}else{
|
||||||
saleTrackingReplace(position,newType)
|
saleTrackingReplace(position,newType)
|
||||||
|
setListPosition(position, false)
|
||||||
}
|
}
|
||||||
isMarking = true
|
isMarking = true
|
||||||
setTotalLines()
|
setTotalLines()
|
||||||
|
|
|
@ -7,7 +7,6 @@ import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.content.pm.PackageInfo
|
import android.content.pm.PackageInfo
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
import android.icu.text.Transliterator
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Settings
|
import android.provider.Settings
|
||||||
import android.view.KeyEvent
|
import android.view.KeyEvent
|
||||||
|
@ -138,7 +137,6 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
|
|
||||||
private fun showWorkingForms() {
|
private fun showWorkingForms() {
|
||||||
|
|
||||||
/*Log.d("VERDNATURA::", "click")*/
|
|
||||||
val listForms: ArrayList<workForms> = ArrayList()
|
val listForms: ArrayList<workForms> = ArrayList()
|
||||||
|
|
||||||
listForms.add(
|
listForms.add(
|
||||||
|
@ -155,6 +153,16 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
"https://test-salix.verdnatura.es"
|
"https://test-salix.verdnatura.es"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
listForms.add(
|
||||||
|
workForms(
|
||||||
|
"Sergio",
|
||||||
|
"https://test-app.verdnatura.es",
|
||||||
|
"https://test-salix.verdnatura.es",
|
||||||
|
true
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
listForms.add(workForms("Añadir otra forma", " ", " "))
|
listForms.add(workForms("Añadir otra forma", " ", " "))
|
||||||
|
|
||||||
val array = arrayOfNulls<String>(listForms.size)
|
val array = arrayOfNulls<String>(listForms.size)
|
||||||
|
@ -174,7 +182,8 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
binding.edittextServer.setText(it)
|
binding.edittextServer.setText(it)
|
||||||
saveData(
|
saveData(
|
||||||
"base_urlSalix",
|
"base_urlSalix",
|
||||||
it)
|
it
|
||||||
|
)
|
||||||
|
|
||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
|
@ -548,4 +557,4 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data class workForms(val name: String, val urlSilex: String, val urlSalix: String)
|
data class workForms(val name: String, val urlSilex: String, val urlSalix: String,val isShowDelete:Boolean=false)
|
||||||
|
|
Loading…
Reference in New Issue