bugfix
This commit is contained in:
parent
f725675e8c
commit
6e0edc1acc
@ -48,12 +48,10 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
|
|||||||
if (getIsMe()) {
|
if (getIsMe()) {
|
||||||
refreshData()
|
refreshData()
|
||||||
|
|
||||||
viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) }
|
|
||||||
// waitForQRScanResult()
|
// waitForQRScanResult()
|
||||||
} else {
|
} else {
|
||||||
showData(getUserDto()!!)
|
showData(getUserDto()!!)
|
||||||
binding.backToSearch.visibility = View.VISIBLE
|
binding.backToSearch.visibility = View.VISIBLE
|
||||||
|
|
||||||
binding.backToSearch.setOnClickListener {
|
binding.backToSearch.setOnClickListener {
|
||||||
navigateTo(view, R.id.action_profileFragment_to_adminFragment)
|
navigateTo(view, R.id.action_profileFragment_to_adminFragment)
|
||||||
}
|
}
|
||||||
@ -72,7 +70,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
|
|||||||
val userDTO = UserServiceST.getInstance().getUserDTO() ?: return
|
val userDTO = UserServiceST.getInstance().getUserDTO() ?: return
|
||||||
|
|
||||||
Log.d("1234", userDTO.isACSBlocked.toString())
|
Log.d("1234", userDTO.isACSBlocked.toString())
|
||||||
binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск недействителен" else "Пропуск действителен"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun hideButtons() {
|
private fun hideButtons() {
|
||||||
@ -111,6 +108,9 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
|
|||||||
|
|
||||||
private fun refreshData() {
|
private fun refreshData() {
|
||||||
viewModel.getInfo()
|
viewModel.getInfo()
|
||||||
|
viewModel.visitListState.collectWithLifecycle(this) { data ->
|
||||||
|
adapter.submitData(data)
|
||||||
|
}
|
||||||
subscribeToGetData()
|
subscribeToGetData()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,8 +171,15 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
|
|||||||
showMyData(userDto)
|
showMyData(userDto)
|
||||||
checkForAdmin()
|
checkForAdmin()
|
||||||
}
|
}
|
||||||
|
if (state is ProfileViewModel.State.Error){
|
||||||
|
handleError(state.errorMessage)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleError(errorMessage: String) {
|
||||||
|
// TODO()
|
||||||
|
}
|
||||||
|
|
||||||
private fun setAvatar(photo: String) {
|
private fun setAvatar(photo: String) {
|
||||||
Glide.with(requireContext())
|
Glide.with(requireContext())
|
||||||
|
@ -63,7 +63,8 @@ class ProfileViewModel() : ViewModel() {
|
|||||||
Log.d("Pvm", data.login)
|
Log.d("Pvm", data.login)
|
||||||
},
|
},
|
||||||
onFailure = { error ->
|
onFailure = { error ->
|
||||||
error.message?.let { error(it) } //FIXME()
|
// error.message?.let { error(it) }
|
||||||
|
_state.emit(State.Error(error.message.toString()))
|
||||||
Log.e("ProfileViewModel", error.message.toString())
|
Log.e("ProfileViewModel", error.message.toString())
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -105,6 +106,9 @@ class ProfileViewModel() : ViewModel() {
|
|||||||
data class Change(
|
data class Change(
|
||||||
val item: Boolean
|
val item: Boolean
|
||||||
) : State
|
) : State
|
||||||
|
data class Error(
|
||||||
|
val errorMessage: String
|
||||||
|
) : State
|
||||||
}
|
}
|
||||||
|
|
||||||
sealed interface Action {
|
sealed interface Action {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user