Commit d26e0468 authored by wanglei's avatar wanglei

启动页对齐正式版本,添加通知跳转上报

parent a4b70cc6
#Wed May 15 15:19:32 CST 2024
gradle.version=8.0
#Wed May 15 09:35:29 CST 2024
java.home=D\:\\AS Iguana\\jbr
...@@ -17,8 +17,10 @@ import com.blankj.utilcode.util.SPUtils ...@@ -17,8 +17,10 @@ import com.blankj.utilcode.util.SPUtils
import com.blankj.utilcode.util.ToastUtils import com.blankj.utilcode.util.ToastUtils
import com.zxhyis.toolss.FileApp import com.zxhyis.toolss.FileApp
import com.zxhyis.toolss.R import com.zxhyis.toolss.R
import com.zxhyis.toolss.ad.AdUtils
import com.zxhyis.toolss.ad.AdmobUtils import com.zxhyis.toolss.ad.AdmobUtils
import com.zxhyis.toolss.ad.ConfigHelper import com.zxhyis.toolss.ad.ConfigHelper
import com.zxhyis.toolss.ad.EventHelper
import com.zxhyis.toolss.ad.bean.PushCfg import com.zxhyis.toolss.ad.bean.PushCfg
import com.zxhyis.toolss.base.TopActivity import com.zxhyis.toolss.base.TopActivity
import com.zxhyis.toolss.common.notification.AppService import com.zxhyis.toolss.common.notification.AppService
...@@ -32,7 +34,6 @@ import com.zxhyis.toolss.ui.page.appmanager.AppManager2Activity ...@@ -32,7 +34,6 @@ import com.zxhyis.toolss.ui.page.appmanager.AppManager2Activity
import com.zxhyis.toolss.ui.page.bigfileclean.BigFileCleanActivity import com.zxhyis.toolss.ui.page.bigfileclean.BigFileCleanActivity
import com.zxhyis.toolss.ui.page.notifaction.NotificationCleanActivity import com.zxhyis.toolss.ui.page.notifaction.NotificationCleanActivity
import com.zxhyis.toolss.ui.page.notifaction.NotificationGuestActivity import com.zxhyis.toolss.ui.page.notifaction.NotificationGuestActivity
import com.zxhyis.toolss.ui.page.photocompress.photo.CompressioningActivity
import com.zxhyis.toolss.ui.page.photocompress.photo.StartCompressionPhotoActivity import com.zxhyis.toolss.ui.page.photocompress.photo.StartCompressionPhotoActivity
import com.zxhyis.toolss.ui.page.recentusage.RecentAppActivity import com.zxhyis.toolss.ui.page.recentusage.RecentAppActivity
import com.zxhyis.toolss.ui.page.speed.BatteryOptimizerActivity import com.zxhyis.toolss.ui.page.speed.BatteryOptimizerActivity
...@@ -136,7 +137,7 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() { ...@@ -136,7 +137,7 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() {
vb.idTvPrivacyPolic.setOnClick(javaClass.simpleName) { vb.idTvPrivacyPolic.setOnClick(javaClass.simpleName) {
val intent = Intent( val intent = Intent(
Intent.ACTION_VIEW, Intent.ACTION_VIEW,
Uri.parse("https://sites.google.com/view/abdoze/home") Uri.parse("https://sites.google.com/view/clean-mas/home")
) )
startActivity(intent) startActivity(intent)
} }
...@@ -150,6 +151,8 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() { ...@@ -150,6 +151,8 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() {
} }
private fun loadAd() { private fun loadAd() {
AdUtils.getLoadingTime()
val loadTime = SPUtils.getInstance().getInt("loading_page_time")
MainScope().launch(Dispatchers.Main) { MainScope().launch(Dispatchers.Main) {
launch(Dispatchers.IO) { launch(Dispatchers.IO) {
ConfigHelper.appList = AppUtils.getAppsInfo().shuffled() ConfigHelper.appList = AppUtils.getAppsInfo().shuffled()
...@@ -158,7 +161,7 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() { ...@@ -158,7 +161,7 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() {
while (true) { while (true) {
delay(200) delay(200)
time += 200 time += 200
if (vb.pb.progress <= 98 && time <= 15000) { if (vb.pb.progress <= 98 && time <= loadTime * 1000) {
vb.pb.progress = (vb.pb.progress + Random.nextInt(5)).coerceAtMost(98) vb.pb.progress = (vb.pb.progress + Random.nextInt(5)).coerceAtMost(98)
} else if (vb.pb.progress != 99 && !isPause) { } else if (vb.pb.progress != 99 && !isPause) {
break break
...@@ -203,72 +206,89 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() { ...@@ -203,72 +206,89 @@ class SplashActivity : TopActivity<ActivityLayoutSplashBinding>() {
//=================================主动广播======================================= //=================================主动广播=======================================
PushCfg.ID_JUNK_CLEAN_PUSH -> { PushCfg.ID_JUNK_CLEAN_PUSH -> {
startActivity<PrepareScanActivity>() startActivity<PrepareScanActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=PrepareScanActivity")
} }
PushCfg.ID_VIRUS_PUSH -> { PushCfg.ID_VIRUS_PUSH -> {
startActivity<VirusActivity>() startActivity<VirusActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=VirusActivity")
} }
PushCfg.ID_BIGFILE_PUSH -> { PushCfg.ID_BIGFILE_PUSH -> {
startActivity<BigFileCleanActivity>() startActivity<BigFileCleanActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=BigFileCleanActivity")
} }
PushCfg.ID_PHOTO_COMPRESS -> { PushCfg.ID_PHOTO_COMPRESS -> {
startActivity<StartCompressionPhotoActivity>() startActivity<StartCompressionPhotoActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=StartCompressionPhotoActivity")
} }
PushCfg.ID_APP_MANAGER -> { PushCfg.ID_APP_MANAGER -> {
startActivity<AppManager2Activity>() startActivity<AppManager2Activity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=AppManager2Activity")
} }
PushCfg.ID_NETWORK_TRAFFIC -> { PushCfg.ID_NETWORK_TRAFFIC -> {
startActivity<NetWorkActivity>() startActivity<NetWorkActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=NetWorkActivity")
} }
PushCfg.ID_CLEAN_NOTIFICATION -> { PushCfg.ID_CLEAN_NOTIFICATION -> {
if (SPUtils.getInstance().getBoolean("notification_guest", false)) { if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
startActivity(Intent(this, NotificationCleanActivity::class.java)) startActivity(Intent(this, NotificationCleanActivity::class.java))
EventHelper.event("notification_jump", "JumpType=$JumpType activity=NotificationCleanActivity")
} else { } else {
startActivity(Intent(this, NotificationGuestActivity::class.java)) startActivity(Intent(this, NotificationGuestActivity::class.java))
EventHelper.event("notification_jump", "JumpType=$JumpType activity=NotificationGuestActivity")
} }
} }
PushCfg.ID_RECENT_USE_APP -> { PushCfg.ID_RECENT_USE_APP -> {
startActivity<RecentAppActivity>() startActivity<RecentAppActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=RecentAppActivity")
} }
PushCfg.ID_SIMILAR_IMAGE -> { PushCfg.ID_SIMILAR_IMAGE -> {
startActivity<RepeaterdPhotoActivity>() startActivity<RepeaterdPhotoActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=RepeaterdPhotoActivity")
} }
PushCfg.ID_CLEAN_SPEAKER -> { PushCfg.ID_CLEAN_SPEAKER -> {
startActivity<SpeakerCleanerActivity>() startActivity<SpeakerCleanerActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=SpeakerCleanerActivity")
} }
PushCfg.ID_BATTERY_OPTIMIZATION -> { PushCfg.ID_BATTERY_OPTIMIZATION -> {
startActivity<BatteryOptimizerActivity>() startActivity<BatteryOptimizerActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=BatteryOptimizerActivity")
} }
//================================被动广播========================================= //================================被动广播=========================================
PushCfg.ID_INSTALL_PACKAGE_PUSH -> { PushCfg.ID_INSTALL_PACKAGE_PUSH -> {
startActivity<VirusActivity>() startActivity<VirusActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=VirusActivity")
} }
PushCfg.ID_UNINSTALL_PACKAGE_PUSH -> { PushCfg.ID_UNINSTALL_PACKAGE_PUSH -> {
startActivity<PrepareScanActivity>() startActivity<PrepareScanActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=PrepareScanActivity")
} }
PushCfg.ID_CHARGE -> { PushCfg.ID_CHARGE -> {
startActivity<BatteryInfoActivity>() startActivity<BatteryInfoActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=BatteryInfoActivity")
} }
PushCfg.ID_LOW_BATTERY_PUSH -> { PushCfg.ID_LOW_BATTERY_PUSH -> {
startActivity<BatteryInfoActivity>() startActivity<BatteryInfoActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=BatteryInfoActivity")
} }
PushCfg.ID_PHONE_ACCELERATE -> { PushCfg.ID_PHONE_ACCELERATE -> {
startActivity<SpeedActivity>() startActivity<SpeedActivity>()
EventHelper.event("notification_jump", "JumpType=$JumpType activity=SpeedActivity")
} }
else -> { else -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment