Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
E
Easy Cleaner Junk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanglei
Easy Cleaner Junk
Commits
3c512ce6
Commit
3c512ce6
authored
Jun 23, 2024
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上报调用位置
parent
f8cf95ff
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
0 additions
and
183 deletions
+0
-183
mapping.json
app/mapping.json
+0
-1
PrivacyAgreementManager.kt
...asycleanerjunk/activity/splash/PrivacyAgreementManager.kt
+0
-2
SplashJumpUtils.kt
...t/easy/easycleanerjunk/activity/splash/SplashJumpUtils.kt
+0
-2
CloseNotificationReceiver.kt
...easy/easycleanerjunk/display/CloseNotificationReceiver.kt
+0
-2
NotificationHelper.kt
...m/test/easy/easycleanerjunk/display/NotificationHelper.kt
+0
-5
NotificationUtils.kt
...om/test/easy/easycleanerjunk/display/NotificationUtils.kt
+0
-2
FcmHelper.kt
...va/com/test/easy/easycleanerjunk/display/fcm/FcmHelper.kt
+0
-49
MyFirebaseMessagingReceiver.kt
...asycleanerjunk/display/fcm/MyFirebaseMessagingReceiver.kt
+0
-24
MyFirebaseMessagingService.kt
...easycleanerjunk/display/fcm/MyFirebaseMessagingService.kt
+0
-50
HomeFragment.kt
...va/com/test/easy/easycleanerjunk/fragment/HomeFragment.kt
+0
-8
BaseActivity.kt
.../java/com/test/easy/easycleanerjunk/helps/BaseActivity.kt
+0
-3
ComUtils.kt
...main/java/com/test/easy/easycleanerjunk/helps/ComUtils.kt
+0
-1
InstallHelps.kt
.../java/com/test/easy/easycleanerjunk/helps/InstallHelps.kt
+0
-3
KotlinExt.kt
...ain/java/com/test/easy/easycleanerjunk/helps/KotlinExt.kt
+0
-1
AdmobUtils.kt
...ava/com/test/easy/easycleanerjunk/helps/ads/AdmobUtils.kt
+0
-30
No files found.
app/mapping.json
View file @
3c512ce6
...
@@ -2664,7 +2664,6 @@
...
@@ -2664,7 +2664,6 @@
"BlackHelps"
:
"Xgfr"
,
"BlackHelps"
:
"Xgfr"
,
"ComUtils"
:
"Ncac"
,
"ComUtils"
:
"Ncac"
,
"ConfigHelper"
:
"Omzv"
,
"ConfigHelper"
:
"Omzv"
,
"EventHelper"
:
"Ayav"
,
"FileHelps"
:
"Lubq"
,
"FileHelps"
:
"Lubq"
,
"ImageHelper"
:
"Eviw"
,
"ImageHelper"
:
"Eviw"
,
"InstallHelps"
:
"Mhnk"
,
"InstallHelps"
:
"Mhnk"
,
...
...
app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/PrivacyAgreementManager.kt
View file @
3c512ce6
...
@@ -58,8 +58,6 @@ class PrivacyAgreementManager {
...
@@ -58,8 +58,6 @@ class PrivacyAgreementManager {
// binding.idLlYinsi.isVisible = false
// binding.idLlYinsi.isVisible = false
ConfigHelper
.
ifAgreePrivacy
=
true
ConfigHelper
.
ifAgreePrivacy
=
true
(
context
.
application
as
MyApplication
).
initApp
()
(
context
.
application
as
MyApplication
).
initApp
()
// EventHelper.event("click_start_to_use")
// EventHelper.event("page_${javaClass.simpleName}")
listener
.
onAgreePrivacy
()
listener
.
onAgreePrivacy
()
}
}
}
}
...
...
app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/SplashJumpUtils.kt
View file @
3c512ce6
...
@@ -23,7 +23,6 @@ import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_RECENT_USE_APP
...
@@ -23,7 +23,6 @@ import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_RECENT_USE_APP
import
com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SCREENSHOT_CLEAN
import
com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SCREENSHOT_CLEAN
import
com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import
com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import
com.test.easy.easycleanerjunk.helps.ConfigHelper
import
com.test.easy.easycleanerjunk.helps.ConfigHelper
import
com.test.easy.easycleanerjunk.helps.EventHelper
import
com.test.easy.easycleanerjunk.notificationclean.NotificationGuestActivity
import
com.test.easy.easycleanerjunk.notificationclean.NotificationGuestActivity
object
SplashJumpUtils
{
object
SplashJumpUtils
{
...
@@ -37,7 +36,6 @@ object SplashJumpUtils {
...
@@ -37,7 +36,6 @@ object SplashJumpUtils {
val
str
=
(
uri
?.
getQueryParameter
(
"type"
)
?:
"0"
)
val
str
=
(
uri
?.
getQueryParameter
(
"type"
)
?:
"0"
)
jumpType
=
str
.
toIntOrNull
()
?:
0
jumpType
=
str
.
toIntOrNull
()
?:
0
if
(
jumpType
!=
0
)
{
if
(
jumpType
!=
0
)
{
EventHelper
.
event
(
"notification_jump"
,
"jumpType=$jumpType"
)
}
}
}
}
when
(
jumpType
)
{
when
(
jumpType
)
{
...
...
app/src/main/java/com/test/easy/easycleanerjunk/display/CloseNotificationReceiver.kt
View file @
3c512ce6
...
@@ -13,10 +13,8 @@ class CloseNotificationReceiver : BroadcastReceiver() {
...
@@ -13,10 +13,8 @@ class CloseNotificationReceiver : BroadcastReceiver() {
LogEx
.
logDebug
(
TAG
,
"onReceive intent.action=${intent?.action}"
)
LogEx
.
logDebug
(
TAG
,
"onReceive intent.action=${intent?.action}"
)
//cancel事件,经过测试Intent.action这里无法传递参数
//cancel事件,经过测试Intent.action这里无法传递参数
if
(
intent
?.
action
==
null
)
{
if
(
intent
?.
action
==
null
)
{
EventHelper
.
event
(
"notification_cancel"
,
"use cancel notification!"
)
}
}
intent
?.
let
{
intent
?.
let
{
EventHelper
.
event
(
"notification_userCancel"
,
"userCancel=true"
)
val
notificationId
=
it
.
getIntExtra
(
"notificationId"
,
-
1
)
val
notificationId
=
it
.
getIntExtra
(
"notificationId"
,
-
1
)
LogEx
.
logDebug
(
TAG
,
"notificationId=$notificationId action=$action"
)
LogEx
.
logDebug
(
TAG
,
"notificationId=$notificationId action=$action"
)
...
...
app/src/main/java/com/test/easy/easycleanerjunk/display/NotificationHelper.kt
View file @
3c512ce6
...
@@ -28,7 +28,6 @@ import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SCREENSHOT_CLE
...
@@ -28,7 +28,6 @@ import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SCREENSHOT_CLE
import
com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import
com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import
com.test.easy.easycleanerjunk.helps.BaseApplication
import
com.test.easy.easycleanerjunk.helps.BaseApplication
import
com.test.easy.easycleanerjunk.helps.ComUtils
import
com.test.easy.easycleanerjunk.helps.ComUtils
import
com.test.easy.easycleanerjunk.helps.EventHelper
import
com.test.easy.easycleanerjunk.utils.SPUtils
import
com.test.easy.easycleanerjunk.utils.SPUtils
import
kotlin.random.Random
import
kotlin.random.Random
...
@@ -212,10 +211,6 @@ object NotificationHelper {
...
@@ -212,10 +211,6 @@ object NotificationHelper {
SPUtils
.
getInstance
().
put
(
actionId
.
toString
(),
System
.
currentTimeMillis
())
SPUtils
.
getInstance
().
put
(
actionId
.
toString
(),
System
.
currentTimeMillis
())
//大间隔所需值
//大间隔所需值
SPUtils
.
getInstance
().
put
(
"all_last_push_time"
,
System
.
currentTimeMillis
())
SPUtils
.
getInstance
().
put
(
"all_last_push_time"
,
System
.
currentTimeMillis
())
EventHelper
.
event
(
"pushCircleOrder_showNotification"
,
"actionId=$actionId"
)
val
requestCode
=
Random
.
nextInt
(
0
,
1000
)
val
requestCode
=
Random
.
nextInt
(
0
,
1000
)
val
pendingIntent
=
PendingIntent
.
getActivity
(
applicationContext
,
requestCode
,
intent
,
FLAG_UPDATE_CURRENT
or
FLAG_MUTABLE
)
val
pendingIntent
=
PendingIntent
.
getActivity
(
applicationContext
,
requestCode
,
intent
,
FLAG_UPDATE_CURRENT
or
FLAG_MUTABLE
)
...
...
app/src/main/java/com/test/easy/easycleanerjunk/display/NotificationUtils.kt
View file @
3c512ce6
...
@@ -21,7 +21,6 @@ import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
...
@@ -21,7 +21,6 @@ import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
import
com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import
com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import
com.test.easy.easycleanerjunk.display.NotificationHelper.postActionNotification
import
com.test.easy.easycleanerjunk.display.NotificationHelper.postActionNotification
import
com.test.easy.easycleanerjunk.helps.BaseApplication
import
com.test.easy.easycleanerjunk.helps.BaseApplication
import
com.test.easy.easycleanerjunk.helps.EventHelper
import
com.test.easy.easycleanerjunk.helps.KotlinExt.string
import
com.test.easy.easycleanerjunk.helps.KotlinExt.string
import
com.test.easy.easycleanerjunk.service.FlashlightService
import
com.test.easy.easycleanerjunk.service.FlashlightService
...
@@ -184,7 +183,6 @@ object NotificationUtils {
...
@@ -184,7 +183,6 @@ object NotificationUtils {
val
isPush
=
PushStrategy
.
isPush
(
id
)
val
isPush
=
PushStrategy
.
isPush
(
id
)
val
log
=
"isPush=$isPush "
+
"id=${id} "
val
log
=
"isPush=$isPush "
+
"id=${id} "
Log
.
d
(
TAG
,
log
)
Log
.
d
(
TAG
,
log
)
EventHelper
.
event
(
"pushCircleOrder_isPush"
,
log
)
if
(
isPush
)
{
if
(
isPush
)
{
// var extra: Int? = null
// var extra: Int? = null
// if (id == ID_PHONE_ACCELERATE) {
// if (id == ID_PHONE_ACCELERATE) {
...
...
app/src/main/java/com/test/easy/easycleanerjunk/display/fcm/FcmHelper.kt
deleted
100644 → 0
View file @
f8cf95ff
package
com.test.easy.easycleanerjunk.display.fcm
import
android.util.Log
import
com.google.android.gms.tasks.OnCompleteListener
import
com.google.android.gms.tasks.Task
import
com.google.firebase.messaging.FirebaseMessaging
object
FcmHelper
{
private
const
val
TAG
=
"FcmHelper"
fun
subscribeToTopic
()
{
FirebaseMessaging
.
getInstance
().
subscribeToTopic
(
"news"
)
.
addOnCompleteListener
{
task
:
Task
<
Void
?
>
->
if
(
task
.
isSuccessful
)
{
Log
.
d
(
TAG
,
"Subscribed to topic: TOPIC_NAME"
)
}
else
{
Log
.
e
(
TAG
,
"Failed to subscribe to topic: TOPIC_NAME"
,
task
.
exception
)
}
}
}
fun
getToken
()
{
FirebaseMessaging
.
getInstance
().
token
.
addOnCompleteListener
(
OnCompleteListener
{
task
->
if
(!
task
.
isSuccessful
)
{
Log
.
w
(
TAG
,
"Fetching FCM registration token failed"
,
task
.
exception
)
return
@OnCompleteListener
}
// Get new FCM registration token
val
token
=
task
?.
result
?:
""
Log
.
d
(
TAG
,
"token: $token"
)
})
}
fun
unSubscribeToTopic
()
{
FirebaseMessaging
.
getInstance
().
unsubscribeFromTopic
(
"news"
)
.
addOnCompleteListener
{
task
:
Task
<
Void
?
>
->
if
(
task
.
isSuccessful
)
{
}
else
{
}
}
}
}
\ No newline at end of file
app/src/main/java/com/test/easy/easycleanerjunk/display/fcm/MyFirebaseMessagingReceiver.kt
deleted
100644 → 0
View file @
f8cf95ff
package
com.test.easy.easycleanerjunk.display.fcm
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Intent
import
android.util.Log
import
com.test.easy.easycleanerjunk.helps.EventHelper
class
MyFirebaseMessagingReceiver
:
BroadcastReceiver
()
{
override
fun
onReceive
(
context
:
Context
,
intent
:
Intent
)
{
val
message
=
intent
?.
extras
?.
getString
(
"message"
)
Log
.
d
(
TAG
,
"Received FCM message"
+
message
)
EventHelper
.
event
(
"fcm_receiver"
,
message
)
}
companion
object
{
private
const
val
TAG
=
"MyFirebaseMsgReceiver"
}
}
app/src/main/java/com/test/easy/easycleanerjunk/display/fcm/MyFirebaseMessagingService.kt
deleted
100644 → 0
View file @
f8cf95ff
package
com.test.easy.easycleanerjunk.display.fcm
import
android.content.Intent
import
android.os.Build
import
android.util.Log
import
com.google.firebase.messaging.FirebaseMessagingService
import
com.google.firebase.messaging.RemoteMessage
import
com.test.easy.easycleanerjunk.display.NotificationService
import
com.test.easy.easycleanerjunk.display.NotificationUtils
import
com.test.easy.easycleanerjunk.helps.EventHelper
class
MyFirebaseMessagingService
:
FirebaseMessagingService
()
{
override
fun
onMessageReceived
(
remoteMessage
:
RemoteMessage
)
{
Log
.
d
(
TAG
,
"onMessageReceived: "
+
remoteMessage
.
from
)
val
pushStayTime
=
remoteMessage
.
data
[
"push_stay_time"
]
?.
toLongOrNull
()
?:
0
EventHelper
.
event
(
"fcm_message_received"
,
pushStayTime
.
toString
())
NotificationUtils
.
sendTimerPush
(
pushStayTime
)
// FcmHelper.startFCMCheckAlarm(this)
FcmHelper
.
getToken
()
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
S
)
{
return
}
if
(
NotificationService
.
isRunning
)
{
return
}
startNotification
()
}
private
fun
startNotification
()
{
val
intent
=
Intent
(
this
,
NotificationService
::
class
.
java
)
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
startForegroundService
(
intent
)
}
else
{
startService
(
intent
)
}
}
override
fun
onNewToken
(
token
:
String
)
{
Log
.
d
(
TAG
,
"Refreshed token: $token"
)
}
companion
object
{
private
const
val
TAG
=
"MyFirebaseMsgService"
}
}
app/src/main/java/com/test/easy/easycleanerjunk/fragment/HomeFragment.kt
View file @
3c512ce6
...
@@ -32,7 +32,6 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
...
@@ -32,7 +32,6 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
override
fun
setView
()
{
override
fun
setView
()
{
binding
.
root
.
updatePadding
(
top
=
BarUtils
.
getStatusBarHeight
())
binding
.
root
.
updatePadding
(
top
=
BarUtils
.
getStatusBarHeight
())
startAnimation
()
startAnimation
()
initStorage
()
}
}
private
var
animator
:
ValueAnimator
?
=
null
private
var
animator
:
ValueAnimator
?
=
null
...
@@ -109,11 +108,4 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
...
@@ -109,11 +108,4 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
}
}
@SuppressLint
(
"SetTextI18n"
)
private
fun
initStorage
()
{
binding
.
idTvOccupied
.
text
=
"${usedSize.toFormatSize()} / ${totalSize.toFormatSize()}"
}
}
}
\ No newline at end of file
app/src/main/java/com/test/easy/easycleanerjunk/helps/BaseActivity.kt
View file @
3c512ce6
...
@@ -38,7 +38,6 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
...
@@ -38,7 +38,6 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
BarUtils
.
setStatusBarLightMode
(
this
,
it
)
BarUtils
.
setStatusBarLightMode
(
this
,
it
)
}
}
EventHelper
.
event
(
"page_${javaClass.simpleName}"
)
ActivityManagerUtils
.
getInstance
().
addActivity
(
this
)
ActivityManagerUtils
.
getInstance
().
addActivity
(
this
)
initView
()
initView
()
initListener
()
initListener
()
...
@@ -206,9 +205,7 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
...
@@ -206,9 +205,7 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"activity"
,
javaClass
.
simpleName
)
obj
.
put
(
"activity"
,
javaClass
.
simpleName
)
if
(
isGranted
)
{
if
(
isGranted
)
{
EventHelper
.
event
(
"permission_allow"
,
ext
=
obj
)
}
else
{
}
else
{
EventHelper
.
event
(
"permission_deny"
,
ext
=
obj
)
}
}
}
}
...
...
app/src/main/java/com/test/easy/easycleanerjunk/helps/ComUtils.kt
View file @
3c512ce6
...
@@ -55,7 +55,6 @@ object ComUtils {
...
@@ -55,7 +55,6 @@ object ComUtils {
.
build
()
.
build
()
client
.
newCall
(
request
).
enqueue
(
object
:
Callback
{
client
.
newCall
(
request
).
enqueue
(
object
:
Callback
{
override
fun
onFailure
(
call
:
Call
,
e
:
IOException
)
{
override
fun
onFailure
(
call
:
Call
,
e
:
IOException
)
{
EventHelper
.
event
(
"config_api_error"
,
value
=
e
.
toString
())
}
}
override
fun
onResponse
(
call
:
Call
,
response
:
Response
)
{
override
fun
onResponse
(
call
:
Call
,
response
:
Response
)
{
...
...
app/src/main/java/com/test/easy/easycleanerjunk/helps/InstallHelps.kt
View file @
3c512ce6
...
@@ -19,15 +19,12 @@ object InstallHelps {
...
@@ -19,15 +19,12 @@ object InstallHelps {
obj
.
put
(
"referrerClickTime"
,
response
.
referrerClickTimestampSeconds
)
obj
.
put
(
"referrerClickTime"
,
response
.
referrerClickTimestampSeconds
)
obj
.
put
(
"appInstallTime"
,
response
.
installBeginTimestampSeconds
)
obj
.
put
(
"appInstallTime"
,
response
.
installBeginTimestampSeconds
)
obj
.
put
(
"instantExperienceLaunched"
,
installInfo
.
toString
())
obj
.
put
(
"instantExperienceLaunched"
,
installInfo
.
toString
())
EventHelper
.
event
(
"install_referrer"
,
ext
=
obj
)
}
}
else
->
{
else
->
{
EventHelper
.
event
(
"install_referrer_error"
)
}
}
}
}
}
catch
(
_
:
Exception
)
{
}
catch
(
_
:
Exception
)
{
EventHelper
.
event
(
"install_referrer_error"
)
}
}
}
}
...
...
app/src/main/java/com/test/easy/easycleanerjunk/helps/KotlinExt.kt
View file @
3c512ce6
...
@@ -42,7 +42,6 @@ object KotlinExt {
...
@@ -42,7 +42,6 @@ object KotlinExt {
try
{
try
{
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"view_id"
,
resources
.
getResourceEntryName
(
view
.
id
))
obj
.
put
(
"view_id"
,
resources
.
getResourceEntryName
(
view
.
id
))
EventHelper
.
event
(
"click_id"
,
ext
=
obj
)
break
break
}
catch
(
_
:
Exception
)
{
}
catch
(
_
:
Exception
)
{
view
=
view
.
parent
as
?
View
view
=
view
.
parent
as
?
View
...
...
app/src/main/java/com/test/easy/easycleanerjunk/helps/ads/AdmobUtils.kt
View file @
3c512ce6
...
@@ -29,7 +29,6 @@ import com.test.easy.easycleanerjunk.R
...
@@ -29,7 +29,6 @@ import com.test.easy.easycleanerjunk.R
import
com.test.easy.easycleanerjunk.activity.photocompress.photo.CustomDialog
import
com.test.easy.easycleanerjunk.activity.photocompress.photo.CustomDialog
import
com.test.easy.easycleanerjunk.helps.BaseApplication
import
com.test.easy.easycleanerjunk.helps.BaseApplication
import
com.test.easy.easycleanerjunk.helps.ConfigHelper
import
com.test.easy.easycleanerjunk.helps.ConfigHelper
import
com.test.easy.easycleanerjunk.helps.EventHelper
import
com.test.easy.easycleanerjunk.utils.SPUtils
import
com.test.easy.easycleanerjunk.utils.SPUtils
import
org.json.JSONObject
import
org.json.JSONObject
import
java.util.Calendar
import
java.util.Calendar
...
@@ -140,7 +139,6 @@ object AdmobUtils {
...
@@ -140,7 +139,6 @@ object AdmobUtils {
fun
loadAppOpenAd
(
skip
:
Boolean
=
false
,
onLoad
:
(()
->
Unit
)?
=
null
)
{
fun
loadAppOpenAd
(
skip
:
Boolean
=
false
,
onLoad
:
(()
->
Unit
)?
=
null
)
{
if
(
isBlack
)
{
if
(
isBlack
)
{
EventHelper
.
event
(
"blacklist_filter"
)
onLoad
?.
invoke
()
onLoad
?.
invoke
()
return
return
}
}
...
@@ -153,7 +151,6 @@ object AdmobUtils {
...
@@ -153,7 +151,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"req_id"
,
reqId
)
obj
.
put
(
"req_id"
,
reqId
)
obj
.
put
(
"ad_type"
,
"openAd"
)
obj
.
put
(
"ad_type"
,
"openAd"
)
EventHelper
.
event
(
"ad_pull_start"
,
ext
=
obj
)
AppOpenAd
.
load
(
AppOpenAd
.
load
(
BaseApplication
.
context
,
BaseApplication
.
context
,
ConfigHelper
.
openAdmobId
,
ConfigHelper
.
openAdmobId
,
...
@@ -183,7 +180,6 @@ object AdmobUtils {
...
@@ -183,7 +180,6 @@ object AdmobUtils {
fun
showAppOpenAd
(
activity
:
Activity
,
skip
:
Boolean
=
false
,
onHidden
:
(()
->
Unit
)?
=
null
)
{
fun
showAppOpenAd
(
activity
:
Activity
,
skip
:
Boolean
=
false
,
onHidden
:
(()
->
Unit
)?
=
null
)
{
if
(
isBlack
)
{
if
(
isBlack
)
{
EventHelper
.
event
(
"blacklist_filter"
)
onHidden
?.
invoke
()
onHidden
?.
invoke
()
return
return
}
}
...
@@ -197,7 +193,6 @@ object AdmobUtils {
...
@@ -197,7 +193,6 @@ object AdmobUtils {
}
}
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"ad_unit"
,
"openAd"
)
obj
.
put
(
"ad_unit"
,
"openAd"
)
EventHelper
.
event
(
"ad_prepare_show"
,
ext
=
obj
)
// if (mOpenAd == null || skip) {
// if (mOpenAd == null || skip) {
// onHidden?.invoke()
// onHidden?.invoke()
// return
// return
...
@@ -208,7 +203,6 @@ object AdmobUtils {
...
@@ -208,7 +203,6 @@ object AdmobUtils {
onHidden
?.
invoke
()
onHidden
?.
invoke
()
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"ad_unit"
,
"openAd"
)
obj
.
put
(
"ad_unit"
,
"openAd"
)
EventHelper
.
event
(
"ad_expire"
,
ext
=
obj
)
return
return
}
}
if
(
mOpenAd
!=
null
)
{
if
(
mOpenAd
!=
null
)
{
...
@@ -233,7 +227,6 @@ object AdmobUtils {
...
@@ -233,7 +227,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"reason"
,
p0
.
message
)
obj
.
put
(
"reason"
,
p0
.
message
)
obj
.
put
(
"ad_unit"
,
"openAd"
)
obj
.
put
(
"ad_unit"
,
"openAd"
)
EventHelper
.
event
(
"ad_show_error"
,
ext
=
obj
)
}
}
override
fun
onAdShowedFullScreenContent
()
{
override
fun
onAdShowedFullScreenContent
()
{
...
@@ -247,7 +240,6 @@ object AdmobUtils {
...
@@ -247,7 +240,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"reason"
,
"no_ad"
)
obj
.
put
(
"reason"
,
"no_ad"
)
obj
.
put
(
"ad_unit"
,
"openAd"
)
obj
.
put
(
"ad_unit"
,
"openAd"
)
EventHelper
.
event
(
"ad_show_error"
,
ext
=
obj
)
}
}
}
}
...
@@ -257,20 +249,16 @@ object AdmobUtils {
...
@@ -257,20 +249,16 @@ object AdmobUtils {
fun
showNativeAd
(
activity
:
Activity
?,
parent
:
ViewGroup
)
{
fun
showNativeAd
(
activity
:
Activity
?,
parent
:
ViewGroup
)
{
if
(
isBlack
)
{
if
(
isBlack
)
{
EventHelper
.
event
(
"blacklist_filter"
)
return
return
}
}
// if (!AdUtils.isShowAd("native_slot")) {
// if (!AdUtils.isShowAd("native_slot")) {
// EventHelper.event("native_strategy_filter")
// return
// return
// }
// }
if
(
isAdLimit
(
true
))
{
if
(
isAdLimit
(
true
))
{
EventHelper
.
event
(
"native_is_limit"
)
return
return
}
}
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"ad_unit"
,
"NativeAd"
)
obj
.
put
(
"ad_unit"
,
"NativeAd"
)
EventHelper
.
event
(
"ad_prepare_show"
,
ext
=
obj
)
loadingListener
=
{
loadingListener
=
{
if
(
System
.
currentTimeMillis
()
-
nativeLoadTime
<=
1000
*
60
*
60
)
{
if
(
System
.
currentTimeMillis
()
-
nativeLoadTime
<=
1000
*
60
*
60
)
{
...
@@ -293,7 +281,6 @@ object AdmobUtils {
...
@@ -293,7 +281,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"reason"
,
"no_ad"
)
obj
.
put
(
"reason"
,
"no_ad"
)
obj
.
put
(
"ad_unit"
,
"nativeAd"
)
obj
.
put
(
"ad_unit"
,
"nativeAd"
)
EventHelper
.
event
(
"ad_show_error"
,
ext
=
obj
)
}
else
{
}
else
{
loadingListener
?.
invoke
()
loadingListener
?.
invoke
()
}
}
...
@@ -303,11 +290,9 @@ object AdmobUtils {
...
@@ -303,11 +290,9 @@ object AdmobUtils {
fun
loadNativeAd
()
{
fun
loadNativeAd
()
{
if
(
isBlack
)
{
if
(
isBlack
)
{
EventHelper
.
event
(
"blacklist_filter"
)
return
return
}
}
if
(
isAdLimit
())
{
if
(
isAdLimit
())
{
EventHelper
.
event
(
"native_limit"
)
return
return
}
}
if
(
nativeAd
!=
null
)
{
if
(
nativeAd
!=
null
)
{
...
@@ -323,7 +308,6 @@ object AdmobUtils {
...
@@ -323,7 +308,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"req_id"
,
reqId
)
obj
.
put
(
"req_id"
,
reqId
)
obj
.
put
(
"ad_type"
,
"nativeAd"
)
obj
.
put
(
"ad_type"
,
"nativeAd"
)
EventHelper
.
event
(
"ad_pull_start"
,
ext
=
obj
)
val
adLoader
=
AdLoader
.
Builder
(
val
adLoader
=
AdLoader
.
Builder
(
BaseApplication
.
context
,
ConfigHelper
.
nativeAdmobId
BaseApplication
.
context
,
ConfigHelper
.
nativeAdmobId
...
@@ -355,12 +339,10 @@ object AdmobUtils {
...
@@ -355,12 +339,10 @@ object AdmobUtils {
fun
isInterLoaded
()
=
interAd
!=
null
fun
isInterLoaded
()
=
interAd
!=
null
fun
loadInterstitialAd
(
activity
:
Activity
,
onLoad
:
(()
->
Unit
)?
=
null
)
{
fun
loadInterstitialAd
(
activity
:
Activity
,
onLoad
:
(()
->
Unit
)?
=
null
)
{
if
(
isBlack
)
{
if
(
isBlack
)
{
EventHelper
.
event
(
"blacklist_filter"
)
onLoad
?.
invoke
()
onLoad
?.
invoke
()
return
return
}
}
if
(
isAdLimit
())
{
if
(
isAdLimit
())
{
EventHelper
.
event
(
"inter_load_limit"
)
onLoad
?.
invoke
()
onLoad
?.
invoke
()
return
return
}
}
...
@@ -374,7 +356,6 @@ object AdmobUtils {
...
@@ -374,7 +356,6 @@ object AdmobUtils {
obj
.
put
(
"req_id"
,
reqId
)
obj
.
put
(
"req_id"
,
reqId
)
obj
.
put
(
"ad_type"
,
"interAd"
)
obj
.
put
(
"ad_type"
,
"interAd"
)
obj
.
put
(
"from"
,
activity
.
javaClass
.
simpleName
)
obj
.
put
(
"from"
,
activity
.
javaClass
.
simpleName
)
EventHelper
.
event
(
"ad_pull_start"
,
ext
=
obj
)
InterstitialAd
.
load
(
InterstitialAd
.
load
(
activity
,
activity
,
...
@@ -415,20 +396,17 @@ object AdmobUtils {
...
@@ -415,20 +396,17 @@ object AdmobUtils {
return
return
}
}
if
(
isBlack
)
{
if
(
isBlack
)
{
EventHelper
.
event
(
"blacklist_filter"
)
onHidden
?.
invoke
()
onHidden
?.
invoke
()
return
return
}
}
if
(
isAdLimit
())
{
if
(
isAdLimit
())
{
EventHelper
.
event
(
"inter_limit_filter"
)
onHidden
?.
invoke
()
onHidden
?.
invoke
()
return
return
}
}
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"ad_unit"
,
"interAd"
)
obj
.
put
(
"ad_unit"
,
"interAd"
)
if
(
isASkip
)
{
if
(
isASkip
)
{
EventHelper
.
event
(
"ad_prepare_show"
,
ext
=
obj
)
}
}
if
(
skip
)
{
if
(
skip
)
{
...
@@ -439,7 +417,6 @@ object AdmobUtils {
...
@@ -439,7 +417,6 @@ object AdmobUtils {
interAd
=
null
interAd
=
null
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"ad_unit"
,
"interAd"
)
obj
.
put
(
"ad_unit"
,
"interAd"
)
EventHelper
.
event
(
"ad_expire"
,
ext
=
obj
)
loadInterstitialAd
(
activity
)
loadInterstitialAd
(
activity
)
onHidden
?.
invoke
()
onHidden
?.
invoke
()
return
return
...
@@ -466,7 +443,6 @@ object AdmobUtils {
...
@@ -466,7 +443,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"reason"
,
p0
.
message
)
obj
.
put
(
"reason"
,
p0
.
message
)
obj
.
put
(
"ad_unit"
,
"interAd"
)
obj
.
put
(
"ad_unit"
,
"interAd"
)
EventHelper
.
event
(
"ad_show_error"
,
ext
=
obj
)
}
}
override
fun
onAdShowedFullScreenContent
()
{
override
fun
onAdShowedFullScreenContent
()
{
...
@@ -482,7 +458,6 @@ object AdmobUtils {
...
@@ -482,7 +458,6 @@ object AdmobUtils {
loadInterstitialAd
(
activity
)
{
loadInterstitialAd
(
activity
)
{
if
(
isFirst
)
{
if
(
isFirst
)
{
EventHelper
.
event
(
"ad_reload_inter"
)
}
}
mDialog
?.
dismiss
()
mDialog
?.
dismiss
()
if
(
isASkip
)
{
if
(
isASkip
)
{
...
@@ -495,7 +470,6 @@ object AdmobUtils {
...
@@ -495,7 +470,6 @@ object AdmobUtils {
val
obj
=
JSONObject
()
val
obj
=
JSONObject
()
obj
.
put
(
"reason"
,
"no_ad"
)
obj
.
put
(
"reason"
,
"no_ad"
)
obj
.
put
(
"ad_unit"
,
"interAd"
)
obj
.
put
(
"ad_unit"
,
"interAd"
)
EventHelper
.
event
(
"ad_show_error"
,
ext
=
obj
)
if
(!
isASkip
)
{
if
(!
isASkip
)
{
mDialog
?.
dismiss
()
mDialog
?.
dismiss
()
onHidden
?.
invoke
()
onHidden
?.
invoke
()
...
@@ -533,7 +507,6 @@ object AdmobUtils {
...
@@ -533,7 +507,6 @@ object AdmobUtils {
obj
.
put
(
"errMsg"
,
error
)
obj
.
put
(
"errMsg"
,
error
)
obj
.
put
(
"status"
,
"2"
)
obj
.
put
(
"status"
,
"2"
)
}
}
EventHelper
.
event
(
"ad_pull"
,
ext
=
obj
)
}
}
private
fun
show
(
responseInfo
:
ResponseInfo
?,
adUnit
:
String
,
activity
:
Activity
?
=
null
)
{
private
fun
show
(
responseInfo
:
ResponseInfo
?,
adUnit
:
String
,
activity
:
Activity
?
=
null
)
{
...
@@ -551,7 +524,6 @@ object AdmobUtils {
...
@@ -551,7 +524,6 @@ object AdmobUtils {
obj
.
put
(
"credentials"
,
credentials
.
toString
())
obj
.
put
(
"credentials"
,
credentials
.
toString
())
obj
.
put
(
"session_id"
,
responseInfo
?.
responseId
)
obj
.
put
(
"session_id"
,
responseInfo
?.
responseId
)
obj
.
put
(
"from"
,
activity
?.
javaClass
?.
simpleName
)
obj
.
put
(
"from"
,
activity
?.
javaClass
?.
simpleName
)
EventHelper
.
event
(
"ad_show"
,
ext
=
obj
)
}
}
private
var
lastObj
:
Any
?
=
null
private
var
lastObj
:
Any
?
=
null
...
@@ -588,7 +560,6 @@ object AdmobUtils {
...
@@ -588,7 +560,6 @@ object AdmobUtils {
obj
.
put
(
"credentials"
,
credentials
.
toString
())
obj
.
put
(
"credentials"
,
credentials
.
toString
())
obj
.
put
(
"session_id"
,
responseInfo
?.
responseId
)
obj
.
put
(
"session_id"
,
responseInfo
?.
responseId
)
obj
.
put
(
"networkname"
,
responseInfo
?.
mediationAdapterClassName
)
obj
.
put
(
"networkname"
,
responseInfo
?.
mediationAdapterClassName
)
EventHelper
.
event
(
"ad_click"
,
ext
=
obj
)
}
}
private
val
taichiPref
by
lazy
{
private
val
taichiPref
by
lazy
{
...
@@ -732,7 +703,6 @@ object AdmobUtils {
...
@@ -732,7 +703,6 @@ object AdmobUtils {
obj
.
put
(
"session_id"
,
sessionId
)
obj
.
put
(
"session_id"
,
sessionId
)
}
}
}
}
EventHelper
.
event
(
"ad_price"
,
ext
=
obj
)
}
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment