更新-1

app/build.gradle

@@ -33,11 +33,13 @@ dependencies {
     implementation 'com.google.android.material:material:1.10.0'
     testImplementation 'junit:junit:4.13.2'
 
-    implementation 'com.global.wt:l1b2t123457j1:v28.5.1'
+//    implementation 'com.global.wt:l1b2t123457j1:v28.5.1'
 
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
     implementation 'com.google.firebase:firebase-analytics'
 
+    implementation 'com.blankj:utilcodex:1.31.1'
+
     //Androidx
     api "androidx.appcompat:appcompat:1.1.0"
     api "androidx.browser:browser:1.4.0"

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

+package com.zl.sdk;
+
+import android.content.Intent;
+
+import com.zl.sdk.out.DialogShowStatusCallback;
+
+public interface KPListener {
+    /**
+     * 是否初始化了保活
+     *
+     * @return
+     */
+    boolean isInit();
+
+    /**
+     * icon状态
+     *
+     * @return
+     */
+    boolean iconShow();
+
+    /**
+     * 应用是否运行在前台
+     *
+     * @return
+     */
+    boolean isAppForeground();
+
+    /**
+     * 拉起外展弹窗
+     *
+     * @param intent
+     * @param callback
+     */
+    void startOutDialog(Intent intent,DialogShowStatusCallback callback);
+}

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

 package com.zl.sdk;
 
 import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
 import androidx.annotation.Keep;
 
-import com.zl.sdk.ad.AdDataManager;
-import com.zl.sdk.bean.AdAppInfo;
+import com.blankj.utilcode.util.AppUtils;
 import com.zl.sdk.ad.topOn.TopOnAdManager;
-import com.zl.sdk.bean.WeatherAdData;
-import com.zl.sdk.icon.IcOptManager;
+import com.zl.sdk.bean.AdAppInfo;
 import com.zl.sdk.icon.IconHelp;
-import com.zl.sdk.icon.IconStateCallBack;
-import com.zl.sdk.keeplive.KplvManager;
 import com.zl.sdk.out.ActionFrom;
 import com.zl.sdk.out.DialogShowStatusCallback;
 import com.zl.sdk.out.OutAdManager;
+import com.zl.sdk.util.LogUtil;
 
-import java.util.ArrayList;
-import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 
 @Keep
-public final class OutHelp {
+public final class OutHelp implements KPListener {
     private OutHelp() {
     }
 
@@ -35,11 +33,16 @@ public final class OutHelp {
         return OutHelp.Holder.INSTANCE;
     }
 
+    private static final String TAG = "OutShow OutHelp ---> ";
     private Context mContext = null;
     private boolean isDebug = false;
     private Intent intent = null;
-    //icon状态返回
-    private IconStateCallBack iconStateCallBack = null;
+
+    private KPListener kpListener = null;
+
+    //是否第一次轮询
+    private boolean firstLx = true;
+
     //外展弹窗拉起回调
     private DialogShowStatusCallback dialogShowStatusCallback = null;
 
@@ -47,89 +50,119 @@ public final class OutHelp {
      * 初始化
      *
      * @param context 上下文
-     * @param appInfo topon应用信息
      * @param isDebug 开启调试
      */
-    public void init(Context context, AdAppInfo appInfo, boolean isDebug) {
+    public void init(Context context, boolean isDebug) {
         this.mContext = context;
         this.isDebug = isDebug;
 
-        //初始化保活
-        KplvManager.getInstance().attachBase(context);
-
+        AdAppInfo appInfo = new AdAppInfo("", "");
         //初始化广告SDK
         TopOnAdManager.get().initSDK(context, appInfo);
 
         //Icon初始化
-        IcOptManager.getInstance().init(context);
+//        IcOptManager.getInstance().init(context);
         IconHelp.get().init(context);
+
+        initTriggerConditions();
     }
 
-    /**
-     * 监听icon状态
-     */
-    public void setIconStateCallBack(IconStateCallBack iconStateCallBack) {
-        this.iconStateCallBack = iconStateCallBack;
+    private void initTriggerConditions() {
+        initTimer();
+        initReciver();
+    }
+
+    private void initReciver() {
+
+    }
+
+
+    private void initTimer() {
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                showOutAd(firstLx);
+            }
+        }, 60 * 1000);
+    }
+
+
+    @Override
+    public boolean isInit() {
+        if (kpListener != null) {
+            return kpListener.isInit();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean iconShow() {
+        if (kpListener != null) {
+            return kpListener.iconShow();
+        }
+        return true;
     }
 
+    @Override
+    public boolean isAppForeground() {
+        if (kpListener != null) {
+            return kpListener.isAppForeground();
+        }
+        return AppUtils.isAppForeground();
+    }
+
+    @Override
+    public void startOutDialog(Intent intent, DialogShowStatusCallback callback) {
+        if (kpListener != null) {
+            kpListener.startOutDialog(intent, callback);
+        }
+    }
 
     /**
      * 进入外展广告播放逻辑（解锁）
      *
-     * @param targetClass 目标页
      * @param actionFrom 动作来源
      * @param callback   结果回调
      */
-    public void showOutAd(Class targetClass, ActionFrom actionFrom, DialogShowStatusCallback callback) {
-        intent = new Intent(mContext, targetClass);
+    public void showOutAd(ActionFrom actionFrom, DialogShowStatusCallback callback) {
+        try {
+            intent = new Intent(mContext, Class.forName(targetClass));
             dialogShowStatusCallback = callback;
             OutAdManager.get().startShowOutAd(actionFrom);
+        } catch (ClassNotFoundException e) {
+            LogUtil.e("showOutAd", "目标页面未找到");
+        }
     }
 
 
     /**
      * 进入外展广告播放逻辑 （轮询）
      *
-     * @param targetClass 目标页
      * @param isFirst  是否第一次检查
      * @param callback 结果回调
      */
-    public void showOutAd(Class targetClass, boolean isFirst, DialogShowStatusCallback callback) {
-        intent = new Intent(mContext, targetClass);
+    private void showOutAd(boolean isFirst, DialogShowStatusCallback callback) {
+        try {
+            intent = new Intent(mContext, Class.forName(targetClass));
             dialogShowStatusCallback = callback;
             OutAdManager.get().checkShowOutAd(isFirst);
+        } catch (ClassNotFoundException e) {
+            LogUtil.e("showOutAd", "目标页面未找到");
         }
-
-
-    /**
-     * 隐藏icon
-     *
-     * @param componentName 启动页完整路径
-     */
-    public void hideIcon(String componentName) {
-        KplvManager.getInstance().hideIcon(mContext, componentName);
     }
 
-    /**
-     * 显示icon
-     *
-     * @param componentName 启动页完整路径
-     */
-    public void showIcon(String componentName) {
-        KplvManager.getInstance().showIcon(mContext, componentName);
-    }
 
-
-    /**
-     * 设置广告数据
-     *
-     * @param map         线上配置广告信息
-     * @param defaultData 本地默认广告信息
-     */
-    public void setAdDataMap(Map<Integer, ArrayList<WeatherAdData.NormalAdData>> map, WeatherAdData.NormalAdData defaultData) {
-        AdDataManager.get().setAdDataMap(map);
-        AdDataManager.get().setDefaultData(defaultData);
-    }
+//    /**
+//     * 设置广告数据
+//     *
+//     * @param map         线上配置广告信息
+//     * @param defaultData 本地默认广告信息
+//     */
+//    public void setAdDataMap(Map<Integer, ArrayList<WeatherAdData.NormalAdData>> map, WeatherAdData.NormalAdData defaultData) {
+//        AdDataManager.get().setAdDataMap(map);
+//        AdDataManager.get().setDefaultData(defaultData);
+//    }
 
 
     public Context getContext() {
@@ -144,10 +177,6 @@ public final class OutHelp {
         return isDebug;
     }
 
-    public IconStateCallBack getIconStateCallBack() {
-        return iconStateCallBack;
-    }
-
     public DialogShowStatusCallback getDialogShowStatusCallback() {
         return dialogShowStatusCallback;
     }
@@ -155,4 +184,36 @@ public final class OutHelp {
     public void cleanDialogCallBack() {
         dialogShowStatusCallback = null;
     }
+
+
+    public static class TriggerReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null) {
+                return;
+            }
+            String action = intent.getAction();
+            LogUtil.d(TAG, "onReceive action =" + action);
+            switch (action) {
+                case Intent.ACTION_USER_PRESENT: {
+                    LogUtil.d(TAG, "onReceive ACTION_USER_PRESENT");
+                    LogUtil.d("OutShow ===>>> 解锁");
+                    OutAdManager.get().showOutAd("", ActionFrom.ACTION_USER_PRESENT, null);
+                    break;
+                }
+                case Intent.ACTION_SCREEN_ON: {
+                    LogUtil.d(TAG, "onReceive ACTION_SCREEN_ON");
+                    LogUtil.d("OutShow ===>>> 亮屏");
+                    break;
+                }
+                case Intent.ACTION_CLOSE_SYSTEM_DIALOGS: {
+                    LogUtil.d(TAG, "onReceive ACTION_CLOSE_SYSTEM_DIALOGS =" + intent.getStringExtra("reason"));
+                    LogUtil.d("OutShow ===>>> 桌面");
+                    break;
+                }
+                default: {
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

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

@@ -7,7 +7,6 @@ import android.util.Log;
 import com.zl.sdk.OutHelp;
 import com.zl.sdk.event.statistics.Statistics;
 import com.zl.sdk.icon.IconHelp;
-import com.zl.sdk.keeplive.KplvManager;
 import com.zl.sdk.util.LogUtil;
 
 import org.json.JSONException;
@@ -182,7 +181,7 @@ public final class EventUtils {
     public static void statTimeTriggle() {
         Map<String, Object> map = new HashMap<>();
         map.put("type", String.valueOf(IconHelp.get().isIconHided()));
-        map.put("init", String.valueOf(KplvManager.getInstance().isInit()));
+//        map.put("init", String.valueOf(KplvManager.getInstance().isInit()));
         Statistics.getInstance().dotEvent(OutHelp.get().getContext(), "time_trig", "", map);
     }
 

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

@@ -53,13 +53,9 @@ public class IconHelp {
 
 
     public void init(Context context) {
-        iconHide = IcOptManager.getInstance().isIconHided(context);
+        iconHide = !OutHelp.get().iconShow();
         LogUtil.d(TAG + "检查icon状态： iconHide=" + iconHide);
 
-        if (OutHelp.get().getIconStateCallBack() != null) {
-            OutHelp.get().getIconStateCallBack().iconState(!iconHide);
-        }
-
         if (iconHide) {
             iconHadHide();
         }
@@ -74,10 +70,6 @@ public class IconHelp {
         iconHide = isHide;
         LogUtil.d(TAG + "检查icon状态：设置为是否可见 iconHide=" + iconHide);
 
-        if (OutHelp.get().getIconStateCallBack() != null) {
-            OutHelp.get().getIconStateCallBack().iconState(!iconHide);
-        }
-
         if (iconHide) {
             iconHadHide();
         }

app/src/main/java/com/zl/sdk/keeplive/KplvManager.java

-package com.zl.sdk.keeplive;
-
-import android.annotation.SuppressLint;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.text.TextUtils;
-
-import com.zl.sdk.OutHelp;
-import com.zl.sdk.event.EventUtils;
-import com.zl.sdk.event.statistics.Statistics;
-import com.zl.sdk.util.LogUtil;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import f.g.ajglwh.fdauef.cpaukw.FG;
-import f.g.ajglwh.fdauef.cpaukw.FgListener;
-
-public class KplvManager {
-
-    private static final String TAG = "FG_LOG";
-
-    public static final String LAUNCHER_ACTIVITY_NAME = "com.global.weather.mvp.ui.view.launch.WelcomeActivity";
-
-    private volatile boolean isInit = false;
-    private volatile boolean isAttach = false;
-    private Context context;
-
-    @SuppressLint("StaticFieldLeak")
-    private static KplvManager kplvManager;
-
-    private KplvManager() {
-    }
-
-    public static synchronized KplvManager getInstance() {
-        if (kplvManager == null) {
-            kplvManager = new KplvManager();
-        }
-        return kplvManager;
-    }
-
-    public void attachBase(Context base) {
-        if (isAttach) {
-            return;
-        }
-        isAttach = true;
-        try {
-            FG.setUse_notification(false);
-            FG.setUse_service(false);
-            FG.setUse_domaemon(false);
-            if (!FG.isMainProcess(base)) {
-                FG.attach(base);
-            }
-        } catch (Throwable throwable) {
-        }
-    }
-
-    public void checkInit(Context context, InitCallbak initCallbak) {
-        if (this.context == null) {
-            this.context = context.getApplicationContext();
-        }
-        checkNaturalUser(initCallbak);
-    }
-
-    private void statUsr(String state, String result, String sourceString) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("state", state);
-        if (!TextUtils.isEmpty(result)) {
-            params.put("result", result);
-        }
-        if (!TextUtils.isEmpty(sourceString)) {
-            params.put("source", sourceString);
-        }
-
-        Statistics.getInstance().dotEvent(OutHelp.get().getContext(), "usr_check", "", params);
-    }
-
-    private void lvStat() {
-        FG.setFGListener(new FgListener() {
-            @Override
-            public void onTrack(String eventName, Map<String, Object> map) {
-                LogUtil.d("==FG==", "onTrack: " + eventName + " " + map.toString());
-                try {
-                    Statistics.getInstance().dotEvent(OutHelp.get().getContext(), eventName, "", map);
-                } catch (Exception e) {
-                }
-            }
-
-            @Override
-            public void reportException(String message, Throwable e) {
-            }
-
-            @Override
-            public void onBroadcastReceivedEvent(Intent intent) {
-            }
-
-            @Override
-            public void onTiming() {
-            }
-        });
-    }
-
-    public void checkNaturalUser(InitCallbak initCallbak) {
-        lvStat();
-        if (initCallbak != null) {
-            initCallbak.onFinish();
-        }
-    }
-
-
-    private void init(Context context) {
-        if (isInit) {
-            return;
-        }
-        if (FG.isMainProcess(this.context)) {
-            FG.setUse_music(false);
-//            if (IconHelp.get().isIconHided()) {
-            FG.setUSE_TA_ACTIVITY(true);
-            FG.setUSE_BA_ACTIVITY(true);
-//            }
-            FG.setUSE_ShowWhenLocked(false);
-            FG.setUse_thaw(false);
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O || isLowMemory(context)) {
-                LogUtil.dForce("==FG==", "低端机");
-                FG.setUse_receiver(false);
-            }
-            //初始化
-            FG.init(this.context, false);
-            isInit = true;
-
-            Statistics.getInstance().dotEvent(EventUtils.FG_INIT);
-            LogUtil.d("==FG==", "fg init");
-        }
-    }
-
-//    public void startActivity(Context context, Class targetActivityClass) {
-//        if (FG.isAppInFront()) {
-//            LogUtil.d(TAG, "在前台不进行弹出");
-//            return;
-//        }
-//        Intent intent = new Intent(context, targetActivityClass);
-//        startActivity(context, intent);
-//    }
-//
-//    public void startActivity(Context context, Intent intent) {
-//        SLKManager.get().resetIntent(intent);
-//        LogUtil.d(TAG, "start intent :" + intent.toURI());
-//        //TODO 事件上报
-////        StatUtils.statRemindCommonFgSurpriseStart(StatUtils.WEATHER_START, "");
-//
-//        try {
-//            FG.surprise(context, intent, "", false, new StartCallback() {
-//                @Override
-//                public void onSuccess(Intent intent) {
-//                    LogUtil.d(TAG, "surprise onSuccess");
-//                    try {
-//                        //TODO 事件上报
-////                        StatUtils.statRemindCommonFgSurpriseStart(StatUtils.WEATHER_START_OK, "");
-//                    } catch (Throwable throwable) {
-//                    }
-//                }
-//
-//                @Override
-//                public void onFail(Intent intent, String reason) {
-//                    LogUtil.d(TAG, "surprise onFail reason =" + reason);
-//                    try {
-//                        //TODO 事件上报
-////                        StatUtils.statRemindCommonFgSurpriseStart(StatUtils.WEATHER_START_NO, reason);
-//                    } catch (Throwable throwable) {
-//                    }
-//                }
-//
-//                @Override
-//                public void onNotificationShow(Intent intent) {
-//                    //开始持续悬停
-//                    LogUtil.d(TAG, "surprise onNotificationShow");
-//                }
-//
-//                @Override
-//                public void onNotificationClose(Intent intent, boolean isAuto) {
-//                    //isAuto ： true 页面打开成功SDK自己关的 false：用户手动划掉或者任务栏清除通知被关
-//                    LogUtil.d(TAG, "surprise onNotificationClose isAuto =" + isAuto);
-//                }
-//
-//                @Override
-//                public void onTry(Intent intent, int num) {
-//                    LogUtil.d(TAG, "surprise onTry num =" + num);
-//                }
-//            }, null);
-//        } catch (Exception e) {
-//            //TODO 事件上报
-////            StatUtils.statRemindCommonFgSurpriseStart(StatUtils.WEATHER_START_NO, e.toString());
-//        }
-//
-//    }
-
-    public boolean isInit() {
-        return isInit;
-    }
-
-    public void hideIcon(Context context, String componentName) {
-        FG.hideIcon(context, componentName);
-    }
-
-    public void showIcon(Context context, String componentName) {
-        FG.showIcon(context, componentName);
-    }
-
-    public boolean isMainProcess(Context context) {
-        return FG.isMainProcess(context);
-    }
-
-    public boolean isFGProcess(Context context) {
-        return FG.isFgProcess(context);
-    }
-
-    public boolean isAppFront() {
-        return FG.isAppInFront();
-    }
-
-    public void setShowOnLock(boolean showOnLock) {
-        FG.setUSE_ShowWhenLocked(showOnLock);
-    }
-
-    private boolean isLowMemory(Context context) {
-        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        ActivityManager.MemoryInfo info = new ActivityManager.MemoryInfo();
-        manager.getMemoryInfo(info);
-        long total = info.totalMem;
-        LogUtil.d(TAG, "isLowMemoryisLowMemory: " + total);
-        if (total <= 1024 * 1024 * 1024 * 4L) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isIconHide(Context context, String launchName) {
-        try {
-            boolean isHide = FG.isHideIcon(context, launchName);
-            return isHide;
-        } catch (Throwable throwable) {
-        }
-        return false;
-    }
-
-    public interface InitCallbak {
-        void onFinish();
-    }
-}

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

@@ -21,14 +21,11 @@ import com.zl.sdk.bean.WeatherAdData;
 import com.zl.sdk.event.EventUtils;
 import com.zl.sdk.event.DialogFailReason;
 import com.zl.sdk.icon.IconHelp;
-import com.zl.sdk.keeplive.KplvManager;
 import com.zl.sdk.util.AppOutUtils;
 import com.zl.sdk.util.LogUtil;
 
 import java.util.Calendar;
 
-import f.g.ajglwh.fdauef.cpaukw.FG;
-
 public class CheckHelper {
     private static final String TAG = "OutShow CheckHelper --> ";
 
@@ -37,12 +34,12 @@ public class CheckHelper {
      * 解锁/回到桌面 触发展示的外展广告
      */
     public static boolean checkAdCanShowByScene(int actionState) {
-        boolean isInit = KplvManager.getInstance().isInit();
-        if (!isInit) {
-            LogUtil.d(TAG + "（场景检查）保活未初始化，不能展示");
-            EventUtils.staDialogFail(DialogFailReason.NO_INIT, actionState, EventUtils.DIALOG_TYPE_AD);
-            return false;
-        }
+//        boolean isInit = KplvManager.getInstance().isInit();
+//        if (!isInit) {
+//            LogUtil.d(TAG + "（场景检查）保活未初始化，不能展示");
+//            EventUtils.staDialogFail(DialogFailReason.NO_INIT, actionState, EventUtils.DIALOG_TYPE_AD);
+//            return false;
+//        }
 
 //TODO 放在外面判断
 
@@ -59,11 +56,11 @@ public class CheckHelper {
         }
 
 
-        if (FG.isAppInFront()) {
-            LogUtil.d(TAG + "（场景检查）应用在前台，不能展示");
-            EventUtils.staDialogFail(DialogFailReason.IS_FOREGROUND, actionState, EventUtils.DIALOG_TYPE_AD);
-            return false;
-        }
+//        if (FG.isAppInFront()) {
+//            LogUtil.d(TAG + "（场景检查）应用在前台，不能展示");
+//            EventUtils.staDialogFail(DialogFailReason.IS_FOREGROUND, actionState, EventUtils.DIALOG_TYPE_AD);
+//            return false;
+//        }
 
         if (!AppOutUtils.isScreenOn()) {
             LogUtil.d(TAG + "（场景检查）手机未亮屏，不能展示");
@@ -98,12 +95,12 @@ public class CheckHelper {
     }
 
     public static boolean checkAdCanShowBySceneNoIcon(int actionState) {
-        boolean isInit = KplvManager.getInstance().isInit();
-        if (!isInit) {
-            LogUtil.d(TAG + "（场景检查）保活未初始化，不能展示");
-            EventUtils.staDialogFail(DialogFailReason.NO_INIT, actionState, EventUtils.DIALOG_TYPE_AD);
-            return false;
-        }
+//        boolean isInit = KplvManager.getInstance().isInit();
+//        if (!isInit) {
+//            LogUtil.d(TAG + "（场景检查）保活未初始化，不能展示");
+//            EventUtils.staDialogFail(DialogFailReason.NO_INIT, actionState, EventUtils.DIALOG_TYPE_AD);
+//            return false;
+//        }
 
         if (!NetworkUtils.isConnected()) {
             LogUtil.d(TAG + "（场景检查）网络未连接，不能展示");
@@ -129,11 +126,11 @@ public class CheckHelper {
             return false;
         }
 
-        if (checkTopActivityIsAd() && KplvManager.getInstance().isAppFront()) {
-            LogUtil.d(TAG + "（场景检查）广告播放中，不能展示");
-            EventUtils.staDialogFail(DialogFailReason.AD_EXITS, actionState, EventUtils.DIALOG_TYPE_AD);
-            return false;
-        }
+//        if (checkTopActivityIsAd() && KplvManager.getInstance().isAppFront()) {
+//            LogUtil.d(TAG + "（场景检查）广告播放中，不能展示");
+//            EventUtils.staDialogFail(DialogFailReason.AD_EXITS, actionState, EventUtils.DIALOG_TYPE_AD);
+//            return false;
+//        }
 
         LogUtil.d(TAG + "（场景检查）能展示");
         return true;

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

@@ -3,5 +3,5 @@ package com.zl.sdk.out;
 public interface DialogShowStatusCallback {
     void success();
 
-    void fail();
+    void fail(String reason);
 }

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

@@ -15,19 +15,13 @@ import com.zl.sdk.bean.WeatherAdData;
 import com.zl.sdk.event.EventUtils;
 import com.zl.sdk.event.statistics.Statistics;
 import com.zl.sdk.icon.IconHelp;
-import com.zl.sdk.keeplive.KplvManager;
 import com.zl.sdk.util.AppOutUtils;
 import com.zl.sdk.util.LogUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
-import f.g.ajglwh.fdauef.cpaukw.FG;
-import f.g.ajglwh.fdauef.cpaukw.NotificationConfig;
-import f.g.ajglwh.fdauef.cpaukw.StartCallback;
-
 
 public class OutAdManager extends BaseOutShowManager {
     private OutAdManager() {
@@ -155,7 +149,7 @@ public class OutAdManager extends BaseOutShowManager {
             LogUtil.d(TAG, ">>>轮询检查<<< first start， no need check");
             Map<String, Object> map = new HashMap<>();
             map.put("type", String.valueOf(IconHelp.get().isIconHided()));
-            map.put("init", String.valueOf(KplvManager.getInstance().isInit()));
+//            map.put("init", String.valueOf(KplvManager.getInstance().isInit()));
             Statistics.getInstance().dotEvent(OutHelp.get().getContext(), "time_first_trig", "", map);
             return;
         }
@@ -217,7 +211,7 @@ public class OutAdManager extends BaseOutShowManager {
         } else {
             LogUtil.d(TAG + ">>>重试检查<<< =============>>> END 重试超过次数 不再重试");
 
-            returnFailCallBack();
+            returnFailCallBack("retry over time");
 
             cleanLoadAdFailTime();
 
@@ -283,7 +277,7 @@ public class OutAdManager extends BaseOutShowManager {
             checkNeedLoadAd(actionFrom);
         } else {
             LogUtil.d(TAG + ">>>播放广告<<<  =============>>> END 不能播放广告 场景检测不通过，不能加载广告");
-            returnFailCallBack();
+            returnFailCallBack("scene check fail");
         }
     }
 
@@ -304,14 +298,14 @@ public class OutAdManager extends BaseOutShowManager {
     /**
      * 外展逻辑完成-失败
      */
-    private void returnFailCallBack() {
+    private void returnFailCallBack(String reason) {
         LogUtil.d(TAG);
         LogUtil.d(TAG + ">>>广告逻辑结束<<< ===> END 返回失败");
         LogUtil.d(TAG);
 
 
         if (OutHelp.get().getDialogShowStatusCallback() != null) {
-            OutHelp.get().getDialogShowStatusCallback().fail();
+            OutHelp.get().getDialogShowStatusCallback().fail(reason);
             OutHelp.get().cleanDialogCallBack();
         }
     }
@@ -335,7 +329,6 @@ public class OutAdManager extends BaseOutShowManager {
             //TODO 清除隐藏的Activity
 //            LaunchStart.getInstance().cleanAllActivityExcludeAds();
 
-
 //            intent.setClass(context, SLKActivity.class);
 //            if (!(context instanceof Activity)) {
 //                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -347,24 +340,71 @@ public class OutAdManager extends BaseOutShowManager {
 
             EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START, "", isShow, actionFrom.getAction());
 
-            NotificationConfig notificationConfig = new NotificationConfig(null);
+//            NotificationConfig notificationConfig = new NotificationConfig(null);
             //这个参数传0 就是不悬挂在桌面，1000 就是悬挂一秒，-1 就是持续悬挂
-            notificationConfig.duration = 0;
+//            notificationConfig.duration = 0;
 
             LogUtil.d(TAG + "拉起广告SLK");
-            FG.surprise(context, intent, "", true, new StartCallback() {
+
+
+            OutHelp.get().startOutDialog(intent, new DialogShowStatusCallback() {
                 @Override
-                public void onSuccess(Intent intent) {
-                    LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起成功");
-                    try {
-                        returnSuccessCallBack();
-                        EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_OK, "", isShow, actionFrom.getAction());
-                    } catch (Throwable throwable) {
-                    }
+                public void success() {
+                    outDialogShowSuccess(isShow, actionFrom);
                 }
 
                 @Override
-                public void onFail(Intent intent, String reason) {
+                public void fail(String reason) {
+                    outDialogShowFail(isShow, context, actionFrom, remindersInfo, data, reason);
+                }
+            });
+
+//            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");
+            EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_NO, e.toString(), isShow, actionFrom.getAction());
+        }
+    }
+
+    private void outDialogShowFail(boolean isShow, Context context, ActionFrom actionFrom, RemindersInfo remindersInfo, WeatherAdData.NormalAdData data, String reason) {
         LogUtil.d(TAG, "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 失败原因：" + reason);
         try {
             IconHelp.get().clearNotification();
@@ -374,7 +414,7 @@ public class OutAdManager extends BaseOutShowManager {
                 startAdDialog(context, isShow, actionFrom, remindersInfo, data);
             } else {
                 LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起失败 已经重试一次，不再重试");
-                            returnFailCallBack();
+                returnFailCallBack(reason);
             }
 
             EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_NO, reason, isShow, actionFrom.getAction());
@@ -382,22 +422,12 @@ public class OutAdManager extends BaseOutShowManager {
         }
     }
 
-                @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();
-            EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_NO, e.toString(), isShow, actionFrom.getAction());
+    private void outDialogShowSuccess(boolean isShow, ActionFrom actionFrom) {
+        LogUtil.d(TAG + "广告SLK（" + (isShow ? "播放" : "加载") + "） 拉起成功");
+        try {
+            returnSuccessCallBack();
+            EventUtils.statRemindOutFgSurpriseStart(EventUtils.SLK_START_OK, "", isShow, actionFrom.getAction());
+        } catch (Throwable throwable) {
         }
     }
 
@@ -437,7 +467,7 @@ public class OutAdManager extends BaseOutShowManager {
                 LogUtil.d(TAG);
                 LogUtil.d(TAG + ">>>加载广告<<< =============>>> END 没有能加载的广告");
                 LogUtil.d(TAG);
-                returnFailCallBack();
+                returnFailCallBack("no ad data");
             }
             return;
         }
@@ -467,7 +497,7 @@ public class OutAdManager extends BaseOutShowManager {
             }
         }
 
-        returnFailCallBack();
+        returnFailCallBack("no ad data");
 
         LogUtil.d(TAG);
         LogUtil.d(TAG + ">>>加载广告<<< =============>>> END 没有能加载的广告");
@@ -480,7 +510,7 @@ public class OutAdManager extends BaseOutShowManager {
      */
     private void preloadByData(ActionFrom actionFrom, WeatherAdData.NormalAdData normalAdData) {
         if (normalAdData == null) {
-            returnFailCallBack();
+            returnFailCallBack("ad data is null");
             return;
         }
 

settings.gradle

@@ -3,13 +3,13 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
-        maven {
-            credentials {
-                username '621344be8af5d39eb3f17f3e'
-                password '(ijI1DwR7[wG'
-            }
-            url 'https://packages.aliyun.com/maven/repository/2279663-release-AiyNZM/'
-        }
+//        maven {
+//            credentials {
+//                username '621344be8af5d39eb3f17f3e'
+//                password '(ijI1DwR7[wG'
+//            }
+//            url 'https://packages.aliyun.com/maven/repository/2279663-release-AiyNZM/'
+//        }
 
         //Anythink(Core)
         maven { url "https://jfrog.anythinktech.com/artifactory/overseas_sdk" }
@@ -30,13 +30,13 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven {
-            credentials {
-                username '621344be8af5d39eb3f17f3e'
-                password '(ijI1DwR7[wG'
-            }
-            url 'https://packages.aliyun.com/maven/repository/2279663-release-AiyNZM/'
-        }
+//        maven {
+//            credentials {
+//                username '621344be8af5d39eb3f17f3e'
+//                password '(ijI1DwR7[wG'
+//            }
+//            url 'https://packages.aliyun.com/maven/repository/2279663-release-AiyNZM/'
+//        }
 
 
         //Anythink(Core)