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/DivideDao.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java b/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java
index aa9295a..464f24b 100644
--- a/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java
+++ b/app/src/main/java/com/dayu/pipirrapp/dao/DivideDao.java
@@ -9,6 +9,7 @@
import com.dayu.pipirrapp.bean.db.DivideBean;
import com.dayu.pipirrapp.bean.db.MarkerBean;
+import com.dayu.pipirrapp.bean.db.SearchResultBean;
import java.util.List;
@@ -17,7 +18,7 @@
import io.reactivex.rxjava3.core.Maybe;
/**
- * DivideDao -
+ * DivideDao -鍒嗘按鎴�
*
* @author zuoxiao
* @version 1.0
@@ -52,6 +53,16 @@
@Query("select * from DivideBean")
Single<List<DivideBean>> findAllToSingle();
- @Query("SELECT * FROM divide")
+ @Query("SELECT * FROM DivideBean")
Maybe<List<DivideBean>> getAll(); // 鏀逛负杩斿洖Maybe<List<DivideBean>>
+
+ @Query("SELECT * FROM DivideBean WHERE divideName LIKE '%' || :name || '%'")
+ Single<List<DivideBean>> findByDivideNameLike(String name);
+
+ @Query("SELECT divideName as name, 'divide' as type, lat, lng, address, divideId as id FROM DivideBean " +
+ "WHERE divideName LIKE '%' || :keyword || '%' " +
+ "UNION " +
+ "SELECT name, 'marker' as type, lat, lng, address, id FROM MarkerBean " +
+ "WHERE name LIKE '%' || :keyword || '%'")
+ Single<List<SearchResultBean>> searchAllByKeyword(String keyword);
}
--
Gitblit v1.8.0