diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt index e5f7475..e3c4b83 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt @@ -128,17 +128,15 @@ class ZeroBuyActivity : AppViewsEmptyViewModelActivity() { private fun requestData() { lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.ZeroBuyListData.collect { result -> - when (result) { - is Result.Loading -> { showLoading(false) } - is Result.Success -> { - hideLoading() - updateUIs(result.data) - } - is Result.Error -> { - hideLoading() - } + viewModel.ZeroBuyListData.collect { result -> + when (result) { + is Result.Loading -> { showLoading(false) } + is Result.Success -> { + hideLoading() + updateUIs(result.data) + } + is Result.Error -> { + hideLoading() } } } @@ -175,13 +173,13 @@ class ZeroBuyActivity : AppViewsEmptyViewModelActivity() { private fun updateUIs(data: ZeroBuyResp) { - showCompletePurchasesInfo(data.mFinishedList) mAdapter.submitList(data.mCurrentList) + showCompletePurchasesInfo(data.mFinishedList) } private fun showCompletePurchasesInfo(finishedList: List?) { finishedList?.let { - val userId = AccountManager.getAccount()?.userId + val userId = AccountManager.getAccount().userId val joinedIdList = SpUtil.instance().getList(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS) val hasNotifiedIdList: MutableList = SpUtil.instance().getList(SpUtil.KEY_ZEROBUY_HAS_NOTIFY_IDS).toMutableList() it.forEach { item-> diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyNotWinDialog.kt b/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyNotWinDialog.kt index b0e4a00..2a5bc75 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyNotWinDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyNotWinDialog.kt @@ -31,14 +31,10 @@ class ZeroBuyNotWinDialog(context: Activity, private val item: ZeroBuyItem) : Bi } } - tvTitle.text = item.title + tvTitleSub.text = item.title + " - " + item.price } } - private fun gotoWatchVideo() { - Router.Withdraw.startActivity(mActivity) - } - } diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyWinDialog.kt b/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyWinDialog.kt index 0acd75f..7511d0a 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyWinDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/dialogs/ZeroBuyWinDialog.kt @@ -6,7 +6,6 @@ import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.beans.ZeroBuyItem import com.vididin.real.money.game.databinding.DialogZeroBuyWinBinding as ViewBinding -import com.gamedog.vididin.router.Router class ZeroBuyWinDialog(context: Activity, private val item: ZeroBuyItem) : BindingDialog(context, ViewBinding::inflate) { @@ -31,7 +30,7 @@ class ZeroBuyWinDialog(context: Activity, private val item: ZeroBuyItem) : Bindi } } - tvTitle.text = item.title + tvTitleSub.text = item.title + " - " + item.price tvPurchaseId.text = item.redeem_code } } diff --git a/app/src/main/res/layout/dialog_zero_buy_not_win.xml b/app/src/main/res/layout/dialog_zero_buy_not_win.xml index a216327..d7d0a79 100644 --- a/app/src/main/res/layout/dialog_zero_buy_not_win.xml +++ b/app/src/main/res/layout/dialog_zero_buy_not_win.xml @@ -28,21 +28,24 @@ android:background="@mipmap/zero_win_dialog_bg" > - - - + + + diff --git a/app/src/main/res/layout/dialog_zero_buy_win.xml b/app/src/main/res/layout/dialog_zero_buy_win.xml index d8359d3..653f302 100644 --- a/app/src/main/res/layout/dialog_zero_buy_win.xml +++ b/app/src/main/res/layout/dialog_zero_buy_win.xml @@ -28,17 +28,20 @@ android:background="@mipmap/zero_win_dialog_bg" > - d h Diamantes insuficientes + Festa GrĂ¡tis \ No newline at end of file