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-02 18:00:45 +08:00
parent 03e67932b1
commit bd75b8baeb
10 changed files with 300 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/ckkj/water/custom/CustomTypeFilterPopupView.java
View File

@@ -68,25 +68,35 @@ public class CustomTypeFilterPopupView extends PartShadowPopupView implements Vi
switch (v.getId()){
case R.id.tv_manual:
if(mSelManual){
// 已选中，取消选中
mSelManual = false;
tvManual.setTextColor(mContext.getColor(R.color.color_zhu));
tvManual.setSelected(mSelManual);
tvManual.setSelected(false);
}else{
// 选中手动，同时取消自动
mSelManual = true;
mSelAuto = false;
tvManual.setTextColor(mContext.getColor(R.color.white));
tvManual.setSelected(mSelManual);
tvManual.setSelected(true);
tvAuto.setTextColor(mContext.getColor(R.color.color_zhu));
tvAuto.setSelected(false);
}
break;
case R.id.tv_auto:
if(mSelAuto){
// 已选中，取消选中
mSelAuto = false;
tvAuto.setTextColor(mContext.getColor(R.color.color_zhu));
tvAuto.setSelected(mSelAuto);
tvAuto.setSelected(false);
}else{
// 选中自动，同时取消手动
mSelAuto = true;
mSelManual = false;
tvAuto.setTextColor(mContext.getColor(R.color.white));
tvAuto.setSelected(mSelAuto);
tvAuto.setSelected(true);
tvManual.setTextColor(mContext.getColor(R.color.color_zhu));
tvManual.setSelected(false);
}
break;
@@ -95,8 +105,8 @@ public class CustomTypeFilterPopupView extends PartShadowPopupView implements Vi
mSelAuto = false;
tvManual.setTextColor(mContext.getColor(R.color.color_zhu));
tvAuto.setTextColor(mContext.getColor(R.color.color_zhu));
tvManual.setSelected(mSelManual);
tvAuto.setSelected(mSelAuto);
tvManual.setSelected(false);
tvAuto.setSelected(false);
break;
case R.id.tv_finish:

11
app/src/main/java/com/ckkj/water/history/HistoryFragment.java
View File

@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment;
import com.ckkj.water.R;
import com.ckkj.water.base.BaseFragment;
import com.ckkj.water.databinding.HistoryFragmentLayoutBinding;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.history.mvp.HistoryContract;
import com.ckkj.water.history.mvp.HistoryPresenter;
@@ -103,4 +104,14 @@ public class HistoryFragment extends BaseFragment<HistoryFragmentLayoutBinding,
public void getHistoryListSuccess(List<WateringRecord> msg, int total) {
}
@Override
public void deleteHistorySuccess(BaseBean msg, int position) {
}
@Override
public void getHistoryStatisticsSuccess(WaterStatisticsEntity entity) {
}
}

75
app/src/main/java/com/ckkj/water/history/StatisticFragment.java
View File

