|
@@ -36,6 +36,10 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
|
|
|
* 推荐游戏adapter
|
|
|
*/
|
|
|
private var gameList = mutableListOf<Record>()
|
|
|
+ private var isFirstPage = true
|
|
|
+
|
|
|
+ //推荐游戏分页数据
|
|
|
+ private var pageList = mutableListOf<Record>()
|
|
|
private val gameAdapter by lazy { GameAdapter() }
|
|
|
|
|
|
private var playVoice: PlayVoice? = null
|
|
@@ -113,6 +117,20 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
|
|
|
btnCheck.setOnSingleClickListener {
|
|
|
JumpUtil.jumpActivity(RouterUrlCommon.trainData, mContext)
|
|
|
}
|
|
|
+ //下一页
|
|
|
+ btnNextPage.setOnSingleClickListener {
|
|
|
+ pageList.clear()
|
|
|
+ if (isFirstPage) {
|
|
|
+ btnNextPage.text = "上一页"
|
|
|
+ isFirstPage = false
|
|
|
+ pageList.addAll(gameList.subList(4, gameList.size))
|
|
|
+ } else {
|
|
|
+ btnNextPage.text = "下一页"
|
|
|
+ isFirstPage = true
|
|
|
+ pageList.addAll(gameList.subList(0, 4))
|
|
|
+ }
|
|
|
+ gameAdapter.setData(pageList)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -176,7 +194,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
|
|
|
if (it.currentTaskNum == it.totalTaskNum) {
|
|
|
if (TextUtils.equals("0", it.status)) {
|
|
|
//任务完成
|
|
|
- if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
|
|
|
+ if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
|
|
|
+ .not()
|
|
|
+ ) {
|
|
|
User.saveTaskDialogStatus(User.getNowDay())
|
|
|
showTipDialog()
|
|
|
} else {
|
|
@@ -191,7 +211,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
|
|
|
"继续专属训练"
|
|
|
}
|
|
|
showLayout(false)
|
|
|
- if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
|
|
|
+ if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
|
|
|
+ .not()
|
|
|
+ ) {
|
|
|
playVoice?.speak(it.taskDesn)
|
|
|
showTaskDialog(it.taskDesn)
|
|
|
}
|
|
@@ -246,14 +268,22 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
|
|
|
@SuppressLint("NotifyDataSetChanged")
|
|
|
private fun getGameList() {
|
|
|
gameList.clear()
|
|
|
+ pageList.clear()
|
|
|
viewModel.getGameList(fail = {
|
|
|
it.toast()
|
|
|
}, success = {
|
|
|
if (it.isNullOrEmpty().not()) {
|
|
|
gameList.clear()
|
|
|
+ pageList.clear()
|
|
|
gameList.addAll(it)
|
|
|
+ binding.btnNextPage.show(it.size > 4)
|
|
|
+ if (it.size > 4) {
|
|
|
+ pageList.addAll(it.subList(0, 4))
|
|
|
+ } else {
|
|
|
+ pageList.addAll(it)
|
|
|
+ }
|
|
|
}
|
|
|
- gameAdapter.setData(gameList)
|
|
|
+ gameAdapter.setData(pageList)
|
|
|
})
|
|
|
}
|
|
|
|