Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
kehaoyuan@ghzhushou.com
2020-02-28 10:57:47 +08:00
parent 142a64d261 2ef98fd050
commit e24d7f1045
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt
View File

@ -207,7 +207,7 @@ class FuLiViewModel(application: Application,
fuLiData.notice = gameDetail.notice
itemList.add(fuLiData)
}
if (showArticleEntrance == true && mArticleList != null) {
if (showArticleEntrance == true && !mArticleList.isNullOrEmpty()) {
val fuLiData = FuLiItemData()
fuLiData.article = mArticleList
itemList.add(fuLiData)
@ -233,7 +233,7 @@ class FuLiViewModel(application: Application,
itemList.add(fuLiData)
index++
}
if (mLiBaoList != null) {
if (!mLiBaoList.isNullOrEmpty()) {
val fuLiData = FuLiItemData()
fuLiData.libao = mLiBaoList
itemList.add(fuLiData)
@ -245,7 +245,7 @@ class FuLiViewModel(application: Application,
itemList.add(fuLiData)
if (!gameDetail.serverEntity?.calendar.isNullOrEmpty()) isExistServer = true
}
if (mAnswerList != null) {
if (!mAnswerList.isNullOrEmpty()) {
val fuLiData = FuLiItemData()
fuLiData.answer = mAnswerList
itemList.add(fuLiData)