From d4cc897e26213c2262fecd8afe23bbe63bb3d420 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Wed, 17 Jun 2026 10:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=90=AF=E6=B5=87?=
 =?UTF-8?q?=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ckkj/water/device/AddDeviceActivity.java  |  2 +-
 .../water/device/AddDeviceActivity_copy.java  |  2 +-
 .../water/device/DeviceConnectActivity.java   |  2 +-
 .../water/device/DeviceControlActivity.java   | 46 +++++++++++++------
 .../ckkj/water/device/DeviceInfoActivity.java |  2 +-
 .../water/device/DeviceReNameActivity.java    |  2 +-
 .../water/device/DeviceSettingsActivity.java  |  2 +-
 .../ckkj/water/device/SelectWifiActivity.java |  6 +--
 .../water/device/SelectWifiActivity_copy.java |  2 +-
 .../ckkj/water/device/mvp/DeviceContract.java |  2 +-
 .../water/device/mvp/DevicePresenter.java     |  8 ++--
 app/src/main/res/values/strings.xml           |  3 +-
 12 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
index d6f11d7..00d9c5f 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
@@ -207,7 +207,7 @@ public class AddDeviceActivity extends BaseActivity<AddDeviceLayoutBinding, Devi
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
index 942202a..d36a8ca 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
@@ -444,7 +444,7 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
index 31b3153..495214b 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
@@ -273,7 +273,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
index 71759e0..77ee306 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
@@ -188,18 +188,21 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
                 break;
 
             case R.id.tv_confirm:
-                if(mCustomDuration == 0 && mAdapter.getmSelPostion() == -1){
-                    ToastUtil.showShort(mContext,getString(R.string.select_watering_duration));
-                    return;
+                if(mDeviceEntity.getWorkStatus().equals("0")){
+                    if(mCustomDuration == 0 && mAdapter.getmSelPostion() == -1){
+                        ToastUtil.showShort(mContext,getString(R.string.select_watering_duration));
+                        return;
+                    }
                 }
-                showCenterTipDialog(R.mipmap.icon_dialog_success,getString(R.string.start_watering));//
-                String status = mDeviceEntity.getStatus();
-                if(status.equals("1")){
-                    status = "0";
+                int duration = 0;
+                String workStatus = mDeviceEntity.getWorkStatus();
+                if(workStatus.equals("1")){
+                    workStatus = "0";
                 }else{
-                    status = "1";
+                    workStatus = "1";
+                    duration = convertToMinutes(mTimeList.get(mAdapter.getmSelPostion()));
                 }
-                mPresenter.switchDeviceWork(mDeviceEntity.getId(),status,
+                mPresenter.switchDeviceWork(mDeviceEntity,workStatus,
                         mCustomDuration == 0 ? convertToMinutes(mTimeList.get(mAdapter.getmSelPostion()))
                          : mCustomDuration);
                 break;
@@ -316,6 +319,27 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
         mRemoteDeviceEntity = bean;
     }
 
+
+    /**
+     * 开关设备成功
+     * @param bean
+     * @param status
+     */
+    @Override
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
+        mDeviceEntity.setWorkStatus(status);
+        mCustomDuration = 0;
+        mAdapter.setOnSelPosition(-1);
+        if(status.equals("0")){
+            showCenterTipDialog(R.mipmap.icon_dialog_success,getString(R.string.end_watering));
+            viewBinding.tvConfirm.setText(getString(R.string.start_watering));
+        }else{
+            showCenterTipDialog(R.mipmap.icon_dialog_success,getString(R.string.start_watering));
+            viewBinding.tvConfirm.setText(getString(R.string.end_watering));
+        }
+    }
+
+
     @Override
     public int getLayoutResId(Bundle savedInstanceState) {
         return 0;
@@ -349,10 +373,6 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
 
     }
 
-    @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
-
-    }
 
     @Override
     public void queryDeviceBindStatusSuccess(WaterDeviceEntity bean) {
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceInfoActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceInfoActivity.java
index ae8bf2f..eb6f619 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceInfoActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceInfoActivity.java
@@ -99,7 +99,7 @@ public class DeviceInfoActivity extends BaseActivity<DeviceInfoLayoutBinding, De
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceReNameActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceReNameActivity.java
index 712ee62..698df25 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceReNameActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceReNameActivity.java
@@ -136,7 +136,7 @@ public class DeviceReNameActivity extends BaseActivity<SetDeviceNameLayoutBindin
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java
index db83cea..e13adea 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java
@@ -221,7 +221,7 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
 
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
index d6b0310..3f3853f 100644
--- a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
@@ -4,9 +4,7 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
 import android.Manifest;
-import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 import android.os.Handler;
@@ -15,8 +13,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
-import androidx.core.app.ActivityCompat;
-
 import com.ckkj.water.ConstantUtil;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
@@ -407,7 +403,7 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity_copy.java b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity_copy.java
index 58c4623..448820e 100644
--- a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity_copy.java
+++ b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity_copy.java
@@ -340,7 +340,7 @@ public class SelectWifiActivity_copy extends BaseActivity<DeviceResetWifiBinding
     }
 
     @Override
-    public void turnOnOffDeviceSuccess(BaseBean bean) {
+    public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/mvp/DeviceContract.java b/app/src/main/java/com/ckkj/water/device/mvp/DeviceContract.java
index 31ebf2a..ccddb53 100644
--- a/app/src/main/java/com/ckkj/water/device/mvp/DeviceContract.java
+++ b/app/src/main/java/com/ckkj/water/device/mvp/DeviceContract.java
@@ -37,7 +37,7 @@ public class DeviceContract {
         void getDeviceDetailInfo(WaterDeviceEntity bean);
         void editDeviceInfoSuccess(BaseBean bean);
         void deleteDeviceSuccess(BaseBean bean);
-        void turnOnOffDeviceSuccess(BaseBean bean);
+        void turnOnOffDeviceSuccess(BaseBean bean, String status);
 
         void queryDeviceBindStatusSuccess(WaterDeviceEntity bean);
     }
diff --git a/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java b/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java
index 00e11d5..54bfcfc 100644
--- a/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java
+++ b/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java
@@ -137,14 +137,14 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
 
     /**
      * 开启/关闭浇水
-     * @param id
+     * @param deviceEntity
      * @param status
      * @param duration
      */
-    public void switchDeviceWork(String id, String status, int duration) {
+    public void switchDeviceWork(WaterDeviceEntity deviceEntity, String status, int duration) {
         try {
             JSONObject json = new JSONObject();
-            json.put("id",id);
+            json.put("deviceNo",deviceEntity.getDeviceNo());
             json.put("workStatus",status);
 //            json.put("startTime","09:50");
             json.put("durationMin",duration + "");
@@ -152,7 +152,7 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
                 @Override
                 public void success(BaseBean bean,int total) {
                     if(DevicePresenter.this.getView() != null){
-                        DevicePresenter.this.getView().turnOnOffDeviceSuccess(bean);
+                        DevicePresenter.this.getView().turnOnOffDeviceSuccess(bean,status);
                     }
                 }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d47cd16..b06b746 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,7 +91,8 @@
     <string name="device_status_not_working">待机中</string>
     <string name="device_status_offline">离线</string>
     <string name="select_watering_duration">请选择浇水时长</string>
-    <string name="start_watering">开始浇水</string>
+    <string name="start_watering">开启浇水</string>
+    <string name="end_watering">关闭浇水</string>
     <string name="reset_device_provision">该操作需要手动将设备重置到配网模式</string>
     <string name="device_binding_conflict_message">该设备已被其他用户绑定，您可以登录该账号尝试解绑，或重置设备进入配网模式</string>