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-05-26 17:35:08 +08:00
parent 65dfc1b5f1
commit 9ab6d134ab
29 changed files with 271 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import com.ckkj.water.databinding.AddDeviceLayoutBinding;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ActivityManager;
import com.ckkj.water.utils.manager.ThemeManager;
@@ -195,7 +195,7 @@ public class AddDeviceActivity extends BaseActivity<AddDeviceLayoutBinding, Devi
}
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
}

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

@@ -15,10 +15,9 @@ import com.ckkj.water.databinding.DeviceConnectLayoutBinding;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ActivityManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
/**
@@ -105,7 +104,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
}
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
}

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

@@ -11,19 +11,17 @@ import com.ckkj.water.EventMessage;
import com.ckkj.water.R;
import com.ckkj.water.base.BaseActivity;
import com.ckkj.water.custom.GridSpacingItemDecoration;
import com.ckkj.water.custom.view.CustomAttachPopup;
import com.ckkj.water.custom.view.CustomBubbleAttachPopup;
import com.ckkj.water.databinding.DeviceControlLayoutBinding;
import com.ckkj.water.device.adapter.DeviceTimeSelectAdapter;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.core.BasePopupView;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +36,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
implements DeviceContract.DeviceView {
private List<String> mTimeList = new ArrayList<>();
private IndexDeviceEntity mDeviceEntity;
private WaterDeviceEntity mDeviceEntity;
private DeviceTimeSelectAdapter mAdapter;
@Override
public DevicePresenter createPresenter() {
@@ -50,7 +48,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
super.initData(savedInstanceState);
Bundle bundle = getIntent().getExtras();
if(bundle != null){
mDeviceEntity = (IndexDeviceEntity) bundle.getSerializable("device_info");
mDeviceEntity = (WaterDeviceEntity) bundle.getSerializable("device_info");
if(mDeviceEntity != null){
showLoadingDialog();
mPresenter.getDeviceDetailInfo(mDeviceEntity.getId());
@@ -144,7 +142,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
if(resultCode == RESULT_OK){
switch (requestCode){
case REQUEST_EVENT_CODE_10002:
mDeviceEntity = (IndexDeviceEntity) data.getSerializableExtra("device_entity");
mDeviceEntity = (WaterDeviceEntity) data.getSerializableExtra("device_entity");
viewBinding.includedTitle.tvTitle.setText(mDeviceEntity.getDeviceName());
break;
}
@@ -165,7 +163,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
* @param bean
*/
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
hideDialogLoading();
}

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

@@ -9,7 +9,7 @@ import com.ckkj.water.databinding.DeviceInfoLayoutBinding;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.gyf.immersionbar.ImmersionBar;
@@ -73,7 +73,7 @@ public class DeviceInfoActivity extends BaseActivity<DeviceInfoLayoutBinding, De
}
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
}

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

@@ -12,7 +12,7 @@ import com.ckkj.water.databinding.SetDeviceNameLayoutBinding;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.manager.ActivityManager;
import com.ckkj.water.utils.show.ToastUtil;
@@ -87,7 +87,7 @@ public class DeviceReNameActivity extends BaseActivity<SetDeviceNameLayoutBindin
}
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
}

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

