refactor(api): 优化净菜包和餐品净菜包接口返回结构

- 移除净菜包和餐品净菜包接口中分页包装PageData,接口直接返回列表数组
- 修改相关调用处,取消对PageData的类型转换,直接处理列表数据
- 清理无用的PageData导入语句
- 保持接口功能和调用逻辑一致,提升代码简洁性和易维护性
This commit is contained in:
mazengfei
2026-08-09 17:59:04 +08:00
parent 5dc0bb2ec5
commit dec5ecc100
2 changed files with 6 additions and 8 deletions
@@ -21,7 +21,6 @@ import com.shuwei.intelligent.shelves.base.BaseActivity
import com.shuwei.intelligent.shelves.databinding.ActivityShelfV2Binding
import com.shuwei.intelligent.shelves.model.CleanPackageOption
import com.shuwei.intelligent.shelves.model.MealPackageOption
import com.shuwei.intelligent.shelves.model.PageData
import com.shuwei.intelligent.shelves.model.ShelfModelV2
import com.shuwei.intelligent.shelves.model.SendWeightEvent
import com.shuwei.intelligent.shelves.net.Loading
@@ -281,7 +280,7 @@ class ShelfV2Activity : BaseActivity() {
binding.include?.root?.gone()
binding.root.postDelayed({ Loading.dismiss() }, 200)
@Suppress("UNCHECKED_CAST")
val items = (data.data as? PageData<*>)?.list as? List<CleanPackageOption>
val items = data.data as? List<CleanPackageOption>
if (items.isNullOrEmpty()) {
loadEmptyView(); return
}
@@ -296,7 +295,7 @@ class ShelfV2Activity : BaseActivity() {
binding.include?.root?.gone()
binding.root.postDelayed({ Loading.dismiss() }, 200)
@Suppress("UNCHECKED_CAST")
val items = (data.data as? PageData<*>)?.list as? List<MealPackageOption>
val items = data.data as? List<MealPackageOption>
if (items.isNullOrEmpty()) {
loadEmptyView(); return
}
@@ -3,7 +3,6 @@ package com.shuwei.intelligent.shelves.net
import com.shuwei.intelligent.shelves.model.CabinetInitResult
import com.shuwei.intelligent.shelves.model.CleanPackageOption
import com.shuwei.intelligent.shelves.model.MealPackageOption
import com.shuwei.intelligent.shelves.model.PageData
import com.shuwei.intelligent.shelves.model.PageOptionsReq
import com.shuwei.intelligent.shelves.model.SyncBody
import retrofit2.http.Body
@@ -26,23 +25,23 @@ interface ApiServiceV2 {
/**
* 4.2.1 净菜包下拉列表(itemType=1
* POST + JSON Body 分页请求,返回分页结构 PageData
* POST + JSON Body 分页请求,data 直接为列表数组
*/
@POST
suspend fun getCleanPackageOptions(
@Url url: String = UrlConfig.CLEAN_PACKAGE_OPTIONS,
@Body body: PageOptionsReq
): RespData<PageData<CleanPackageOption>>
): RespData<List<CleanPackageOption>>
/**
* 4.2.2 餐品净菜包下拉列表(itemType=2)
* POST + JSON Body 分页请求,返回分页结构 PageData
* POST + JSON Body 分页请求,data 直接为列表数组
*/
@POST
suspend fun getMealPackageOptions(
@Url url: String = UrlConfig.MEAL_PACKAGE_OPTIONS,
@Body body: PageOptionsReq
): RespData<PageData<MealPackageOption>>
): RespData<List<MealPackageOption>>
/**
* 4.3 全量同步整柜数据(定时上报)