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-30 16:32:17 +08:00
parent 7aed064ddb
commit 694b74cda7
8 changed files with 107 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -4,7 +4,7 @@ apply plugin: 'com.hihonor.mcs.asplugin'
apply plugin: 'io.freefair.lombok' // ✅ 加上这个
android {
compileSdkVersion 33
compileSdkVersion 34
lintOptions {
checkReleaseBuilds false // 关闭 release 打包时 lint 检查
abortOnError false // 即使有错误也不终止编译
@@ -226,6 +226,8 @@ dependencies {
implementation "androidx.camera:camera-camera2:1.0.2"
implementation "androidx.camera:camera-lifecycle:1.0.2"
implementation "androidx.camera:camera-view:1.0.0-alpha25"
//蓝牙管理
implementation 'no.nordicsemi.android:ble:2.11.0'
}

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

@@ -4,6 +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.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
@@ -34,6 +35,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import no.nordicsemi.android.ble.BleManager;
import pub.devrel.easypermissions.EasyPermissions;
/**

18
app/src/main/java/com/ckkj/water/device/manage/DeviceBleManager.java Normal file
View File

@@ -0,0 +1,18 @@
package com.ckkj.water.device.manage;
import android.content.Context;
import androidx.annotation.NonNull;
import no.nordicsemi.android.ble.BleManager;
/**
* @author fengxiaoyang
* @date 2026/5/30
* @description TODO: 描述该类的作用
*/
public class DeviceBleManager extends BleManager {
public DeviceBleManager(@NonNull Context context) {
super(context);
}
}

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

@@ -12,6 +12,7 @@ import com.ckkj.water.databinding.TabHistoryFragmentLayoutBinding;
import com.ckkj.water.history.adapter.WateringHistoryAdapter;
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.network.BaseBean;
import com.ckkj.water.plan.entity.WaterPlanWeekEntity;
@@ -44,6 +45,7 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
mAdapter = new WateringHistoryAdapter(mContext,R.layout.tab_history_item_layout,recordList);
viewBinding.rvHisttory.setAdapter(mAdapter);
initListener();
mPresenter.getWaterHistoryList();
}
private void initListener() {
@@ -139,7 +141,7 @@ public class TabHistoryFragment extends BaseFragment<TabHistoryFragmentLayoutBin
@Override
public HistoryPresenter createPresenter() {
return null;
return new HistoryPresenter(new HistoryImpl());
}
@Override

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

@@ -2,12 +2,16 @@ package com.ckkj.water.history.mvp;
import com.ckkj.water.base.IView;
import java.util.Map;
public class HistoryContract {
public interface CallBack<T> {
void success(T msg);
void fail(String msg);
}
public interface DataModel{
//历史列表
void getHistoryList(Map<String, String> map, CallBack callBack);
}

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

@@ -1,5 +1,51 @@
package com.ckkj.water.history.mvp;
import com.ckkj.water.base.entity.MineUserInfoBean;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.network.NetWorkManager;
import java.util.Map;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
public class HistoryImpl implements HistoryContract.DataModel{
/**
* 查询浇水历史
* @param map
* @param callBack
*/
@Override
public void getHistoryList(Map<String, String> map, HistoryContract.CallBack callBack) {
NetWorkManager.getRequest().waterLogList(NetWorkManager.getToken(), map)
.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.getData());
}
}
@Override
public void onError(@NonNull Throwable e) {
callBack.fail(e.getMessage());
}
@Override
public void onComplete() {
}
});
}
}

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

@@ -1,6 +1,10 @@
package com.ckkj.water.history.mvp;
import com.ckkj.water.base.BasePresenter;
import com.ckkj.water.network.BaseBean;
import java.util.HashMap;
import java.util.Map;
public class HistoryPresenter extends BasePresenter<HistoryContract.HistoryView> {
private HistoryImpl impl;
@@ -8,4 +12,27 @@ public class HistoryPresenter extends BasePresenter<HistoryContract.HistoryView>
public HistoryPresenter(HistoryImpl impl) {
this.impl = impl;
}
/**
* 获取浇水历史
*/
public void getWaterHistoryList() {
Map<String,String> map = new HashMap<>();
impl.getHistoryList(map, new HistoryContract.CallBack<BaseBean>() {
@Override
public void success(BaseBean bean) {
if(HistoryPresenter.this.getView() != null){
}
}
@Override
public void fail(String msg) {
if(HistoryPresenter.this.getView() != null){
HistoryPresenter.this.getView().showMessage(msg);
}
}
});
}
}

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

@@ -111,6 +111,10 @@ public interface Request {
Observable<BaseBean> planUnBindDevice(@HeaderMap Map<String,String> headMap,@QueryMap Map<String, String> map);
//查询排程列表
@GET("app/v1/waterLogList")
Observable<BaseBean> waterLogList(@HeaderMap Map<String, String> headMap,@QueryMap Map<String, String> map);
@POST("mobile/version?end=android")