Skip to content

E
Easy Cleaner Junk
Commit 691e9f19 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改ui 和去掉广告限制

parent 58d76642
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 482 deletions
app/src/main/java/com/test/easy/easycleanerjunk/activity/ScreenShotActivity.kt
View file @ 691e9f19
......@@ -28,7 +28,7 @@ import kotlin.collections.HashSet
import kotlin.random.Random
class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
override val isLightMode = true
private lateinit var screenShotAdapter: ScreenShotAdapter
override val binding: ActivityScreenShotBinding by lazy {
......
app/src/main/java/com/test/easy/easycleanerjunk/activity/SettingActivity.kt
View file @ 691e9f19
......@@ -8,10 +8,11 @@ import com.test.easy.easycleanerjunk.helps.BaseActivity
import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.ConfigHelper.allNotification
import com.test.easy.easycleanerjunk.helps.ConfigHelper.remainNotification
import com.test.easy.easycleanerjunk.view.RateStarPop
class SettingActivity : BaseActivity<ActivitySettingBinding>() {
override val isLightMode = true
override val binding: ActivitySettingBinding by lazy {
ActivitySettingBinding.inflate(layoutInflater)
}
......@@ -42,6 +43,9 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
)
startActivity(intent)
}
binding.idLlScore.setOnClickListener {
RateStarPop.show(this,true)
}
}
}
\ No newline at end of file
app/src/main/java/com/test/easy/easycleanerjunk/fragment/HomeFragment.kt
View file @ 691e9f19
......@@ -9,11 +9,13 @@ import androidx.core.view.updatePadding
import com.test.easy.easycleanerjunk.activity.LargeFileCleanActivity
import com.test.easy.easycleanerjunk.activity.RepeatPhotoActivity
import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
import com.test.easy.easycleanerjunk.activity.ScreenShotActivity
import com.test.easy.easycleanerjunk.activity.SettingActivity
import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
import com.test.easy.easycleanerjunk.databinding.FragmentLayoutHomeBinding
import com.test.easy.easycleanerjunk.helps.BaseFragment
import com.test.easy.easycleanerjunk.helps.KotlinExt.setOnClickListener
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.utils.BarUtils
class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
......@@ -50,6 +52,7 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
override fun onResume() {
super.onResume()
AdmobUtils.showNativeAd(requireActivity(),binding.idFlAd)
if (animPaused) {
startAnimation()
animPaused = false
......@@ -84,7 +87,10 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
binding.ivSetting.setOnClickListener {
startActivity(Intent(requireContext(), SettingActivity::class.java))
}
binding.idScreenshotClean.setOnClickListener {
startActivity(Intent(requireContext(), ScreenShotActivity::class.java))
}
}
}
\ No newline at end of file
app/src/main/java/com/test/easy/easycleanerjunk/helps/ads/AdmobUtils.kt
View file @ 691e9f19
......@@ -46,87 +46,7 @@ object AdmobUtils {
private var mOpenAd: AppOpenAd? = null
private const val typeShow = "Show"
private const val typeClick = "Click"
var adShowCount = 80
get() {
return SPUtils.getInstance().getInt("adShowCount", field)
}
set(value) {
field = value
SPUtils.getInstance().put("adShowCount", value)
}
var nativeAdShowCount = 40
get() {
return SPUtils.getInstance().getInt("nativeAdShowCount", field)
}
set(value) {
field = value
SPUtils.getInstance().put("nativeAdShowCount", value)
}
var adClickCount = 10
get() {
return SPUtils.getInstance().getInt("adClickCount", field)
}
set(value) {
field = value
SPUtils.getInstance().put("adClickCount", value)
}
var nativeAdClickCount = 10
get() {
return SPUtils.getInstance().getInt("nativeAdClickCount", field)
}
set(value) {
field = value
SPUtils.getInstance().put("nativeAdClickCount", value)
}
var isNowPlayAd = 0
get() {
return SPUtils.getInstance().getInt("isNowPlayAd", field)
}
set(value) {
field = value
SPUtils.getInstance().put("isNowPlayAd", value)
}
fun isAdLimit(isNative: Boolean = false) =
getTodayCount(typeShow, isNative) % 1000 >= getAdShowCount(isNative) || getTodayCount(
typeClick,
isNative
) % 1000 >= getAdClickCount(isNative)
private fun getAdShowCount(isNative: Boolean) = if (isNative) nativeAdShowCount else adShowCount
private fun getTodayCount(type: String, isNative: Boolean): Long {
val last = Calendar.getInstance().apply {
timeInMillis = SPUtils.getInstance()
.getLong("${if (isNative) "native" else "other"}AdToday${type}Count", 0)
}
return Calendar.getInstance().run {
if (get(Calendar.DAY_OF_YEAR) == last[Calendar.DAY_OF_YEAR]) {
last
} else {
set(Calendar.MILLISECOND, 0)
this
}
}.timeInMillis
}
private var singleAdClickCount = 4
get() {
return SPUtils.getInstance().getInt("singleAdClickCount", field)
}
set(value) {
field = value
SPUtils.getInstance().put("singleAdClickCount", value)
}
private fun getAdClickCount(isNative: Boolean) =
if (isNative) nativeAdClickCount else adClickCount
private fun addTodayCount(type: String, isNative: Boolean) {
val todayCount = getTodayCount(type, isNative)
SPUtils.getInstance()
.put("${if (isNative) "native" else "other"}AdToday${type}Count", todayCount + 1)
}
var isBlack = false
get() {
......@@ -138,10 +58,6 @@ object AdmobUtils {
}
fun loadAppOpenAd(skip: Boolean = false, onLoad: (() -> Unit)? = null) {
if (isBlack) {
onLoad?.invoke()
return
}
if (mOpenAd != null || skip) {
onLoad?.invoke()
......@@ -162,7 +78,6 @@ object AdmobUtils {
onLoad?.invoke()
pull(ad.responseInfo, "openAd", reqId = reqId)
ad.onPaidEventListener = EventOnPaidEventListener(ad)
// Log.e("MXL", "OpenonAdLoaded: ")
// Log.e("MXL", "拉取成功: ", )
}
......@@ -171,7 +86,6 @@ object AdmobUtils {
onLoad?.invoke()
pull(p0.responseInfo, "openAd", p0.message, reqId = reqId)
// Log.e("MXL", "onAdFailedToLoad: " + p0.message)
//ToastUtils.showShort("开屏拉取失败" + p0.message)
}
})
}
......@@ -179,15 +93,6 @@ object AdmobUtils {
fun isOpenAdLoaded() = mOpenAd != null
fun showAppOpenAd(activity: Activity, skip: Boolean = false, onHidden: (() -> Unit)? = null) {
if (isBlack) {
onHidden?.invoke()
return
}
// if (!AdUtils.isShowAd("splash_slot")) {
// onHidden?.invoke()
// return
// }
if (activity.isFinishing || activity.isDestroyed) {
return
}
......@@ -206,12 +111,11 @@ object AdmobUtils {
return
}
if (mOpenAd != null) {
var thisMOpenAd = mOpenAd
val thisMOpenAd = mOpenAd
mOpenAd = null
thisMOpenAd?.fullScreenContentCallback = object : FullScreenContentCallback() {
override fun onAdClicked() {
click(thisMOpenAd?.responseInfo, "openAd")
onAdClick(thisMOpenAd)
}
override fun onAdDismissedFullScreenContent() {
......@@ -248,15 +152,6 @@ object AdmobUtils {
private var loadingListener: (() -> Unit)? = null
fun showNativeAd(activity: Activity?, parent: ViewGroup) {
if (isBlack) {
return
}
// if (!AdUtils.isShowAd("native_slot")) {
// return
// }
if (isAdLimit(true)) {
return
}
val obj = JSONObject()
obj.put("ad_unit", "NativeAd")
......@@ -289,12 +184,6 @@ object AdmobUtils {
private var isLoading = false
fun loadNativeAd() {
if (isBlack) {
return
}
if (isAdLimit()) {
return
}
if (nativeAd != null) {
return
}
......@@ -322,7 +211,6 @@ object AdmobUtils {
}.withAdListener(object : AdListener() {
override fun onAdClicked() {
click(nativeAd?.responseInfo, "nativeAd")
onAdClick(nativeAd)
}
override fun onAdFailedToLoad(p0: LoadAdError) {
......@@ -338,15 +226,6 @@ object AdmobUtils {
private var interAd: InterstitialAd? = null
fun isInterLoaded() = interAd != null
fun loadInterstitialAd(activity: Activity, onLoad: (() -> Unit)? = null) {
if (isBlack) {
onLoad?.invoke()
return
}
if (isAdLimit()) {
onLoad?.invoke()
return
}
if (interAd != null) {
onLoad?.invoke()
return
......@@ -368,7 +247,11 @@ object AdmobUtils {
onLoad?.invoke()
pull(p0.responseInfo, "interAd", p0.message, reqId = reqId)
if (BuildConfig.DEBUG) {
Toast.makeText(BaseApplication.context, "拉取失败" + p0.message, Toast.LENGTH_SHORT)
Toast.makeText(
BaseApplication.context,
"拉取失败" + p0.message,
Toast.LENGTH_SHORT
)
}
// Log.e("MXL", "InterAdFailedToLoad: " + p0.message)
......@@ -395,20 +278,8 @@ object AdmobUtils {
if (activity.isFinishing || activity.isDestroyed) {
return
}
if (isBlack) {
onHidden?.invoke()
return
}
if (isAdLimit()) {
onHidden?.invoke()
return
}
val obj = JSONObject()
obj.put("ad_unit", "interAd")
if (isASkip) {
}
if (skip) {
onHidden?.invoke()
return
......@@ -427,7 +298,6 @@ object AdmobUtils {
thisInterAd?.fullScreenContentCallback = object : FullScreenContentCallback() {
override fun onAdClicked() {
click(thisInterAd?.responseInfo, "interAd")
onAdClick(thisInterAd)
}
override fun onAdDismissedFullScreenContent() {
......@@ -510,7 +380,6 @@ object AdmobUtils {
}
private fun show(responseInfo: ResponseInfo?, adUnit: String, activity: Activity? = null) {
addTodayCount(typeShow, adUnit == "nativeAd")
val response = responseInfo?.adapterResponses?.getOrNull(0)
val obj = JSONObject()
obj.put("source", response?.adSourceName)
......@@ -526,26 +395,9 @@ object AdmobUtils {
obj.put("from", activity?.javaClass?.simpleName)
}
private var lastObj: Any? = null
private var curSingleAdClick = 0
private fun onAdClick(obj: Any?) {
if (lastObj == obj) {
curSingleAdClick++
} else {
lastObj = obj
curSingleAdClick = 1
}
if (curSingleAdClick == singleAdClickCount) {
isBlack = true
exitProcess(0)
}
}
private fun click(responseInfo: ResponseInfo?, adUnit: String) {
addTodayCount(typeClick, adUnit == "nativeAd")
val response = responseInfo?.adapterResponses?.getOrNull(0)
val obj = JSONObject()
......
app/src/main/java/com/test/easy/easycleanerjunk/view/RateStarPop.kt
View file @ 691e9f19
......@@ -15,18 +15,23 @@ import com.test.easy.easycleanerjunk.utils.SPUtils
class RateStarPop(private val activity: Activity) : PopupWindow() {
companion object {
fun show(activity: Activity) {
val n = SPUtils.getInstance().getInt("RateNums", 0)
SPUtils.getInstance().put("RateNums", n + 1)
if (SPUtils.getInstance().getBoolean("isRated", false)) {
return
}
if (n > 0 && n % 8 == 0) {
fun show(activity: Activity, isshow: Boolean = false) {
if (isshow) {
RateStarPop(activity).show()
} else {
return
val n = SPUtils.getInstance().getInt("RateNums", 0)
SPUtils.getInstance().put("RateNums", n + 1)
if (SPUtils.getInstance().getBoolean("isRated", false)) {
return
}
if (n > 0 && n % 8 == 0) {
RateStarPop(activity).show()
} else {
return
}
}
}
fun dismiss(activity: Activity) {
......
app/src/main/res/layout/activity_setting.xml
View file @ 691e9f19
......@@ -27,20 +27,81 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Notification settings"
android:text="Settings"
android:textColor="@color/black"
android:textSize="19sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</FrameLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/id_ll_score"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical">
<androidx.cardview.widget.CardView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/t_score" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Score"
android:textColor="#000000"
android:textSize="15sp"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="18dp"
android:src="@mipmap/jianotu" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/card_privacy"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/t_privacy" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Privacy Policy"
android:textColor="#000000"
android:textSize="15sp"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="18dp"
android:src="@mipmap/jianotu" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="20dp"
android:visibility="gone"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="15dp">
......
app/src/main/res/layout/item_parent.xml
View file @ 691e9f19
......@@ -94,7 +94,7 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/jiantou" />
android:src="@mipmap/jianotu" />
</com.noober.background.view.BLLinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_tool_grid_1.xml
View file @ 691e9f19
......@@ -33,7 +33,7 @@
<ImageView
android:layout_width="25dp"
android:layout_height="25dp"
android:src="@mipmap/jiantou"
android:src="@mipmap/jianotu"
tools:ignore="ContentDescription" />
</LinearLayout>
\ No newline at end of file
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