From 5c293e79cf6c9cd1760c7dff259802e988495293 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 31 Oct 2023 12:23:12 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=20=EB=AA=A9=EB=A1=9D=20-=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=EC=9D=84=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=ED=95=B4=20=EC=9D=B4=EC=A0=84=20=EA=B5=AC=EB=A7=A4=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=B4=20=EC=B6=94=EA=B0=80=EB=A1=9C=20=EB=A1=9C?= =?UTF-8?q?=EB=94=A9=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/AudioContentOrderListViewModel.kt | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt index 6f15287..5e6c083 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt @@ -27,51 +27,53 @@ class AudioContentOrderListViewModel( private var isLast = false var page = 1 - private val size = 10 + private val size = 3 fun getAudioContentOrderList(onFailure: (() -> Unit)? = null) { - _isLoading.value = true - compositeDisposable.add( - repository.getAudioContentOrderList( - page = page, - size = size, - token = "Bearer ${SharedPreferenceManager.token}" - ) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - { - if (it.success && it.data != null) { - if (it.data.items.isNotEmpty()) { - page += 1 - _orderList.postValue(it.data.items) + if (_isLoading.value == false) { + _isLoading.value = true + compositeDisposable.add( + repository.getAudioContentOrderList( + page = page, + size = size, + token = "Bearer ${SharedPreferenceManager.token}" + ) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + { + if (it.success && it.data != null) { + if (it.data.items.isNotEmpty()) { + page += 1 + _orderList.postValue(it.data.items) + } else { + isLast = true + } } else { - isLast = true - } - } else { - if (it.message != null) { - _toastLiveData.postValue(it.message) - } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) - } + if (it.message != null) { + _toastLiveData.postValue(it.message) + } else { + _toastLiveData.postValue( + "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + ) + } + if (onFailure != null) { + onFailure() + } + } + _isLoading.value = false + }, + { + _isLoading.value = false + it.message?.let { message -> Logger.e(message) } + _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") if (onFailure != null) { onFailure() } } - _isLoading.value = false - }, - { - _isLoading.value = false - it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") - if (onFailure != null) { - onFailure() - } - } - ) - ) + ) + ) + } } }