@@ -4,11 +4,18 @@ import android.os.Bundle;
import com.ckkj.water.base.BaseFragment;
import com.ckkj.water.databinding.WaterCountFragmentLayoutBinding;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.history.mvp.HistoryContract;
import com.ckkj.water.history.mvp.HistoryImpl;
import com.ckkj.water.history.mvp.HistoryPresenter;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.plan.entity.WaterPlanWeekEntity;
import com.ckkj.water.plan.mvp.WaterPlanContract;
import com.ckkj.water.plan.mvp.WaterPlanImpl;
import com.ckkj.water.plan.mvp.WaterPlanPresenter;
import com.ckkj.water.utils.show.ToastUtil;
import java.util.List;
@@ -17,16 +24,36 @@ import java.util.List;
* @date 2026/5/16
* @description TODO: 统计界面
*/
public class StatisticFragment extends BaseFragment<WaterCountFragmentLayoutBinding, WaterPlanPresenter>
implements WaterPlanContract.WaterPlanView {
public class StatisticFragment extends BaseFragment<WaterCountFragmentLayoutBinding, HistoryPresenter>
implements HistoryContract.HistoryView {
@Override
protected void onResumeInitData() {
super.onResumeInitData();
showLoadingDialog();
mPresenter.getWaterStatistic();
}
@Override
public void initData(Bundle state) {
}
@Override
public WaterPlanPresenter createPresenter() {
return null;
public void getHistoryStatisticsSuccess(WaterStatisticsEntity entity) {
hideDialogLoading();
viewBinding.tvTotalValue.setText(entity.getCount()+"");
viewBinding.tvThisWeekValue.setText(entity.getWeekCount()+"");
viewBinding.tvThisMonthValue.setText(entity.getMonCount()+"");
viewBinding.tvPlanValue.setText(entity.getSchedule()+"");
viewBinding.tvManuallyValue.setText(entity.getManualNum()+"");
viewBinding.tvTotalDurationValue.setText(entity.getAllTime()+"");
// viewBinding.tvTotalValue.setText(entity.getCount()+"");
}
@Override
public HistoryPresenter createPresenter() {
return new HistoryPresenter(new HistoryImpl());
}
@Override
@@ -36,7 +63,8 @@ public class StatisticFragment extends BaseFragment<WaterCountFragmentLayoutBind
@Override
public void showError(String message) {
hideDialogLoading();
ToastUtil.showShort(mContext,message);
}
@Override
@@ -45,47 +73,14 @@ public class StatisticFragment extends BaseFragment<WaterCountFragmentLayoutBind
}
@Override
public void getWaterConfigListSuccess(List<WaterPlanWeekEntity> list,int total) {
public void getHistoryListSuccess(List<WateringRecord> msg, int total) {
}
@Override
public void saveConfigSuccess(WaterPlanWeekEntity entity) {
public void deleteHistorySuccess(BaseBean msg, int position) {
}
@Override
public void updateConfigSuccess(WaterPlanWeekEntity entity) {
}
@Override
public void updatePlanStatusSuccess(BaseBean bean, String status) {
}
@Override
public void getPlanDetailInfo(WaterPlanWeekEntity entity) {
}
@Override
public void getPlanBindDeviceList(WaterDeviceEntity bean) {
}
@Override
public void planBindDeviceSuccess(BaseBean bean) {
}
@Override
public void deletePlanSuccess(BaseBean bean) {
}
@Override
public void planUnbindDeviceSuccess(BaseBean bean, int position) {
}
}

47
app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java
View File

@@ -11,6 +11,7 @@ import com.ckkj.water.custom.CustomTypeFilterPopupView;
import com.ckkj.water.custom.view.CustomRefreshHeader;
import com.ckkj.water.databinding.TabHistoryFragmentLayoutBinding;
import com.ckkj.water.history.adapter.WateringHistoryAdapter;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.history.mvp.HistoryContract;
import com.ckkj.water.history.mvp.HistoryImpl;
@@ -41,12 +42,15 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
private List<WateringRecord> recordList = new ArrayList<>();
private WateringHistoryAdapter mAdapter;
private int mCurrentPage = 1;
private String mFilterStartTime = "";
private String mFilterEndTime = "";
private int mFilterType = -1; //0-排程 1-手动
@Override
protected void onResumeInitData() {
super.onResumeInitData();
showLoadingDialog();
mPresenter.getWaterHistoryList(mCurrentPage);
getWaterHistoryList();
}
@Override
@@ -61,16 +65,19 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
viewBinding.refresh.setOnRefreshListener(layout -> {
mCurrentPage = 1;
viewBinding.refresh.setNoMoreData(false);
mPresenter.getWaterHistoryList(mCurrentPage);
getWaterHistoryList();
});
viewBinding.refresh.setOnLoadMoreListener(layout -> {
mCurrentPage++;
mPresenter.getWaterHistoryList(mCurrentPage);
getWaterHistoryList();
});
}
private void getWaterHistoryList(){
mPresenter.getWaterHistoryList(mCurrentPage,mFilterStartTime,mFilterEndTime,mFilterType);
}
private void initListener() {
setClick(viewBinding.linearTimeFilter);
setClick(viewBinding.linearTypeFilter);
@@ -88,7 +95,8 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
@Override
public void onConfirmClick() {
mAdapter.remove(position);
showLoadingDialog();
mPresenter.deleteWaterHistory(recordList.get(position).getId(),position);
}
});
break;
@@ -125,7 +133,9 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
.asCustom(new CustomTimeFilterPopupView(getContext(), new CustomTimeFilterPopupView.OnClickListener() {
@Override
public void callBack(String startTime, String endTime) {
ToastUtil.showShort(mContext,startTime + "---" + endTime);
mFilterStartTime = startTime;
mFilterEndTime = endTime;
getWaterHistoryList();
}
}));
popupView.show();
@@ -153,7 +163,13 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
.asCustom(new CustomTypeFilterPopupView(getContext(), new CustomTypeFilterPopupView.OnClickListener() {
@Override
public void callBack(boolean mSelManual, boolean mSelAuto) {
if(mSelManual){
mFilterType = 1;
}
if(mSelAuto){
mFilterType = 0;
}
getWaterHistoryList();
}
}));
typePopupView.show();
@@ -201,6 +217,23 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
}
}
/**
* 删除历史记录成功
* @param bean
* @param position
*/
@Override
public void deleteHistorySuccess(BaseBean bean, int position) {
hideDialogLoading();
recordList.remove(position);
mAdapter.notifyItemRemoved(position);
}
@Override
public void getHistoryStatisticsSuccess(WaterStatisticsEntity entity) {
}
@Override
public HistoryPresenter createPresenter() {

4
app/src/main/java/com/ckkj/water/history/adapter/WateringHistoryAdapter.java
View File

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.ckkj.water.R;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.utils.time.ZYTimeUtils;
import java.util.List;
@@ -28,7 +29,8 @@ public class WateringHistoryAdapter extends BaseQuickAdapter<WateringRecord, Bas
helper.setText(R.id.tv_device_name,item.getDeviceName());
helper.setText(R.id.tv_device_serial,item.getDeviceNo());
helper.setText(R.id.tv_plan_time,mContext.getString(R.string.history_watering_adapter_time)
+ ":" + item.getStartTime() + "-" + item.getEndTime());
+ ":" + ZYTimeUtils.timeWithoutMillis(item.getStartTime())
+ "-" + ZYTimeUtils.timeWithoutMillis(item.getEndTime()));
helper.setText(R.id.tv_plan_duration,mContext.getString(R.string.device_work_times_title)
+ ":" + item.getDurationMin() + "min");
helper.setText(R.id.tv_plan_type,mContext.getString(R.string.tab_filter_type)

34
app/src/main/java/com/ckkj/water/history/entity/WaterStatisticsEntity.java Normal file
View File

@@ -0,0 +1,34 @@
package com.ckkj.water.history.entity;
import java.io.Serializable;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author fengxiaoyang
* @date 2026/6/2
* @description 历史记录数据统计
*/
@NoArgsConstructor
@Data
public class WaterStatisticsEntity implements Serializable {
/**
* schedule : 0
* manualNum : 2
* averageTime : 2
* count : 2
* weekCount : 1
* monCount : 1
* allTime : 5
*/
private int schedule;//排程次数
private int manualNum;//手动浇水次数
private int averageTime;//平均浇水时长
private int count;//总次数
private int weekCount;//本周浇水次数
private int monCount;//本月浇水次数
private int allTime;//总浇水时长
}

10
app/src/main/java/com/ckkj/water/history/mvp/HistoryContract.java
View File

@@ -1,7 +1,9 @@
package com.ckkj.water.history.mvp;
import com.ckkj.water.base.IView;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.network.BaseBean;
import java.util.List;
import java.util.Map;
@@ -14,11 +16,19 @@ public class HistoryContract {
public interface DataModel{
//历史列表
void getHistoryList(Map<String, String> map, CallBack callBack);
//删除某一历史记录
void deleteHistory(String logID, CallBack callBack);
//浇水的数据统计
void getWateringStatistics(Map<String, String> map, CallBack callBack);
}
public interface HistoryView extends IView {
//历史记录成功
void getHistoryListSuccess(List<WateringRecord> msg, int total);
//删除历史记录成功
void deleteHistorySuccess(BaseBean msg, int position);
//数据统计成功
void getHistoryStatisticsSuccess(WaterStatisticsEntity entity);
}
}

75
app/src/main/java/com/ckkj/water/history/mvp/HistoryImpl.java
View File

@@ -1,6 +1,7 @@
package com.ckkj.water.history.mvp;
import com.ckkj.water.base.entity.MineUserInfoBean;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.network.NetWorkManager;
@@ -50,4 +51,78 @@ public class HistoryImpl implements HistoryContract.DataModel{
}
});
}
/**
* 删除某一历史记录
* @param logID
* @param callBack
*/
@Override
public void deleteHistory(String logID, HistoryContract.CallBack callBack) {
try {
NetWorkManager.getRequest().deleteWaterLog(NetWorkManager.getToken(), logID)
.subscribeOn(Schedulers.io())
.unsubscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull BaseBean bean) {
if (bean.getCode() == 200) {
callBack.success(bean,0);
} else {
callBack.fail(bean.getMessage());
}
}
@Override
public void onError(@NonNull Throwable e) {
callBack.fail(e.getMessage());
}
@Override
public void onComplete() {
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 浇水的数据统计
* @param map
* @param callBack
*/
@Override
public void getWateringStatistics(Map<String, String> map, HistoryContract.CallBack callBack) {
NetWorkManager.getRequest().getDataStatistics(NetWorkManager.getToken())
.subscribeOn(Schedulers.io())
.unsubscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseBean<WaterStatisticsEntity>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull BaseBean<WaterStatisticsEntity> bean) {
if (bean.getCode() == 200) {
callBack.success(bean.getData(),0);
}
}
@Override
public void onError(@NonNull Throwable e) {
callBack.fail(e.getMessage());
}
@Override
public void onComplete() {
}
});
}
}

