From 6ff7704cad31d3b21e841281da3b737fdb1c0c12 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Tue, 23 Dec 2025 18:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=9B=B4=E6=8E=A5=E9=85=8D=E7=BD=AEco?= =?UTF-8?q?nst=20=E7=9A=84=20appid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gamedog/vididin/VidiConst.kt | 1 - .../main/java/com/gamedog/vididin/di/GlobalInterceptor2.kt | 3 ++- .../com/gamedog/vididin/features/zero/ZeroBuyViewModel.kt | 4 ++-- app/src/main/java/com/gamedog/vididin/request/RequestUtil.kt | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/VidiConst.kt b/app/src/main/java/com/gamedog/vididin/VidiConst.kt index f32fe8f..5fe6633 100644 --- a/app/src/main/java/com/gamedog/vididin/VidiConst.kt +++ b/app/src/main/java/com/gamedog/vididin/VidiConst.kt @@ -63,7 +63,6 @@ object VidiConst { const val WATCH_AD_REWARD_GOLD = 200 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 WITHDRAW_SMALL_NUM = 0.1F diff --git a/app/src/main/java/com/gamedog/vididin/di/GlobalInterceptor2.kt b/app/src/main/java/com/gamedog/vididin/di/GlobalInterceptor2.kt index ae2cecf..3a24842 100644 --- a/app/src/main/java/com/gamedog/vididin/di/GlobalInterceptor2.kt +++ b/app/src/main/java/com/gamedog/vididin/di/GlobalInterceptor2.kt @@ -2,6 +2,7 @@ package com.gamedog.vididin.core.network.di import android.util.Log +import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.DeviceUtil import com.gamedog.vididin.request.RequestUtil import okhttp3.Headers @@ -35,7 +36,7 @@ class GlobalInterceptor2 : Interceptor { .addHeader("Accept", "application/json") .addHeader("Accept-Charset", "utf-8") // server real defined - .addHeader("ApplicationId", RequestUtil.Request_ZeroBuy_APPId) + .addHeader("ApplicationId", AndroidUtil.getPackageId()) .addHeader("DeviceId", DeviceUtil.generateDeviceId()) .addHeader("authorazation", "Bearer xxxxx") 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 0ee3eed..6f311c6 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,7 +33,7 @@ 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: MutableMap = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) + val requestParams: MutableMap = mutableMapOf("AppId" to AndroidUtil.getPackageId(), "DeviceId" to DeviceUtil.generateDeviceId()) val userId = AccountManager.getAccount()?.userId?: 0 if (userId > 0) { requestParams.put("UserId", userId.toString()) @@ -85,7 +85,7 @@ 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: MutableMap = mutableMapOf("AppId" to VidiConst.ZEROBUY_APPID, "DeviceId" to DeviceUtil.generateDeviceId()) + val requestParams: MutableMap = mutableMapOf("AppId" to AndroidUtil.getPackageId(), "DeviceId" to DeviceUtil.generateDeviceId()) val userId = AccountManager.getAccount()?.userId?: 0 if (userId > 0) { requestParams.put("UserId", userId.toString()) diff --git a/app/src/main/java/com/gamedog/vididin/request/RequestUtil.kt b/app/src/main/java/com/gamedog/vididin/request/RequestUtil.kt index a960468..b68b4b9 100644 --- a/app/src/main/java/com/gamedog/vididin/request/RequestUtil.kt +++ b/app/src/main/java/com/gamedog/vididin/request/RequestUtil.kt @@ -1,6 +1,7 @@ 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.MD5Util import com.gamedog.vididin.VidiConst @@ -10,8 +11,6 @@ class RequestUtil private constructor(){ const val Request_APPId = "video1" const val Request_Sceret = "secret1" - const val Request_ZeroBuy_APPId = "com.vididin.real.money.game" - fun getTimestampSec(): Long { return System.currentTimeMillis()/1000 } @@ -23,7 +22,7 @@ class RequestUtil private constructor(){ // applicationId-timestamp-deviceId-operation-secret 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)?:"" }