Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckyFarm
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
王雪伟
LuckyFarm
Commits
365fc901
Commit
365fc901
authored
Dec 01, 2020
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加速剂任务领取修改
parent
3b54e39d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
SpeedWaterTaskAdapter.kt
...rc/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt
+2
-3
SpeedWaterPresenter.kt
...rc/main/java/com/ym/game/presenter/SpeedWaterPresenter.kt
+1
-1
TaskCompleteEntity.kt
...src/main/java/com/ym/library/module/TaskCompleteEntity.kt
+1
-0
IGameApi.kt
library/src/main/java/com/ym/library/net/IGameApi.kt
+1
-1
No files found.
app/src/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt
View file @
365fc901
...
@@ -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
)
}
}
}
}
...
...
app/src/main/java/com/ym/game/presenter/SpeedWaterPresenter.kt
View file @
365fc901
...
@@ -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
.
get
TaskComplete
Report
(
sid
).
compose
(
GameApiClient
.
gameApi
.
get
WelfareVideo
Report
(
sid
).
compose
(
RxSchedulers
.
observableIO2Main
()
RxSchedulers
.
observableIO2Main
()
).
subscribe
(
object
:
BaseObserver
<
NewsEntity
>()
{
).
subscribe
(
object
:
BaseObserver
<
NewsEntity
>()
{
override
fun
onSuccess
(
result
:
NewsEntity
?)
{
override
fun
onSuccess
(
result
:
NewsEntity
?)
{
...
...
library/src/main/java/com/ym/library/module/TaskCompleteEntity.kt
View file @
365fc901
...
@@ -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
library/src/main/java/com/ym/library/net/IGameApi.kt
View file @
365fc901
...
@@ -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
(
"
s
id"
)
id
:
Int
):
Observable
<
Response
<
TaskCompleteEntity
>>
/**
/**
* 排行榜领取
* 排行榜领取
...
...
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