Skip to content

L
LuckyFarm
Commit a732f2f9 authored by wangxuewei's avatar wangxuewei
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：幸运农场
[实现方案] ：1.0.7更换广告依赖方式，加入预加载描述
parent d0393ced
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 122 deletions
app/src/main/java/com/ym/game/GameActivity.kt
View file @ a732f2f9
...@@ -233,32 +233,36 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -233,32 +233,36 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
fun adFlyBox() { fun adFlyBox() {
if (flyBoxIsClick) { if (flyBoxIsClick) {
flyBoxIsClick = false flyBoxIsClick = false
AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "", act, object : ZXADVideoListener { AdManager.playRewardAd(
override fun onAdClose() { ADConfig.AD_REWARD_VIDIO,
loadAdCache() "fly_box_video",
flyBoxIsClick = true act,
//看视频上报 object : ZXADVideoListener {
getVideoAcceleratorsReceive(); override fun onAdClose() {
getFlyBoxReceive() loadAdCache()
} flyBoxIsClick = true
//看视频上报
getVideoAcceleratorsReceive();
getFlyBoxReceive()
}
override fun onAdShow() { override fun onAdShow() {
flyBoxIsClick = true flyBoxIsClick = true
} }
override fun onAdVideoBarClick() { override fun onAdVideoBarClick() {
flyBoxIsClick = true flyBoxIsClick = true
} }
override fun onError(errorMsg: String?) { override fun onError(errorMsg: String?) {
loadAdCache() loadAdCache()
flyBoxIsClick = true flyBoxIsClick = true
} }
override fun onSuccess() { override fun onSuccess() {
flyBoxIsClick = true flyBoxIsClick = true
} }
}) })
} }
} }
...@@ -270,32 +274,36 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -270,32 +274,36 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
fun adRedPackPlan() { fun adRedPackPlan() {
if (flyBoxIsClick2) { if (flyBoxIsClick2) {
flyBoxIsClick2 = false flyBoxIsClick2 = false
AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "", act, object : ZXADVideoListener { AdManager.playRewardAd(
override fun onAdClose() { ADConfig.AD_REWARD_VIDIO,
loadAdCache() "bottom_open_red_pack_video",
flyBoxIsClick2 = true act,
//看视频上报 object : ZXADVideoListener {
getVideoAcceleratorsReceive(); override fun onAdClose() {
getRedPackPlanReceive(); loadAdCache()
} flyBoxIsClick2 = true
//看视频上报
getVideoAcceleratorsReceive();
getRedPackPlanReceive();
}
override fun onAdShow() { override fun onAdShow() {
flyBoxIsClick2 = true flyBoxIsClick2 = true
} }
override fun onAdVideoBarClick() { override fun onAdVideoBarClick() {
flyBoxIsClick2 = true flyBoxIsClick2 = true
} }
override fun onError(errorMsg: String?) { override fun onError(errorMsg: String?) {
loadAdCache() loadAdCache()
flyBoxIsClick2 = true flyBoxIsClick2 = true
} }
override fun onSuccess() { override fun onSuccess() {
flyBoxIsClick2 = true flyBoxIsClick2 = true
} }
}) })
} }
} }
...@@ -367,43 +375,47 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -367,43 +375,47 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
* */ * */
fun getCloudSpeed(callback: IUnitySendMessageCallback?) { fun getCloudSpeed(callback: IUnitySendMessageCallback?) {
Log.d("wxw", "云朵加速") Log.d("wxw", "云朵加速")
AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "", act, object : ZXADVideoListener { AdManager.playRewardAd(
override fun onAdClose() { ADConfig.AD_REWARD_VIDIO,
loadAdCache() "cloud_speed_video",
//看视频上报 act,
getVideoAcceleratorsReceive(); object : ZXADVideoListener {
GameApiClient.gameApi.getCloudSpeed() override fun onAdClose() {
.compose(RxSchedulers.observableIO2Main()) loadAdCache()
.subscribe(object : BaseObserver<StatusEntity>() { //看视频上报
override fun onSuccess(result: StatusEntity?) { getVideoAcceleratorsReceive();
Log.d("wxw", "云朵加速" + Utils.obj2Str(result)) GameApiClient.gameApi.getCloudSpeed()
callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result)) .compose(RxSchedulers.observableIO2Main())
} .subscribe(object : BaseObserver<StatusEntity>() {
override fun onSuccess(result: StatusEntity?) {
Log.d("wxw", "云朵加速" + Utils.obj2Str(result))
callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result))
}
override fun onFailure( override fun onFailure(
e: Throwable?, e: Throwable?,
code: String?, code: String?,
errorMsg: String? errorMsg: String?
) { ) {
Log.d("wxw", "云朵加速 error") Log.d("wxw", "云朵加速 error")
callback?.onCloudSpeedSuccess(false, errorMsg + "") callback?.onCloudSpeedSuccess(false, errorMsg + "")
} }
}) })
} }
override fun onAdShow() { override fun onAdShow() {
} }
override fun onAdVideoBarClick() { override fun onAdVideoBarClick() {
} }
override fun onError(errorMsg: String?) { override fun onError(errorMsg: String?) {
loadAdCache() loadAdCache()
} }
override fun onSuccess() { override fun onSuccess() {
} }
}) })
// GameApiClient.gameApi.getCloudSpeed().compose(RxSchedulers.observableIO2Main()) // GameApiClient.gameApi.getCloudSpeed().compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<StatusEntity>() { // .subscribe(object : BaseObserver<StatusEntity>() {
...@@ -538,7 +550,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -538,7 +550,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
fun getVideoSeedReceive(callback: IUnitySendMessageCallback?, id: Int) { fun getVideoSeedReceive(callback: IUnitySendMessageCallback?, id: Int) {
if (videoSeedClick) { if (videoSeedClick) {
videoSeedClick = false videoSeedClick = false
AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "", AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "receive_seed_video",
this, object : ZXADVideoListener { this, object : ZXADVideoListener {
override fun onAdClose() { override fun onAdClose() {
loadAdCache() loadAdCache()
...@@ -606,51 +618,55 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -606,51 +618,55 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?, id: Int) { fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?, id: Int) {
if (videoJiasuClick) { if (videoJiasuClick) {
videoJiasuClick = false videoJiasuClick = false
AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "", this, object : ZXADVideoListener { AdManager.playRewardAd(
override fun onAdClose() { ADConfig.AD_REWARD_VIDIO,
loadAdCache() "receive_accelerators_video",
videoJiasuClick = true this,
//看视频上报 object : ZXADVideoListener {
getVideoAcceleratorsReceive(); override fun onAdClose() {
GameApiClient.gameApi.getVideoAcceleratorsReceive(id) loadAdCache()
.compose(RxSchedulers.observableIO2Main()) videoJiasuClick = true
.subscribe(object : BaseObserver<StatusEntity>() { //看视频上报
override fun onSuccess(result: StatusEntity?) { getVideoAcceleratorsReceive();
Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result)) GameApiClient.gameApi.getVideoAcceleratorsReceive(id)
callback?.onIncrVideoAcceleratorsSuccess( .compose(RxSchedulers.observableIO2Main())
true, .subscribe(object : BaseObserver<StatusEntity>() {
Utils.obj2Str(result) override fun onSuccess(result: StatusEntity?) {
) Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result))
} callback?.onIncrVideoAcceleratorsSuccess(
true,
Utils.obj2Str(result)
)
}
override fun onFailure( override fun onFailure(
e: Throwable?, e: Throwable?,
code: String?, code: String?,
errorMsg: String? errorMsg: String?
) { ) {
Log.d("wxw", "看视频领取加速剂 error") Log.d("wxw", "看视频领取加速剂 error")
callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "") callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "")
} }
}) })
} }
override fun onAdShow() { override fun onAdShow() {
videoJiasuClick = true videoJiasuClick = true
} }
override fun onAdVideoBarClick() { override fun onAdVideoBarClick() {
videoJiasuClick = true videoJiasuClick = true
} }
override fun onError(errorMsg: String?) { override fun onError(errorMsg: String?) {
loadAdCache() loadAdCache()
videoJiasuClick = true videoJiasuClick = true
} }
override fun onSuccess() { override fun onSuccess() {
videoJiasuClick = true videoJiasuClick = true
} }
}) })
} }
// GameApiClient.gameApi.getVideoAcceleratorsReceive(id) // GameApiClient.gameApi.getVideoAcceleratorsReceive(id)
...@@ -777,8 +793,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -777,8 +793,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
View.OnClickListener { View.OnClickListener {
GameEvent("click_receive_redPack_double", "点击六倍领取") GameEvent("click_receive_redPack_double", "点击六倍领取")
Log.d("wxw", "签到翻倍广告点击") Log.d("wxw", "签到翻倍广告点击")
AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO, "", AdManager.playRewardAd(ADConfig.AD_REWARD_VIDIO,
act, object : ZXADVideoListener { "six_receive_redPack_video",
act,
object : ZXADVideoListener {
override fun onAdClose() { override fun onAdClose() {
loadAdCache() loadAdCache()
//看视频上报 //看视频上报
......
app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt
View file @ a732f2f9
...@@ -180,7 +180,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View, ...@@ -180,7 +180,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
// ) // )
AdManager.playRewardAd( AdManager.playRewardAd(
ADConfig.AD_REWARD_VIDIO, ADConfig.AD_REWARD_VIDIO,
"", "receive_coin_task_video",
(mContext as Activity), (mContext as Activity),
object : ZXADVideoListener { object : ZXADVideoListener {
override fun onAdClose() { override fun onAdClose() {
......
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @ a732f2f9
...@@ -191,7 +191,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -191,7 +191,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
// }, AdID.mPlacementId_Reward_video_luck_farm) // }, AdID.mPlacementId_Reward_video_luck_farm)
AdManager.playRewardAd( AdManager.playRewardAd(
ADConfig.AD_REWARD_VIDIO, ADConfig.AD_REWARD_VIDIO,
"", "lucky_turntable_lottery_look_video",
(context as Activity), (context as Activity),
object : ZXADVideoListener { object : ZXADVideoListener {
override fun onAdClose() { override fun onAdClose() {
......
library/build.gradle
View file @ a732f2f9
...@@ -112,7 +112,7 @@ dependencies { ...@@ -112,7 +112,7 @@ dependencies {
// exclude group: 'com.mintegral.msdk' // exclude group: 'com.mintegral.msdk'
// exclude group: 'cn.vlion.inlandsh' // exclude group: 'cn.vlion.inlandsh'
// } // }
api 'com.ym.admodule:admodule:1.0.1.7' api 'com.ym.admodule:admodule:1.0.1.10'
api ("com.bx:adsdk:1.3.3"){ api ("com.bx:adsdk:1.3.3"){
exclude group: 'com.google.code.gson' exclude group: 'com.google.code.gson'
} }
......
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