From 694b74cda7d4d4adae4018fd9885ce6d473bcceb Mon Sep 17 00:00:00 2001 From: fengjignqi <15192412330@163.com> Date: Sat, 30 May 2026 16:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=20=E8=A7=A3=E7=BB=91?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../ckkj/water/device/AddDeviceActivity.java | 2 + .../water/device/manage/DeviceBleManager.java | 18 ++++++++ .../water/history/TabHistoryFragment.java | 4 +- .../water/history/mvp/HistoryContract.java | 4 ++ .../ckkj/water/history/mvp/HistoryImpl.java | 46 +++++++++++++++++++ .../water/history/mvp/HistoryPresenter.java | 27 +++++++++++ .../java/com/ckkj/water/network/Request.java | 4 ++ 8 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/ckkj/water/device/manage/DeviceBleManager.java diff --git a/app/build.gradle b/app/build.gradle index 2b6e9fc..01d7a8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' } diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java index aaf3425..d55bdef 100644 --- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java +++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java @@ -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; /** diff --git a/app/src/main/java/com/ckkj/water/device/manage/DeviceBleManager.java b/app/src/main/java/com/ckkj/water/device/manage/DeviceBleManager.java new file mode 100644 index 0000000..43183a6 --- /dev/null +++ b/app/src/main/java/com/ckkj/water/device/manage/DeviceBleManager.java @@ -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); + } +} diff --git a/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java b/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java index 9ed4e4c..d59bf15 100644 --- a/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java +++ b/app/src/main/java/com/ckkj/water/history/TabHistoryFragment.java @@ -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 { void success(T msg); void fail(String msg); } public interface DataModel{ + //历史列表 + void getHistoryList(Map map, CallBack callBack); } diff --git a/app/src/main/java/com/ckkj/water/history/mvp/HistoryImpl.java b/app/src/main/java/com/ckkj/water/history/mvp/HistoryImpl.java index 7b017a5..545595a 100644 --- a/app/src/main/java/com/ckkj/water/history/mvp/HistoryImpl.java +++ b/app/src/main/java/com/ckkj/water/history/mvp/HistoryImpl.java @@ -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 map, HistoryContract.CallBack callBack) { + NetWorkManager.getRequest().waterLogList(NetWorkManager.getToken(), map) + .subscribeOn(Schedulers.io()) + .unsubscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @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() { + } + }); + } } diff --git a/app/src/main/java/com/ckkj/water/history/mvp/HistoryPresenter.java b/app/src/main/java/com/ckkj/water/history/mvp/HistoryPresenter.java index d22704c..6cfb6d3 100644 --- a/app/src/main/java/com/ckkj/water/history/mvp/HistoryPresenter.java +++ b/app/src/main/java/com/ckkj/water/history/mvp/HistoryPresenter.java @@ -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 { private HistoryImpl impl; @@ -8,4 +12,27 @@ public class HistoryPresenter extends BasePresenter public HistoryPresenter(HistoryImpl impl) { this.impl = impl; } + + /** + * 获取浇水历史 + */ + public void getWaterHistoryList() { + Map map = new HashMap<>(); + + impl.getHistoryList(map, new HistoryContract.CallBack() { + @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); + } + } + }); + } } diff --git a/app/src/main/java/com/ckkj/water/network/Request.java b/app/src/main/java/com/ckkj/water/network/Request.java index e63ad6a..79b9a71 100644 --- a/app/src/main/java/com/ckkj/water/network/Request.java +++ b/app/src/main/java/com/ckkj/water/network/Request.java @@ -111,6 +111,10 @@ public interface Request { Observable planUnBindDevice(@HeaderMap Map headMap,@QueryMap Map map); + //查询排程列表 + @GET("app/v1/waterLogList") + Observable waterLogList(@HeaderMap Map headMap,@QueryMap Map map); + @POST("mobile/version?end=android")