|
@@ -38,6 +38,7 @@ class HomeViewModel : BaseViewModel() {
|
|
|
val netFoodLiveData = MutableLiveData<Boolean>()
|
|
|
val recipesOnFail = MutableLiveData<Int>()
|
|
|
val refreshRecipesLiveData = MutableLiveData<Boolean>()
|
|
|
+
|
|
|
//处理011选择搜索后点击返回 列表重复的监听
|
|
|
val searchLiveData = MutableLiveData<Boolean>()
|
|
|
|
|
@@ -121,7 +122,6 @@ class HomeViewModel : BaseViewModel() {
|
|
|
var deleteLikeLiveData = MutableLiveData<String>()
|
|
|
|
|
|
|
|
|
-
|
|
|
/**查询本地菜谱分类*/
|
|
|
@SuppressLint("SuspiciousIndentation")
|
|
|
@RequiresApi(Build.VERSION_CODES.N)
|
|
@@ -172,7 +172,8 @@ class HomeViewModel : BaseViewModel() {
|
|
|
}
|
|
|
|
|
|
|
|
|
- },0)
|
|
|
+ }, 0
|
|
|
+ )
|
|
|
|
|
|
} else {
|
|
|
var allSize = 0
|
|
@@ -288,27 +289,29 @@ class HomeViewModel : BaseViewModel() {
|
|
|
|
|
|
|
|
|
//判断是否最后一页
|
|
|
- if (pageNo+1 * pageSize >= t.totalCount) {
|
|
|
+ if (pageNo + 1 * pageSize >= t.totalCount) {
|
|
|
isNotModeLoadMore = true
|
|
|
}
|
|
|
|
|
|
|
|
|
t.data.forEach {
|
|
|
-
|
|
|
+ var userTag = FoodDataProvider.getUserDatabase().userInfoDao()
|
|
|
+ .queryUserTag(CURRENT_USER_ID, it.id.toString())
|
|
|
var cookTime = it.cookTime
|
|
|
var makeHours = cookTime / 3600;
|
|
|
var makeMinutes = (cookTime % 3600) / 60;
|
|
|
+ var startCount = userTag?.starCount ?: 0
|
|
|
foodContentList.add(
|
|
|
FoodContentModel(
|
|
|
it.mainImg,
|
|
|
it.name,
|
|
|
- 0,
|
|
|
+ startCount,
|
|
|
getTime(makeHours ?: 0, makeMinutes ?: 0),
|
|
|
it.easyLevelDesc
|
|
|
?: globalApp().getString(com.develop.common.R.string.easy),
|
|
|
false,
|
|
|
false,
|
|
|
- it.isStar ?:false,
|
|
|
+ it.isStar ?: false,
|
|
|
it.id.toString(),
|
|
|
it.eatCount.toString(),
|
|
|
0
|
|
@@ -325,7 +328,8 @@ class HomeViewModel : BaseViewModel() {
|
|
|
recipesOnFail.postValue(1)
|
|
|
}
|
|
|
|
|
|
- },0)
|
|
|
+ }, 0
|
|
|
+ )
|
|
|
} else {
|
|
|
scope(Dispatchers.IO) {
|
|
|
startSize = 0
|
|
@@ -489,10 +493,10 @@ class HomeViewModel : BaseViewModel() {
|
|
|
}
|
|
|
|
|
|
fun loadMoreLocal011Recipes() {
|
|
|
- if (isSearch){
|
|
|
+ if (isSearch) {
|
|
|
searchPageNo++
|
|
|
- queryRecipesByHotWord(searchHotWord,CategoryType.All)
|
|
|
- }else{
|
|
|
+ queryRecipesByHotWord(searchHotWord, CategoryType.All)
|
|
|
+ } else {
|
|
|
pageNo++
|
|
|
queryLocalRecipes(categoryRecipesNum)
|
|
|
}
|
|
@@ -532,7 +536,7 @@ class HomeViewModel : BaseViewModel() {
|
|
|
* val recipesEdition: String? = "1.0",
|
|
|
* val useNum: Int = 0
|
|
|
* */
|
|
|
- if (searchPageNo ==0){
|
|
|
+ if (searchPageNo == 0) {
|
|
|
val homeHeader = HomeHeader()
|
|
|
homeHeader.filterSortModel = FilterSortModel("")
|
|
|
homeHeader.categoryModel =
|
|
@@ -542,7 +546,7 @@ class HomeViewModel : BaseViewModel() {
|
|
|
|
|
|
|
|
|
//判断是否最后一页
|
|
|
- if (searchPageNo+1 * searchPageSize >= t.totalCount) {
|
|
|
+ if (searchPageNo + 1 * searchPageSize >= t.totalCount) {
|
|
|
isNotModeLoadMore = true
|
|
|
}
|
|
|
|
|
@@ -582,8 +586,8 @@ class HomeViewModel : BaseViewModel() {
|
|
|
recipesOnFail.postValue(1)
|
|
|
}
|
|
|
|
|
|
- },0)
|
|
|
-
|
|
|
+ }, 0
|
|
|
+ )
|
|
|
|
|
|
|
|
|
} else {
|
|
@@ -1149,7 +1153,7 @@ class HomeViewModel : BaseViewModel() {
|
|
|
json, object : CommonUtils.TuyaBooleanHttp {
|
|
|
override fun bean(t: Boolean) {
|
|
|
var id = ""
|
|
|
- if (t){
|
|
|
+ if (t) {
|
|
|
id = number
|
|
|
}
|
|
|
addLikeLiveData.postValue(id)
|
|
@@ -1172,7 +1176,7 @@ class HomeViewModel : BaseViewModel() {
|
|
|
json, object : CommonUtils.TuyaBooleanHttp {
|
|
|
override fun bean(t: Boolean) {
|
|
|
var id = ""
|
|
|
- if (t){
|
|
|
+ if (t) {
|
|
|
id = number
|
|
|
}
|
|
|
deleteLikeLiveData.postValue(id)
|
|
@@ -1185,7 +1189,6 @@ class HomeViewModel : BaseViewModel() {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
private fun resetOnlineConfig() {
|
|
|
currentPage = 1
|
|
|
hasMoreOnline = false
|