68
app/src/main/java/com/ckkj/water/history/mvp/HistoryPresenter.java
View File

@@ -1,7 +1,11 @@
package com.ckkj.water.history.mvp;
import android.text.TextUtils;
import com.ckkj.water.base.BasePresenter;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.network.BaseBean;
import java.util.HashMap;
import java.util.List;
@@ -15,11 +19,27 @@ public class HistoryPresenter extends BasePresenter<HistoryContract.HistoryView>
}
/**
* 获取浇水历史
* 查询历史列表
* @param mCurrentPage
* @param mFilterStartTime
* @param mFilterEndTime
* @param mFilterType
*/
public void getWaterHistoryList(int mCurrentPage) {
public void getWaterHistoryList(int mCurrentPage, String mFilterStartTime, String mFilterEndTime, int mFilterType) {
Map<String,String> map = new HashMap<>();
map.put("pageNum",mCurrentPage+"");
if(!TextUtils.isEmpty(mFilterStartTime)){
// map.put("beginTime",mFilterStartTime);
map.put("param[beginTime]", mFilterStartTime);
}
if(!TextUtils.isEmpty(mFilterStartTime)){
// map.put("endTime",mFilterEndTime);
map.put("param[endTime]", mFilterEndTime);
}
if(mFilterType != -1){
map.put("triggerType",mFilterType+"");
}
impl.getHistoryList(map, new HistoryContract.CallBack<List<WateringRecord>>() {
@Override
public void success(List<WateringRecord> list,int total) {
@@ -36,4 +56,48 @@ public class HistoryPresenter extends BasePresenter<HistoryContract.HistoryView>
}
});
}
/**
* 删除历史记录
* @param id
* @param position
*/
public void deleteWaterHistory(String id, int position) {
impl.deleteHistory(id, new HistoryContract.CallBack<BaseBean>() {
@Override
public void success(BaseBean bean, int total) {
if(HistoryPresenter.this.getView() != null){
HistoryPresenter.this.getView().deleteHistorySuccess(bean,position);
}
}
@Override
public void fail(String msg) {
if(HistoryPresenter.this.getView() != null){
HistoryPresenter.this.getView().showMessage(msg);
}
}
});
}
/**
* 获取浇水统计
*/
public void getWaterStatistic() {
impl.getWateringStatistics(null, new HistoryContract.CallBack<WaterStatisticsEntity>() {
@Override
public void success(WaterStatisticsEntity entity, int total) {
if(HistoryPresenter.this.getView() != null){
HistoryPresenter.this.getView().getHistoryStatisticsSuccess(entity);
}
}
@Override
public void fail(String msg) {
if(HistoryPresenter.this.getView() != null){
HistoryPresenter.this.getView().showMessage(msg);
}
}
});
}
}

