From f2b806239844eb5f4cbc0e734d8dff7ce0b5ac8b Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Tue, 26 May 2026 17:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E7=BC=96=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../water/index/entity/WaterDeviceEntity.java | 49 ++++++-------------
 .../java/com/ckkj/water/network/Request.java  |  2 +-
 .../ckkj/water/plan/BindDeviceFragment.java   |  6 +--
 .../water/plan/adapter/BindDeviceAdapter.java |  4 +-
 .../ckkj/water/plan/mvp/WaterPlanImpl.java    |  4 +-
 5 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/index/entity/WaterDeviceEntity.java b/app/src/main/java/com/ckkj/water/index/entity/WaterDeviceEntity.java
index c9e69bc..bbc3b66 100644
--- a/app/src/main/java/com/ckkj/water/index/entity/WaterDeviceEntity.java
+++ b/app/src/main/java/com/ckkj/water/index/entity/WaterDeviceEntity.java
@@ -48,40 +48,21 @@ public class WaterDeviceEntity implements Serializable {
     @NoArgsConstructor
     @Data
     public static class DeviceListBean implements Serializable{
-        /**
-         * id : 2056641699765178369
-         * deviceNo : 1779176568237
-         * userId : 2056543507514097665
-         * deviceName : 40号设备
-         * deviceImg : null
-         * status : 0
-         * workStatus : 0
-         * powerLevel : null
-         * powerLevelUpdatatime : null
-         * wifiName : 橙空科技WiFi
-         * wifiPassword : 12321212
-         * deviceEm : 213123123123
-         * deviceSn : sdfsd32423gdfgdf3
-         * fwVer : fwVer-56565644
-         * macAddress : 2E:8H:00:KK:N7
-         * expirationTime : null
-         */
-
-        private String idX;
-        private String deviceNoX;
-        private String userIdX;
-        private String deviceNameX;
-        private Object deviceImgX;
-        private String statusX;
+        private String id;
+        private String deviceNo;
+        private String userId;
+        private String deviceName;
+        private Object deviceImg;
+        private String status;
         private String workStatus;
-        private Object powerLevelX;
-        private Object powerLevelUpdatatimeX;
-        private String wifiNameX;
-        private String wifiPasswordX;
-        private String deviceEmX;
-        private String deviceSnX;
-        private String fwVerX;
-        private String macAddressX;
-        private Object expirationTimeX;
+        private Object powerLevel;
+        private Object powerLevelUpdatatime;
+        private String wifiName;
+        private String wifiPassword;
+        private String deviceEm;
+        private String deviceSn;
+        private String fwVer;
+        private String macAddress;
+        private Object expirationTime;
     }
 }
diff --git a/app/src/main/java/com/ckkj/water/network/Request.java b/app/src/main/java/com/ckkj/water/network/Request.java
index f32915a..a6e6934 100644
--- a/app/src/main/java/com/ckkj/water/network/Request.java
+++ b/app/src/main/java/com/ckkj/water/network/Request.java
@@ -83,7 +83,7 @@ public interface Request {
 
     //查询排程可绑定设备列表
     @GET("app/v1/scheduleDeviceList/{id}")
-    Observable<BaseBean<WaterDeviceEntity.DeviceListBean>> getPlanBindDeviceList(@HeaderMap Map<String, String> headMap, @Path("id") String id);
+    Observable<BaseBean<WaterDeviceEntity>> getPlanBindDeviceList(@HeaderMap Map<String, String> headMap, @Path("id") String id);
 
     //查询排程详情
     @GET("app/v1/schedule/{id}")
diff --git a/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java b/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java
index cd0b450..38758a9 100644
--- a/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java
+++ b/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java
@@ -42,10 +42,10 @@ public class BindDeviceFragment extends BaseFragment<PlanBindDeviceLayoutBinding
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 mAdapter.toggleSelection(position);
-                if(mDeviceList.get(position).getStatusX().equals("0")){
-                    mDeviceList.get(position).setStatusX("1");
+                if(mDeviceList.get(position).getStatus().equals("0")){
+                    mDeviceList.get(position).setStatus("1");
                 }else{
-                    mDeviceList.get(position).setStatusX("0");
+                    mDeviceList.get(position).setStatus("0");
                 }
 //                syncSelectedDevices();
             }
diff --git a/app/src/main/java/com/ckkj/water/plan/adapter/BindDeviceAdapter.java b/app/src/main/java/com/ckkj/water/plan/adapter/BindDeviceAdapter.java
index 3993cf3..b46ac38 100644
--- a/app/src/main/java/com/ckkj/water/plan/adapter/BindDeviceAdapter.java
+++ b/app/src/main/java/com/ckkj/water/plan/adapter/BindDeviceAdapter.java
@@ -27,8 +27,8 @@ public class BindDeviceAdapter extends BaseQuickAdapter<WaterDeviceEntity.Device
     @Override
     protected void convert(BaseViewHolder helper, WaterDeviceEntity.DeviceListBean item) {
         CheckBox checkBox = helper.getView(R.id.radio);
-        helper.setText(R.id.tv_device_name, item.getDeviceNameX());
-        helper.setText(R.id.tv_device_serial, item.getDeviceSnX());
+        helper.setText(R.id.tv_device_name, item.getDeviceName());
+        helper.setText(R.id.tv_device_serial, item.getDeviceSn());
         checkBox.setChecked(mSelectedPositions.contains(helper.getLayoutPosition()));
     }
 
diff --git a/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanImpl.java b/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanImpl.java
index a43b402..06805cf 100644
--- a/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanImpl.java
+++ b/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanImpl.java
@@ -144,13 +144,13 @@ public class WaterPlanImpl implements WaterPlanContract.DataModel{
                 .subscribeOn(Schedulers.io())
                 .unsubscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseBean<WaterDeviceEntity.DeviceListBean>>() {
+                .subscribe(new Observer<BaseBean<WaterDeviceEntity>>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
                     }
 
                     @Override
-                    public void onNext(@NonNull BaseBean<WaterDeviceEntity.DeviceListBean> bean) {
+                    public void onNext(@NonNull BaseBean<WaterDeviceEntity> bean) {
                         if (bean.getCode() == 200) {
                             callBack.success(bean.getData(),0);
                         }