From 2f9e1cb327b1d58e4035b77bd903a452774ce66b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 17 十月 2020 17:28:57 +0800
Subject: [PATCH] 广告控制完善

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
index 1b2c74a..bf896e4 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
@@ -234,7 +234,6 @@
                                 BeibeiConstant.GDT_RECOMMAND_NATIVE = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
                                 BeibeiConstant.GDT_RECOMMEND_CATEGORY_MIN_NATIVE = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
                                 BeibeiConstant.GDT_PLAYER_NATIVE1 = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
-                                BeibeiConstant.GDT_SEARCH_NATIVE = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
                                 BeibeiConstant.GDT_DISCOVER_NATIVE = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
                                 BeibeiConstant.GDT_GUESS_LIKE_NATIVE = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
                                 BeibeiConstant.GDT_RECOMMEND_CATEGORY_NATIVE = BeibeiConstant.GDT_DOWNLOAD_HINT_ID;
@@ -381,8 +380,8 @@
      *
      * @param adType
      */
-    private void loadSplashAd(final AdUtil.AD_TYPE adType) {
-        SplashAdUtil.loadAD(adType, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
+    private void loadSplashAd(final AdUtil.AD_TYPE adType, final String pid) {
+        SplashAdUtil.loadAD(pid, adType, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
             @Override
             public void close() {
                 runOnUiThread(new Runnable() {
@@ -397,7 +396,7 @@
             public void noAd() {//鍒濇鍔犺浇鏈姞杞藉嚭骞垮憡
                 if (AdUtil.AD_TYPE.csj == adType) {
                     //鍐嶆鍔犺浇骞跨偣閫氬箍鍛�
-                    SplashAdUtil.loadAD(AdUtil.AD_TYPE.gdt, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
+                    SplashAdUtil.loadAD(pid, AdUtil.AD_TYPE.gdt, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
                         @Override
                         public void close() {
                             runOnUiThread(new Runnable() {
@@ -422,7 +421,7 @@
                 } else if (AdUtil.AD_TYPE.gdt == adType) {
                     //鍐嶆鍔犺浇绌垮北鐢插箍鍛�
                     //鍐嶆鍔犺浇骞跨偣閫氬箍鍛�
-                    SplashAdUtil.loadAD(AdUtil.AD_TYPE.csj, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
+                    SplashAdUtil.loadAD(pid, AdUtil.AD_TYPE.csj, SplashActivity.this, vg_input, vg_ad, ad_close_time, new SplashAdUtil.SplashAdListener() {
                         @Override
                         public void close() {
                             runOnUiThread(new Runnable() {
@@ -477,13 +476,24 @@
                             if (jsonObject != null) {
                                 if (jsonObject.getBoolean("IsPost")) {
                                     JSONObject data = jsonObject.getJSONObject("Data");
-                                    JSONObject ad = data.optJSONObject("ad");
+                                    JSONObject ad = data.optJSONObject("adNew");
                                     AdUtil.saveAdConfig(getApplicationContext(), ad);
                                     AdUtil.AD_TYPE splash = AdUtil.getAdType(getApplicationContext(), AdUtil.POSITION_SPLASH);
-                                    loadSplashAd(splash);
+                                    String pid = AdUtil.getAdPid(getApplicationContext(), AdUtil.POSITION_SPLASH);
+                                    if (StringUtils.isBlank(pid)) {
+                                        if (splash != null) {
+                                            if (splash == AdUtil.AD_TYPE.csj) {
+                                                pid = CSJConstant.SPLASH_AD;
+                                            } else if (splash == AdUtil.AD_TYPE.gdt) {
+                                                pid = BeibeiConstant.GDT_SPLASH_POSITION_ID;
+                                            }
+                                        }
+                                    }
+
+                                    loadSplashAd(splash, pid);
                                 }
                             } else {
-                                loadSplashAd(AdUtil.AD_TYPE.gdt);
+                                loadSplashAd(AdUtil.AD_TYPE.csj, CSJConstant.SPLASH_AD);
                             }
                         }
 
@@ -495,7 +505,7 @@
                         @Override
                         public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
                             super.onFailure(statusCode, headers, responseString, throwable);
-                            loadSplashAd(AdUtil.AD_TYPE.gdt);
+                            loadSplashAd(AdUtil.AD_TYPE.csj, CSJConstant.SPLASH_AD);
                         }
                     });
 

--
Gitblit v1.8.0