Commit f39f5fc6 authored by maxiaoliang's avatar maxiaoliang

修改引导页需求

parent 6ddcdbc6
...@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.LinearSmoothScroller ...@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.LinearSmoothScroller
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.test.easy.easycleanerjunk.R import com.test.easy.easycleanerjunk.R
import com.test.easy.easycleanerjunk.activity.home.NewMainActivity import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity import com.test.easy.easycleanerjunk.activity.scanjunk.CleanGuestActivity
import com.test.easy.easycleanerjunk.adapter.DeviceScanAdapter import com.test.easy.easycleanerjunk.adapter.DeviceScanAdapter
import com.test.easy.easycleanerjunk.databinding.ActivityDeviceScanBinding import com.test.easy.easycleanerjunk.databinding.ActivityDeviceScanBinding
import com.test.easy.easycleanerjunk.helps.BaseActivity import com.test.easy.easycleanerjunk.helps.BaseActivity
...@@ -67,7 +67,11 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() { ...@@ -67,7 +67,11 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() {
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
binding.tvStart.setOnClickListener { binding.tvStart.setOnClickListener {
if (!ConfigHelper.ifGuestFirstClean) {
startActivity(Intent(this, CleanGuestActivity::class.java))
} else {
startActivity(Intent(this, NewMainActivity::class.java)) startActivity(Intent(this, NewMainActivity::class.java))
}
finish() finish()
} }
} }
...@@ -76,7 +80,9 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() { ...@@ -76,7 +80,9 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() {
val scroller = object : LinearSmoothScroller(context) { val scroller = object : LinearSmoothScroller(context) {
override fun calculateSpeedPerPixel(displayMetrics: DisplayMetrics): Float { override fun calculateSpeedPerPixel(displayMetrics: DisplayMetrics): Float {
val layoutMgr = this.layoutManager val layoutMgr = this.layoutManager
if (layoutMgr !is LinearLayoutManager) return super.calculateSpeedPerPixel(displayMetrics) if (layoutMgr !is LinearLayoutManager) return super.calculateSpeedPerPixel(
displayMetrics
)
val first = layoutMgr.findFirstVisibleItemPosition() val first = layoutMgr.findFirstVisibleItemPosition()
val diff = abs(pos - first) val diff = abs(pos - first)
val speed = 25f / diff * speedFactor val speed = 25f / diff * speedFactor
......
...@@ -7,6 +7,7 @@ import androidx.core.view.updatePadding ...@@ -7,6 +7,7 @@ import androidx.core.view.updatePadding
import com.test.easy.easycleanerjunk.databinding.ActivityLayoutCleanGuestBinding import com.test.easy.easycleanerjunk.databinding.ActivityLayoutCleanGuestBinding
import com.test.easy.easycleanerjunk.helps.BaseActivity import com.test.easy.easycleanerjunk.helps.BaseActivity
import com.test.easy.easycleanerjunk.helps.ConfigHelper import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
import com.test.easy.easycleanerjunk.utils.BarUtils import com.test.easy.easycleanerjunk.utils.BarUtils
/** /**
...@@ -27,8 +28,11 @@ class CleanGuestActivity : BaseActivity<ActivityLayoutCleanGuestBinding>() { ...@@ -27,8 +28,11 @@ class CleanGuestActivity : BaseActivity<ActivityLayoutCleanGuestBinding>() {
binding.idTvSkip.isVisible = true binding.idTvSkip.isVisible = true
// }, 3000) // }, 3000)
binding.idTvSkip.setOnClickListener { binding.idTvSkip.setOnClickListener {
MaxAdUtils.showInterstitialAd(this){
finishToMain() finishToMain()
} }
}
binding.idTvClean.setOnClickListener { binding.idTvClean.setOnClickListener {
startActivity(Intent(this, PrepareScanActivity::class.java)) startActivity(Intent(this, PrepareScanActivity::class.java))
finish() finish()
......
...@@ -3,14 +3,13 @@ package com.test.easy.easycleanerjunk.activity.splash ...@@ -3,14 +3,13 @@ package com.test.easy.easycleanerjunk.activity.splash
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.util.Log import android.util.Log
import com.test.easy.easycleanerjunk.activity.scanjunk.CleanGuestActivity
import com.test.easy.easycleanerjunk.activity.DeviceScanActivity import com.test.easy.easycleanerjunk.activity.DeviceScanActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
import com.test.easy.easycleanerjunk.activity.home.NewMainActivity import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
...@@ -80,13 +79,9 @@ object SplashJumpUtils { ...@@ -80,13 +79,9 @@ object SplashJumpUtils {
if (!isHotLaunch) { if (!isHotLaunch) {
if (!ConfigHelper.ifGuest) { if (!ConfigHelper.ifGuest) {
context.startActivity(Intent(context, DeviceScanActivity::class.java)) context.startActivity(Intent(context, DeviceScanActivity::class.java))
} else {
if (!ConfigHelper.ifGuestFirstClean) {
context.startActivity(Intent(context, CleanGuestActivity::class.java))
} else { } else {
context.startActivity(Intent(context, NewMainActivity::class.java)) context.startActivity(Intent(context, NewMainActivity::class.java))
} }
}
} }
} }
......
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