From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果,以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈

---
 app/src/main/java/com/dayu/pipirrapp/dao/InspectionLocationDao.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/dao/InspectionLocationDao.java b/app/src/main/java/com/dayu/pipirrapp/dao/InspectionLocationDao.java
index 68b69ec..1f87eb9 100644
--- a/app/src/main/java/com/dayu/pipirrapp/dao/InspectionLocationDao.java
+++ b/app/src/main/java/com/dayu/pipirrapp/dao/InspectionLocationDao.java
@@ -12,6 +12,7 @@
 import java.util.List;
 
 import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Single;
 
 @Dao
 public interface InspectionLocationDao {
@@ -31,6 +32,26 @@
     InspectionLocationBean findFirst();
 
     //鏌ヨ鎵�鏈夋病鏈変笂浼犵殑鍧愭爣
-    @Query("select  * from InspectionLocationBean where isPost=false")
-    List<InspectionLocationBean> findByNoPost();
+    @Query("select  * from InspectionLocationBean where isPost=false AND mInspectId=:mInspectId ORDER BY locateTime ASC")
+    Single<List<InspectionLocationBean>> findByNoPostAndInspectId(String mInspectId);
+
+
+    //鏌ヨ鎵�鏈夎宸℃id鐨勫潗鏍�
+    @Query("select  * from InspectionLocationBean where mInspectId=:mInspectId ORDER BY locateTime ASC")
+    Single<List<InspectionLocationBean>> findBymInspectId(String mInspectId);
+
+
+    //鏌ヨ鎵�鏈夎宸℃id鐨勫潗鏍�
+    @Query("select  * from InspectionLocationBean where InspectId=:inspectId ORDER BY locateTime ASC")
+    Single<List<InspectionLocationBean>> findByInspectId(String inspectId);
+
+
+
+    //鏌ヨ鎵�鏈夋湭涓婁紶鐨刴InspectId
+    @Query("SELECT DISTINCT mInspectId FROM InspectionLocationBean WHERE isPost = false")
+    Single<List<String>> getUnpostedMInspectIds();
+
+    //鏇存柊鎵�鏈塵InspectId涓嬬殑宸蹭笂浼犵姸鎬�
+    @Query("UPDATE InspectionLocationBean SET isPost = true WHERE mInspectId = :mInspectId")
+    Completable updataByInspectIdSetIsPost(String mInspectId);
 }

--
Gitblit v1.8.0