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

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