添加打点

app/src/main/java/com/mints/fiveworld/ad/express/InSceneExpress.kt

@@ -176,6 +176,10 @@ class InSceneExpress : GMSettingConfigCallback {
          */
         mTTAdNative?.loadAd(adSlotNative, object : GMNativeAdLoadCallback {
             override fun onAdLoadedFail(adError: AdError) {
+                adError?.let {
+                    AdReportManager.lazyRegister(Constant.GRO_MORE_ADTYPE1, AdReportManager.REQUEST_FAIL, it.code!!.toString(), it.message)
+                }
+
                 LogUtil.e(
                     TAG,
                     "gromore应用内非网赚信息流--> 3、load feed ad error : " + adError.code + ", " + adError.message
@@ -228,6 +232,8 @@ class InSceneExpress : GMSettingConfigCallback {
                 AppConfig.isPreExpressAwardActivity = true
 
                 if (ads.size > 0) {
+                    AdReportManager.lazyRegister(Constant.GRO_MORE_ADTYPE1, AdReportManager.REQUEST_SUC)
+
                     frameLayout?.removeAllViews()
                     frameLayout?.addView(createAdView(ads[0]))
 

app/src/main/java/com/mints/fiveworld/ad/full/InSceneFull.java

@@ -129,6 +129,7 @@ public class InSceneFull {
 
             @Override
             public void onFullVideoLoadFail(AdError adError) {
+                AdReportManager.INSTANCE.lazyRegister(Constant.GRO_MORE_ADTYPE4,AdReportManager.REQUEST_FAIL,String.valueOf(adError.code), adError.message);
 
                 LogUtil.d(TAG, "gromore应用内全屏广告--> 3、onFullVideoLoadFail  onError  " + adError.code + adError.message);
                 AdReportManager.INSTANCE.eventFull(
@@ -161,6 +162,8 @@ public class InSceneFull {
 
             @Override
             public void onFullVideoCached() {
+                AdReportManager.INSTANCE.lazyRegister(Constant.GRO_MORE_ADTYPE4,AdReportManager.REQUEST_SUC,"","");
+
                 isLoadSuccess = 2;
                 adLoadTime = System.currentTimeMillis();
 

app/src/main/java/com/mints/fiveworld/ad/wifi/AppOutWifiAdManager.kt

@@ -58,12 +58,11 @@ class AppOutWifiAdManager private constructor() {
         val bundle = Bundle()
         bundle.putInt(TransSceneActivity.TIMING_TYPE, mType)
         IntentUtils.startActivity3(
-            Constant.CARRIER_OUT_TEN_TIME,
-            bundle,
-            BoostFastActivity::class.java,
-            null,
-            true,
-            IntentUtils.TIME_TYPE_ANIM
+                Constant.CARRIER_OUT_TEN_TIME,
+                bundle,
+                BoostFastActivity::class.java,
+                true,
+                IntentUtils.TIME_TYPE_ANIM
         )
     }
 
@@ -105,7 +104,7 @@ class AppOutWifiAdManager private constructor() {
 
     fun tempShowAd(_activity: Activity) {
 
-        // 前台
+        // 前台 正常
         if (ForegroundOrBackground.isForeground2()) {
             UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_TIME10_NEW_CSJ_CACHE_SUC_FOREGROUND.name)
 
@@ -113,17 +112,17 @@ class AppOutWifiAdManager private constructor() {
             return
         }
 
+        // 用户手动 最小化 调用sdk展示广告
         UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_TIME10_NEW_CSJ_CACHE_SUC_BACKGROUND.name)
 
         val bundle = Bundle()
         bundle.putBoolean(TempTransparentActivity.TEMP_TYPE, true)
         IntentUtils.startActivity3(
-            Constant.CARRIER_OUT_TRANSPARENT_ACTIVITY,
-            bundle,
-            TempTransparentActivity::class.java,
-            null,
-            true,
-            IntentUtils.TIME_TYPE_TRANS
+                Constant.CARRIER_OUT_TRANSPARENT_ACTIVITY,
+                bundle,
+                TempTransparentActivity::class.java,
+                true,
+                IntentUtils.TIME_TYPE_HANDS_TRANS
         )
     }
 

app/src/main/java/com/mints/fiveworld/ad/wifi/WifiAdManager.kt

@@ -239,7 +239,6 @@ class WifiAdManager private constructor() {
                 carrier,
                 bundle,
                 TriggerActivity::class.java,
-                null,
                 false,
                 IntentUtils.TIME_TYPE_ANIM
             )
@@ -247,7 +246,6 @@ class WifiAdManager private constructor() {
                 carrier,
                 bundle,
                 ApkActivity::class.java,
-                null,
                 false,
                 IntentUtils.TIME_TYPE_ANIM
             )

app/src/main/java/com/mints/fiveworld/keepalive/AlarmManager.java

@@ -682,7 +682,7 @@ public class AlarmManager implements Handler.Callback {
         Bundle bundle = new Bundle();
         bundle.putInt(TransparentActivity.TIMING_TYPE, currentType++);
         bundle.putString(TransparentActivity.TRANSPARENT_TYPE, TransparentActivity.TRANSPARENT_TYPE_TIMER);
-        IntentUtils.startActivity3(Constant.CARRIER_OUT_TRANSPARENT_ACTIVITY, bundle, TransparentActivity.class, true);
+        IntentUtils.startActivity3(Constant.CARRIER_OUT_TRANSPARENT_ACTIVITY, bundle, TransparentActivity.class, true, IntentUtils.TIME_TYPE_TRANS);
     }
 
     public void setAppOutTimingMinter(int timingMinter) {

app/src/main/java/com/mints/fiveworld/keepalive/OutAppRouter.kt

@@ -61,7 +61,6 @@ object OutAppRouter {
             tempType,
             bundle,
             TransSceneActivity::class.java,
-            null,
             false,
             IntentUtils.TIME_TYPE_TRANS
         )
@@ -174,11 +173,13 @@ object OutAppRouter {
                 TransSceneActivity.TRANSPARENT_TYPE,
                 TransSceneActivity.TRANSPARENT_TYPE_TRIGGER
             )
-            IntentUtils.startActivity3(tempType, bundle, TransSceneActivity::class.java, false)
+            IntentUtils.startActivity3(tempType, bundle, TransSceneActivity::class.java, false,
+                    IntentUtils.SCENE_TYPE_TRANS)
         } else {
             bundle.putString(TriggerActivity.CALL_PHONE_NUM, phone)
             bundle.putInt(TriggerActivity.CALL_PHONE_TIME, time)
-            IntentUtils.startActivity3(tempType, bundle, TriggerActivity::class.java, false)
+            IntentUtils.startActivity3(tempType, bundle, TriggerActivity::class.java, false,
+                    IntentUtils.SCENE_TYPE_ANIM)
         }
     }
 

app/src/main/java/com/mints/fiveworld/manager/wifi/WifiDataManager.kt

@@ -1031,7 +1031,7 @@ object WifiDataManager {
                 }   timing -> 定时次数=${sp.getInt(TIMING, 0)} 定时阈值=" + TIMING_TIMES
         )
 
-        if (isBlackOrClose()) {
+        if (isTimerBlackOrClose()) {
             AdReportManager.eventScene(
                     AdReportManager.INNER_OUT,
                     System.currentTimeMillis(),
@@ -1057,7 +1057,7 @@ object WifiDataManager {
         if (!sp.getBoolean(TIMING_SWITCH, SCENE_SWITCH_DEFAULT)) {
             // 场景开关关闭
             UmengManager.onEventArgs(
-                    AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name,
+                    AdReportManager.EventType.EVENT_TYPE_SCENCE_OUT_TIME10_SWITCH.name,
                     TIMING_SWITCH
             )
             AdReportManager.eventScene(
@@ -1761,6 +1761,34 @@ object WifiDataManager {
         return false
     }
 
+    /**
+     * 定时是否黑名单
+     *
+     * APP_OUT_MAIN_SWITCH=false 表示 关闭总开关
+     * isBlack=true 表示 是反策略黑名单
+     * @return true 不弹 false 弹
+     */
+    fun isTimerBlackOrClose(): Boolean {
+        // 是否是黑名单
+        val isBlack = AntiAuditManager.instance.isBlack()
+
+        if (isBlack) {
+            LogUtil.d(TAG, "是否命中黑名单 -> isBlack=${isBlack}")
+            UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_SCENCE_OUT_TIME10_BLACK.name)
+            return true
+        }
+
+        // 场景总开关
+        val allSwitch = sp.getBoolean(APP_OUT_SWITCH, true)
+
+        if (!allSwitch) {
+            LogUtil.d(TAG, "是否命中黑名单 -> 应用外总开关=${allSwitch} , isBlack=${isBlack}")
+            UmengManager.onEvent(AdReportManager.EventType.EVENT_TYPE_SCENCE_OUT_TIME10_OUTALLSWITCH.name)
+            return true
+        }
+        return false
+    }
+
     /**
      * 弹出成功 次数加一
      *