구매목록
- orderType 파라미터 제거
This commit is contained in:
@@ -88,7 +88,6 @@ interface AudioContentApi {
|
|||||||
|
|
||||||
@GET("/order/audio-content")
|
@GET("/order/audio-content")
|
||||||
fun getAudioContentOrderList(
|
fun getAudioContentOrderList(
|
||||||
@Query("orderType") orderType: OrderType? = null,
|
|
||||||
@Query("page") page: Int,
|
@Query("page") page: Int,
|
||||||
@Query("size") size: Int,
|
@Query("size") size: Int,
|
||||||
@Header("Authorization") authHeader: String
|
@Header("Authorization") authHeader: String
|
||||||
|
|||||||
@@ -118,12 +118,10 @@ class AudioContentRepository(
|
|||||||
)
|
)
|
||||||
|
|
||||||
fun getAudioContentOrderList(
|
fun getAudioContentOrderList(
|
||||||
orderType: OrderType? = null,
|
|
||||||
page: Int,
|
page: Int,
|
||||||
size: Int,
|
size: Int,
|
||||||
token: String
|
token: String
|
||||||
) = api.getAudioContentOrderList(
|
) = api.getAudioContentOrderList(
|
||||||
orderType = orderType,
|
|
||||||
page = page - 1,
|
page = page - 1,
|
||||||
size = size,
|
size = size,
|
||||||
authHeader = token
|
authHeader = token
|
||||||
|
|||||||
@@ -33,12 +33,11 @@ class AudioContentOrderListViewModel(
|
|||||||
var page = 1
|
var page = 1
|
||||||
private val size = 10
|
private val size = 10
|
||||||
|
|
||||||
fun getAudioContentOrderList(orderType: OrderType? = null, onFailure: (() -> Unit)? = null) {
|
fun getAudioContentOrderList(onFailure: (() -> Unit)? = null) {
|
||||||
if (_isLoading.value == false) {
|
if (_isLoading.value == false) {
|
||||||
_isLoading.value = true
|
_isLoading.value = true
|
||||||
compositeDisposable.add(
|
compositeDisposable.add(
|
||||||
repository.getAudioContentOrderList(
|
repository.getAudioContentOrderList(
|
||||||
orderType = orderType,
|
|
||||||
page = page,
|
page = page,
|
||||||
size = size,
|
size = size,
|
||||||
token = "Bearer ${SharedPreferenceManager.token}"
|
token = "Bearer ${SharedPreferenceManager.token}"
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
|
|||||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||||
import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderListViewModel
|
import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderListViewModel
|
||||||
import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListItem
|
import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListItem
|
||||||
import kr.co.vividnext.sodalive.audio_content.order.OrderType
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentPlaylistAddContentBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentPlaylistAddContentBinding
|
||||||
@@ -74,7 +73,7 @@ class PlaylistAddContentDialogFragment(
|
|||||||
|
|
||||||
setupView()
|
setupView()
|
||||||
bindData()
|
bindData()
|
||||||
viewModel.getAudioContentOrderList(orderType = OrderType.KEEP) { dismiss() }
|
viewModel.getAudioContentOrderList { dismiss() }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDismiss(dialog: DialogInterface) {
|
override fun onDismiss(dialog: DialogInterface) {
|
||||||
@@ -141,7 +140,7 @@ class PlaylistAddContentDialogFragment(
|
|||||||
if (!recyclerView.canScrollVertically(1) &&
|
if (!recyclerView.canScrollVertically(1) &&
|
||||||
lastVisibleItemPosition == itemTotalCount
|
lastVisibleItemPosition == itemTotalCount
|
||||||
) {
|
) {
|
||||||
viewModel.getAudioContentOrderList(orderType = OrderType.KEEP) {}
|
viewModel.getAudioContentOrderList {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user