Merge remote-tracking branch 'origin/master'

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

+package com.swiftcleaner.chovey.model.bean;
+
+public class Global {
+    public static String FUNCTION_CLEAN = "function_clean";
+    public static String FUNCTION_APP_MANAGER = "function_app_manager";
+    public static String FUNCTION_BATTERY = "function_battery";
+    public static String FUNCTION_LARGE_FILE = "function_large_file";
+}

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

 package com.swiftcleaner.chovey.view.activity;
 
+import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_APP_MANAGER;
+import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_BATTERY;
+import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_CLEAN;
+import static com.swiftcleaner.chovey.model.bean.Global.FUNCTION_LARGE_FILE;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
@@ -12,6 +17,7 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
 import com.gyf.immersionbar.ImmersionBar;
@@ -22,6 +28,7 @@ import com.swiftcleaner.chovey.view.MainActivity;
 import com.zxdemo.admob.AdmobHelper;
 import com.zxdemo.utils.NonBlockingCountdown;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
@@ -34,6 +41,7 @@ public class StartActivity extends AppCompatActivity {
     private boolean adShowing = false;
     private NonBlockingCountdown nonBlockingCountdown = new NonBlockingCountdown(this::jumpNext);
     private int outJumpTime = 15;
+    public AtomicBoolean jumped = new AtomicBoolean(false);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -202,14 +210,39 @@ public class StartActivity extends AppCompatActivity {
     }
 
 
-    public AtomicBoolean jumped = new AtomicBoolean(false);
-
     private void jumpNext() {
+        Log.e("jumpNext", "jumped=" + jumped.get());
         if (jumped.get()) return;
         jumped.set(true);
-        Intent intent = new Intent(this, MainActivity.class);
-        startActivity(intent);
+        String actionId = getIntent().getExtras() != null ? getIntent().getExtras().getString("actionId") : "";
+        Log.e("jumpNext", "actionId=" + actionId);
+
+        if (Objects.equals(actionId, FUNCTION_CLEAN)) {
+            startActivity(new Intent(this, MainActivity.class));
+            finish();
+            return;
+        }
+
+        if (Objects.equals(actionId, FUNCTION_APP_MANAGER)) {
+            startActivity(new Intent(this, MainActivity.class));
+            finish();
+            return;
+        }
+        if (Objects.equals(actionId, FUNCTION_BATTERY)) {
+            startActivity(new Intent(this, MainActivity.class));
+            finish();
+            return;
+        }
+
+        if (Objects.equals(actionId, FUNCTION_LARGE_FILE)) {
+            startActivity(new Intent(this, MainActivity.class));
+            finish();
+            return;
+        }
+
+        startActivity(new Intent(this, MainActivity.class));
         finish();
+
     }
 
     @Override

app/src/main/java/com/zxdemo/service/PermanentNotifyService.kt

@@ -15,7 +15,13 @@ import android.os.IBinder
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
 import com.swiftcleaner.chovey.R
+import com.swiftcleaner.chovey.model.bean.Global
+import com.swiftcleaner.chovey.model.bean.Global.FUNCTION_APP_MANAGER
+import com.swiftcleaner.chovey.model.bean.Global.FUNCTION_BATTERY
+import com.swiftcleaner.chovey.model.bean.Global.FUNCTION_CLEAN
+import com.swiftcleaner.chovey.model.bean.Global.FUNCTION_LARGE_FILE
 import com.swiftcleaner.chovey.view.MainActivity
+import com.swiftcleaner.chovey.view.activity.StartActivity
 
 class PermanentNotifyService : Service() {
 
@@ -78,28 +84,35 @@ class PermanentNotifyService : Service() {
         val cleanIntent = PendingIntent.getActivity(
             context, // context
             0, // request code
-            Intent("CleanJunkActivity", null, context, MainActivity::class.java), // intent
+            Intent("CleanJunkActivity", null, context, StartActivity::class.java).apply {
+                putExtra("actionId", FUNCTION_CLEAN)
+            }, // intent
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE // flags
         )
-        contentView.setOnClickPendingIntent(R.id.tv_clean, cleanIntent)
-        expendView.setOnClickPendingIntent(R.id.tv_clean, cleanIntent)
+        contentView.setOnClickPendingIntent(R.id.id_ll_clean, cleanIntent)
+        expendView.setOnClickPendingIntent(R.id.id_ll_clean, cleanIntent)
 
         val appIntent = PendingIntent.getActivity(
             context, // context
             0, // request code
-            Intent("AppManagerActivity", null, context, MainActivity::class.java), // intent
+            Intent("AppManagerActivity", null, context, StartActivity::class.java).apply {
+                putExtra("actionId", FUNCTION_APP_MANAGER)
+            }, // intent
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE // flags
         )
-        contentView.setOnClickPendingIntent(R.id.tv_app, appIntent)
-        expendView.setOnClickPendingIntent(R.id.tv_app, appIntent)
-        val whatsIntent = PendingIntent.getActivity(
+        contentView.setOnClickPendingIntent(R.id.id_app_manager, appIntent)
+        expendView.setOnClickPendingIntent(R.id.id_app_manager, appIntent)
+
+        val batteryIntent = PendingIntent.getActivity(
             context, // context
             0, // request code
-            Intent("CleanerActivity", null, context, MainActivity::class.java), // intent
+            Intent("CleanerActivity", null, context, StartActivity::class.java).apply {
+                putExtra("actionId", FUNCTION_BATTERY)
+            }, // intent
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE // flags
         )
-        contentView.setOnClickPendingIntent(R.id.tv_whatsapp, whatsIntent)
-        expendView.setOnClickPendingIntent(R.id.tv_whatsapp, whatsIntent)
+        contentView.setOnClickPendingIntent(R.id.id_battery, batteryIntent)
+        expendView.setOnClickPendingIntent(R.id.id_battery, batteryIntent)
 
         val largeIntent = PendingIntent.getActivity(
             context, // context
@@ -108,13 +121,16 @@ class PermanentNotifyService : Service() {
                 "LargeFileCleanActivity",
                 null,
                 context,
-                MainActivity::class.java
-            ), // intent
+                StartActivity::class.java
+            ).apply {
+                putExtra("actionId", FUNCTION_LARGE_FILE)
+            }, // intent
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE // flags
         )
-        contentView.setOnClickPendingIntent(R.id.tv_large, largeIntent)
-        expendView.setOnClickPendingIntent(R.id.tv_large, largeIntent)
-        val nfIntent = Intent(context, MainActivity::class.java)
+        contentView.setOnClickPendingIntent(R.id.id_large_file, largeIntent)
+        expendView.setOnClickPendingIntent(R.id.id_large_file, largeIntent)
+
+        val nfIntent = Intent(context, StartActivity::class.java)
         val pendingIntent =
             PendingIntent.getActivity(context, 0, nfIntent, PendingIntent.FLAG_IMMUTABLE)
         val builder = NotificationCompat.Builder(context, channelId)

app/src/main/res/layout/notifi_stay_small.xml

@@ -48,9 +48,9 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-    <!--恢复照片-->
+    <!--app管理-->
     <LinearLayout
-        android:id="@+id/id_recovery_photos"
+        android:id="@+id/id_app_manager"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -76,9 +76,9 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-    <!--恢复视频-->
+    <!--电池-->
     <LinearLayout
-        android:id="@+id/id_recovery_videos"
+        android:id="@+id/id_battery"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -104,9 +104,9 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-    <!--恢复文档-->
+    <!--大文件-->
     <LinearLayout
-        android:id="@+id/id_recovery_documents"
+        android:id="@+id/id_large_file"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"

app/src/main/res/layout/notify_stay_big.xml

@@ -47,9 +47,9 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-    <!--恢复照片-->
+    <!--app管理-->
     <LinearLayout
-        android:id="@+id/id_recovery_photos"
+        android:id="@+id/id_app_manager"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -73,9 +73,9 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-    <!--恢复视频-->
+    <!--电池-->
     <LinearLayout
-        android:id="@+id/id_recovery_videos"
+        android:id="@+id/id_battery"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -99,9 +99,9 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-    <!--恢复文档-->
+    <!--大文件-->
     <LinearLayout
-        android:id="@+id/id_recovery_documents"
+        android:id="@+id/id_large_file"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"