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

Version 9 Arreglado vuelta atrás controlador

This commit is contained in:
Sergio De la torre 2022-09-29 07:45:59 +02:00
parent 13ca9e5c47
commit aa27073b22
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@ -14,14 +14,11 @@ android {
minSdkVersion 21 //21
targetSdkVersion 30
versionCode 133
versionName = "9.2Beta"
//versionName = "9.1Beta" versionCode 132
//versionName = "9Beta"// versionCode 131
//versionName = "8.9" versionCode 130
//versionName = "8.9Beta" versionCode 129
//versionName = "8.8Beta" versioncode 128
//versionName = "8.7Beta" versionCode 127
//versionName = "8.8Beta"
versionName = "9"
//versionName = "9.2Beta" versionCode 133
//versionName = "9" versionCode 133
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

2
app/release/output-metadata.json
View File

@ -12,7 +12,7 @@
"filters": [],
"attributes": [],
"versionCode": 133,
"versionName": "9.2Beta",
"versionName": "9",
"outputFile": "app-release.apk"
}
],

BIN
app/release/vn-pickingBeta.apk → app/release/vn-picking.apk
View File

Binary file not shown.

5
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -152,7 +152,7 @@ class CollectionFragment(
override fun onResume() {
if (type==CONTROLADOR && storedBackPosition!=0){
setListPosition(storedBackPosition, true)}
setListPosition(storedBackPosition, false)}
super.onResume()
scanRequest()
}
@ -783,7 +783,7 @@ class CollectionFragment(
} else {
saleAdapter!!.notifyDataSetChanged()
setListPosition(storedPosition, false)
goBack = false
}
@ -1365,6 +1365,7 @@ class CollectionFragment(
//saleTrackingReplace(position,newType)
}else{
saleTrackingReplace(position,newType)
setListPosition(position, false)
}
isMarking = true
setTotalLines()

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

@ -7,7 +7,6 @@ import android.content.Intent
import android.content.SharedPreferences
import android.content.pm.PackageInfo
import android.content.pm.PackageManager
import android.icu.text.Transliterator
import android.net.Uri
import android.provider.Settings
import android.view.KeyEvent
@ -122,7 +121,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
}
binding.edittextServer.setOnClickListener {
// showWorkingForms()
// showWorkingForms()
}
}
@ -138,7 +137,6 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
private fun showWorkingForms() {
/*Log.d("VERDNATURA::", "click")*/
val listForms: ArrayList<workForms> = ArrayList()
listForms.add(
@ -155,12 +153,22 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
"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", " ", " "))
val array = arrayOfNulls<String>(listForms.size)
var showList: ArrayList<String> = ArrayList()
for (l in listForms){
for (l in listForms) {
showList.add(l.name)
}
@ -174,7 +182,8 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
binding.edittextServer.setText(it)
saveData(
"base_urlSalix",
it)
it
)
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)