diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt index 565e44c..2929895 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt @@ -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 + val items = data.data as? List 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 + val items = data.data as? List if (items.isNullOrEmpty()) { loadEmptyView(); return } diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiServiceV2.kt b/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiServiceV2.kt index b81cb80..3a0332c 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiServiceV2.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/net/ApiServiceV2.kt @@ -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> + ): RespData> /** * 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> + ): RespData> /** * 4.3 全量同步整柜数据(定时上报)