From 5c03d0cb06d211bb57270c4ba6b6172eb3034afb Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Thu, 25 Dec 2025 14:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bean=EF=BC=8C=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=200=E5=85=83=E8=B4=AD=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gamedog/vididin/beans/ZeroBuyResp.kt | 22 +++++++------- .../features/winrecords/WinRecordsActivity.kt | 4 +-- .../vididin/features/zero/ZeroBuyActivity.kt | 4 +-- .../vididin/features/zero/ZeroBuyViewModel.kt | 30 ++++++------------- .../vididin/features/zero/ZeroItemAdapter.kt | 4 +-- .../features/zero/dialogs/ZeroBuyWinDialog.kt | 4 +-- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 29 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/beans/ZeroBuyResp.kt b/app/src/main/java/com/gamedog/vididin/beans/ZeroBuyResp.kt index b2c41ea..ef63bcf 100644 --- a/app/src/main/java/com/gamedog/vididin/beans/ZeroBuyResp.kt +++ b/app/src/main/java/com/gamedog/vididin/beans/ZeroBuyResp.kt @@ -1,15 +1,14 @@ package com.gamedog.vididin.beans -data class ZeroBuyResp ( - val Code: Int, - val Message: String, - val UserId: Int, - val CurrentPurchases: String, - val FinishedPurchases: String, - var mCurrentList: List?, - var mFinishedList: List?, + +data class ZeroBuyResp ( + val code: Int, + val message: String, + val user_id: Int, + val current_purchases : List, + val finished_purchases : List?, val Content: String, var contentObj: ZeroBuyItem? ) @@ -26,11 +25,12 @@ data class ZeroBuyItem ( val image:Int = 0, val current_users: List? = null, val winners: List? = null, - val redeem_code: String? = null, + /*val redeem_code: String? = null,*/ val completed: Boolean = false, - // Not from server - var mCountDownTimeStr: String = "" ) + + + diff --git a/app/src/main/java/com/gamedog/vididin/features/winrecords/WinRecordsActivity.kt b/app/src/main/java/com/gamedog/vididin/features/winrecords/WinRecordsActivity.kt index d9c30b1..98aa3ef 100644 --- a/app/src/main/java/com/gamedog/vididin/features/winrecords/WinRecordsActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/winrecords/WinRecordsActivity.kt @@ -91,13 +91,13 @@ class WinRecordsActivity : AppViewsEmptyViewModelActivity(), OnTabS } private fun updateUIs(data: ZeroBuyResp) { - if (data.mFinishedList.isNullOrEmpty()) { + if (data.finished_purchases.isNullOrEmpty()) { binding.tvNoDataHint.isVisible = true binding.recyclerView.isVisible = false } else { binding.tvNoDataHint.isVisible = false binding.recyclerView.isVisible = true - mAdapter.submitList(data.mFinishedList) + mAdapter.submitList(data.finished_purchases) } } 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 e3c4b83..6e5cdcb 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 @@ -173,8 +173,8 @@ class ZeroBuyActivity : AppViewsEmptyViewModelActivity() { private fun updateUIs(data: ZeroBuyResp) { - mAdapter.submitList(data.mCurrentList) - showCompletePurchasesInfo(data.mFinishedList) + mAdapter.submitList(data.current_purchases) + showCompletePurchasesInfo(data.finished_purchases) } private fun showCompletePurchasesInfo(finishedList: List?) { diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyViewModel.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyViewModel.kt index 829b08d..da7408a 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyViewModel.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyViewModel.kt @@ -12,6 +12,7 @@ import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.netbase.NetworkUtil import com.gamedog.vididin.netbase.Result import com.gamedog.vididin.request.RequestUtil +import com.vididin.real.money.game.R import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -42,19 +43,15 @@ class ZeroBuyViewModel : ViewModel() { requestParams.put("ActivityId", itemId.toString()) - val result = NetworkUtil.post("${VidiConst.URL_ZERO_BUY}/query", requestHeaders, requestParams, joinZeroBuyItemIds) + val result = NetworkUtil.post("${VidiConst.URL_ZERO_BUY}/any", requestHeaders, requestParams, joinZeroBuyItemIds) when (result) { is Result.Success -> { - val respObj = AndroidUtil.json2Object(result.data.string())?.apply { - mCurrentList = AndroidUtil.json2Object>(CurrentPurchases) - mFinishedList = AndroidUtil.json2Object>(FinishedPurchases) - contentObj = AndroidUtil.json2Object(Content) - } + val respObj = AndroidUtil.json2Object(result.data.string()) respObj?.contentObj?.let { - val itemId = respObj?.contentObj?.id - if ((respObj.Code == 0 || respObj.Code == 10003) && itemId != null && itemId > 0) { + val itemId = respObj.contentObj?.id + if ((respObj.code == 0 || respObj.code == 10003) && itemId != null && itemId > 0) { val mutableJoinedIdList = if(joinZeroBuyItemIds == null) mutableListOf() else joinZeroBuyItemIds.toMutableList() mutableJoinedIdList.add(itemId) SpUtil.instance().putList(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS, mutableJoinedIdList) @@ -88,31 +85,22 @@ class ZeroBuyViewModel : ViewModel() { requestParams.put("UserId", userId.toString()) } val joinZeroBuyItemIds = SpUtil.instance().getList(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS) - val result = NetworkUtil.post("${VidiConst.URL_ZERO_BUY}/query", requestHeaders, requestParams, joinZeroBuyItemIds) + val result = NetworkUtil.post("${VidiConst.URL_ZERO_BUY}/any", requestHeaders, requestParams, joinZeroBuyItemIds) when (result) { is Result.Success -> { - val respObj = AndroidUtil.json2Object(result.data.string())?.apply { - mCurrentList = AndroidUtil.json2Object>(CurrentPurchases) - mFinishedList = AndroidUtil.json2Object>(FinishedPurchases) - } + val respObj = AndroidUtil.json2Object(result.data.string()) - respObj?.UserId?.let { + respObj?.user_id?.let { if (userId <= 0) { AccountManager.saveUserIdInfo(it) } } - // TODO - when to record joined activity Ids - /*respObj?.Join?.let { - if (userId <= 0) { - AccountManager.saveUserIdInfo(it) - } - }*/ - _ZeroBuyListData.value = Result.Success(respObj!!) } is Result.Error -> { _ZeroBuyListData.value = Result.Error(result.exception, result.message) + AndroidUtil.showToast(R.string.net_error) } else -> { } } diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroItemAdapter.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroItemAdapter.kt index 07143d0..d002dc3 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroItemAdapter.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroItemAdapter.kt @@ -58,8 +58,8 @@ class ZeroItemAdapter(private val joinCallback: (itemId: Int, diamondCost: Int)- mCountDownTimer.start() } - override fun submitList(list: List?) { - val sortedList = list?.sortedByDescending { it?.start_time } + override fun submitList(list: List?) { + val sortedList = list?.sortedByDescending { it.start_time } super.submitList(sortedList) } 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 7511d0a..803075e 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 @@ -30,8 +30,8 @@ class ZeroBuyWinDialog(context: Activity, private val item: ZeroBuyItem) : Bindi } } - tvTitleSub.text = item.title + " - " + item.price - tvPurchaseId.text = item.redeem_code + tvTitleSub.text = item.title + tvPurchaseId.text = item.price } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 66ad163..929f877 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -201,7 +201,7 @@ Completed: Watch Video task. Convert Notes You have exchanged %d gold coins. - + Erro de rede \ No newline at end of file