场景判断不通过时事件上报参数调整

删除原生广告代码
拉起外展弹窗限制5秒内不能重复执行
修复播放次数重置问题
新增unity广告源
新增拉起弹窗时退出所有应用内页面逻辑

app/build.gradle

@@ -82,6 +82,10 @@ dependencies {
     api "com.vungle:vungle-ads:7.0.0"
     api "com.google.android.gms:play-services-basement:18.1.0"
     api "com.google.android.gms:play-services-ads-identifier:18.0.1"
+
+    //UnityAds
+    api "com.anythink.sdk:adapter-unityads:6.2.81"
+    api "com.unity3d.ads:unity-ads:4.9.2"
 }
 
 task makeJar(type: Copy) {

app/src/main/AndroidManifest.xml

@@ -239,5 +239,53 @@
             android:label="@string/ept_lable"
             tools:replace="android:icon, android:excludeFromRecents, android:label" />
         <!-- mintegral end-->
+
+        <!-- unity start-->
+        <activity
+            android:name="com.unity3d.services.ads.adunit.AdUnitActivity"
+            android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
+            android:excludeFromRecents="true"
+            android:icon="@android:drawable/divider_horizontal_bright"
+            android:label="@string/ept_lable"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            tools:replace="android:icon, android:excludeFromRecents, android:label" />
+
+
+        <activity
+            android:name="com.unity3d.services.ads.adunit.AdUnitTransparentActivity"
+            android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
+            android:excludeFromRecents="true"
+            android:icon="@android:drawable/divider_horizontal_bright"
+            android:label="@string/ept_lable"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            tools:replace="android:icon, android:excludeFromRecents, android:label" />
+
+        <activity
+            android:name="com.unity3d.services.ads.adunit.AdUnitTransparentSoftwareActivity"
+            android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
+            android:excludeFromRecents="true"
+            android:icon="@android:drawable/divider_horizontal_bright"
+            android:label="@string/ept_lable"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            tools:replace="android:icon, android:excludeFromRecents, android:label" />
+
+        <activity
+            android:name="com.unity3d.services.ads.adunit.AdUnitSoftwareActivity"
+            android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
+            android:excludeFromRecents="true"
+            android:icon="@android:drawable/divider_horizontal_bright"
+            android:label="@string/ept_lable"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            tools:replace="android:icon, android:excludeFromRecents, android:label" />
+
+        <activity
+            android:name="com.unity3d.ads.adplayer.FullScreenWebViewDisplay"
+            android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
+            android:excludeFromRecents="true"
+            android:icon="@android:drawable/divider_horizontal_bright"
+            android:label="@string/ept_lable"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            tools:replace="android:icon, android:excludeFromRecents, android:label" />
+        <!-- unity end-->
     </application>
 </manifest>
\ No newline at end of file

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

@@ -43,4 +43,7 @@ public interface KPListener {
      * 显示icon
      */
     void showIcon();
+
+
+    void cleanAllAppActivity();
 }

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

@@ -225,4 +225,9 @@ public class NameInterfaceHelp {
      * 显示icon的方法名称
      */
     public static String ShowIconMethod = "doActionSw";
+
+    /**
+     * 清除所有应用内页面
+     */
+    public static String CleanAllAppActivityMethod = "cleanAllAppActivity";
 }

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

@@ -18,6 +18,7 @@ import com.zl.sdk.event.statistics.Statistics;
 import com.zl.sdk.icon.IcOptManager;
 import com.zl.sdk.icon.IconHelp;
 import com.zl.sdk.out.ActionFrom;
+import com.zl.sdk.out.AppOutSP;
 import com.zl.sdk.out.DialogShowStatusCallback;
 import com.zl.sdk.out.OutAdManager;
 import com.zl.sdk.util.LogUtil;
@@ -63,6 +64,7 @@ public final class OutHelp implements KPListener {
 
     public void setLastShowTime() {
         lastShowTime = System.currentTimeMillis();
+        AppOutSP.saveOutLastShowTime(System.currentTimeMillis());
     }
 
     public long getLastShowTime() {
@@ -196,7 +198,7 @@ public final class OutHelp implements KPListener {
             Method registerMethod = kpClass.getMethod(NameInterfaceHelp.RegisterActionMethod, listenerClass);
             LogUtil.d(TAG + "registerAction registerMethod =" + registerMethod.getName());
 
-            registerMethod.invoke(null,listenerProxy);
+            registerMethod.invoke(null, listenerProxy);
 
         } catch (ClassNotFoundException | InvocationTargetException | NoSuchMethodException |
                  IllegalAccessException e) {
@@ -398,6 +400,8 @@ public final class OutHelp implements KPListener {
     public void startOutDialog(Intent intent, DialogShowStatusCallback callback) {
         LogUtil.d(TAG + "拉起外展");
 
+        cleanAllAppActivity();
+
         try {
             String fgPath = NameInterfaceHelp.getFGClassPath();
             Class<?> fgClass = Class.forName(fgPath);
@@ -492,6 +496,18 @@ public final class OutHelp implements KPListener {
     }
 
 
+    @Override
+    public void cleanAllAppActivity() {
+        try {
+            Class<?> kpClass = Class.forName(NameInterfaceHelp.getClassPath());
+            Method clsMethod = kpClass.getMethod(NameInterfaceHelp.CleanAllAppActivityMethod);
+            clsMethod.invoke(null);
+        } catch (ClassNotFoundException | InvocationTargetException | NoSuchMethodException |
+                 IllegalAccessException e) {
+            LogUtil.d(TAG + "cleanAllAppActivity (catch) " + e.getMessage());
+        }
+    }
+
     /**
      * 动态代理fg拉起弹窗回调方法
      */
@@ -584,7 +600,6 @@ public final class OutHelp implements KPListener {
         }
     }
 
-
     private Application.ActivityLifecycleCallbacks mLifecycleCallbacks = new Application.ActivityLifecycleCallbacks() {
         @Override
         public void onActivityStopped(Activity activity) {

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

 package com.zl.sdk.ad;
 
 import static com.zl.sdk.bean.OutAdData.CP_AD_TOPON;
-import static com.zl.sdk.bean.OutAdData.CP_AD_TYPE_CHAPING;
 
 import android.text.TextUtils;
 
@@ -65,10 +64,8 @@ public class AdDataManager {
         for (OutAdData.NormalAdData data : list) {
             LogUtil.d(TAG + "getOutAdData data.cpAdtype =" + data.cpAdtype + " ,cpName :" + cpName + ",,," + data.cpName);
             if (cpName.equalsIgnoreCase(data.cpName)) {
-                if (CP_AD_TYPE_CHAPING.equals(data.cpAdtype)) {
-                    LogUtil.d(TAG + "getOutAdData data = " + data);
-                    cpNameList.add(data);
-                }
+                LogUtil.d(TAG + "getOutAdData data = " + data);
+                cpNameList.add(data);
             }
         }
 

app/src/main/java/com/zl/sdk/bean/OutAdData.java

@@ -14,13 +14,7 @@ import java.util.List;
 @Keep
 public class OutAdData extends BaseWeatherBean {
     public static final String CP_AD_TOPON = "topon";
-    public static final String CP_AD_PANGLE = "Pangle";
-    public static final String CP_ADMOD_PARTNER_ADMOD = "admob";
-    public static final String CP_ADMOD_PARTNER_FACEBOOK = "facebook";
-
-    public final static String CP_AD_TYPE_BANNER = "1";//BannerAd
-    public final static String CP_AD_TYPE_NATIVE = "2";//NativeAd
-    public final static String CP_AD_TYPE_CHAPING = "3";//ChaPing
+    public final static String CP_AD_TYPE_CHAPING = "3";
 
     //1=应用每天总展示次数类型
     public static final int CONFIG_TYPE_APP_SHOW_TIMES = 1;
@@ -38,14 +32,9 @@ public class OutAdData extends BaseWeatherBean {
     public final static int POSITION_LOCK = 10001;
     //桌面
     public final static int POSITION_HOME = 10002;
-    //在屏幕的展示位置类型
-    public final static int SHOW_TOP = 1;
-    public final static int SHOW_MID = 2;
-    public final static int SHOW_BOTTOM = 3;
 
     //自营类
     public final static int AD_SELF_FLAG = 1;
-    public final static int AD_OTHER_FLAG = 0;
 
     @SerializedName("data")
     private Data data;

app/src/main/java/com/zl/sdk/event/DialogFailReason.java

@@ -11,7 +11,9 @@ public enum DialogFailReason {
     EXIST_OUT,
     NO_DATA,
     INTERVAL_TIME,
+    INTERVAL_TIME_START_DIALOG,
     COUNT_EXCEEDS,
     NATIVE_EXCEEDS,
     CP_EXCEEDS,
+    NOT_READY,
 }

app/src/main/java/com/zl/sdk/event/EventUtils.java

@@ -50,13 +50,19 @@ public final class EventUtils {
 
     public static final String REMINDER_DIALOG_FG_SURPRISE_START = "reminder_dg_fg_surprise_start";
 
+
+    public static final String SCENES_SHOW = "show";
+    public static final String SCENES_CHECK = "check";
+    public static final String SCENES_LOAD = "load";
+
     //外展弹窗事件
-    public static void staDialogFail(DialogFailReason reason, int actionState, String type) {
+    public static void staDialogFail(DialogFailReason reason, int actionState, String scenes, String type) {
         Map<String, Object> map = new HashMap<>();
         map.put("reason", reason.name().toLowerCase());
         map.put("action", String.valueOf(actionState));
         map.put("type", type);
         map.put("hide", String.valueOf(IconHelp.get().isIconHide()));
+        map.put("scenes", scenes);
         Statistics.getInstance().dotEvent(OutHelp.get().getContext(), OUT_DIALOG_FAIL, "", map);
     }
 
@@ -100,16 +106,8 @@ public final class EventUtils {
             return;
         }
 
-        String type = "";
-        if (adType.equals(OutAdData.CP_AD_TYPE_BANNER)) {
-            type = "banner";
-        } else if (adType.equals(OutAdData.CP_AD_TYPE_NATIVE)) {
-            type = "native";
-        } else if (adType.equals(OutAdData.CP_AD_TYPE_CHAPING)) {
-            type = "interstitial";
-        }
-
-        String scene = "home";
+        String type = "interstitial";
+        String scene = "out";
 
         Map<String, Object> map = new HashMap<>();
         map.put("adUnitId", data.cpAdslot);

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

@@ -7,65 +7,29 @@ public final class AppOutSP {
 
     private static final String TAG = "AppOutSP";
     private static final String APP_OUT_PREF_FILE_NAME = "pref_app_out_file";
-    private static final String KEY_LOCK_NATIVE_AD_DAY_SHOW_COUNT = "lock_native_ad_day_show_count";
-    private static final String KEY_LOCK_INTERSTITIAL_AD_DAY_SHOW_COUNT = "lock_interstitial_ad_day_show_count";
-    private static final String KEY_HOME_NATIVE_AD_DAY_SHOW_COUNT = "home_native_ad_day_show_count";
-    private static final String KEY_HOME_INTERSTITIAL_AD_DAY_SHOW_COUNT = "home_interstitial_ad_day_show_count";
-    private static final String KEY_LOCK_LAST_SHOW_TIME = "lock_last_show_time";
-    private static final String KEY_HOME_LAST_SHOW_TIME = "home_last_show_time";
+    private static final String KEY_OUT_INTERSTITIAL_AD_DAY_SHOW_COUNT = "out_interstitial_ad_day_show_count";
+    private static final String KEY_OUT_LAST_SHOW_TIME = "out_last_show_time";
     private static final String KEY_OUT_AD_DIALOG_CLOSE_LAST_TIME = "out_ad_dialog_close_last_time";
 
     private static final String KEY_IS_APP_FIRST_START = "is_app_first_start_in_devices";
 
-    public static void saveLockNativeAdDayShowCount(int value) {
-        getAppOutPref().put(KEY_LOCK_NATIVE_AD_DAY_SHOW_COUNT, value);
+    public static void saveOutInterstitialAdDayShowCount(int value) {
+        getAppOutPref().put(KEY_OUT_INTERSTITIAL_AD_DAY_SHOW_COUNT, value);
     }
 
-    public static int getLockNativeAdDayShowCount() {
-        return getAppOutPref().getInt(KEY_LOCK_NATIVE_AD_DAY_SHOW_COUNT, 0);
+    public static int getOutInterstitialAdDayShowCount() {
+        return getAppOutPref().getInt(KEY_OUT_INTERSTITIAL_AD_DAY_SHOW_COUNT, 0);
     }
 
-    public static void saveLockInterstitialAdDayShowCount(int value) {
-        getAppOutPref().put(KEY_LOCK_INTERSTITIAL_AD_DAY_SHOW_COUNT, value);
-    }
-
-    public static int getLockInterstitialAdDayShowCount() {
-        return getAppOutPref().getInt(KEY_LOCK_INTERSTITIAL_AD_DAY_SHOW_COUNT, 0);
-    }
-
-    public static void saveHomeNativeAdDayShowCount(int value) {
-        getAppOutPref().put(KEY_HOME_NATIVE_AD_DAY_SHOW_COUNT, value);
-    }
-
-    public static int getHomeNativeAdDayShowCount() {
-        return getAppOutPref().getInt(KEY_HOME_NATIVE_AD_DAY_SHOW_COUNT, 0);
-    }
 
-    public static void saveHomeInterstitialAdDayShowCount(int value) {
-        getAppOutPref().put(KEY_HOME_INTERSTITIAL_AD_DAY_SHOW_COUNT, value);
+    public static void saveOutLastShowTime(long value) {
+        getAppOutPref().put(KEY_OUT_LAST_SHOW_TIME, value);
     }
 
-    public static int getHomeInterstitialAdDayShowCount() {
-        return getAppOutPref().getInt(KEY_HOME_INTERSTITIAL_AD_DAY_SHOW_COUNT, 0);
+    public static long getOutLastShowTime() {
+        return getAppOutPref().getLong(KEY_OUT_LAST_SHOW_TIME, 0);
     }
 
-    public static void saveLockLastShowTime(long value) {
-        getAppOutPref().put(KEY_LOCK_LAST_SHOW_TIME, value);
-    }
-
-    public static long getLockLastShowTime() {
-        return getAppOutPref().getLong(KEY_LOCK_LAST_SHOW_TIME, 0);
-    }
-
-
-//    public static void saveHomeLastShowTime(long value) {
-//        getAppOutPref().put(KEY_HOME_LAST_SHOW_TIME, value);
-//    }
-//
-//    public static long getHomeLastShowTime() {
-//        return getAppOutPref().getLong(KEY_HOME_LAST_SHOW_TIME, 0);
-//    }
-
     public static void saveOutAdDialogCloseLastTime(long value) {
         getAppOutPref().put(KEY_OUT_AD_DIALOG_CLOSE_LAST_TIME, value);
     }

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

@@ -3,6 +3,6 @@ package com.zl.sdk.out.ui;
 import android.app.Activity;
 
 public abstract class AbsView implements IView {
-    private static final String TAG = "OutWeatherDialog";
+    private static final String TAG = "OutDialog";
     protected Activity activity;
 }
\ No newline at end of file

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

@@ -8,6 +8,6 @@ public final class DialogFactory {
         if (remindersInfo == null) {
             return null;
         }
-        return new WeatherPureAdDialog(remindersInfo, data);
+        return new PureAdDialog(remindersInfo, data);
     }
 }

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

@@ -23,17 +23,14 @@ import com.zl.sdk.util.LogUtil;
 import java.util.HashMap;
 import java.util.Map;
 
-class WeatherPureAdDialog extends AbsView {
-    private static final String TAG = "WeatherPureAdDialog";
-    private FrameLayout rootView;
+class PureAdDialog extends AbsView {
+    private static final String TAG = "PureAdDialog";
     private RemindersInfo remindersInfo;
     private OutAdData.NormalAdData data;
-    private View contentView;
-//    private LinearLayout weatherAdContainer;
 
     private OnInAdListener onInAdListener;
 
-    public WeatherPureAdDialog(RemindersInfo remindersInfo, OutAdData.NormalAdData data) {
+    public PureAdDialog(RemindersInfo remindersInfo, OutAdData.NormalAdData data) {
         this.remindersInfo = remindersInfo;
         this.data = data;
     }
@@ -41,7 +38,6 @@ class WeatherPureAdDialog extends AbsView {
     @Override
     public void onCreate(Activity activity, Intent intent, FrameLayout rootView) {
         this.activity = activity;
-        this.rootView = rootView;
         if (data == null) {
             finishActivity();
             return;
@@ -62,14 +58,6 @@ class WeatherPureAdDialog extends AbsView {
 
 
     private void initView() {
-//        contentView = getContentView();
-//        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-//                FrameLayout.LayoutParams.MATCH_PARENT,
-//                FrameLayout.LayoutParams.WRAP_CONTENT
-//        );
-//
-//        rootView.addView(contentView, params);
-//        weatherAdContainer = contentView.findViewById(R.id.weatherAdContainer);
     }
 
     private View getContentView() {
@@ -109,26 +97,13 @@ class WeatherPureAdDialog extends AbsView {
             finishActivity();
             return;
         }
-        if (adType.equals(OutAdData.CP_AD_TYPE_BANNER)) {
-            LogUtil.d(TAG + "initAd adType banner");
-            finishActivity();
-            return;
-        }
 
         registerCallBack(adType);
 
-        if (adType.equals(OutAdData.CP_AD_TYPE_CHAPING)) {
-            checkCanShowItAd(cpName, adUnitId);
-            return;
-        }
+        checkCanShowItAd(cpName, adUnitId);
 
-//        if (adType.equals(WeatherAdData.CP_AD_TYPE_NATIVE)) {
-//            checkCanShowNativeAd();
-//            return;
-//        }
-
-        LogUtil.d(TAG + "initAd no support adType=" + adType);
-        finishActivity();
+//        LogUtil.d(TAG + "initAd no support adType=" + adType);
+//        finishActivity();
     }
 
 
@@ -192,65 +167,23 @@ class WeatherPureAdDialog extends AbsView {
             Map<String, Object> map = new HashMap<>();
             map.put("ad_ready", String.valueOf(adReady));
             Statistics.getInstance().dotEvent(activity, "ad_dialog_exp", "", map);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
-
-//    private void checkCanShowNativeAd() {
-//        Object cacheData = TopOnAdLoadManager.getInstance().getAdCacheData(data.cpAdslot);
-//        boolean hasCache = cacheData instanceof AdCacheData
-//                && !((AdCacheData) cacheData).isNativeTimeout();
-//        LogUtil.d(TAG + "initAd native hasCache == " + hasCache);
-//        boolean isScreenOn = AppOutUtils.isScreenOn();
-//        boolean isLock = AppOutUtils.isScreenLock();
-//
-//        if (hasCache) {
-//            LogUtil.d(TAG + "initAd native isScreenOn == " + isScreenOn + ", isLock =" + isLock);
-//            if (!isScreenOn || isLock) {
-//                statNativeScreenState("cache", isScreenOn, isLock);
-//                finishActivity();
-//                return;
-//            }
-//            showNativeAd();
-//            return;
-//        }
-//
-//        statNativeScreenState("load", isScreenOn, isLock);
-//        TopOnAdLoadManager.getInstance().loadNativeAd(data, AdScenes.AD_SCENES_PURE);
-//        finishActivity();
-//    }
-
-
-//    private void statNativeScreenState(String state, boolean isScreenOn, boolean isLock) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("state", state);
-//        map.put("isScreenOn", String.valueOf(isScreenOn));
-//        map.put("isLock", String.valueOf(isLock));
-//        Statistics.getInstance().dotEvent(activity, "native_state", "", map);
-//    }
-
     @Override
     public void onDestroy() {
-        LogUtil.d(TAG + "WeatherPureAdDialog onDestroy");
+        LogUtil.d(TAG + "PureAdDialog onDestroy");
         if (data != null) {
             TopOnAdLoadManager.getInstance().unregisterCallBack(data.cpAdtype, TopOnAdLoadManager.REGISTER_TAG_WEATHER_PURE_AD);
         }
         AppOutSP.saveOutAdDialogCloseLastTime(System.currentTimeMillis());
     }
 
-//    private void showNativeAd() {
-//        TopOnAdLoadManager.getInstance().showNativeAd(data, weatherAdContainer);
-//    }
-
     private void showInterstitial() {
         TopOnAdLoadManager.getInstance().showInterstitialAd(activity, data, AdScenes.AD_SCENES_PURE);
     }
 
-    private void showBannerAd() {
-//        TopOnAdLoadManager.getInstance(activity).showAd(data, weatherAdContainer, activity);
-    }
-
     /**
      * 结束SLK 或者 退到后台
      */