klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

메시지 추가 로딩 되지 않는 버그 수정

This commit is contained in:
klaus 2023-09-13 14:31:06 +09:00
parent 9ed175191b
commit 4d4ddb50ac
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageViewModel.kt
View File

@ -27,7 +27,7 @@ class TextMessageViewModel(private val repository: MessageRepository) : BaseView
var page = 1 var page = 1
var pageSize = 10 var pageSize = 10
private var totalCount = 0 private var isLast = false
private var _isLoading = MutableLiveData(false) private var _isLoading = MutableLiveData(false)
val isLoading: LiveData<Boolean> val isLoading: LiveData<Boolean>
@ -35,6 +35,7 @@ class TextMessageViewModel(private val repository: MessageRepository) : BaseView
fun selectMessageBox(messageBox: MessageBox) { fun selectMessageBox(messageBox: MessageBox) {
if (messageBox != _messageBoxLiveData.value!!) { if (messageBox != _messageBoxLiveData.value!!) {
isLast = false
page = 1 page = 1
_messageBoxLiveData.postValue(messageBox) _messageBoxLiveData.postValue(messageBox)
getMessages(messageBox) getMessages(messageBox)
@ -42,7 +43,7 @@ class TextMessageViewModel(private val repository: MessageRepository) : BaseView
} }
fun getMessages(messageBox: MessageBox = _messageBoxLiveData.value!!) { fun getMessages(messageBox: MessageBox = _messageBoxLiveData.value!!) {
if (!_isLoading.value!! && (page - 1 == 0 || totalCount > page * pageSize)) { if (!_isLoading.value!! && !isLast) {
_isLoading.postValue(true) _isLoading.postValue(true)
val messageBoxObservable = when (messageBox) { val messageBoxObservable = when (messageBox) {
@ -78,10 +79,13 @@ class TextMessageViewModel(private val repository: MessageRepository) : BaseView
.subscribe( .subscribe(
{ {
if (it.success && it.data != null) { if (it.success && it.data != null) {
totalCount = it.data.totalCount
_getMessagesLiveData.postValue(it.data.items)
page += 1 page += 1
if (it.data.items.isNotEmpty()) {
_getMessagesLiveData.postValue(it.data.items)
} else {
isLast = true
_getMessagesLiveData.postValue(listOf())
}
} else { } else {
if (it.message != null) { if (it.message != null) {
_toastLiveData.postValue(it.message) _toastLiveData.postValue(it.message)

14
app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageViewModel.kt
View File

@ -27,7 +27,7 @@ class VoiceMessageViewModel(private val repository: MessageRepository) : BaseVie
var page = 1 var page = 1
var pageSize = 10 var pageSize = 10
private var totalCount = 0 private var isLast = false
private var _isLoading = MutableLiveData(false) private var _isLoading = MutableLiveData(false)
val isLoading: LiveData<Boolean> val isLoading: LiveData<Boolean>
@ -35,6 +35,7 @@ class VoiceMessageViewModel(private val repository: MessageRepository) : BaseVie
fun selectMessageBox(messageBox: MessageBox) { fun selectMessageBox(messageBox: MessageBox) {
if (messageBox != _messageBoxLiveData.value!!) { if (messageBox != _messageBoxLiveData.value!!) {
isLast = false
page = 1 page = 1
_messageBoxLiveData.postValue(messageBox) _messageBoxLiveData.postValue(messageBox)
getMessages(messageBox) getMessages(messageBox)
@ -42,7 +43,7 @@ class VoiceMessageViewModel(private val repository: MessageRepository) : BaseVie
} }
fun getMessages(messageBox: MessageBox = _messageBoxLiveData.value!!) { fun getMessages(messageBox: MessageBox = _messageBoxLiveData.value!!) {
if (!_isLoading.value!! && (page - 1 == 0 || totalCount > page * pageSize)) { if (!_isLoading.value!! && !isLast) {
_isLoading.postValue(true) _isLoading.postValue(true)
val messageBoxObservable = when (messageBox) { val messageBoxObservable = when (messageBox) {
MessageBox.SENT -> { MessageBox.SENT -> {
@ -77,10 +78,13 @@ class VoiceMessageViewModel(private val repository: MessageRepository) : BaseVie
.subscribe( .subscribe(
{ {
if (it.success && it.data != null) { if (it.success && it.data != null) {
totalCount = it.data.totalCount
_getMessagesLiveData.postValue(it.data.items)
page += 1 page += 1
if (it.data.items.isNotEmpty()) {
_getMessagesLiveData.postValue(it.data.items)
} else {
isLast = true
_getMessagesLiveData.postValue(listOf())
}
} else { } else {
if (it.message != null) { if (it.message != null) {
_toastLiveData.postValue(it.message) _toastLiveData.postValue(it.message)