From 64e344b0e61e2bb985e674d51e38710420840fda Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Wed, 12 Feb 2020 16:59:36 +0800
Subject: [PATCH] =?UTF-8?q?update:=20rv-ad=20=E4=BC=98=E5=8C=96=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-plus/service/api/ad/rewarded-video-ad.js    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 f09a058d9..c76dd29c0 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
@@ -5,6 +5,8 @@ const eventNames = [
   'error'
 ]
 
+const ERROR_CODE_LIST = [-5001, -5002, -5003, -5004, -5005, -5006]
+
 class RewardedVideoAd {
   constructor (adpid) {
     this._options = {
@@ -21,7 +23,7 @@ class RewardedVideoAd {
     })
 
     this._isLoad = false
-    this._adError = false
+    this._adError = ''
     this._loadPromiseResolve = null
     this._loadPromiseReject = null
     const rewardAd = this._rewardAd = plus.ad.createRewardedVideoAd(this._options)
@@ -40,9 +42,9 @@ class RewardedVideoAd {
     rewardAd.onError((e) => {
       const { code, message } = e
       const data = { code: code, errMsg: message }
-      this._adError = (code && code < 5005)
+      this._adError = message
       this._dispatchEvent('error', data)
-      if (code === 5005 && this._loadPromiseReject != null) {
+      if ((code === -5005 || ERROR_CODE_LIST.index(code) === -1) && this._loadPromiseReject != null) {
         this._loadPromiseReject(data)
         this._loadPromiseReject = null
       }
@@ -66,14 +68,11 @@ class RewardedVideoAd {
         this._rewardAd.show()
         resolve()
       } else {
-        reject(new Error(''))
+        reject(new Error(this._adError))
       }
     })
   }
   _loadAd () {
-    if (this._adError) {
-      return
-    }
     this._isLoad = false
     this._rewardAd.load()
   }
-- 
GitLab