Merge remote-tracking branch 'origin/master'

app/src/main/java/com/swiftcleaner/chovey/model/bean/Global.java

@@ -19,6 +19,7 @@ public class Global {
 
 
     //配置
+    public static String OpenLoadTime = "OpenLoadTime";
     public static String NotificationStayStatus = "NotificationStayStatus";//int
     public static String NotificationStayCount = "NotificationStayCount";//int
     public static String NotificationStayDelay = "NotificationStayDelay";//int

app/src/main/java/com/swiftcleaner/chovey/view/activity/StartActivity.java

@@ -8,6 +8,7 @@ import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_LARGE_FILE;
 import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_SCREENSHOT;
 import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_SIMILAR_PHOTOS;
 import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_WHATS_APP;
+import static com.swiftcleaner.chovey.model.bean.Global.OpenLoadTime;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -36,6 +37,7 @@ import com.zxdemo.http.ZxHttp;
 import com.zxdemo.service.PermanentNotifyService;
 import com.zxdemo.utils.ActivityLauncher;
 import com.zxdemo.utils.NonBlockingCountdown;
+import com.zxdemo.utils.SpUtils;
 
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -49,7 +51,7 @@ public class StartActivity extends AppCompatActivity {
     private ActivityResultLauncher<Intent> notificationSettingsLauncher;
     private boolean adShowing = false;
     private NonBlockingCountdown nonBlockingCountdown = new NonBlockingCountdown(this::jumpNext);
-    private int outJumpTime = 15;
+    private int outJumpTime = SpUtils.Companion.getInstance().getInt(OpenLoadTime, 15);
     public AtomicBoolean jumped = new AtomicBoolean(false);
     private ActivityLauncher launcher;
 

app/src/main/java/com/zxdemo/admob/AdmobHelper.kt

@@ -239,10 +239,10 @@ object AdmobHelper {
         loaded: (() -> Unit?)? = null,
         failed: (() -> Unit?)? = null,
     ) {
-//        if (!checkAvailable(INTERSTITIAL_AD_UNIT, true)) {
-//            failed?.invoke()
-//            return
-//        }
+        if (!checkAvailable(INTERSTITIAL_AD_UNIT, true)) {
+            failed?.invoke()
+            return
+        }
 //        if (isLoadingInterstitialAd) {
 //            failed?.invoke()
 //            return
@@ -777,9 +777,12 @@ object AdmobHelper {
 
     private fun checkAvailable(adUnit: String, notCheckIntervalTime: Boolean = false): Boolean {
         if (isBlacklist()) {
+            Log.d("glc","isBlacklist")
             ReportAdUtils.showErrorAd(EVENT_BLACKLIST, adUnit)
             return false
         }
+        Log.d("glc","isBlacklist() = false ")
+
         val currentTime = System.currentTimeMillis()
         var lastDisplayTime = SpUtils.getInstance().getLong(KEY_LAST_DISPLAY_TIME)
         if (lastDisplayTime.toInt() != 0 && !areTimestampsSameDay(currentTime, lastDisplayTime)) {
@@ -797,14 +800,17 @@ object AdmobHelper {
         val adClick = SpUtils.getInstance().getInt(KEY_AD_CLICK, DEFAULT_AD_CLICK)
         if (displayNumber >= adShow) {
             ReportAdUtils.showErrorAd(EVENT_SHOW_DISPLAYS, adUnit)
+            Log.d("glc","displayNumber >= adShow: "+displayNumber+"  adShow:"+adShow)
             return false
         }
         if (requestNumber >= adRequest) {
             ReportAdUtils.showErrorAd(EVENT_SHOW_REQUESTS, adUnit)
+            Log.d("glc","requestNumber >= adRequest: "+requestNumber)
             return false
         }
         if (clickNumber >= adClick) {
             ReportAdUtils.showErrorAd(EVENT_SHOW_CLICKS, adUnit)
+            Log.d("glc","clickNumber >= adClick: "+requestNumber)
             return false
         }
         if (notCheckIntervalTime || lastDisplayTime.toInt() == 0) return true