Commit c4a7ebc4 authored by wanglei's avatar wanglei

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

parents 73722a8e 2180ecef
...@@ -15,4 +15,5 @@ class ConfigBean() { ...@@ -15,4 +15,5 @@ class ConfigBean() {
var timerDelay: Int = 1 var timerDelay: Int = 1
var timerInterval: Int = 5 var timerInterval: Int = 5
var maxMultiClick: Int = 4 var maxMultiClick: Int = 4
var naAdS: Int = 1
} }
...@@ -64,6 +64,7 @@ object ComUtils { ...@@ -64,6 +64,7 @@ object ComUtils {
SPUtils.getInstance().put("timerS", bean.timerS) SPUtils.getInstance().put("timerS", bean.timerS)
SPUtils.getInstance().put("timerDelay", bean.timerDelay) SPUtils.getInstance().put("timerDelay", bean.timerDelay)
SPUtils.getInstance().put("timerInterval", bean.timerInterval) SPUtils.getInstance().put("timerInterval", bean.timerInterval)
SPUtils.getInstance().put("naAdS", bean.naAdS)
adDisplayInterval = bean.adInterval adDisplayInterval = bean.adInterval
maxMultiClick = bean.maxMultiClick maxMultiClick = bean.maxMultiClick
AdDisplayUtils.getInstance().setMaxAdDisplayCount(bean.adShowCount) AdDisplayUtils.getInstance().setMaxAdDisplayCount(bean.adShowCount)
......
...@@ -6,6 +6,8 @@ import android.content.Context ...@@ -6,6 +6,8 @@ import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import com.test.easy.easycleanerjunk.R import com.test.easy.easycleanerjunk.R
...@@ -15,6 +17,7 @@ import com.test.easy.easycleanerjunk.databinding.DialogFunctionExitBinding ...@@ -15,6 +17,7 @@ import com.test.easy.easycleanerjunk.databinding.DialogFunctionExitBinding
import com.test.easy.easycleanerjunk.databinding.DialogLayoutFlowTypeBinding import com.test.easy.easycleanerjunk.databinding.DialogLayoutFlowTypeBinding
import com.test.easy.easycleanerjunk.databinding.DialogPermissonOpenBinding import com.test.easy.easycleanerjunk.databinding.DialogPermissonOpenBinding
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.utils.SPUtils
import com.test.easy.easycleanerjunk.view.AFunOb.APP_MANAGER import com.test.easy.easycleanerjunk.view.AFunOb.APP_MANAGER
import com.test.easy.easycleanerjunk.view.AFunOb.BATTERY_INFO import com.test.easy.easycleanerjunk.view.AFunOb.BATTERY_INFO
import com.test.easy.easycleanerjunk.view.AFunOb.JUNK_CLEANER import com.test.easy.easycleanerjunk.view.AFunOb.JUNK_CLEANER
...@@ -126,7 +129,16 @@ object DialogViews { ...@@ -126,7 +129,16 @@ object DialogViews {
dialog.dismiss() dialog.dismiss()
} }
dialog.show() dialog.show()
AdmobUtils.showNativeAd(null, dialog.findViewById(R.id.fl_ad))
val adS = SPUtils.getInstance().getInt("naAdS", 1)
val view: FrameLayout = dialog.findViewById(R.id.fl_ad)
if (adS == 1) {
view.visibility = View.VISIBLE
AdmobUtils.showNativeAd(null, view)
} else {
view.visibility = View.GONE
}
} }
} }
\ No newline at end of file
...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint ...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.view.Gravity import android.view.Gravity
import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.PopupWindow import android.widget.PopupWindow
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
...@@ -52,7 +53,13 @@ class PopExitWindow(private val activity: Activity) : PopupWindow() { ...@@ -52,7 +53,13 @@ class PopExitWindow(private val activity: Activity) : PopupWindow() {
BarUtils.setStatusBarLightMode(activity, false) BarUtils.setStatusBarLightMode(activity, false)
showAtLocation(activity.window.decorView, Gravity.CENTER, 0, 0) showAtLocation(activity.window.decorView, Gravity.CENTER, 0, 0)
} }
val adS = SPUtils.getInstance().getInt("naAdS", 1)
if (adS == 1) {
binding.idFlAd.visibility = View.VISIBLE
AdmobUtils.showNativeAd(activity, binding.idFlAd) AdmobUtils.showNativeAd(activity, binding.idFlAd)
} else {
binding.idFlAd.visibility = View.GONE
}
binding.idExperienceNow.setOnClickListener { binding.idExperienceNow.setOnClickListener {
dismiss() dismiss()
activity.startActivity(Intent(activity, ScanJunkActivity::class.java)) activity.startActivity(Intent(activity, ScanJunkActivity::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