Merge branch 'master' of gitlab.huolea.com:koko/swiftcleanerphonehelper

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

@@ -361,6 +361,7 @@ public class CleanJunkActivity extends AppCompatActivity {
         selectedSize = 0;
         updateButtonStatus();
         initAnimation(formatFileSize(selectedSize));
+
     }
 
 
@@ -372,17 +373,36 @@ public class CleanJunkActivity extends AppCompatActivity {
     }
 
     private void initAnimation(String str) {
+
+
+
         binding.clRadarview.setVisibility(View.VISIBLE);
         binding.clLayout.setVisibility(View.GONE);
         binding.radarview.setSearching(true);
         handler = new Handler();
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
-        handler.postDelayed(() -> {
-            binding.radarview.setSearching(false);
-            intent.putExtra("cleanstr", str);
-            startActivity(intent);
-            finish();
-        }, 3000);
+        AdmobHelper.INSTANCE.showAppOpenAd(this,
+                () -> {
+                    binding.radarview.setSearching(false);
+                    intent.putExtra("cleanstr", str);
+                    startActivity(intent);
+                    finish();
+                    return null;
+                },
+                () -> {
+
+                    return null;
+                },
+                () -> {
+                    binding.radarview.setSearching(false);
+                    intent.putExtra("cleanstr", str);
+                    startActivity(intent);
+                    finish();
+                    return null;
+                }
+
+        );
+
     }
 
     @Override

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

@@ -267,12 +267,33 @@ public class LargeFileActivity extends AppCompatActivity {
         binding.radarview.setSearching(true);
         handler = new Handler();
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
-        handler.postDelayed(() -> {
-            binding.radarview.setSearching(false);
-            intent.putExtra("cleanstr", str);
-            startActivity(intent);
-            finish();
-        }, 3000);
+        AdmobHelper.INSTANCE.showAppOpenAd(this,
+                () -> {
+                    binding.radarview.setSearching(false);
+                    intent.putExtra("cleanstr", str);
+                    startActivity(intent);
+                    finish();
+                    return null;
+                },
+                () -> {
+
+                    return null;
+                },
+                () -> {
+                    binding.radarview.setSearching(false);
+                    intent.putExtra("cleanstr", str);
+                    startActivity(intent);
+                    finish();
+                    return null;
+                }
+
+        );
+//        handler.postDelayed(() -> {
+//            binding.radarview.setSearching(false);
+//            intent.putExtra("cleanstr", str);
+//            startActivity(intent);
+//            finish();
+//        }, 3000);
     }
 
     private void initBar() {

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

@@ -150,12 +150,33 @@ public class ScreenShotActivity extends AppCompatActivity {
 
         handler = new Handler(Looper.getMainLooper());
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
-        handler.postDelayed(() -> {
-            binding.radarview.setSearching(false);
-            intent.putExtra("cleanstr", cleanSize);
-            startActivity(intent);
-            finish();
-        }, 3000);
+        AdmobHelper.INSTANCE.showAppOpenAd(this,
+                () -> {
+                    binding.radarview.setSearching(false);
+                    intent.putExtra("cleanstr", cleanSize);
+                    startActivity(intent);
+                    finish();
+                    return null;
+                },
+                () -> {
+
+                    return null;
+                },
+                () -> {
+                    binding.radarview.setSearching(false);
+                    intent.putExtra("cleanstr", cleanSize);
+                    startActivity(intent);
+                    finish();
+                    return null;
+                }
+
+        );
+//        handler.postDelayed(() -> {
+//            binding.radarview.setSearching(false);
+//            intent.putExtra("cleanstr", cleanSize);
+//            startActivity(intent);
+//            finish();
+//        }, 3000);
     }
 
     private String formatFileSize(long size) {