Merge remote-tracking branch 'origin/free-master' into free-master

app/src/main/java/com/test/easy/easycleanerjunk/activity/home/NewMainActivity.kt

@@ -10,6 +10,7 @@ import com.test.easy.easycleanerjunk.databinding.ActivityMainBinding
 import com.test.easy.easycleanerjunk.fragment.HomeFragment
 import com.test.easy.easycleanerjunk.fragment.ToolsFragment
 import com.test.easy.easycleanerjunk.helps.BaseActivity
+import com.test.easy.easycleanerjunk.helps.EventUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
 import com.test.easy.easycleanerjunk.view.RateStarPop
 import kotlinx.coroutines.Dispatchers
@@ -37,7 +38,7 @@ class NewMainActivity : BaseActivity<ActivityMainBinding>() {
     override fun initView() {
         BarUtils.setStatusBarLightMode(this, true)
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
-
+        EventUtils.event("page_home")
         binding.idVp.run {
             adapter = object : FragmentStateAdapter(this@NewMainActivity) {
                 override fun getItemCount(): Int {

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/NewSplashActivity.kt

@@ -13,6 +13,7 @@ import com.test.easy.easycleanerjunk.fcm.CloseNotificationReceiver
 import com.test.easy.easycleanerjunk.fcm.NotificationUtil
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ConfigHelper
+import com.test.easy.easycleanerjunk.helps.EventUtils
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.service.PermanentNotificationService
 import com.test.easy.easycleanerjunk.utils.BarUtils
@@ -59,6 +60,7 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
             binding.idLlJindu.isVisible = true
             binding.idLlYinsi.isVisible = false
             onAgreePrivacy()
+            EventUtils.event("app_start")
         } else {
             PrivacyAgreementManager(binding, this, this)
         }

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/PrivacyAgreementManager.kt

@@ -9,6 +9,7 @@ import android.text.style.UnderlineSpan
 import com.test.easy.easycleanerjunk.MyApplication
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutSplashBinding
 import com.test.easy.easycleanerjunk.helps.ConfigHelper
+import com.test.easy.easycleanerjunk.helps.EventUtils
 
 class PrivacyAgreementManager {
 
@@ -59,6 +60,7 @@ class PrivacyAgreementManager {
             ConfigHelper.ifAgreePrivacy = true
             (context.application as MyApplication).initApp()
             listener.onAgreePrivacy()
+            EventUtils.event("app_start")
         }
     }
 

app/src/main/java/com/test/easy/easycleanerjunk/fcm/NotificationUtil.java

@@ -83,7 +83,7 @@ public class NotificationUtil {
         }
 
         int interval = SPUtils.getInstance().getInt("notification_interval", 60);
-        long lastTime = SPUtils.getInstance().getInt("last_notification_time", 0);
+        long lastTime = SPUtils.getInstance().getLong("last_notification_time", 0);
         long nowTime = System.currentTimeMillis();
         long x = nowTime - lastTime;
         if (x < (interval * 1000)) {
@@ -157,7 +157,7 @@ public class NotificationUtil {
             btn = "Clean up";
         } else if (actionId == ConfigBean.ID_APP_MANAGER) {
             icon = R.drawable.appmanager;
-            desc = "Manage apps that are not frequently used, free up storage space on your phone, and keep it running smoothly!";
+            desc = "Running out of space on your phone? Manage less frequently used apps to free up space on your phone!";
             btn = "View";
         } else if (actionId == ConfigBean.ID_BATTERY) {
             icon = R.drawable.battery;
@@ -169,7 +169,7 @@ public class NotificationUtil {
             btn = "View";
         } else if (actionId == ConfigBean.ID_WHATSAPP) {
             icon = R.drawable.whatsapp_clean;
-            desc = "Running out of storage space on your phone? Clean up WhatsApp to free up space";
+            desc = "Running out of storage space on your phone? Clean up WhatsApp junk files to free up space";
             btn = "View";
         } else {
             return;