@@ -16,14 +16,12 @@ import com.ckkj.water.databinding.DeviceSettingsLayoutBinding;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
import de.greenrobot.event.EventBus;
import de.greenrobot.event.Subscribe;
import de.greenrobot.event.ThreadMode;
/**
* 设备控制页面
@@ -31,7 +29,7 @@ import de.greenrobot.event.ThreadMode;
public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBinding, DevicePresenter>
implements DeviceContract.DeviceView {
private IndexDeviceEntity mDeviceEntity;
private WaterDeviceEntity mDeviceEntity;
@Override
public DevicePresenter createPresenter() {
return new DevicePresenter(new DeviceImpl());
@@ -42,7 +40,7 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
super.initData(savedInstanceState);
Bundle bundle = getIntent().getExtras();
if(bundle != null){
mDeviceEntity = (IndexDeviceEntity) bundle.getSerializable("device_entity");
mDeviceEntity = (WaterDeviceEntity) bundle.getSerializable("device_entity");
viewBinding.tvDeviceName.setText(mDeviceEntity.getDeviceName());
viewBinding.tvWifiName.setText(mDeviceEntity.getWifiName());
@@ -209,7 +207,7 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
}
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
}

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

@@ -8,13 +8,11 @@ import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import androidx.core.app.ActivityCompat;
import androidx.recyclerview.widget.DividerItemDecoration;
import com.ckkj.water.ConstantUtil;
import com.ckkj.water.R;
@@ -23,13 +21,12 @@ import com.ckkj.water.databinding.DeviceResetWifiBinding;
import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.permission.PermissionActivity;
import com.ckkj.water.utils.manager.ActivityManager;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.ckkj.water.utils.text.TextUtil;
import com.gyf.immersionbar.ImmersionBar;
import java.util.ArrayList;
@@ -198,7 +195,7 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
}
@Override
public void getDeviceDetailInfo(IndexDeviceEntity bean) {
public void getDeviceDetailInfo(WaterDeviceEntity bean) {
}

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

@@ -1,7 +1,7 @@
package com.ckkj.water.device.mvp;
import com.ckkj.water.base.IView;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.index.mvp.IndexContract;
import com.ckkj.water.network.BaseBean;
@@ -34,7 +34,7 @@ public class DeviceContract {
public interface DeviceView extends IView {
//添加设备成功g
void addDeviceSuccess(BaseBean bean);
void getDeviceDetailInfo(IndexDeviceEntity bean);
void getDeviceDetailInfo(WaterDeviceEntity bean);
void editDeviceInfoSuccess(BaseBean bean);
void deleteDeviceSuccess(BaseBean bean);
void turnOnOffDeviceSuccess(BaseBean bean);

7
app/src/main/java/com/ckkj/water/device/mvp/DeviceImpl.java
View File

@@ -1,7 +1,6 @@
package com.ckkj.water.device.mvp;
import com.ckkj.water.base.entity.MineUserInfoBean;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.index.mvp.IndexContract;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.network.NetWorkManager;
@@ -25,13 +24,13 @@ public class DeviceImpl implements DeviceContract.DataModel{
.subscribeOn(Schedulers.io())
.unsubscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseBean<IndexDeviceEntity>>() {
.subscribe(new Observer<BaseBean<WaterDeviceEntity>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull BaseBean<IndexDeviceEntity> bean) {
public void onNext(@NonNull BaseBean<WaterDeviceEntity> bean) {
if (bean.getCode() == 200) {
callBack.success(bean.getData(),0);
}

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

@@ -1,11 +1,10 @@
package com.ckkj.water.device.mvp;
import com.ckkj.water.base.BasePresenter;
import com.ckkj.water.index.entity.IndexDeviceEntity;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.index.mvp.IndexContract;
import com.ckkj.water.network.BaseBean;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -61,9 +60,9 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
public void getDeviceDetailInfo(String deviceID) {
Map<String,String> map = new HashMap<>();
map.put("id",deviceID);
impl.getDeviceInfomation(map, new IndexContract.CallBack<IndexDeviceEntity>() {
impl.getDeviceInfomation(map, new IndexContract.CallBack<WaterDeviceEntity>() {
@Override
public void success(IndexDeviceEntity bean,int total) {
public void success(WaterDeviceEntity bean, int total) {
if(DevicePresenter.this.getView() != null){
DevicePresenter.this.getView().getDeviceDetailInfo(bean);
}
@@ -82,7 +81,7 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
* 修改设备信息
* @param mDeviceEntity
*/
public void updateDeviceInfo(IndexDeviceEntity mDeviceEntity) {
public void updateDeviceInfo(WaterDeviceEntity mDeviceEntity) {
try {
JSONObject json = new JSONObject();
json.put("id",mDeviceEntity.getId());
@@ -113,7 +112,7 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
* 解绑设备
* @param deviceEntity
*/
public void unBindDevice(IndexDeviceEntity deviceEntity) {
public void unBindDevice(WaterDeviceEntity deviceEntity) {
impl.deleteDevice(deviceEntity.getId(), new IndexContract.CallBack<BaseBean>() {
@Override
public void success(BaseBean bean, int total) {