13
app/src/main/java/com/ckkj/water/network/Request.java
View File

@@ -3,6 +3,7 @@ package com.ckkj.water.network;
import com.ckkj.water.base.entity.MineUserInfoBean;
import com.ckkj.water.history.entity.WaterStatisticsEntity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.login.entity.LoginEntity;
@@ -108,12 +109,12 @@ public interface Request {
@PUT("app/v1/editScheduleStatus")
Observable<BaseBean<WaterPlanWeekEntity>> updateScheduleStatus(@HeaderMap Map<String, String> headMap, @Body RequestBody requestBody);
//解绑信息
//删除排程
@DELETE("app/v1/deleteschedule/{ids}")
Observable<BaseBean> deletePlanById(@HeaderMap Map<String,String> headMap, @Path("ids") String id);
//解绑信息
//删除设备
@DELETE("app/v1/deleteDevice/{ids}")
Observable<BaseBean> unBindDevice(@HeaderMap Map<String,String> headMap, @Path("ids") String id);
@@ -122,9 +123,15 @@ public interface Request {
Observable<BaseBean> planUnBindDevice(@HeaderMap Map<String,String> headMap,@QueryMap Map<String, String> map);
//查询排程列表
//浇水历史记录
@GET("app/v1/waterLogList")
Observable<BaseBean<List<WateringRecord>>> waterLogList(@HeaderMap Map<String, String> headMap, @QueryMap Map<String, String> map);
//删除某一条历史记录
@DELETE("app/v1/waterLog/{id}")
Observable<BaseBean> deleteWaterLog(@HeaderMap Map<String,String> headMap, @Path("id") String id);
//浇水历史数据统计
@GET("app/v1/dataStatistics")
Observable<BaseBean<WaterStatisticsEntity>> getDataStatistics(@HeaderMap Map<String, String> headMap);