From dec5ecc100585eb155f20263c120da6f20cc6e76 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Sun, 9 Aug 2026 17:59:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(api):=20=E4=BC=98=E5=8C=96=E5=87=80?=
 =?UTF-8?q?=E8=8F=9C=E5=8C=85=E5=92=8C=E9=A4=90=E5=93=81=E5=87=80=E8=8F=9C?=
 =?UTF-8?q?=E5=8C=85=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除净菜包和餐品净菜包接口中分页包装PageData，接口直接返回列表数组
- 修改相关调用处，取消对PageData的类型转换，直接处理列表数据
- 清理无用的PageData导入语句
- 保持接口功能和调用逻辑一致，提升代码简洁性和易维护性
---
 .../intelligent/shelves/activity/ShelfV2Activity.kt      | 5 ++---
 .../com/shuwei/intelligent/shelves/net/ApiServiceV2.kt   | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

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<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
         }
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<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 全量同步整柜数据（定时上报）