From e51e976385bbfac318bd74f984fff7eaac0f6a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= <yeziwei@ghzhushou.com>
Date: Wed, 25 Oct 2023 14:52:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dapp=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=8E=B7=E5=8F=96=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=B7=E6=B1=82=E6=B2=A1=E6=9C=89=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8Agid=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/ad/AdDelegateHelper.kt     |  4 ++++
 app/src/main/java/com/gh/common/util/DataUtils.java | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
index 93fe6a5550..61459247d3 100644
--- a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
+++ b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt
@@ -154,6 +154,9 @@ object AdDelegateHelper {
      */
     fun handleAdConfig(configList: List<AdConfig>) {
         mGameSearchAdList.clear()
+        mSplashAd = null
+        mDownloadManagerAd = null
+        mVGameLaunchAd = null
         for (config in configList) {
             // 处理返回的数据
             when (config.location) {
@@ -161,6 +164,7 @@ object AdDelegateHelper {
                     config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
                     mSplashAd = config
                 }
+
                 "download_manager" -> mDownloadManagerAd = config
                 "game_search" -> config.let { mGameSearchAdList.add(it) }
                 "helper_launch" -> mVGameLaunchAd = config
diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java
index 713408d7a7..9e535dd7f6 100644
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@@ -9,15 +9,16 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.gh.gamecenter.common.base.GlobalActivityManager;
+import com.gh.ad.AdDelegateHelper;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.GlobalActivityManager;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.SensorsBridge;
-import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
@@ -117,6 +118,11 @@ public class DataUtils {
                 String originalGid = HaloApp.getInstance().getGid();
                 HaloApp.getInstance().setGid(gid);
 
+                // 更新广告配置
+                ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> {
+                    AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null);
+                });
+
                 // gid 变更时上报 gid 变更日志
                 if (!TextUtils.isEmpty(originalGid) && !originalGid.equals(gid)) {
                     NewFlatLogUtils.logGidChanged(originalGid, gid);