Commit 365fc901 authored by maxiaoliang's avatar maxiaoliang

加速剂任务领取修改

parent 3b54e39d
...@@ -55,7 +55,7 @@ class SpeedWaterTaskAdapter : ...@@ -55,7 +55,7 @@ class SpeedWaterTaskAdapter :
} }
if (!TextUtils.isEmpty(data.description)) { if (!TextUtils.isEmpty(data.description)) {
// holder.btnProgess.visibility = View.GONE // holder.btnProgess.visibility = View.GONE
holder.tvTitle.text = data.title+" (${data.current_nums}/${data.awardLimit})" // holder.tvTitle.text = data.title
holder.tvProgess.text = data.description holder.tvProgess.text = data.description
} else { } else {
// holder.btnProgess.visibility = View.VISIBLE // holder.btnProgess.visibility = View.VISIBLE
...@@ -155,8 +155,7 @@ class SpeedWaterTaskAdapter : ...@@ -155,8 +155,7 @@ class SpeedWaterTaskAdapter :
RxBusUtil.getDefault() RxBusUtil.getDefault()
.send(RxBusConstant.RX_SPEED_WATER_TASK_LIST) .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST)
if (result != null) { if (result != null) {
MainDialog.showgetWaterDrop(mContext, 5, "task_accelerator", result.awardNum!!, null)
MainDialog.showgetWaterDrop(mContext, 5, "task_accelerator", result.awardCoins!!, null)
} }
} }
......
...@@ -42,7 +42,7 @@ class SpeedWaterPresenter : SpeedWaterContract.Presenter { ...@@ -42,7 +42,7 @@ class SpeedWaterPresenter : SpeedWaterContract.Presenter {
} }
override fun getTaskComplete(sid: Int) { override fun getTaskComplete(sid: Int) {
GameApiClient.gameApi.getTaskCompleteReport(sid).compose( GameApiClient.gameApi.getWelfareVideoReport(sid).compose(
RxSchedulers.observableIO2Main() RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<NewsEntity>() { ).subscribe(object : BaseObserver<NewsEntity>() {
override fun onSuccess(result: NewsEntity?) { override fun onSuccess(result: NewsEntity?) {
......
...@@ -6,5 +6,6 @@ class TaskCompleteEntity { ...@@ -6,5 +6,6 @@ class TaskCompleteEntity {
var recode: Int? = 0 var recode: Int? = 0
var cents: Int? = 0 var cents: Int? = 0
var taskId: Int? = 0 var taskId: Int? = 0
var awardNum:Int?=0
var awardCoins:Int?=0 var awardCoins:Int?=0
} }
\ No newline at end of file
...@@ -191,7 +191,7 @@ interface IGameApi { ...@@ -191,7 +191,7 @@ interface IGameApi {
* @return * @return
*/ */
@POST(NetConfig.Game.URL_GAME_ACCELERATORS_TASK_RECEIVE) @POST(NetConfig.Game.URL_GAME_ACCELERATORS_TASK_RECEIVE)
fun getAcceleTask(@Query("id") id: Int): Observable<Response<TaskCompleteEntity>> fun getAcceleTask(@Query("sid") id: Int): Observable<Response<TaskCompleteEntity>>
/** /**
* 排行榜领取 * 排行榜领取
......
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