修改启动页

app/src/main/AndroidManifest.xml

@@ -38,7 +38,7 @@
         tools:targetApi="34">
 
         <activity
-            android:name=".activity.SplashActivity"
+            android:name=".activity.splash.Splash2Activity"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/splash.theme">

app/src/main/java/com/base/filerecoveryrecyclebin/MyApplication.kt

@@ -5,7 +5,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
-import com.base.filerecoveryrecyclebin.activity.SplashActivity
+import com.base.filerecoveryrecyclebin.activity.splash.Splash2Activity
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
 import com.base.filerecoveryrecyclebin.bean.ConstObject.ifAgreePrivacy
 import com.base.filerecoveryrecyclebin.fcm.FCMManager
@@ -143,7 +143,7 @@ class MyApplication : BaseApplication() {
                             topActivity?.startActivity(
                                 Intent(
                                     topActivity,
-                                    SplashActivity::class.java
+                                    Splash2Activity::class.java
                                 ).apply {
                                     putExtra("isHotLaunch", true)
                                     putExtra("type", -1)
@@ -152,7 +152,7 @@ class MyApplication : BaseApplication() {
                             topActivity?.startActivity(
                                 Intent(
                                     topActivity,
-                                    SplashActivity::class.java
+                                    Splash2Activity::class.java
                                 ).apply {
                                     putExtra("isHotLaunch", true)
                                     putExtra("type", -1)

app/src/main/java/com/base/filerecoveryrecyclebin/activity/splash/PrivacyManager.kt

+package com.base.filerecoveryrecyclebin.activity.splash
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.UnderlineSpan
+import com.base.filerecoveryrecyclebin.MyApplication
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ifAgreePrivacy
+import com.base.filerecoveryrecyclebin.databinding.ActivitySplashBinding
+import com.base.filerecoveryrecyclebin.help.ConfigHelper
+
+
+class PrivacyManager {
+
+
+    private val binding: ActivitySplashBinding
+
+    private val context: Activity
+
+    private val listener: onUserPrivacyAggreementListener
+
+    constructor(
+        binding: ActivitySplashBinding,
+        context: Activity,
+        listener: onUserPrivacyAggreementListener
+    ) {
+        this.binding = binding
+        this.context = context
+        this.listener = listener
+        initView()
+    }
+
+
+    private fun initView() {
+
+
+        val spannableString = SpannableString("Privacy Policy")
+        spannableString.setSpan(
+            UnderlineSpan(),
+            0,
+            spannableString.length,
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        binding.idTvPrivacyPolicy.text = spannableString
+
+        binding.idTvPrivacyPolicy.setOnClickListener {
+            val intent = Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse(ConfigHelper.privacyPolicy)
+            )
+            context.startActivity(intent)
+        }
+
+        var clicked = false
+        binding.idTvStart.setOnClickListener {
+            if (clicked) {
+                return@setOnClickListener
+            }
+            clicked = true
+            //            binding.idTvStart.isVisible = false
+//            binding.idLlJindu.isVisible = true
+//            binding.idLlYinsi.igitsVisible = false
+            ifAgreePrivacy = true
+            (context.application as MyApplication).initApp()
+//            MobileAds.initialize(context) { initializationStatus ->
+            listener.onAgreePrivacy()
+//            }
+            // EventUtils.event("app_start")
+        }
+    }
+
+    interface onUserPrivacyAggreementListener {
+        fun onAgreePrivacy()
+    }
+
+}
\ No newline at end of file

app/src/main/java/com/base/filerecoveryrecyclebin/activity/splash/Splash2Activity.kt

+package com.base.filerecoveryrecyclebin.activity.splash
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+import android.os.Handler
+import androidx.activity.result.contract.ActivityResultContracts
+import com.base.filerecoveryrecyclebin.MyApplication
+import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ifAgreePrivacy
+import com.base.filerecoveryrecyclebin.databinding.ActivitySplashBinding
+import com.base.filerecoveryrecyclebin.fcm.CloseNotificationReceiver
+import com.base.filerecoveryrecyclebin.fcm.NotificationUtil
+import com.base.filerecoveryrecyclebin.help.BaseActivity
+import com.base.filerecoveryrecyclebin.service.StayNotificationService.Companion.startStayNotification
+import com.base.filerecoveryrecyclebin.utils.BarUtils
+
+@SuppressLint("CustomSplashScreen")
+class Splash2Activity : BaseActivity<ActivitySplashBinding>(),
+    PrivacyManager.onUserPrivacyAggreementListener, TaskManager.ProgressListener {
+    private val TAG = "NewStartActivity"
+    private fun initStatusBar() {
+        BarUtils.setStatusBarLightMode(this, true)
+        BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
+        if (Build.VERSION.SDK_INT >= 33) {
+            registerForActivityResult(ActivityResultContracts.RequestPermission()) {}.launch(
+                Manifest.permission.POST_NOTIFICATIONS
+            )
+        }
+    }
+
+    override val binding: ActivitySplashBinding by lazy {
+        ActivitySplashBinding.inflate(layoutInflater)
+    }
+
+    private var mTaskManager: TaskManager? = null
+    var jumpType = 0
+
+    override fun initView() {
+        initStatusBar()
+        if (isDestroyed) {
+            return
+        }
+        if (MyApplication.isInterOpenShowing) {
+            finish()
+            return
+        }
+
+        NotificationUtil.stopNotificationHandler()
+        jumpType = intent.getIntExtra("actionId", 0)
+        closeNotification()
+        mTaskManager = TaskManager(binding, this)
+        if (ifAgreePrivacy) {
+            onAgreePrivacy()
+            //  EventUtils.event("app_start")
+        } else {
+            PrivacyManager(binding, this, this)
+        }
+
+    }
+    private fun closeNotification() {
+        sendBroadcast(Intent(this, CloseNotificationReceiver::class.java).apply {
+            this.action = CloseNotificationReceiver.Action
+            this.putExtra(CloseNotificationReceiver.NotificationId, jumpType)
+        })
+    }
+
+    override fun onAgreePrivacy() {
+        if (jumpType == 0) {
+            startStayNotification()
+        }
+        mTaskManager?.startProgress()
+        loadAd()
+//        if (!ConfigHelper.ifGuest) {
+//            mTaskManager?.pauseProgress()
+//            onProgressMax()
+//            return
+//        } else {
+//            loadAd()
+//        }
+
+    }
+
+
+    override fun onProgressMax() {
+        Handler().postDelayed({
+            StartUtils.jumpNextPage(this)
+        }, 500)
+    }
+
+    private fun loadAd() {
+//        AdmobMaxHelper.admobMaxShowOpenAd(this){
+//
+//        }
+            AdmobMaxHelper.admobMaxShowOpenAd(this,{
+                if (!isPause) {
+                    mTaskManager?.pauseProgress()
+                    runOnUiThread {
+                        mTaskManager?.maxProgress()
+                    }
+                }
+            })
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+    }
+
+    private var isPause = false
+
+    override fun onStart() {
+        super.onStart()
+        isPause = false
+    }
+
+    override fun onPause() {
+        super.onPause()
+        isPause = true
+    }
+
+    override fun onResume() {
+        super.onResume()
+        isPause = false
+    }
+
+    override fun onStop() {
+        super.onStop()
+        isPause = true
+    }
+
+
+}
\ No newline at end of file

app/src/main/java/com/base/filerecoveryrecyclebin/activity/splash/StartUtils.kt

+package com.base.filerecoveryrecyclebin.activity.splash
+
+import android.app.Activity
+import android.content.Intent
+import android.util.Log
+import com.base.filerecoveryrecyclebin.activity.MainActivity
+import com.base.filerecoveryrecyclebin.activity.appmanager.AppManagerAnimationActivity
+import com.base.filerecoveryrecyclebin.activity.appprocess.AppProcessAnimationActivity
+import com.base.filerecoveryrecyclebin.activity.battery.BatteryInfoAnimationActivity
+import com.base.filerecoveryrecyclebin.activity.guide.GuideActivity
+import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity
+import com.base.filerecoveryrecyclebin.activity.photomanager.PhotoManagerAnimationActivity
+import com.base.filerecoveryrecyclebin.activity.recovery.FileScanResultActivity
+import com.base.filerecoveryrecyclebin.activity.whatsapp.WhatsAppCleanerAnimationActivity
+import com.base.filerecoveryrecyclebin.bean.ConstObject
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_APP_MANAGER
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_APP_PROCESS
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_BATTERY_INFO
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_JUNK_CLEAN_PUSH
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_RECOVERY_DOCUMENTS
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_RECOVERY_PHOTOS
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_RECOVERY_VIDEOS
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_SCREENSHOT_CLEAN
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_SIMILAR_IMAGE
+import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_WHATSAPP
+import com.base.filerecoveryrecyclebin.bean.ConstObject.isGuide
+
+object StartUtils {
+
+    private val TAG = "SplashJumpUtils"
+    fun jumpNextPage(context: Activity) {
+
+        var jumpType = context.intent.getIntExtra("actionId", 0)
+
+        Log.e(TAG, "actionId: $jumpType")
+
+        if (jumpType == 0) {
+            val uri = context.intent.data
+            val str = (uri?.getQueryParameter("type") ?: "0")
+            jumpType = str.toIntOrNull() ?: 0
+            if (jumpType != 0) {
+            }
+        }
+        when (jumpType) {
+//=================================主动广播=======================================
+            ID_JUNK_CLEAN_PUSH -> {
+                context.startActivity(Intent(context, ScanJunkActivity::class.java))
+            }
+
+            ID_SIMILAR_IMAGE -> {
+                context.startActivity(Intent(context, PhotoManagerAnimationActivity::class.java))
+            }
+
+            ID_SCREENSHOT_CLEAN -> {
+                context.startActivity(Intent(context, PhotoManagerAnimationActivity::class.java))
+            }
+
+            ID_RECOVERY_PHOTOS -> {
+                context.startActivity(Intent(context, FileScanResultActivity::class.java).putExtra("ScanType",ConstObject.SCAN_PHOTOS))
+            }
+
+            ID_RECOVERY_VIDEOS -> {
+                context.startActivity(Intent(context, FileScanResultActivity::class.java).putExtra("ScanType",ConstObject.SCAN_VIDEOS))
+
+            }
+
+            ID_RECOVERY_DOCUMENTS -> {
+                context.startActivity(Intent(context, FileScanResultActivity::class.java).putExtra("ScanType",ConstObject.SCAN_DOCUMENTS))
+            }
+
+            ID_WHATSAPP -> {
+                context.startActivity(Intent(context, WhatsAppCleanerAnimationActivity::class.java))
+            }
+            ID_APP_PROCESS->{
+                context.startActivity(Intent(context, AppProcessAnimationActivity::class.java))
+            }
+            ID_APP_MANAGER->{
+                context.startActivity(Intent(context, AppManagerAnimationActivity::class.java))
+            }
+            ID_BATTERY_INFO -> {
+                context.startActivity(Intent(context, BatteryInfoAnimationActivity::class.java))
+            }
+
+
+//================================被动广播=========================================
+
+            else -> {
+                val isHotLaunch = context.intent?.extras?.getBoolean("isHotLaunch", false) ?: false
+                if (!isHotLaunch) {
+                    if (!isGuide) {
+                        context.startActivity(Intent(context, GuideActivity::class.java))
+                    } else {
+                        context.startActivity(Intent(context, MainActivity::class.java))
+                    }
+
+                }
+            }
+        }
+        context.finish()
+    }
+}
\ No newline at end of file

app/src/main/java/com/base/filerecoveryrecyclebin/activity/splash/TaskManager.kt

+package com.base.filerecoveryrecyclebin.activity.splash
+
+import android.os.Handler
+import android.view.View
+import androidx.core.view.isVisible
+import com.base.filerecoveryrecyclebin.databinding.ActivitySplashBinding
+
+class TaskManager {
+
+
+    private val binding: ActivitySplashBinding
+
+    private var mHandler: Handler
+
+    private var mIsPaused = false
+    private var mProgress = 0
+
+    private val listener: ProgressListener
+
+    constructor(binding: ActivitySplashBinding, listener: ProgressListener) {
+        this.binding = binding
+        this.listener = listener
+        mHandler = Handler()
+        initView()
+    }
+
+    var loadTime: Int = 15
+
+    private fun initView() {
+        //loadTime = SPUtils.getInstance().getInt("loading_page_time", 15)
+        binding.pb.max = loadTime
+        binding.pb.progress = 0
+
+    }
+
+    fun startProgress() {
+        binding.idTvStart.isVisible = false
+        binding.llStart.visibility = View.GONE
+        binding.llProgress.visibility = View.VISIBLE
+        val mRunnable: Runnable = object : Runnable {
+            override fun run() {
+                if (!mIsPaused) {
+                    mProgress++ // 计算进度
+                    binding.pb.progress = mProgress
+                    if (mProgress < loadTime) {
+                        mHandler.postDelayed(this, 1000) // 每秒钟更新一次进度
+                    } else {
+                        listener.onProgressMax()
+                        pauseProgress()
+                    }
+                }
+            }
+        }
+        mHandler.postDelayed(mRunnable, 1000)
+    }
+
+    fun pauseProgress() {
+        if (!mIsPaused) {
+            mIsPaused = true
+            mHandler.removeCallbacksAndMessages(null)
+        }
+    }
+
+    fun maxProgress() {
+        binding.pb.progress = binding.pb.max
+        listener.onProgressMax()
+    }
+
+    interface ProgressListener {
+        fun onProgressMax()
+    }
+}
\ No newline at end of file

app/src/main/java/com/base/filerecoveryrecyclebin/fcm/NotificationUtil.kt

@@ -16,7 +16,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.base.filerecoveryrecyclebin.MyApplication
 import com.base.filerecoveryrecyclebin.R
-import com.base.filerecoveryrecyclebin.activity.SplashActivity
+import com.base.filerecoveryrecyclebin.activity.splash.Splash2Activity
 import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_APP_MANAGER
 import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_APP_PROCESS
 import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_BATTERY_INFO
@@ -133,7 +133,7 @@ object NotificationUtil {
         bigRemoteViews.setOnClickPendingIntent(R.id.fl_cancel, cancelNotificationPendingIntent(context, actionId))
 
         //跳转
-        val intent = Intent(context, SplashActivity::class.java)
+        val intent = Intent(context, Splash2Activity::class.java)
         intent.putExtra("actionId", actionId)
         val btnRequestCode = Random().nextInt(1000)
         val btnPendingIntent = PendingIntent.getActivity(context, btnRequestCode, intent, PendingIntent.FLAG_IMMUTABLE)

app/src/main/java/com/base/filerecoveryrecyclebin/help/ConfigHelper.kt

 package com.base.filerecoveryrecyclebin.help
 
-import com.base.filerecoveryrecyclebin.activity.SplashActivity
+import com.base.filerecoveryrecyclebin.activity.splash.Splash2Activity
 
 object ConfigHelper {
 
@@ -40,7 +40,7 @@ object ConfigHelper {
         "adActivity",
         "AdActivity",
         "AppLovinFullscreenActivity",
-        SplashActivity::class.java.simpleName
+        Splash2Activity::class.java.simpleName
         // 返回前台时不跳转启动页的 activity
     )
 

app/src/main/java/com/base/filerecoveryrecyclebin/service/StayNotificationService.kt

 package  com.base.filerecoveryrecyclebin.service
 
-import android.Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC
-import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -22,9 +20,9 @@ import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.base.filerecoveryrecyclebin.R
 import com.base.filerecoveryrecyclebin.activity.MainActivity
-import com.base.filerecoveryrecyclebin.activity.SplashActivity
 import com.base.filerecoveryrecyclebin.activity.recyclebin.MediaContentObserver
 import com.base.filerecoveryrecyclebin.activity.recyclebin.MyFileObserver
+import com.base.filerecoveryrecyclebin.activity.splash.Splash2Activity
 import com.base.filerecoveryrecyclebin.bean.ConstObject
 import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_DOCUMENTS
 import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_PHOTOS
@@ -166,7 +164,7 @@ class StayNotificationService : Service() {
         val expendView = RemoteViews(context.packageName, R.layout.stay_notification_big)
 
         val requestCode1 = Random.nextInt(1800)
-        val intent0 = Intent(context, SplashActivity::class.java).apply {
+        val intent0 = Intent(context, Splash2Activity::class.java).apply {
             putExtra("actionId", ConstObject.ID_JUNK_CLEAN_PUSH)
         }
         val pendingIntent0 =
@@ -175,7 +173,7 @@ class StayNotificationService : Service() {
         expendView.setOnClickPendingIntent(R.id.id_ll_clean, pendingIntent0)
 
         val requestCode2 = Random.nextInt(1800)
-        val intent2 = Intent(context, SplashActivity::class.java).apply {
+        val intent2 = Intent(context, Splash2Activity::class.java).apply {
             putExtra("actionId", ConstObject.ID_RECOVERY_PHOTOS)
             putExtra("ScanType", SCAN_PHOTOS)
         }
@@ -185,7 +183,7 @@ class StayNotificationService : Service() {
         expendView.setOnClickPendingIntent(R.id.id_recovery_photos, pendingIntent2)
 
         val requestCode3 = Random.nextInt(1800)
-        val intent3 = Intent(context, SplashActivity::class.java).apply {
+        val intent3 = Intent(context, Splash2Activity::class.java).apply {
             putExtra("actionId", ConstObject.ID_RECOVERY_VIDEOS)
             putExtra("ScanType", SCAN_VIDEOS)
         }
@@ -203,7 +201,7 @@ class StayNotificationService : Service() {
 //        expendView.setOnClickPendingIntent(R.id.id_screenshot, pendingIntent4)
 
         val requestCode4 = Random.nextInt(1800)
-        val intent4 = Intent(context, SplashActivity::class.java).apply {
+        val intent4 = Intent(context, Splash2Activity::class.java).apply {
             putExtra("actionId", ConstObject.ID_RECOVERY_DOCUMENTS)
             putExtra("ScanType", SCAN_DOCUMENTS)
         }