Merge remote-tracking branch 'origin/master'

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

@@ -108,7 +108,7 @@ public class AdDataManager {
                 adData.cpAdslot = PROP.isTest() ? "b6509805ed0208" : "b657019e06896e";//cp:b6509805ed0208   native:b1f5eocpkk4f3f  release cp:b1f5i60t92g4gq
                 adData.showCount = 5;
                 adData.showTimes = 5;
-                adData.interval = 1 * 60;//30分钟  未隐藏icon
+                adData.interval = 30;//30分钟  未隐藏icon
                 adData.intervalHide = 10 * 60;//10分钟  隐藏icon
                 adData.showTimesHideForAdId = 30;
                 adData.showTimeHide = 30;

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

@@ -46,7 +46,7 @@ public final class TopOnAdLoadManager {
             //只要有广告加载成功就去走播放逻辑
             //加载成功，调用播放纯广告逻辑
             LogUtil.d(TAG + "加载广告完成 去播放 doWork 222");
-            OutAdManager.get().doWork(ActionFrom.ACTION_UNKNOWN);
+            OutAdManager.get().doWork(ActionFrom.ACTION_UNKNOWN, false);
         }
 
         @Override

app/src/main/java/com/zl/sdk/icon/IcOptManager.java

@@ -301,10 +301,6 @@ public class IcOptManager {
     private class ScreenBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (!DataManager.get().checkOutOpen(context)) {
-                LogUtil.d(TAG + "外展未开启,不改变icon状态2");
-                return;
-            }
 
             String action = intent.getAction();
             LogUtil.d(TAG + "===>>> 灭屏");

app/src/main/java/com/zl/sdk/out/OutAdManager.java

@@ -200,7 +200,7 @@ public class OutAdManager extends BaseOutShowManager {
         LogUtil.d(TAG + ">>>广告逻辑开始<<< ===> START action=" + actionFrom);
         LogUtil.d(TAG);
 
-        doWork(actionFrom);
+        doWork(actionFrom, true);
     }
 
 
@@ -211,8 +211,8 @@ public class OutAdManager extends BaseOutShowManager {
      *
      * @param actionFrom
      */
-    public void doWork(ActionFrom actionFrom) {
-        if (System.currentTimeMillis() - lastDoWork < 500) {
+    public void doWork(ActionFrom actionFrom, boolean checkLastDoWorkTime) {
+        if (checkLastDoWorkTime && System.currentTimeMillis() - lastDoWork < 500) {
             Statistics.getInstance().dotEvent(EventUtils.OUT_AD_START_FAIL_INVERT_TIME);
             LogUtil.d(TAG + ">>>播放广告<<<  =============>>> END 触发太频繁");
             return;