修复热启动开屏问题和添加生命周期绑定方法

EspoirX · Nov 14, 2023 · 8833e34 · 8833e34
1 parent 8437cd5
commit 8833e34
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 1 deletion.
diff --git a/app/src/main/java/com/espoir/easyadvapp/ad/TTHotSplashAdvStrategy.kt b/app/src/main/java/com/espoir/easyadvapp/ad/TTHotSplashAdvStrategy.kt
@@ -18,6 +18,7 @@ package com.espoir.easyadvapp.ad
 //            EasyAdv.splashConfig()
 //                .setCodeId(codeId)
 //                .setActivity(activity)
+//                .isHotSplash(true)
 //                .setWidth(activity.getScreenWidth())
 //                .setHeight(activity.getScreenHeight())
 //                .setContainer(container)

diff --git a/easyadv/src/main/java/com/espoir/easyadv/AdvControl.kt b/easyadv/src/main/java/com/espoir/easyadv/AdvControl.kt
@@ -34,6 +34,10 @@ class AdvControl {
             config.listener(CallbackType.ERROR, EasyAdv.ERROR_SDK, "sdk init fail")
             return
         }
+        if (config.isHotSplash) {
+            splashAdvEngine?.showSplashAdv(config)
+            return
+        }
         showSplashAdvTime = System.currentTimeMillis()
         //等待sdk初始化完成
         while (!splashAdvFlag) {

diff --git a/easyadv/src/main/java/com/espoir/easyadv/EasyAdv.kt b/easyadv/src/main/java/com/espoir/easyadv/EasyAdv.kt
@@ -124,7 +124,13 @@ object EasyAdv {
     fun rewardVideoConfig() = RewardVideoAdvConfig()
 
     internal fun showSplashAdv(config: SplashAdvConfig) {
-        advControl?.showSplashAdv(config, splashAdvEngine)
+        if (config.isHotSplash) {
+            if (isInitSdkSuccess) {
+                advControl?.showSplashAdv(config, splashAdvEngine)
+            }
+        } else {
+            advControl?.showSplashAdv(config, splashAdvEngine)
+        }
     }
 
     internal fun showFullScreenVideoAdv(config: FullScreenVideoAdvConfig) {

diff --git a/easyadv/src/main/java/com/espoir/easyadv/config/BannerAdvConfig.kt b/easyadv/src/main/java/com/espoir/easyadv/config/BannerAdvConfig.kt
@@ -2,6 +2,8 @@ package com.espoir.easyadv.config
 
 import android.app.Activity
 import android.view.ViewGroup
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
 import com.espoir.easyadv.BannerAdvListener
 import com.espoir.easyadv.CallbackType
@@ -13,6 +15,8 @@ open class BannerAdvConfig : BaseAdvConfig() {
     var codeId: String = ""
     var container: ViewGroup? = null
     internal var bannerAdvListener: BannerAdvListener? = null
+    internal var lifecycleOwner: LifecycleOwner? = null
+    internal var lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY
 
     fun setCodeId(codeId: String) = apply {
         this.codeId = codeId
@@ -30,6 +34,11 @@ open class BannerAdvConfig : BaseAdvConfig() {
         this.activity = WeakReference(activity)
     }
 
+    fun lifecycle(lifecycleOwner: LifecycleOwner, lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY) = apply {
+        this.lifecycleOwner = lifecycleOwner
+        this.lifeEvent = lifeEvent
+    }
+
     fun setWidth(width: Int) = apply {
         this.width = width
     }

diff --git a/easyadv/src/main/java/com/espoir/easyadv/config/FullScreenVideoAdvConfig.kt b/easyadv/src/main/java/com/espoir/easyadv/config/FullScreenVideoAdvConfig.kt
@@ -1,6 +1,8 @@
 package com.espoir.easyadv.config
 
 import android.app.Activity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import com.bytedance.sdk.openadsdk.TTFullScreenVideoAd
 import com.espoir.easyadv.CallbackType
 import com.espoir.easyadv.EasyAdv
@@ -11,6 +13,8 @@ import java.lang.ref.WeakReference
 open class FullScreenVideoAdvConfig : BaseAdvConfig() {
     var codeId: String = ""
     internal var fullScreenVideoAdvListener: FullScreenVideoAdvListener? = null
+    internal var lifecycleOwner: LifecycleOwner? = null
+    internal var lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY
 
     fun setCodeId(codeId: String) = apply {
         this.codeId = codeId
@@ -24,6 +28,11 @@ open class FullScreenVideoAdvConfig : BaseAdvConfig() {
         this.activity = WeakReference(activity)
     }
 
+    fun lifecycle(lifecycleOwner: LifecycleOwner, lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY) = apply {
+        this.lifecycleOwner = lifecycleOwner
+        this.lifeEvent = lifeEvent
+    }
+
     fun setWidth(width: Int) = apply {
         this.width = width
     }

diff --git a/easyadv/src/main/java/com/espoir/easyadv/config/RewardVideoAdvConfig.kt b/easyadv/src/main/java/com/espoir/easyadv/config/RewardVideoAdvConfig.kt
@@ -2,6 +2,8 @@ package com.espoir.easyadv.config
 
 import android.app.Activity
 import android.os.Bundle
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import com.bytedance.sdk.openadsdk.TTAdConstant
 import com.bytedance.sdk.openadsdk.mediation.manager.MediationAdEcpmInfo
 import com.espoir.easyadv.CallbackType
@@ -16,6 +18,8 @@ class RewardVideoAdvConfig : BaseAdvConfig() {
     internal var interceptors = mutableListOf<AdvInterceptor>()
     var extraMap = hashMapOf<String, String>()
     var rewardVideoAdvListener: RewardVideoAdvListener? = null
+    internal var lifecycleOwner: LifecycleOwner? = null
+    internal var lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY
 
     fun setCodeId(codeId: String) = apply {
         this.codeId = codeId
@@ -33,6 +37,11 @@ class RewardVideoAdvConfig : BaseAdvConfig() {
         this.activity = WeakReference(activity)
     }
 
+    fun lifecycle(lifecycleOwner: LifecycleOwner, lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY) = apply {
+        this.lifecycleOwner = lifecycleOwner
+        this.lifeEvent = lifeEvent
+    }
+
     fun setWidth(width: Int) = apply {
         this.width = width
     }

diff --git a/easyadv/src/main/java/com/espoir/easyadv/config/SplashAdvConfig.kt b/easyadv/src/main/java/com/espoir/easyadv/config/SplashAdvConfig.kt
@@ -3,6 +3,8 @@ package com.espoir.easyadv.config
 import android.app.Activity
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import com.bytedance.sdk.openadsdk.TTSplashAd
 import com.espoir.easyadv.CallbackType
 import com.espoir.easyadv.EasyAdv
@@ -12,7 +14,10 @@ import java.lang.ref.WeakReference
 class SplashAdvConfig : BaseAdvConfig() {
     var codeId: String = ""
     var container: ViewGroup? = null
+    internal var isHotSplash: Boolean = false
     internal var splashAdvListener: SplashAdvListener? = null
+    internal var lifecycleOwner: LifecycleOwner? = null
+    internal var lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY
 
     fun setCodeId(codeId: String) = apply {
         this.codeId = codeId
@@ -30,6 +35,15 @@ class SplashAdvConfig : BaseAdvConfig() {
         this.activity = WeakReference(activity)
     }
 
+    fun lifecycle(lifecycleOwner: LifecycleOwner, lifeEvent: Lifecycle.Event = Lifecycle.Event.ON_DESTROY) = apply {
+        this.lifecycleOwner = lifecycleOwner
+        this.lifeEvent = lifeEvent
+    }
+
+    fun isHotSplash(isHotSplash: Boolean) = apply {
+        this.isHotSplash = isHotSplash
+    }
+
     fun setWidth(width: Int) = apply {
         this.width = width
     }