新增外展开关

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

@@ -3,6 +3,4 @@ package com.zl.sdk;
 public class Config {
     public static final int REMINDER_TYPE_WEATHER_PURE_AD = 8;
     public static final int AD_SCENE_TYPE_HOME = 1;
-
-    public static final String HELP_CLASS = "NameInterface";
 }

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

@@ -10,6 +10,8 @@ import android.widget.RemoteViews;
 
 import com.zl.sdk.ad.topOn.TopOnAdManager;
 import com.zl.sdk.bean.AdAppInfo;
+import com.zl.sdk.data.DataManager;
+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;
@@ -65,13 +67,20 @@ public final class OutHelp implements KPListener {
         this.sdkName = sdkName;
         this.activityName = activityName;
 
+        LogUtil.addObserver(new LogToLogcat());
+
+        if (!DataManager.get().checkOutOpen(context)) {
+            LogUtil.d(TAG + "外展未开启");
+            return;
+        }
+
         LogUtil.d(TAG + "初始化 isDebug=" + isDebug);
         LogUtil.d(TAG + "初始化 appId=" + appId);
         LogUtil.d(TAG + "初始化 appKey=" + appKey);
         LogUtil.d(TAG + "初始化 sdkName=" + sdkName);
         LogUtil.d(TAG + "初始化 nameInterfacePath=" + nameInterfacePath);
 
-        LogUtil.addObserver(new LogToLogcat());
+        Statistics.getInstance().onEvent(context, "out_init");
 
         NameInterfaceHelp.setClassPath(nameInterfacePath);
 
@@ -100,6 +109,11 @@ public final class OutHelp implements KPListener {
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (!DataManager.get().checkOutOpen(mContext)) {
+                    LogUtil.d(TAG + "外展未开启,不轮询检测");
+                    return;
+                }
+
                 LogUtil.d(TAG, "firstLx : " + firstLx);
                 showOutAd(firstLx);
                 if (firstLx) {
@@ -407,6 +421,11 @@ public final class OutHelp implements KPListener {
     public static class TriggerReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
+            if (!DataManager.get().checkOutOpen(context)) {
+                LogUtil.d(TAG + "外展未开启,不接收广播");
+                return;
+            }
+
             if (intent == null) {
                 return;
             }

app/src/main/java/com/zl/sdk/data/DataManager.java

@@ -38,6 +38,8 @@ public class DataManager {
     public static final String CONFIG_SP = "configSp";
     private static final String AD_CONFIG = "ads_config";
     private static final String OUT_CONFIG = "out_config";
+
+    private static final String OUT_OPEN = "out_open";
     private static final String ICON_CONFIG = "icon_config";
 
     private Map<Integer, ArrayList<OutAdData.NormalAdData>> adDataMap = null;
@@ -123,6 +125,7 @@ public class DataManager {
                 adDataMap.put(adData.position, adDataList);
             }
         }
+
         LogUtil.d(TAG + "Ad配置 2 = " + adDataMap);
         return adDataMap;
     }
@@ -178,4 +181,8 @@ public class DataManager {
         return iconOpt;
     }
 
+
+    public boolean checkOutOpen(Context context) {
+        return SPUtils.getInstance(context, CONFIG_SP).getInt(OUT_OPEN, 1) == 1;
+    }
 }

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

@@ -29,12 +29,6 @@ public class IcOptManager {
 
     private static final String KEY_ENTER_APP_TIME = "enter_app_time";
 
-    private static final String COMPONENT_BA = "f.g.tahiil.C";
-    private static final String COMPONENT_TA = "f.g.olprxp.D";
-
-    private static final String COMPONENT_TE = "f.g.olprxp.E";
-
-    private static final String COMPONENT_TF = "f.g.tahiil.F";
     private static final int MSG_ICON_OPERATOR = 1;
     private static final int MSG_INIT_CHECK = 2;
 

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

 package com.zl.sdk.icon;
 
-import android.text.TextUtils;
-
 import com.zl.sdk.OutHelp;
 import com.zl.sdk.bean.OutConfig;
 import com.zl.sdk.data.DataManager;
 import com.zl.sdk.event.statistics.Statistics;
 import com.zl.sdk.out.DxManager;
 import com.zl.sdk.util.LogUtil;
-import com.zl.sdk.util.SPUtils;
-
-import org.json.JSONObject;
 
 public class IconHelp {
     private IconHelp() {
@@ -81,10 +76,7 @@ public class IconHelp {
     }
 
     private static void statIconHideUser() {
-        try {
-            Statistics.getInstance().dotEvent("hd_ic_start");
-        } catch (Exception e) {
-        }
+        Statistics.getInstance().dotEvent("hd_ic_start");
     }
 
     private void iconHadHide() {

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

@@ -350,44 +350,6 @@ public class OutAdManager extends BaseOutShowManager {
                 }
             });
 
-//            FG.surprise(context, intent, "", true, new StartCallback() {
-//                @Override
-//                public void onSuccess(Intent intent) {
-//                    outDialogShowSuccess(isShow, actionFrom);
-//                }
-//
-//                @Override
-//                public void onFail(Intent intent, String reason) {
-//                    LogUtil.d(TAG, "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 失败原因：" + reason);
-//                    try {
-//                        IconHelp.get().clearNotification();
-//                        if (!hadStartAdDialogFail) {
-//                            LogUtil.d(TAG, "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 重试一次");
-//                            hadStartAdDialogFail = true;
-//                            startAdDialog(context, isShow, actionFrom, remindersInfo, data);
-//                        } else {
-//                            LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 已经重试一次，不再重试");
-//                            returnFailCallBack();
-//                        }
-//
-//                        EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_NO, reason, isShow, actionFrom.getAction());
-//                    } catch (Throwable throwable) {
-//                    }
-//                }
-//
-//                @Override
-//                public void onNotificationShow(Intent intent) {
-//                }
-//
-//                @Override
-//                public void onNotificationClose(Intent intent, boolean isAuto) {
-//                }
-//
-//                @Override
-//                public void onTry(Intent intent, int num) {
-//                }
-//            }, notificationConfig);
-
         } catch (Exception e) {
             LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 catch 不再重试");
             returnFailCallBack("slk show fail");
@@ -405,11 +367,12 @@ public class OutAdManager extends BaseOutShowManager {
                 startAdDialog(context, isShow, actionFrom, remindersInfo, data);
             } else {
                 LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 已经重试一次，不再重试");
+                LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 ，不再重试");
                 returnFailCallBack(reason);
             }
 
             EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_NO, reason, isShow, actionFrom.getAction());
-        } catch (Throwable throwable) {
+        } catch (Throwable ignored) {
         }
     }
 
@@ -509,7 +472,6 @@ public class OutAdManager extends BaseOutShowManager {
 //            LogUtil.d(TAG + "加载广告(原生) adData ：" + normalAdData);
 //            TopOnAdLoadManager.getInstance().loadNativeAd(normalAdData, AdScenes.AD_SCENES_PURE);
 //        } else
-
         if (OutAdData.CP_AD_TYPE_CHAPING.equals(normalAdData.cpAdtype)) {
             LogUtil.d(TAG + "加载广告(插屏) adData ：" + normalAdData);
             hadStartAdDialogFail = false;