事件上报完善

第一次加载受外展开关控制

app/src/main/java/com/zl/sdk/OutHelp.java

@@ -134,8 +134,10 @@ public final class OutHelp implements KPListener {
         //初始化触发条件
         initTriggerConditions();
 
-        //第一次加载广告
-        OutAdManager.get().checkNeedLoadAd(ActionFrom.ACTION_UNKNOWN);
+        if (DataManager.get().checkOutOpen(mContext)) {
+            //第一次加载广告
+            OutAdManager.get().checkNeedLoadAd(ActionFrom.ACTION_UNKNOWN);
+        }
     }
 
     private void initTriggerConditions() {
@@ -640,8 +642,9 @@ public final class OutHelp implements KPListener {
 
     private static void stateRecAction(String action, String state) {
         Map<String, String> map = new HashMap<>();
-        map.put("state", "self");
+        map.put("state", state);
         map.put("action", action);
+
         Statistics.getInstance().dotEvent("rec_action", map);
     }
     private void cleanAllRunningAppActivity() {

app/src/main/java/com/zl/sdk/event/statistics/Statistics.java

@@ -176,4 +176,17 @@ public class Statistics implements ICustomStatistics, ICommonStatistics {
             statistics.dotEvent(eventId);
         }
     }
+
+    @Override
+    public void dotEvent(String eventId, Map<String, String> eventMap) {
+        if (mObserver.isEmpty()) {
+            return;
+        }
+        for (AbsStatistics statistics : mObserver) {
+            if (!statistics.isAllowedUpload()) {
+                return;
+            }
+            statistics.dotEvent(eventId,eventMap);
+        }
+    }
 }

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

@@ -43,11 +43,11 @@ public class CheckHelper {
 //            return false;
 //        }
 //
-//        if (!AppOutUtils.isScreenOn()) {
-//            LogUtil.d(TAG + "（场景检查）手机未亮屏，不能展示");
-//            EventUtils.staDialogFail(DialogFailReason.SCREEN_OFF, actionState, scenes, EventUtils.DIALOG_TYPE_AD);
-//            return false;
-//        }
+        if (actionState == ActionFrom.ACTION_TIMER.getAction() && !AppOutUtils.isScreenOn()) {
+            LogUtil.d(TAG + "（场景检查）手机未亮屏，不能展示");
+            EventUtils.staDialogFail(DialogFailReason.SCREEN_OFF, actionState, scenes, EventUtils.DIALOG_TYPE_AD);
+            return false;
+        }
 
 //        if (isTelephonyCalling()) {
 //            LogUtil.d(TAG + "（场景检查）通话中，不能展示");