不直接配置const 的 appid

This commit is contained in:
renhaoting 2025-12-23 18:10:51 +08:00
parent f737254d0c
commit 6ff7704cad
4 changed files with 6 additions and 7 deletions

View File

@ -63,7 +63,6 @@ object VidiConst {
const val WATCH_AD_REWARD_GOLD = 200 const val WATCH_AD_REWARD_GOLD = 200
const val ZEROBUY_SECRET: String = "1f04c57a" const val ZEROBUY_SECRET: String = "1f04c57a"
const val ZEROBUY_APPID: String = "com.vididin.real.money.game"
const val DIAMOND_NUM_FOR_ONE_AD = 1 const val DIAMOND_NUM_FOR_ONE_AD = 1
const val WITHDRAW_SMALL_NUM = 0.1F const val WITHDRAW_SMALL_NUM = 0.1F

View File

@ -2,6 +2,7 @@ package com.gamedog.vididin.core.network.di
import android.util.Log import android.util.Log
import com.ama.core.architecture.util.AndroidUtil
import com.ama.core.architecture.util.DeviceUtil import com.ama.core.architecture.util.DeviceUtil
import com.gamedog.vididin.request.RequestUtil import com.gamedog.vididin.request.RequestUtil
import okhttp3.Headers import okhttp3.Headers
@ -35,7 +36,7 @@ class GlobalInterceptor2 : Interceptor {
.addHeader("Accept", "application/json") .addHeader("Accept", "application/json")
.addHeader("Accept-Charset", "utf-8") .addHeader("Accept-Charset", "utf-8")
// server real defined // server real defined
.addHeader("ApplicationId", RequestUtil.Request_ZeroBuy_APPId) .addHeader("ApplicationId", AndroidUtil.getPackageId())
.addHeader("DeviceId", DeviceUtil.generateDeviceId()) .addHeader("DeviceId", DeviceUtil.generateDeviceId())
.addHeader("authorazation", "Bearer xxxxx") .addHeader("authorazation", "Bearer xxxxx")

View File

@ -33,7 +33,7 @@ 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: MutableMap<String, String> = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) val requestParams: MutableMap<String, String> = mutableMapOf("AppId" to AndroidUtil.getPackageId(), "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())
@ -85,7 +85,7 @@ 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: MutableMap<String, String> = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) val requestParams: MutableMap<String, String> = mutableMapOf("AppId" to AndroidUtil.getPackageId(), "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())

View File

@ -1,6 +1,7 @@
package com.gamedog.vididin.request package com.gamedog.vididin.request
import com.ama.core.architecture.util.AndroidUtil
import com.ama.core.architecture.util.DeviceUtil import com.ama.core.architecture.util.DeviceUtil
import com.ama.core.architecture.util.MD5Util import com.ama.core.architecture.util.MD5Util
import com.gamedog.vididin.VidiConst import com.gamedog.vididin.VidiConst
@ -10,8 +11,6 @@ class RequestUtil private constructor(){
const val Request_APPId = "video1" const val Request_APPId = "video1"
const val Request_Sceret = "secret1" const val Request_Sceret = "secret1"
const val Request_ZeroBuy_APPId = "com.vididin.real.money.game"
fun getTimestampSec(): Long { fun getTimestampSec(): Long {
return System.currentTimeMillis()/1000 return System.currentTimeMillis()/1000
} }
@ -23,7 +22,7 @@ class RequestUtil private constructor(){
// applicationId-timestamp-deviceId-operation-secret // applicationId-timestamp-deviceId-operation-secret
fun getZeroBuyRequestSign(timeSec: Long, operation: Int): String { fun getZeroBuyRequestSign(timeSec: Long, operation: Int): String {
var signOrigin = "${VidiConst.ZEROBUY_APPID}-${timeSec}-${DeviceUtil.generateDeviceId()}-$operation-${VidiConst.ZEROBUY_SECRET}" var signOrigin = "${AndroidUtil.getPackageId()}-${timeSec}-${DeviceUtil.generateDeviceId()}-$operation-${VidiConst.ZEROBUY_SECRET}"
return MD5Util.md5(signOrigin)?:"" return MD5Util.md5(signOrigin)?:""
} }