Commit 56cd3d25 authored by wanglei's avatar wanglei

...

parent 2605e61f
......@@ -27,6 +27,17 @@ android {
return SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.ENGLISH).format(this)
}
setProperty("archivesBaseName", "pdf-v${System.currentTimeMillis().toFormatTime3()}")
signingConfigs {
create("release") {
//E6:A2:DD:0A:E6:73:22:32:4E:98:08:78:73:29:01:C4:8D:A0:38:DB:D8:B2:DD:B9:AC:55:69:B2:6B:DF:B0:B4
storeFile = file("../smartcl.jks")
storePassword = "123456"
keyAlias = "key0"
keyPassword = "123456"
}
}
}
buildTypes {
......@@ -46,6 +57,24 @@ android {
viewBinding = true
buildConfig = true
}
buildTypes {
release {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
// 设置是否要自动上传
firebaseCrashlytics {
mappingFileUploadEnabled = true
}
signingConfig = signingConfigs.getByName("release")
}
}
}
gradle.taskGraph.whenReady {
tasks.forEach { task ->
if (task.name.contains("uploadCrashlyticsMappingFile")) {
task.enabled = false
}
}
}
dependencies {
......
......@@ -3,6 +3,7 @@ package com.base.pdfreader2.ads
import com.base.pdfreader2.ads.AdmobHelper.inter_limit_click
import com.base.pdfreader2.ads.AdmobHelper.inter_limit_request
import com.base.pdfreader2.ads.AdmobHelper.inter_limit_show
import com.base.pdfreader2.ads.AdmobHelper.native_limit_click
import com.base.pdfreader2.ads.AdmobHelper.native_limit_request
import com.base.pdfreader2.ads.AdmobHelper.native_limit_show
import com.base.pdfreader2.ads.AdmobHelper.open_limit_click
......@@ -159,7 +160,7 @@ object AdDisplayUtils {
//region native
private val native_max_request = AppPreferences.getInstance().getString(native_limit_request, "15").toInt()
private val native_max_show = AppPreferences.getInstance().getString(native_limit_show, "10").toInt()
private val native_max_click = AppPreferences.getInstance().getString(native_limit_show, "1").toInt()
private val native_max_click = AppPreferences.getInstance().getString(native_limit_click, "1").toInt()
fun incrementNativeRequestCount() {
currentNativeRequest += 1
......
......@@ -26,37 +26,9 @@ object AdmobHelper {
const val native_limit_show = "native_limit_show"
const val native_limit_click = "native_limit_click"
//是否展示多语言
val showLanPage = "showLanPage"
//开屏加载ad时间
val open_ad_loading = "open_ad_loading"
//创建pdf加载ad时间
val create_pdf_loading = "create_pdf_loading"
//删除文件
val delete_loading = "delete_loading"
//打开文件
val open_file_loading = "open_file_loading"
//合并pdf
val merge_loading = "merge_loading"
//拆分pdf
val split_loading = "split_loading"
//可请求时间段(由 x 定义)
const val ad_request_period = "ad_request_interval"
//可请求时间段内允许的最大请求数(由 y 定义)
const val ad_period_max_request = "ad_period_max_request"
//可请求时间段间隔时间
const val ad_request_period_interval = "ad_request_period_interval"
var isAdInit = AtomicBoolean(false)
fun initAdmobAd(activity: Activity) {
......
......@@ -62,12 +62,13 @@ object AdmobNativeUtils {
loadingListener?.invoke()
loadingListener = null
pullAd(it.responseInfo, "nativeAd", reqId = reqId)
AdDisplayUtils.incrementNativeRequestCount()
}.withAdListener(object : AdListener() {
override fun onAdLoaded() {
super.onAdLoaded()
onAdLoaded?.invoke()
onAdLoaded = null
AdDisplayUtils.incrementNativeRequestCount()
AdDisplayUtils.incrementNativeShowCount()
}
override fun onAdClicked() {
......
......@@ -34,7 +34,7 @@ object NewComUtils {
"$API_URL/${appCode}spk?pkg=$packageName&referrer=${bRefer}&vn=${BuildConfig.VERSION_NAME}&vc=${BuildConfig.VERSION_CODE}&device=${
AppPreferences.getInstance().getString("gid", "")
}&aid=${AppPreferences.getInstance().getString("uuid", "")}"
}&aid=${AppPreferences.getInstance().getString("uuid", "")}&mode=1"
// &mode=3
......
File added
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