Skip to content

Commit

Permalink
Merge branch 'hotfix/v0.2.7.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
aaa1115910 committed May 17, 2024
2 parents 9aec925 + 27e2af8 commit ece3e1a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ class RecommendViewModel(
var loadCount = 0
val maxLoadMoreCount = 3
if (!loading) {
while (recommendVideoList.size < 14 && loadCount < maxLoadMoreCount) {
if (recommendVideoList.size == 0) {
// first load data
while (recommendVideoList.size < 14 && loadCount < maxLoadMoreCount) {
loadData()
if (loadCount != 0) logger.fInfo { "Load more recommend videos because items too less" }
loadCount++
}
} else {
loadData()
if (loadCount != 0) logger.fInfo { "Load more recommend videos because items too less" }
loadCount++
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/AppConfiguration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object AppConfiguration {
private const val major = 0
private const val minor = 2
private const val patch = 7
private const val bugFix = 0
private const val bugFix = 1

@Suppress("KotlinConstantConditions")
val versionName: String by lazy {
Expand Down

0 comments on commit ece3e1a

Please sign in to comment.