删除外展newIntent内的逻辑

PureAdDialog播放广告增加次数判断
播放失败事件新增事件参数

app/src/main/java/com/zl/sdk/ad/TopOnAdLoadManager.java

@@ -11,7 +11,6 @@ import com.zl.sdk.OutHelp;
 import com.zl.sdk.ad.interstitial.TopOnAdInterstitialCallBack;
 import com.zl.sdk.ad.interstitial.TopOnInterstitialAdLoad;
 import com.zl.sdk.bean.OutAdData;
-import com.zl.sdk.event.DialogFailReason;
 import com.zl.sdk.event.EventUtils;
 import com.zl.sdk.event.statistics.Statistics;
 import com.zl.sdk.out.ActionFrom;
@@ -168,6 +167,7 @@ public final class TopOnAdLoadManager {
             para.put("isReady", String.valueOf(isReady));
             para.put("screen_state", String.valueOf(AppOutUtils.isScreenOn()));
             para.put("foreground", OutHelp.get().isAppForeground());
+            para.put("time", Math.abs(System.currentTimeMillis() - OutHelp.get().getLastShowTime()));
             String adPage = OutHelp.get().getPage();
             if (!TextUtils.isEmpty(adPage)) {
                 para.put("page", adPage);

app/src/main/java/com/zl/sdk/out/ui/DxActivity.java

@@ -55,10 +55,10 @@ public class DxActivity extends BaseActivity {
     @Override
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        LogUtil.d(TAG + "onNewIntent : " + hasExecuteInLifeCycle);
-        if (!hasExecuteInLifeCycle) {
-            execute();
-        }
+//        LogUtil.d(TAG + "onNewIntent : " + hasExecuteInLifeCycle);
+//        if (!hasExecuteInLifeCycle) {
+//            execute();
+//        }
     }
 
     @Override

app/src/main/java/com/zl/sdk/out/ui/PureAdDialog.java

@@ -17,6 +17,7 @@ import com.zl.sdk.event.EventUtils;
 import com.zl.sdk.event.statistics.AdScenes;
 import com.zl.sdk.event.statistics.Statistics;
 import com.zl.sdk.out.AppOutSP;
+import com.zl.sdk.out.CheckHelper;
 import com.zl.sdk.util.AppOutUtils;
 import com.zl.sdk.util.DpiUtil;
 import com.zl.sdk.util.LogUtil;
@@ -146,19 +147,18 @@ class PureAdDialog extends AbsView {
 
 
     private void checkCanShowItAd(String cpName, String adUnitId) {
-        boolean isReady = TopOnAdLoadManager.getInstance().isInterstitialReady(cpName, adUnitId);
-        LogUtil.d(TAG + "initAd interstitial isReady =" + isReady);
+        boolean adDataCanShow = CheckHelper.checkCanShowAdByTimesFromAdData(data, -1, EventUtils.SCENES_SHOW);
+        boolean adReady = CheckHelper.checkAdReady(data, EventUtils.SCENES_SHOW);
 
-        statAdDialogExp(isReady);
+        statAdDialogExp(adReady);
 
-        if (isReady) {
+        if (adDataCanShow && adReady) {
             statAdPage("1");
             showInterstitial();
-            finishActivity();
-            return;
+        } else if (adDataCanShow) {
+            TopOnAdLoadManager.getInstance().loadInterstitialAd(data, AdScenes.AD_SCENES_PURE);
         }
 
-        TopOnAdLoadManager.getInstance().loadInterstitialAd(data, AdScenes.AD_SCENES_PURE);
         finishActivity();
     }
 
@@ -167,7 +167,7 @@ class PureAdDialog extends AbsView {
             Map<String, Object> para = new HashMap<>();
             para.put("position", position);
             para.put("screen_state", String.valueOf(AppOutUtils.isScreenOn()));
-            para.put("foreground",OutHelp.get().isAppForeground());
+            para.put("foreground", OutHelp.get().isAppForeground());
             String adPage = OutHelp.get().getPage();
             if (!TextUtils.isEmpty(adPage)) {
                 para.put("page", adPage);