更新-外展DxActivity管理类完善

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

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import com.zl.sdk.OutHelp;
 import com.zl.sdk.bean.IconAdConfig;
 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;
 
@@ -124,5 +125,8 @@ public class IconHelp {
             IconHelp.get().setRetryShowAdCount(adConfig.retry_times);
             IconHelp.get().setRetryShowAdTime(adConfig.retry_interval_time * 1000L);
         }
+
+        OutHelp.get().clearNotification();
+        DxManager.get().removeAllSLKActivity();
     }
 }
\ No newline at end of file

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

 package com.zl.sdk.out;
 
-import android.app.Activity;
-import android.os.Build;
-
 import com.zl.sdk.bean.RemindersInfo;
 import com.zl.sdk.bean.WeatherAdData;
+import com.zl.sdk.out.ui.DxActivity;
 
 import java.util.Stack;
 
@@ -43,23 +41,19 @@ public class DxManager {
     }
 
 
-    private final Stack<Activity> appOutActivities = new Stack<Activity>();
+    private final Stack<DxActivity> appOutActivities = new Stack<>();
 
 
     public boolean existAppOutActivities() {
         return !appOutActivities.isEmpty();
     }
 
-    public Stack<Activity> getAppOutActivities() {
-        return appOutActivities;
-    }
-
 
-    public void addActivity(Activity activity) {
+    public void addActivity(DxActivity activity) {
         appOutActivities.push(activity);
     }
 
-    public void removeActivity(Activity activity) {
+    public void removeActivity(DxActivity activity) {
         appOutActivities.remove(activity);
     }
 
@@ -68,7 +62,7 @@ public class DxManager {
             return;
         }
 
-        for (Activity activity : appOutActivities) {
+        for (DxActivity activity : appOutActivities) {
             activity.finishAndRemoveTask();
         }
 

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

@@ -47,6 +47,7 @@ public class DxActivity extends BaseActivity {
     @Override
     public void onAfterCreate(Bundle bundle) {
         LogUtil.d(TAG + "onCreate");
+        DxManager.get().addActivity(this);
     }
 
 
@@ -108,6 +109,8 @@ public class DxActivity extends BaseActivity {
         map.put("s_d_t", String.valueOf(time));
         Statistics.getInstance().onEvent(OutHelp.get().getContext(), EventUtils.OUT_DIALOG_EXPOSE_ONCE_STAY_TIME, null, map);
         super.onDestroy();
+
+        DxManager.get().removeActivity(this);
     }
 
     @Override
@@ -115,7 +118,8 @@ public class DxActivity extends BaseActivity {
         return false;
     }
 
-    public void close() {
+    @Override
+    public void finish() {
         if (IconHelp.get().isIconHide()) {
             LogUtil.d(TAG + "icon隐藏 退回到后台");
             if (proxyView != null) {
@@ -133,9 +137,13 @@ public class DxActivity extends BaseActivity {
         }
     }
 
+    public void finishAndRemoveTask() {
+        activity.finishAndRemoveTask();
+    }
+
     @Override
     public boolean beforeBackPressed() {
-        close();
+        finish();
         return true;
     }
 
@@ -173,13 +181,13 @@ public class DxActivity extends BaseActivity {
 
         if (remindersInfo == null) {
             LogUtil.d(TAG + "finish remindersInfo为空");
-            close();
+            finish();
             return;
         }
 
         if (remindersInfo.reminderType != Config.REMINDER_TYPE_WEATHER_PURE_AD && IconHelp.get().isIconHide()) {
             LogUtil.d(TAG + "finish 不是纯广告并且隐藏了icon");
-            close();
+            finish();
             return;
         }
 
@@ -196,7 +204,7 @@ public class DxActivity extends BaseActivity {
 
         if (proxyView == null) {
             LogUtil.d(TAG + "finish 5 View=null");
-            close();
+            finish();
             return;
         }