Merge remote-tracking branch 'origin/master'

app/src/main/java/com/swiftcleaner/chovey/view/MainActivity.java

@@ -36,6 +36,7 @@ import com.swiftcleaner.chovey.view.activity.SimilarPhotosActivity;
 import com.swiftcleaner.chovey.view.activity.WhatsAppActivity;
 import com.swiftcleaner.chovey.view.dialog.AppExitDialog;
 import com.swiftcleaner.chovey.view.dialog.CustomBottomSheetDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 public class MainActivity extends AppCompatActivity {
     ActivityMainBinding binding;
@@ -82,37 +83,143 @@ public class MainActivity extends AppCompatActivity {
         binding.phoneMemory.setText(totalMemory + "/" + usedMemory);
 
         binding.cleanUp.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
                         intTempJump();
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
+                        intTempJump();
+                        return null;
+                    });
         });
-
         binding.ivSetting.setOnClickListener(v -> {
-            Intent intent = new Intent(this, SettingActivity.class);
-            startActivity(intent);
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        initSetting();
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
+                        initSetting();
+                        return null;
+                    });
+
+
         });
         binding.cl3CleanJunk.setOnClickListener(v -> {
-            Intent intent = new Intent(this, CleanJunkActivity.class);
-            startActivity(intent);
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        intTempJump();
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
+                        intTempJump();
+                        return null;
+                    });
+
         });
         binding.cl3AppManager.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        startActivity(new Intent(this, BatteryInfoActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
                         startActivity(new Intent(this, BatteryInfoActivity.class));
+                        return null;
+                    });
+
         });
         binding.cl3BatteryInfo.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        startActivity(new Intent(this, InfoActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
                         startActivity(new Intent(this, InfoActivity.class));
+                        return null;
+                    });
+
         });
         binding.appProcess.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
                         startActivity(new Intent(this, AppProcessActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, AppProcessActivity.class));
+                        return null;
+                    });
+
         });
         binding.largeFileCleaner.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
                         startActivity(new Intent(this, LargeFileActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, LargeFileActivity.class));
+                        return null;
+                    });
+
         });
         binding.screenshotCleaner.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        startActivity(new Intent(this, ScreenShotActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
                         startActivity(new Intent(this, ScreenShotActivity.class));
+                        return null;
+                    });
+
         });
         binding.whatsApp.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        startActivity(new Intent(this, WhatsAppActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
                         startActivity(new Intent(this, WhatsAppActivity.class));
+                        return null;
+                    });
         });
         binding.similarPhotos.setOnClickListener(v -> {
+            AdmobHelper.INSTANCE.showInterstitialAd(this, () -> {
+                        startActivity(new Intent(this, SimilarPhotosActivity.class));
+                        return null;
+                    },
+                    () -> {
+                        return null;
+                    },
+                    () -> {
                         startActivity(new Intent(this, SimilarPhotosActivity.class));
+                        return null;
+                    });
+
         });
     }
 
@@ -176,7 +283,10 @@ public class MainActivity extends AppCompatActivity {
         Intent intent = new Intent(this, CleanJunkActivity.class);
         startActivity(intent);
     }
