Skip to content

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

[提交人]：王雪伟 

[提交简述] ：多多菜园
[实现方案] ：云朵加速判断是否可加速
parent 04f6b015
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 54 deletions
app/src/main/java/com/ym/game/GameActivity.kt
View file @ 43aefde3
......@@ -144,8 +144,12 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
JumpUtils.jumpSettingActivity()
}
fun gotoXiaoManActivity(){
JumpUtils.jumpXiaomanActivity("多多菜园")
/**
* 小满入口
*/
fun gotoXiaoManActivity() {
EventUtils.onEvent("XiaoManClick", "小满入口点击");
JumpUtils.jumpXiaomanActivity("天天领现金")
}
/**
......@@ -898,4 +902,23 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
}
})
}
//检查云朵加速
fun checkCloud(callback: IUnitySendMessageCallback?){
GameApiClient.gameApi.getGameCloudCheck().compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<GuideEntity>() {
override fun onSuccess(result: GuideEntity?) {
callback?.onGetCheckCloud(
true,
Utils.obj2Str(result)
)
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
callback?.onGetCheckCloud(false, "CloudError")
}
})
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/IUnitySendMessageCallback.kt
View file @ 43aefde3
......@@ -8,29 +8,43 @@ package com.ym.game
interface IUnitySendMessageCallback {
//主页
fun onHomeSuccess(isSuccess: Boolean, result: String)
//云朵加速
fun onCloudSpeedSuccess(isSuccess: Boolean, result: String)
//土地列表
fun onFarmLandListSuccess(isSuccess: Boolean, result: String)
//土地解锁，种植，收获
fun onLandUnLockSuccess(isSuccess: Boolean, result: String)
//使用加速剂
fun onUseAcceleratorsSuccess(isSuccess: Boolean, result: String)
//购买种子
fun onBuySeedSuccess(isSuccess: Boolean, result: String)
//仓库
fun onHomeWareListSuccess(isSuccess: Boolean, result: String)
//订单列表
fun onOrderListSuccess(isSuccess: Boolean, result: String)
//订单领取
fun onOrderReceiveSuccess(isSuccess: Boolean, result: String)
//看视频获得种子
fun onIncrVideoSeedSuccess(isSuccess: Boolean, result: String)
//看视频获得加速剂
fun onIncrVideoAcceleratorsSuccess(isSuccess: Boolean, result: String)
//看视频获得宝箱奖励
fun onAdFlyBoxSuccess(isSuccess: Boolean, result: String)
//判断新手
fun onGetGuideSuccess(isSuccess: Boolean, result: String)
//判断是否云朵加速
fun onGetCheckCloud(isSuccess: Boolean, result: String)
}
\ No newline at end of file
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @ 43aefde3
......@@ -32,7 +32,7 @@ class BaseApplication : MultiDexApplication() {
//第一步初始化 application
AppliContext.init(this)
// Config.init(this)
NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
Constant.appLs = "afcbef40e31631d3"//appls
AdManager.init(this)
......
app/src/main/java/com/ym/game/net/IGameApi.kt
View file @ 43aefde3
......@@ -24,6 +24,15 @@ interface IGameApi {
@GET(NetConfig.Game.URL_GAME_HOME_INFO)
fun getGameHomeInfo(): Observable<Response<HomeInfoEntity>>
/**
* 云朵加速判断
* @param
* @param
* @return
*/
@GET(NetConfig.Game.URL_GAME_CLOUD_CHECK)
fun getGameCloudCheck(): Observable<Response<GuideEntity>>
/**
* 地块列表
* @param
......
app/version.properties
View file @ 43aefde3
PACKAGE_NAME=com.ym.ddcy
VERSION_CODE=1
VERSION_NAME=1.0.0
\ No newline at end of file
VERSION_CODE=2
VERSION_NAME=1.0.1
\ No newline at end of file
library/src/main/java/com/ym/library/Constant.java
View file @ 43aefde3
......@@ -455,8 +455,8 @@ public class Constant {
public static String district = "";
public static String street = "";
public static String makingMoneyUrl = "";
public static String WelfareCenter = "https://h5v3.zhangxinzhixun.com/huayuan/Welfare";//福利中心
public static String PunchRecord = "https://h5v3.zhangxinzhixun.com/huayuan/ClockIn";//打卡记录
public static String WelfareCenter = "http://h5v3.ihuomao.com/BarbaraFarm/Welfare";//福利中心
public static String PunchRecord = "http://h5v3.ihuomao.com/BarbaraFarm/ClockIn";//打卡记录
public static String RankList = "https://h5v3.zhangxinzhixun.com/huayuan/Ranking";//排行榜
public static String WithDraw = "http://h5v2.zhangxinzhixun.com/farm/Withdraw";//提现页
public static String WithDraw2 = "http://h5v2.zhangxinzhixun.com/farm/Withdraw?novice=1";//提现页
......
library/src/main/java/com/ym/library/activity/XiaoManActivity.kt
View file @ 43aefde3
package com.ym.library.activity
import android.os.SystemClock
import android.util.Log
import com.bx.adsdk.CampaignCallback
import com.bx.adsdk.CampaignFragment
......@@ -143,83 +144,125 @@ class XiaoManActivity : BaseActivity() {
}
})
}
/**
* 广点通广告
*/
fun showGDTAd(appID: String, pId: String, requestId: String) {
GDTADManager.getInstance().initWith(this@XiaoManActivity, requestId)
// rewardVideoAD = RewardVideoAD(this, appID, pId, object : RewardVideoADListener {
// override fun onADLoad() {
// if (rewardVideoAD != null) rewardVideoAD?.showAD()
// campaignFragment?.setVideoLoad(requestId)
// }
// override fun onVideoCached() {}
// override fun onADShow() {
// EventUtils.onEvent("XIAO_MAN_GDT_SHOW","小满广点通广告展示")
// }
// override fun onADExpose() {}
// override fun onReward() {}
// override fun onADClick() {
// EventUtils.onEvent("XIAO_MAN_GDT_CLICK","小满广点通广告点击")
// }
// override fun onVideoComplete() {
// campaignFragment?.setVideoComplete(requestId)
// }
// override fun onADClose() {
// EventUtils.onEvent("XIAO_MAN_GDT_CLOSE_CLICK","小满广点通广告关闭点击")
// campaignFragment?.setVideoClose(requestId)
// }
// override fun onError(adError: AdError) {
// campaignFragment?.setVideoError(requestId)
// }
// })
// rewardVideoAD?.loadAD()
var rewardVideoAD = RewardVideoAD(this, pId, object : RewardVideoADListener {
GDTADManager.getInstance().initWith(this@XiaoManActivity, appID)
rewardVideoAD = RewardVideoAD(this@XiaoManActivity, pId, object : RewardVideoADListener {
override fun onADExpose() {
// listener.onAdShow()
}
override fun onADClick() {
EventUtils.onEvent("XIAO_MAN_GDT_CLICK","小满广点通广告点击")
}
override fun onVideoCached() {
if (!rewardVideoAD?.hasShown()!!) { //广告展示检查2：当前广告数据还没有展示过
val delta: Long = 1000 //建议给广告过期时间加个buffer，单位ms，这里demo采用1000ms的buffer
//广告展示检查3：展示广告前判断广告数据未过期
if (SystemClock.elapsedRealtime() < rewardVideoAD!!.getExpireTimestamp() - delta) {
rewardVideoAD?.showAD()
} else {//激励视频广告已过期，请再次请求广告后进行广告展示！
}
} else {//此条广告已经展示过，请再次请求广告后进行广告展示！
}
}
override fun onReward() {
}
override fun onADClose() {
EventUtils.onEvent("XIAO_MAN_GDT_CLOSE_CLICK","小满广点通广告关闭点击")
campaignFragment?.setVideoClose(requestId)
}
//如果这里
override fun onADLoad() {
if (rewardVideoAD != null) rewardVideoAD?.showAD()
campaignFragment?.setVideoLoad(requestId)
}
override fun onVideoComplete() {
campaignFragment?.setVideoComplete(requestId)
}
override fun onError(p0: AdError?) {
campaignFragment?.setVideoError(requestId)
}
override fun onADShow() {
EventUtils.onEvent("XIAO_MAN_GDT_SHOW","小满广点通广告展示")
}
}) // 有声播放
rewardVideoAD.loadAD()
})
rewardVideoAD?.loadAD()
}
// /**
// * 广点通广告
// */
// fun showGDTAd(appID: String, pId: String, requestId: String) {
// GDTADManager.getInstance().initWith(this@XiaoManActivity, requestId)
//// rewardVideoAD = RewardVideoAD(this, appID, pId, object : RewardVideoADListener {
//// override fun onADLoad() {
//// if (rewardVideoAD != null) rewardVideoAD?.showAD()
//// campaignFragment?.setVideoLoad(requestId)
//// }
//// override fun onVideoCached() {}
//// override fun onADShow() {
//// EventUtils.onEvent("XIAO_MAN_GDT_SHOW","小满广点通广告展示")
//// }
//// override fun onADExpose() {}
//// override fun onReward() {}
//// override fun onADClick() {
//// EventUtils.onEvent("XIAO_MAN_GDT_CLICK","小满广点通广告点击")
//// }
//// override fun onVideoComplete() {
//// campaignFragment?.setVideoComplete(requestId)
//// }
//// override fun onADClose() {
//// EventUtils.onEvent("XIAO_MAN_GDT_CLOSE_CLICK","小满广点通广告关闭点击")
//// campaignFragment?.setVideoClose(requestId)
//// }
//// override fun onError(adError: AdError) {
//// campaignFragment?.setVideoError(requestId)
//// }
//// })
//// rewardVideoAD?.loadAD()
//
//
// var rewardVideoAD = RewardVideoAD(this, pId, object : RewardVideoADListener {
// override fun onADExpose() {
//// listener.onAdShow()
// }
//
// override fun onADClick() {
// EventUtils.onEvent("XIAO_MAN_GDT_CLICK","小满广点通广告点击")
// }
//
// override fun onVideoCached() {
// }
//
// override fun onReward() {
//
// }
//
// override fun onADClose() {
// EventUtils.onEvent("XIAO_MAN_GDT_CLOSE_CLICK","小满广点通广告关闭点击")
// campaignFragment?.setVideoClose(requestId)
// }
//
//
// //如果这里
// override fun onADLoad() {
// if (rewardVideoAD != null) rewardVideoAD?.showAD()
// campaignFragment?.setVideoLoad(requestId)
// }
//
// override fun onVideoComplete() {
// campaignFragment?.setVideoComplete(requestId)
// }
//
// override fun onError(p0: AdError?) {
// campaignFragment?.setVideoError(requestId)
// }
//
// override fun onADShow() {
// EventUtils.onEvent("XIAO_MAN_GDT_SHOW","小满广点通广告展示")
// }
//
// }) // 有声播放
// rewardVideoAD.loadAD()
// }
override fun onResume() {
super.onResume()
......
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ 43aefde3
......@@ -244,5 +244,7 @@ public class NetConfig {
public static final String URL_GAME_WD_HISTORY = "app/v1/game/ddcy/wd_history";//兑换记录
public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receive";//兑换记录
public static final String URL_GAME_USER_GUIDE = "app/v1/game/ddcy/user_guide";//兑换记录
public static final String URL_GAME_CLOUD_CHECK = "app/v1/game/farm/cloud_check";//云朵加速判断
}
}
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