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

app/src/main/java/com/test/easy/easycleanerjunk/bean/ConfigBean.kt

@@ -15,4 +15,5 @@ class ConfigBean() {
     var timerDelay: Int = 1
     var timerInterval: Int = 5
     var maxMultiClick: Int = 4
+    var naAdS: Int = 1
 }

app/src/main/java/com/test/easy/easycleanerjunk/helps/ComUtils.kt

@@ -64,6 +64,7 @@ object ComUtils {
                 SPUtils.getInstance().put("timerS", bean.timerS)
                 SPUtils.getInstance().put("timerDelay", bean.timerDelay)
                 SPUtils.getInstance().put("timerInterval", bean.timerInterval)
+                SPUtils.getInstance().put("naAdS", bean.naAdS)
                 adDisplayInterval = bean.adInterval
                 maxMultiClick = bean.maxMultiClick
                 AdDisplayUtils.getInstance().setMaxAdDisplayCount(bean.adShowCount)

app/src/main/java/com/test/easy/easycleanerjunk/view/DialogViews.kt

@@ -6,6 +6,8 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import com.test.easy.easycleanerjunk.R
@@ -15,6 +17,7 @@ import com.test.easy.easycleanerjunk.databinding.DialogFunctionExitBinding
 import com.test.easy.easycleanerjunk.databinding.DialogLayoutFlowTypeBinding
 import com.test.easy.easycleanerjunk.databinding.DialogPermissonOpenBinding
 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.BATTERY_INFO
 import com.test.easy.easycleanerjunk.view.AFunOb.JUNK_CLEANER
@@ -126,7 +129,16 @@ object DialogViews {
             dialog.dismiss()
         }
         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

app/src/main/java/com/test/easy/easycleanerjunk/view/PopExitWindow.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.view.Gravity
+import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupWindow
 import androidx.core.view.updatePadding
@@ -52,7 +53,13 @@ class PopExitWindow(private val activity: Activity) : PopupWindow() {
             BarUtils.setStatusBarLightMode(activity, false)
             showAtLocation(activity.window.decorView, Gravity.CENTER, 0, 0)
         }
-        AdmobUtils.showNativeAd(activity, binding.idFlAd)
+        val adS = SPUtils.getInstance().getInt("naAdS", 1)
+        if (adS == 1) {
+            binding.idFlAd.visibility = View.VISIBLE
+            AdmobUtils.showNativeAd(activity, binding.idFlAd)
+        } else {
+            binding.idFlAd.visibility = View.GONE
+        }
         binding.idExperienceNow.setOnClickListener {
             dismiss()
             activity.startActivity(Intent(activity, ScanJunkActivity::class.java))