Commit 0311dffd authored by wanglei's avatar wanglei

...

parent 72961cce
...@@ -47,6 +47,7 @@ abstract class AdEvent { ...@@ -47,6 +47,7 @@ abstract class AdEvent {
val obj = JSONObject() val obj = JSONObject()
obj.put("ad_unit", adUnit) obj.put("ad_unit", adUnit)
obj.put("req_id", reqId) obj.put("req_id", reqId)
obj.put("from", from)
EventUtils.event("ad_limit", value, obj) EventUtils.event("ad_limit", value, obj)
LogEx.logDebug(TAG, "ad_limit $obj") LogEx.logDebug(TAG, "ad_limit $obj")
} }
......
...@@ -31,7 +31,7 @@ object LimitUtils { ...@@ -31,7 +31,7 @@ object LimitUtils {
*/ */
private inline val isRequestLimited: Boolean private inline val isRequestLimited: Boolean
get() { get() {
val maxCount = AdsMgr.adsConfigBean?.numRequestLimit ?: 100 val maxCount = AdsMgr.adsConfigBean.numRequestLimit
return maxCount > -1 && AppPreferences.getInstance() return maxCount > -1 && AppPreferences.getInstance()
.getInt(NUM_REQUEST, 0) >= maxCount .getInt(NUM_REQUEST, 0) >= maxCount
} }
...@@ -41,7 +41,7 @@ object LimitUtils { ...@@ -41,7 +41,7 @@ object LimitUtils {
*/ */
private inline val isDisplayLimited: Boolean private inline val isDisplayLimited: Boolean
get() { get() {
val maxCount = AdsMgr.adsConfigBean?.numDisplayLimit ?: 100 val maxCount = AdsMgr.adsConfigBean.numDisplayLimit
return maxCount > -1 && AppPreferences.getInstance() return maxCount > -1 && AppPreferences.getInstance()
.getInt(NUM_DISPLAY, 0) >= maxCount .getInt(NUM_DISPLAY, 0) >= maxCount
} }
...@@ -51,7 +51,7 @@ object LimitUtils { ...@@ -51,7 +51,7 @@ object LimitUtils {
*/ */
private inline val isClickLimited: Boolean private inline val isClickLimited: Boolean
get() { get() {
val maxCount = AdsMgr.adsConfigBean?.numClickLimit ?: 100 val maxCount = AdsMgr.adsConfigBean.numClickLimit
return maxCount > -1 && AppPreferences.getInstance() return maxCount > -1 && AppPreferences.getInstance()
.getInt(NUM_CLICK, 0) >= maxCount .getInt(NUM_CLICK, 0) >= maxCount
} }
......
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