From 04c3223e5a95a6490a544ba6e2dadadc89094016 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Tue, 9 Dec 2025 18:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20post=20=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vididin/features/zero/ZeroBuyViewModel.kt | 16 ++++++++-------- .../gamedog/vididin/main/BeginnerGiftDialog.kt | 4 ++-- .../com/gamedog/vididin/netbase/ApiService.kt | 4 +++- .../com/gamedog/vididin/netbase/NetworkUtil.kt | 5 +++-- 4 files changed, 16 insertions(+), 13 deletions(-) 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 5b8cfb4..6057e3a 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 @@ -33,19 +33,19 @@ class ZeroBuyViewModel : ViewModel() { val curTimeSec = System.currentTimeMillis()/1000 val signStr = RequestUtil.getZeroBuyRequestSign(curTimeSec, operationVal) val requestHeaders = mapOf("Operation" to operationVal.toString(), "Timestamp" to curTimeSec.toString(), "Sign" to signStr) - val requestParams = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) + val requestParams: MutableMap = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) val userId = AccountManager.getAccount()?.userId?: 0 if (userId > 0) { requestParams.put("UserId", userId.toString()) } val joinZeroBuyItemIds = SpUtil.instance().getList(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS) - if (joinZeroBuyItemIds.isNotEmpty()) { + /*if (joinZeroBuyItemIds.isNotEmpty()) { requestParams.put("JoinedPurchaseIds", AndroidUtil.object2Json(joinZeroBuyItemIds)) - } + }*/ requestParams.put("ActivityId", itemId.toString()) - val result = NetworkUtil.get("${VidiConst.URL_ZERO_BUY}/anynameisok", requestHeaders, requestParams) + val result = NetworkUtil.post("${VidiConst.URL_ZERO_BUY}/anynameisok", requestHeaders, requestParams, joinZeroBuyItemIds) when (result) { is Result.Success -> { val respObj = AndroidUtil.json2Object(result.data.string())?.apply { @@ -85,18 +85,18 @@ class ZeroBuyViewModel : ViewModel() { val curTimeSec = System.currentTimeMillis()/1000 val signStr = RequestUtil.getZeroBuyRequestSign(curTimeSec, operationVal) val requestHeaders = mapOf("Operation" to operationVal.toString(), "Timestamp" to curTimeSec.toString(), "Sign" to signStr) - val requestParams = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) + val requestParams: MutableMap = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) val userId = AccountManager.getAccount()?.userId?: 0 if (userId > 0) { requestParams.put("UserId", userId.toString()) } val joinZeroBuyItemIds = SpUtil.instance().getList(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS) - if (joinZeroBuyItemIds.isNotEmpty()) { + /*if (joinZeroBuyItemIds.isNotEmpty()) { requestParams.put("JoinedPurchaseIds", AndroidUtil.object2Json(joinZeroBuyItemIds)) - } + }*/ - val result = NetworkUtil.get("${VidiConst.URL_ZERO_BUY}/anynameisok", requestHeaders, requestParams) + val result = NetworkUtil.post("${VidiConst.URL_ZERO_BUY}/anynameisok", requestHeaders, requestParams, joinZeroBuyItemIds) when (result) { is Result.Success -> { val respObj = AndroidUtil.json2Object(result.data.string())?.apply { diff --git a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt index dbed81f..4ffa0a6 100644 --- a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt @@ -26,10 +26,10 @@ class BeginnerGiftDialog(activity: Activity) : BindingDialog { - if (mActivity is MainActivity) { + /*if (mActivity is MainActivity) { (mActivity as MainActivity).switchTab(1) } - NotifyMan.instance().sendEvent(VididinEvents.EVENT_JUMP_2_FIRST_WITHDRAW, null) + NotifyMan.instance().sendEvent(VididinEvents.EVENT_JUMP_2_FIRST_WITHDRAW, null)*/ dismiss() } } diff --git a/app/src/main/java/com/gamedog/vididin/netbase/ApiService.kt b/app/src/main/java/com/gamedog/vididin/netbase/ApiService.kt index 1d298e1..371a436 100644 --- a/app/src/main/java/com/gamedog/vididin/netbase/ApiService.kt +++ b/app/src/main/java/com/gamedog/vididin/netbase/ApiService.kt @@ -2,6 +2,7 @@ package com.gamedog.vididin.netbase import okhttp3.ResponseBody import retrofit2.http.Body +import retrofit2.http.Field import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded import retrofit2.http.GET @@ -24,7 +25,8 @@ interface ApiService { suspend fun postRequest( @Url url: String, @HeaderMap headers: Map = emptyMap(), - @FieldMap params: Map = emptyMap() + @FieldMap params: Map = emptyMap(), + @Field("JoinedPurchaseIds") JoinedPurchaseIds: List = emptyList(), ): ResponseBody @POST diff --git a/app/src/main/java/com/gamedog/vididin/netbase/NetworkUtil.kt b/app/src/main/java/com/gamedog/vididin/netbase/NetworkUtil.kt index 0976c2b..173b430 100644 --- a/app/src/main/java/com/gamedog/vididin/netbase/NetworkUtil.kt +++ b/app/src/main/java/com/gamedog/vididin/netbase/NetworkUtil.kt @@ -24,10 +24,11 @@ object NetworkUtil { suspend fun post( url: String, headers: Map = emptyMap(), - params: Map = emptyMap() + params: Map = emptyMap(), + JoinedPurchaseIds : List = emptyList() ): Result { return executeRequest { - apiService.postRequest(url, headers, params) + apiService.postRequest(url, headers, params, JoinedPurchaseIds) } }