Commit 33f60fe2 authored by wanglei's avatar wanglei

=========主分支需同步的功能==========

parent c6cd0001
...@@ -54,21 +54,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -54,21 +54,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
} }
NOTIFICATION_CLEANER -> { NOTIFICATION_CLEANER -> {
if (SPUtils.getInstance().getBoolean("notification_guest", false)) { startActivity(Intent(this, NotificationGuestActivity::class.java))
startActivity(
Intent(
this,
NotificationCleanActivity::class.java
)
)
} else {
startActivity(
Intent(
this,
NotificationGuestActivity::class.java
)
)
}
} }
NETWORK_TRAFFIC -> { NETWORK_TRAFFIC -> {
......
...@@ -80,12 +80,8 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() { ...@@ -80,12 +80,8 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
binding.idNotificationCleaner.setOnClickListener { binding.idNotificationCleaner.setOnClickListener {
if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
startActivity(Intent(requireActivity(), NotificationCleanActivity::class.java))
} else {
startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java)) startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java))
} }
}
binding.idRecentApp.setOnClickListener { binding.idRecentApp.setOnClickListener {
......
...@@ -53,12 +53,8 @@ class ToolsFragment : BaseFragment<FragmentLayoutToolsBinding>() { ...@@ -53,12 +53,8 @@ class ToolsFragment : BaseFragment<FragmentLayoutToolsBinding>() {
} }
NOTIFICATION_CLEANER -> { NOTIFICATION_CLEANER -> {
if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
startActivity(Intent(requireActivity(), NotificationCleanActivity::class.java))
} else {
startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java)) startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java))
} }
}
NETWORK_TRAFFIC -> { NETWORK_TRAFFIC -> {
startActivity(Intent(requireContext(), NetWorkActivity::class.java)) startActivity(Intent(requireContext(), NetWorkActivity::class.java))
......
...@@ -7,6 +7,10 @@ import com.blankj.utilcode.util.BarUtils ...@@ -7,6 +7,10 @@ import com.blankj.utilcode.util.BarUtils
import com.blankj.utilcode.util.SPUtils import com.blankj.utilcode.util.SPUtils
import com.test.basd.smartjunkcleaner.databinding.ActivityLayoutTionGuestBinding import com.test.basd.smartjunkcleaner.databinding.ActivityLayoutTionGuestBinding
import com.test.basd.smartjunkcleaner.helps.BaseActivity import com.test.basd.smartjunkcleaner.helps.BaseActivity
import com.test.basd.smartjunkcleaner.helps.ads.AdmobUtils
import com.test.basd.smartjunkcleaner.view.AdPreparationPop
import com.test.basd.smartjunkcleaner.view.RateStarPop
import kotlin.random.Random
class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>() { class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>() {
...@@ -24,13 +28,23 @@ class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>() ...@@ -24,13 +28,23 @@ class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>()
binding.idTzGuest.setAnimation("ying_sjunk_dao/data.json") binding.idTzGuest.setAnimation("ying_sjunk_dao/data.json")
binding.idTzGuest.playAnimation() binding.idTzGuest.playAnimation()
SPUtils.getInstance().put("notification_guest", true) SPUtils.getInstance().put("notification_guest", true)
binding.root.postDelayed({
AdmobUtils.showInterstitialAd(this) {
startActivity(Intent(this, NotificationCleanActivity::class.java))
finish()
}
}, Random.nextLong(2500, 4000))
binding.idTvTryNow.setOnClickListener { binding.idTvTryNow.setOnClickListener {
startActivity(Intent(this, NotificationCleanActivity::class.java)) startActivity(Intent(this, NotificationCleanActivity::class.java))
finish() finish()
} }
binding.idTGuanbi.setOnClickListener { binding.idTGuanbi.setOnClickListener {
AdmobUtils.showInterstitialAd(this@NotificationGuestActivity) {
finishToMain() finishToMain()
} }
} }
}
} }
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="17dp" android:padding="17dp"
android:visibility="gone"
android:src="@mipmap/guanbi" android:src="@mipmap/guanbi"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
android:id="@+id/id_tv_ss" android:id="@+id/id_tv_ss"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:gravity="center" android:gravity="center"
android:text="Close unimportant notifications,\n make notification bar much cleaner" android:text="Close unimportant notifications,\n make notification bar much cleaner"
android:textColor="#000000" android:textColor="#000000"
...@@ -51,6 +53,7 @@ ...@@ -51,6 +53,7 @@
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:gravity="center" android:gravity="center"
android:text="TRY NOW" android:text="TRY NOW"
android:visibility="gone"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" android:textSize="18sp"
app:bl_corners_radius="24dp" app:bl_corners_radius="24dp"
......
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