Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -92,7 +92,8 @@
 
         <activity
             android:name=".view.MainActivity"
-            android:exported="false" /> <!-- 今日头条autosize 屏幕适配 -->
+            android:exported="false"
+            android:launchMode="singleTop" /> <!-- 今日头条autosize 屏幕适配 -->
         <meta-data
             android:name="design_width_in_dp"
             android:value="360" />

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

@@ -3,6 +3,7 @@ package com.swiftcleaner.chovey.view.activity;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import android.app.Activity;
 import android.os.Handler;
 import android.view.View;
 import android.content.Intent;
@@ -114,7 +115,7 @@ public class CleanJunkActivity extends AppCompatActivity {
 
             if (emptyFolders != null) {
                 for (CleanFileBean file : emptyFolders) {
-                    if (file.getMineType()!=null&&file.getName()!=null){
+                    if (file.getMineType() != null && file.getName() != null) {
                         file.setSelected(true); // 设置为选中状态
                         emptyFiles.add(file);
                         totalSelectedSize += file.getLength();
@@ -375,7 +376,6 @@ public class CleanJunkActivity extends AppCompatActivity {
     private void initAnimation(String str) {
 
 
-
         binding.clRadarview.setVisibility(View.VISIBLE);
         binding.clLayout.setVisibility(View.GONE);
         binding.radarview.setSearching(true);
@@ -442,6 +442,7 @@ public class CleanJunkActivity extends AppCompatActivity {
     }
 
     private void initCustDialog() {
+        Activity activity = this;
         CustomScoreDialog customScoreDialog = new CustomScoreDialog(this);
         customScoreDialog.setOnDialogClickListener(new CustomScoreDialog.OnDialogClickListener() {
             @Override
@@ -451,8 +452,9 @@ public class CleanJunkActivity extends AppCompatActivity {
 
             @Override
             public void onSubmit() {
+
                 AdmobHelper.INSTANCE.showInterstitialAd(CleanJunkActivity.this, () -> {
-                            finish();
+                            FinishMain.INSTANCE.finishToMain(activity);
                             return null;
                         },
                         () -> {

app/src/main/java/com/swiftcleaner/chovey/view/activity/FinishMain.kt

+package com.swiftcleaner.chovey.view.activity
+
+import android.app.Activity
+import android.content.Intent
+import com.swiftcleaner.chovey.view.MainActivity
+
+object FinishMain {
+
+
+    fun finishToMain(activity: Activity) {
+        activity.startActivity(Intent(activity, MainActivity::class.java))
+        activity.finish()
+    }
+}
\ No newline at end of file