-
+    private void initSetting(){
+        Intent intent = new Intent(this, SettingActivity.class);
+        startActivity(intent);
+    }
 
     private void initBar() {
         ImmersionBar.with(this)
@@ -202,6 +312,7 @@ public class MainActivity extends AppCompatActivity {
         });
         appExitDialog.show();
     }
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -24,6 +24,7 @@ import com.swiftcleaner.chovey.model.tool.MemoryUtils;
 import com.swiftcleaner.chovey.view.adapter.AppInfoAdapter;
 import com.swiftcleaner.chovey.view.adapter.AppProcessAdapter;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -130,8 +131,17 @@ public class AppProcessActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(AppProcessActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -19,6 +19,7 @@ import com.swiftcleaner.chovey.model.bean.AppInfoBean;
 import com.swiftcleaner.chovey.model.tool.AppUtils;
 import com.swiftcleaner.chovey.view.adapter.AppInfoAdapter;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -100,8 +101,17 @@ public class BatteryInfoActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(BatteryInfoActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -19,6 +19,7 @@ import com.swiftcleaner.chovey.view.adapter.EmptyCleanAdapter;
 import com.swiftcleaner.chovey.view.adapter.LogsCleanAdapter;
 import com.swiftcleaner.chovey.view.adapter.TempCleanAdapter;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -426,8 +427,17 @@ public class CleanJunkActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(CleanJunkActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -9,6 +9,7 @@ import android.view.View;
 import com.gyf.immersionbar.ImmersionBar;
 import com.swiftcleaner.chovey.databinding.ActivityEndCleanJunkBinding;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 public class EndCleanJunkActivity extends AppCompatActivity {
     ActivityEndCleanJunkBinding binding;
@@ -78,8 +79,17 @@ public class EndCleanJunkActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(EndCleanJunkActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -8,6 +8,7 @@ import com.gyf.immersionbar.ImmersionBar;
 import com.swiftcleaner.chovey.databinding.ActivityInfoBinding;
 import com.swiftcleaner.chovey.model.util.BatteryReceiver;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 public class InfoActivity extends AppCompatActivity {
     private ActivityInfoBinding binding;
@@ -86,8 +87,17 @@ public class InfoActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(InfoActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -24,6 +24,7 @@ import com.swiftcleaner.chovey.model.tool.MediaHelps;
 import com.swiftcleaner.chovey.model.tool.ToastUtil;
 import com.swiftcleaner.chovey.view.adapter.LargeFileAdapter;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.io.File;
 import java.text.DecimalFormat;
@@ -294,8 +295,17 @@ public class LargeFileActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(LargeFileActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -22,6 +22,7 @@ import com.swiftcleaner.chovey.model.tool.ToastUtil;
 import com.swiftcleaner.chovey.view.activity.EndCleanJunkActivity;
 import com.swiftcleaner.chovey.view.adapter.ScreenShotAdapter;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -182,8 +183,17 @@ public class ScreenShotActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(ScreenShotActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -17,6 +17,7 @@ import com.swiftcleaner.chovey.R;
 import com.swiftcleaner.chovey.databinding.ActivityMainBinding;
 import com.swiftcleaner.chovey.databinding.ActivitySettingBinding;
 import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 public class SettingActivity extends AppCompatActivity {
     ActivitySettingBinding binding;
@@ -87,8 +88,17 @@ public class SettingActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
-                customScoreDialog.dismiss();
+                AdmobHelper.INSTANCE.showInterstitialAd(SettingActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
                             finish();
+                            return null;
+                        });
             }
         });
         customScoreDialog.show();

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

@@ -13,6 +13,8 @@ import com.swiftcleaner.chovey.model.bean.SimilarBean;
 import com.swiftcleaner.chovey.model.bean.ImageHelpers;
 import com.swiftcleaner.chovey.model.tool.MediaHelps;
 import com.swiftcleaner.chovey.view.adapter.SimilarPhotosAdapter;
+import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -41,7 +43,7 @@ public class SimilarPhotosActivity extends AppCompatActivity {
 
     private void initShow() {
         binding.ivReturn.setOnClickListener(v -> {
-            finish();
+            initCustDialog();
         });
 
         initSimilar();
@@ -183,4 +185,40 @@ public class SimilarPhotosActivity extends AppCompatActivity {
                 .navigationBarDarkIcon(true)  // 导航栏图标颜色为浅色
                 .init();
     }
+    private void initCustDialog() {
+        CustomScoreDialog customScoreDialog = new CustomScoreDialog(this);
+        customScoreDialog.setOnDialogClickListener(new CustomScoreDialog.OnDialogClickListener() {
+            @Override
+            public void onCancel() {
+                customScoreDialog.dismiss();
+            }
+
+            @Override
+            public void onSubmit() {
+                AdmobHelper.INSTANCE.showInterstitialAd(SimilarPhotosActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
+                            finish();
+                            return null;
+                        });
+            }
+        });
+        customScoreDialog.show();
+    }
+
+    @Override
+    public void onBackPressed() {
+        initCustDialog();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        executorService.shutdown();
+    }
 }
\ No newline at end of file

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

@@ -16,6 +16,8 @@ import com.swiftcleaner.chovey.model.tool.FileHelps;
 import com.swiftcleaner.chovey.model.tool.FileTypes;
 import com.swiftcleaner.chovey.view.adapter.EmptyCleanAdapter;
 import com.swiftcleaner.chovey.view.adapter.WhatsAppCleanAdapter;
+import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
+import com.zxdemo.admob.AdmobHelper;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -48,7 +50,9 @@ public class WhatsAppActivity extends AppCompatActivity {
     }
 
     private void initShow() {
-
+        binding.ivReturn.setOnClickListener(v->{
+            initCustDialog();
+        });
         executorService.submit(() -> {
             List<CleanFileBean> files = FileHelps.findWhatsappFiles();
             Log.d("ssad",files.toString());
@@ -127,6 +131,12 @@ public class WhatsAppActivity extends AppCompatActivity {
         int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
         return new DecimalFormat("#,##0.#").format(size / Math.pow(1024, digitGroups)) + " " + units[digitGroups];
     }
+
+    @Override
+    public void onBackPressed() {
+        initCustDialog();
+    }
+
     private void initBar() {
         ImmersionBar.with(this)
                 .transparentStatusBar()  // 透明状态栏
@@ -134,4 +144,35 @@ public class WhatsAppActivity extends AppCompatActivity {
                 .navigationBarDarkIcon(false)  // 导航栏图标颜色为浅色
                 .init();
     }
+    private void initCustDialog() {
+        CustomScoreDialog customScoreDialog = new CustomScoreDialog(this);
+        customScoreDialog.setOnDialogClickListener(new CustomScoreDialog.OnDialogClickListener() {
+            @Override
+            public void onCancel() {
+                customScoreDialog.dismiss();
+            }
+
+            @Override
+            public void onSubmit() {
+                AdmobHelper.INSTANCE.showInterstitialAd(WhatsAppActivity.this, () -> {
+                            finish();
+                            return null;
+                        },
+                        () -> {
+                            return null;
+                        },
+                        () -> {
+                            finish();
+                            return null;
+                        });
+            }
+        });
+        customScoreDialog.show();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        executorService.shutdown();
+    }
 }
\ No newline at end of file