fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化开启浇水

Browse Source
This commit is contained in:
fengjignqi
2026-06-17 10:01:33 +08:00
parent 8b3c6d1761
commit d4cc897e26
12 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
View File

@@ -207,7 +207,7 @@ public class AddDeviceActivity extends BaseActivity<AddDeviceLayoutBinding, Devi
}
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

2
app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
View File

@@ -444,7 +444,7 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
}
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

2
app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
View File

@@ -273,7 +273,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
}
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

46
app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
View File

@@ -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) {

2
app/src/main/java/com/ckkj/water/device/DeviceInfoActivity.java
View File

@@ -99,7 +99,7 @@ public class DeviceInfoActivity extends BaseActivity<DeviceInfoLayoutBinding, De
}
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

2
app/src/main/java/com/ckkj/water/device/DeviceReNameActivity.java
View File

@@ -136,7 +136,7 @@ public class DeviceReNameActivity extends BaseActivity<SetDeviceNameLayoutBindin
}
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

2
app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java
View File

@@ -221,7 +221,7 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

6
app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
View File

@@ -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) {
}

2
app/src/main/java/com/ckkj/water/device/SelectWifiActivity_copy.java
View File

@@ -340,7 +340,7 @@ public class SelectWifiActivity_copy extends BaseActivity<DeviceResetWifiBinding
}
@Override
public void turnOnOffDeviceSuccess(BaseBean bean) {
public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
}

2
app/src/main/java/com/ckkj/water/device/mvp/DeviceContract.java
View File

@@ -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);
}

8
app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java
View File

@@ -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);
}
}

3
app/src/main/res/values/strings.xml
View File

@@ -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>