Commit 8e35d0a9 authored by maxiaoliang's avatar maxiaoliang

修改需求

parent 737e29b8
......@@ -227,6 +227,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
binding.idClBtn.isVisible = scanCount >= 3
binding.idClBtn.isEnabled = sizes.sum() > 0
if (scanCount >= 3 && sizes.sum().toInt() == 0) {
if(ConfigHelper.admobTrueMaxFlase==0){
MaxAdUtils.showInterstitialAd(this)
}else{
AdmobUtils.showInterstitialAd(this)
}
// MaxAdUtils.showInterstitialAd(this) {
// startActivity(
// Intent(this, ResultActivity::class.java).putExtra(
......
......@@ -2,6 +2,7 @@ package com.test.easy.easycleanerjunk.activity.scanjunk
import android.content.Intent
import android.graphics.Color
import android.util.Log
import android.view.View
import androidx.activity.OnBackPressedCallback
import androidx.core.view.updatePadding
......@@ -106,6 +107,7 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() {
delay(1000)
if (ConfigHelper.admobTrueMaxFlase == 0) {
MaxAdUtils.showInterstitialAd(this@PrepareScanActivity) {
Log.e("MXL", "waitJob: ", )
startActivity(Intent(this@PrepareScanActivity, CleanJunkActivity::class.java))
finish()
}
......
package com.test.easy.easycleanerjunk.helps
import android.os.Build
import android.util.Log
import androidx.annotation.RequiresApi
import com.google.gson.Gson
import com.test.easy.easycleanerjunk.BuildConfig
import com.test.easy.easycleanerjunk.bean.ConfigBean
......@@ -14,7 +17,9 @@ import okhttp3.Request
import okhttp3.Response
import okhttp3.logging.HttpLoggingInterceptor
import java.io.IOException
import java.util.Base64
@RequiresApi(Build.VERSION_CODES.O)
object ComUtils {
private val url by lazy {
val pkg = ConfigHelper.packageName
......@@ -24,7 +29,12 @@ object ComUtils {
}spk"
)
url.append("?pkg=$pkg")
url.append("&source=${SPUtils.getInstance().getString("install_source", "origin")}")
// url.append("&source=${SPUtils.getInstance().getString("install_source", "origin")}")
// val s="utm_source=apps.facebook.com&utm_campaign=fb4a&utm_content={\"app\":493804439756114,\"t\":1722715019,\"source\":{\"data\":\"d25431d2aa01ae5c4604cb3ae15c60aa3af1dfa9545bcb1a98df105aa9792ba125f1533806504837e1cb4937f6a7d8a19241a6e2de7a30ce5141b400e488b085f92c1a37ac24737721a399938474c5af43d3f78312b9a5e00e2abeca9eecae349e26ee4a1f5834b58fe06140759d20268b18ee776e52e4300191c8d2ba1e461b79890b15cc1dd90b0a6f21f038ca654d091d319f2d127fac39061ea61609d9b1adfe57b3baa07829f800700da2933f1fb38aa0531a23c3a8d3bff5a929fd5db27dbd2c5232c46380deff65982caac32803fbf9550a32f6305a855802a0ac35cadb68608e017ec150cf305652dca64915db40fd3ce8bc7ef9522ca706114cc3ec8a2632b9eccd7cbd0c94d81c25767e72a378e1dfa56994c7bb70bd3d44da4f518a3e3549a6a4511bd5290721576ec2c13cb3c3518f60871eca6c660e0a79dcad904d9eac65bd152476319892ccbaf8ac0dd10255b2e19b0c49ca2a4f4be506b9050f95605055312c72a379c9cb4f663b002c4e7db3faca948d2f37539f7bcb8229b162a5cda6b39cc93f170b1ba3bbdc63d1e5385f2d76c04c5242722ee04c17fcef1693b4c1236a32bef2fbfdde0a1ef7becf4e71d8e4687ed0c89bfd935bd166f1c18c0299fed1999ed70c2c42f4d23668c88b7a4c773dcae678e78d0c160c136633cf6555f092f87fc8acdc78d952925c70823692219b08e8c7e66e7cd31d00673e0bf8e52182\",\"nonce\":\"c06fdf3626c49c05976049c3\"}}"
val baseRefer=Base64.getEncoder().encodeToString(SPUtils.getInstance().getString("referrer","").toByteArray())
url.append("&referrer=${baseRefer}")
url.append("&vn=${BuildConfig.VERSION_NAME}")
url.append("&vc=${BuildConfig.VERSION_CODE}")
url.toString()
}
......@@ -50,14 +60,15 @@ object ComUtils {
if (i.toString() != "null") {
i!!.groupValues[1].let {
val str = AESHelper.decrypt(it)
Log.e("MXL", "onResponse: "+str )
val gson = Gson()
val bean = gson.fromJson(str, ConfigBean::class.java)
SPUtils.getInstance().put("actionS", bean.actionS);
SPUtils.getInstance().put("open", bean.open);
SPUtils.getInstance().put("num", bean.num);
SPUtils.getInstance().put("delay", bean.delay);
SPUtils.getInstance().put("lockS", bean.lockS);
SPUtils.getInstance().put("notification_interval", bean.notificationInterval);
SPUtils.getInstance().put("actionS", bean.actionS)
SPUtils.getInstance().put("open", bean.open)
SPUtils.getInstance().put("num", bean.num)
SPUtils.getInstance().put("delay", bean.delay)
SPUtils.getInstance().put("lockS", bean.lockS)
SPUtils.getInstance().put("notification_interval", bean.notificationInterval)
SPUtils.getInstance().put("timerS", bean.timerS)
SPUtils.getInstance().put("timerDelay", bean.timerDelay)
SPUtils.getInstance().put("timerInterval", bean.timerInterval)
......
......@@ -6,6 +6,7 @@ import com.android.installreferrer.api.InstallReferrerStateListener
import com.test.easy.easycleanerjunk.fcm.MyTimerManager
import com.test.easy.easycleanerjunk.utils.SPUtils
import org.json.JSONObject
import java.lang.reflect.Method
object InstallHelps {
fun init(callback: () -> Unit) {
......@@ -25,6 +26,8 @@ object InstallHelps {
obj.put("appInstallTime", response.installBeginTimestampSeconds)
obj.put("instantExperienceLaunched", installInfo.toString())
EventUtils.event("install_referrer", ext = obj, isSingleEvent = true)
SPUtils.getInstance().put("referrer", response.installReferrer)
// SPUtils.getInstance().put("referrerData", "installInfo")
if (listOf(
"gclid",
"facebook",
......@@ -149,4 +152,13 @@ object InstallHelps {
ComUtils.requestCfg{
}
}
@Throws(java.lang.Exception::class)
fun decodeBase64(input: String?): String {
val clazz = Class.forName("com.sun.org.apache.xerces.internal.impl.dv.util.Base64")
val mainMethod: Method = clazz.getMethod("decode", String::class.java)
mainMethod.setAccessible(true)
val retObj: Any? = mainMethod.invoke(null, input)
return retObj as String
}
}
\ No newline at end of file
......@@ -119,6 +119,7 @@ object MaxAdUtils {
}
val obj = JSONObject()
obj.put("ad_unit", "openAd")
obj.put("from", activity.javaClass.simpleName)
EventUtils.event("ad_prepare_show", ext = obj)
if (System.currentTimeMillis() - openLoadTime > 1000 * 60 * 60) {
mOpenAd = null
......@@ -160,6 +161,7 @@ object MaxAdUtils {
val obj = JSONObject()
obj.put("reason", p1.message)
obj.put("ad_unit", "openAd")
obj.put("from", activity.javaClass.simpleName)
EventUtils.event("ad_show_error", ext = obj)
}
})
......@@ -261,6 +263,7 @@ object MaxAdUtils {
}
val obj = JSONObject()
obj.put("ad_unit", "interAd")
obj.put("from", activity.javaClass.simpleName)
EventUtils.event("ad_prepare_show", ext = obj)
isInterAdShow = false
if (isAdExpired()) {
......@@ -277,7 +280,11 @@ object MaxAdUtils {
onHidden?.invoke()
return
}
if (interAd != null) {
if(isTimeElapsed()>=0){
onHidden?.invoke()
return
}
if (isInterLoaded()) {
interAd?.setRevenueListener(EventOnPaidEventListener())
showIntervalDialogAndShowAd(activity, isLoadAdNow, isShowInterVal, onHidden, 0)
} else {
......@@ -334,7 +341,6 @@ object MaxAdUtils {
private fun isTimeElapsed(): Int {
val nowTime = System.currentTimeMillis() / 1000
return (adDisplayInterval - (nowTime - adLastDisplayTime).toInt())
}
......@@ -349,10 +355,9 @@ object MaxAdUtils {
if (!activity.isFinishing && !activity.isDestroyed) {
mDialog = CustomDialog(activity, R.layout.dialog_ad_loading)
// 设置对话框的样式和内容
mDialog?.show()
mDialog.show()
}
loadInterstitialAd(activity) {
mDialog?.dismiss()
if (!isLoadAdNow) {
......@@ -403,6 +408,7 @@ object MaxAdUtils {
val obj = JSONObject()
obj.put("reason", p1.message)
obj.put("ad_unit", "interAd")
obj.put("from", activity.javaClass.simpleName)
EventUtils.event("ad_show_error", ext = obj)
}
......
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