修改为 post 请求
This commit is contained in:
parent
edc968f004
commit
04c3223e5a
|
|
@ -33,19 +33,19 @@ class ZeroBuyViewModel : ViewModel() {
|
||||||
val curTimeSec = System.currentTimeMillis()/1000
|
val curTimeSec = System.currentTimeMillis()/1000
|
||||||
val signStr = RequestUtil.getZeroBuyRequestSign(curTimeSec, operationVal)
|
val signStr = RequestUtil.getZeroBuyRequestSign(curTimeSec, operationVal)
|
||||||
val requestHeaders = mapOf("Operation" to operationVal.toString(), "Timestamp" to curTimeSec.toString(), "Sign" to signStr)
|
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<String, String> = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId())
|
||||||
val userId = AccountManager.getAccount()?.userId?: 0
|
val userId = AccountManager.getAccount()?.userId?: 0
|
||||||
if (userId > 0) {
|
if (userId > 0) {
|
||||||
requestParams.put("UserId", userId.toString())
|
requestParams.put("UserId", userId.toString())
|
||||||
}
|
}
|
||||||
val joinZeroBuyItemIds = SpUtil.instance().getList<Int>(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS)
|
val joinZeroBuyItemIds = SpUtil.instance().getList<Int>(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS)
|
||||||
if (joinZeroBuyItemIds.isNotEmpty()) {
|
/*if (joinZeroBuyItemIds.isNotEmpty()) {
|
||||||
requestParams.put("JoinedPurchaseIds", AndroidUtil.object2Json(joinZeroBuyItemIds))
|
requestParams.put("JoinedPurchaseIds", AndroidUtil.object2Json(joinZeroBuyItemIds))
|
||||||
}
|
}*/
|
||||||
requestParams.put("ActivityId", itemId.toString())
|
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) {
|
when (result) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
val respObj = AndroidUtil.json2Object<ZeroBuyResp>(result.data.string())?.apply {
|
val respObj = AndroidUtil.json2Object<ZeroBuyResp>(result.data.string())?.apply {
|
||||||
|
|
@ -85,18 +85,18 @@ class ZeroBuyViewModel : ViewModel() {
|
||||||
val curTimeSec = System.currentTimeMillis()/1000
|
val curTimeSec = System.currentTimeMillis()/1000
|
||||||
val signStr = RequestUtil.getZeroBuyRequestSign(curTimeSec, operationVal)
|
val signStr = RequestUtil.getZeroBuyRequestSign(curTimeSec, operationVal)
|
||||||
val requestHeaders = mapOf("Operation" to operationVal.toString(), "Timestamp" to curTimeSec.toString(), "Sign" to signStr)
|
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<String, String> = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId())
|
||||||
val userId = AccountManager.getAccount()?.userId?: 0
|
val userId = AccountManager.getAccount()?.userId?: 0
|
||||||
if (userId > 0) {
|
if (userId > 0) {
|
||||||
requestParams.put("UserId", userId.toString())
|
requestParams.put("UserId", userId.toString())
|
||||||
}
|
}
|
||||||
val joinZeroBuyItemIds = SpUtil.instance().getList<Int>(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS)
|
val joinZeroBuyItemIds = SpUtil.instance().getList<Int>(SpUtil.KEY_ZEROBUY_JOINED_ACTIVITY_IDS)
|
||||||
if (joinZeroBuyItemIds.isNotEmpty()) {
|
/*if (joinZeroBuyItemIds.isNotEmpty()) {
|
||||||
requestParams.put("JoinedPurchaseIds", AndroidUtil.object2Json(joinZeroBuyItemIds))
|
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) {
|
when (result) {
|
||||||
is Result.Success -> {
|
is Result.Success -> {
|
||||||
val respObj = AndroidUtil.json2Object<ZeroBuyResp>(result.data.string())?.apply {
|
val respObj = AndroidUtil.json2Object<ZeroBuyResp>(result.data.string())?.apply {
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@ class BeginnerGiftDialog(activity: Activity) : BindingDialog<DialogBeginnerGiftB
|
||||||
setOnClickBatch(tvAction) {
|
setOnClickBatch(tvAction) {
|
||||||
when (this) {
|
when (this) {
|
||||||
tvAction -> {
|
tvAction -> {
|
||||||
if (mActivity is MainActivity) {
|
/*if (mActivity is MainActivity) {
|
||||||
(mActivity as MainActivity).switchTab(1)
|
(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()
|
dismiss()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.gamedog.vididin.netbase
|
||||||
|
|
||||||
import okhttp3.ResponseBody
|
import okhttp3.ResponseBody
|
||||||
import retrofit2.http.Body
|
import retrofit2.http.Body
|
||||||
|
import retrofit2.http.Field
|
||||||
import retrofit2.http.FieldMap
|
import retrofit2.http.FieldMap
|
||||||
import retrofit2.http.FormUrlEncoded
|
import retrofit2.http.FormUrlEncoded
|
||||||
import retrofit2.http.GET
|
import retrofit2.http.GET
|
||||||
|
|
@ -24,7 +25,8 @@ interface ApiService {
|
||||||
suspend fun postRequest(
|
suspend fun postRequest(
|
||||||
@Url url: String,
|
@Url url: String,
|
||||||
@HeaderMap headers: Map<String, String> = emptyMap(),
|
@HeaderMap headers: Map<String, String> = emptyMap(),
|
||||||
@FieldMap params: Map<String, String> = emptyMap()
|
@FieldMap params: Map<String, String> = emptyMap(),
|
||||||
|
@Field("JoinedPurchaseIds") JoinedPurchaseIds: List<Int> = emptyList<Int>(),
|
||||||
): ResponseBody
|
): ResponseBody
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,11 @@ object NetworkUtil {
|
||||||
suspend fun post(
|
suspend fun post(
|
||||||
url: String,
|
url: String,
|
||||||
headers: Map<String, String> = emptyMap(),
|
headers: Map<String, String> = emptyMap(),
|
||||||
params: Map<String, String> = emptyMap()
|
params: Map<String, String> = emptyMap(),
|
||||||
|
JoinedPurchaseIds : List<Int> = emptyList<Int>()
|
||||||
): Result<ResponseBody> {
|
): Result<ResponseBody> {
|
||||||
return executeRequest {
|
return executeRequest {
|
||||||
apiService.postRequest(url, headers, params)
|
apiService.postRequest(url, headers, params, JoinedPurchaseIds)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue