From 4410afc29f6e30148305cd62b30665b5fac9fe1f Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Fri, 7 Aug 2020 20:48:56 +0800
Subject: [PATCH] =?UTF-8?q?update:=20rewardAd=20=E5=A2=9E=E5=8A=A0=20prelo?=
 =?UTF-8?q?ad=20=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-plus/service/api/ad/rewarded-video-ad.js   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/platforms/app-plus/service/api/ad/rewarded-video-ad.js b/src/platforms/app-plus/service/api/ad/rewarded-video-ad.js
index acf419226..0133ce84f 100644
--- a/src/platforms/app-plus/service/api/ad/rewarded-video-ad.js
+++ b/src/platforms/app-plus/service/api/ad/rewarded-video-ad.js
@@ -21,6 +21,7 @@ class RewardedVideoAd {
       }
     })
 
+    this._preload = options.preload !== undefined ? options.preload : true
     this._isLoad = false
     this._adError = ''
     this._loadPromiseResolve = null
@@ -30,8 +31,8 @@ class RewardedVideoAd {
     const rewardAd = this._rewardAd = plus.ad.createRewardedVideoAd(options)
     rewardAd.onLoad((e) => {
       this._isLoad = true
-      this._dispatchEvent('load', {})
       this._lastLoadTime = Date.now()
+      this._dispatchEvent('load', {})
 
       if (this._loadPromiseResolve != null) {
         this._loadPromiseResolve()
@@ -39,7 +40,9 @@ class RewardedVideoAd {
       }
     })
     rewardAd.onClose((e) => {
-      this._loadAd()
+      if (this._preload) {
+        this._loadAd()
+      }
       this._dispatchEvent('close', { isEnded: e.isEnded })
     })
     rewardAd.onVerify && rewardAd.onVerify((e) => {
@@ -59,11 +62,14 @@ class RewardedVideoAd {
         this._loadPromiseReject = null
       }
     })
-    this._loadAd()
+
+    if (this._preload) {
+      this._loadAd()
+    }
   }
 
   get isExpired () {
-    return (Math.abs(Date.now() - this._lastLoadTime) > EXPIRED_TIME)
+    return (this._lastLoadTime !== 0 && (Math.abs(Date.now() - this._lastLoadTime) > EXPIRED_TIME))
   }
 
   load () {
-- 
GitLab