diff --git a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt index 52fe032..d4a45ea 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt @@ -26,7 +26,18 @@ bean.searchType = searchType bean.userId = userId.toString() bean.searchTime = System.currentTimeMillis().timestampToCompleteDate() - searchBeanDao.insert(bean) + if (!isKeywordsExist(keywords, searchType)) { + searchBeanDao.insert(bean) + } + } + + private fun isKeywordsExist(keywords: String, searchType: String): Boolean { + val count = searchBeanDao.queryBuilder().where( + SearchHistoryBeanDao.Properties.UserId.eq(userId), + SearchHistoryBeanDao.Properties.Keywords.eq(keywords), + SearchHistoryBeanDao.Properties.SearchType.eq(searchType) + ).count() + return count.toInt() != 0 } fun queryHistoryByType(searchType: String): MutableList { diff --git a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt index 52fe032..d4a45ea 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt @@ -26,7 +26,18 @@ bean.searchType = searchType bean.userId = userId.toString() bean.searchTime = System.currentTimeMillis().timestampToCompleteDate() - searchBeanDao.insert(bean) + if (!isKeywordsExist(keywords, searchType)) { + searchBeanDao.insert(bean) + } + } + + private fun isKeywordsExist(keywords: String, searchType: String): Boolean { + val count = searchBeanDao.queryBuilder().where( + SearchHistoryBeanDao.Properties.UserId.eq(userId), + SearchHistoryBeanDao.Properties.Keywords.eq(keywords), + SearchHistoryBeanDao.Properties.SearchType.eq(searchType) + ).count() + return count.toInt() != 0 } fun queryHistoryByType(searchType: String): MutableList { diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 1810342..16123df 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,9 +1,18 @@ + android:pathData="M768,384c-19.2,0 -32,12.8 -32,32l0,377.6c0,25.6 -19.2,38.4 -38.4,38.4L326.4,832c-25.6,0 -38.4,-19.2 -38.4,-38.4L288,416C288,396.8 275.2,384 256,384S224,396.8 224,416l0,377.6c0,57.6 44.8,102.4 102.4,102.4l364.8,0c57.6,0 102.4,-44.8 102.4,-102.4L793.6,416C800,396.8 787.2,384 768,384z" /> + + + diff --git a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt index 52fe032..d4a45ea 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt @@ -26,7 +26,18 @@ bean.searchType = searchType bean.userId = userId.toString() bean.searchTime = System.currentTimeMillis().timestampToCompleteDate() - searchBeanDao.insert(bean) + if (!isKeywordsExist(keywords, searchType)) { + searchBeanDao.insert(bean) + } + } + + private fun isKeywordsExist(keywords: String, searchType: String): Boolean { + val count = searchBeanDao.queryBuilder().where( + SearchHistoryBeanDao.Properties.UserId.eq(userId), + SearchHistoryBeanDao.Properties.Keywords.eq(keywords), + SearchHistoryBeanDao.Properties.SearchType.eq(searchType) + ).count() + return count.toInt() != 0 } fun queryHistoryByType(searchType: String): MutableList { diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 1810342..16123df 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,9 +1,18 @@ + android:pathData="M768,384c-19.2,0 -32,12.8 -32,32l0,377.6c0,25.6 -19.2,38.4 -38.4,38.4L326.4,832c-25.6,0 -38.4,-19.2 -38.4,-38.4L288,416C288,396.8 275.2,384 256,384S224,396.8 224,416l0,377.6c0,57.6 44.8,102.4 102.4,102.4l364.8,0c57.6,0 102.4,-44.8 102.4,-102.4L793.6,416C800,396.8 787.2,384 768,384z" /> + + + diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index f637b70..73f53de 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -17,7 +17,8 @@ + android:layout_height="wrap_content" + android:padding="@dimen/dp_5"> diff --git a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt index 52fe032..d4a45ea 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/DataBaseManager.kt @@ -26,7 +26,18 @@ bean.searchType = searchType bean.userId = userId.toString() bean.searchTime = System.currentTimeMillis().timestampToCompleteDate() - searchBeanDao.insert(bean) + if (!isKeywordsExist(keywords, searchType)) { + searchBeanDao.insert(bean) + } + } + + private fun isKeywordsExist(keywords: String, searchType: String): Boolean { + val count = searchBeanDao.queryBuilder().where( + SearchHistoryBeanDao.Properties.UserId.eq(userId), + SearchHistoryBeanDao.Properties.Keywords.eq(keywords), + SearchHistoryBeanDao.Properties.SearchType.eq(searchType) + ).count() + return count.toInt() != 0 } fun queryHistoryByType(searchType: String): MutableList { diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 1810342..16123df 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,9 +1,18 @@ + android:pathData="M768,384c-19.2,0 -32,12.8 -32,32l0,377.6c0,25.6 -19.2,38.4 -38.4,38.4L326.4,832c-25.6,0 -38.4,-19.2 -38.4,-38.4L288,416C288,396.8 275.2,384 256,384S224,396.8 224,416l0,377.6c0,57.6 44.8,102.4 102.4,102.4l364.8,0c57.6,0 102.4,-44.8 102.4,-102.4L793.6,416C800,396.8 787.2,384 768,384z" /> + + + diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index f637b70..73f53de 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -17,7 +17,8 @@ + android:layout_height="wrap_content" + android:padding="@dimen/dp_5"> diff --git a/app/src/main/res/layout/item_search_rv_l.xml b/app/src/main/res/layout/item_search_rv_l.xml index 1dae83c..b2b1504 100644 --- a/app/src/main/res/layout/item_search_rv_l.xml +++ b/app/src/main/res/layout/item_search_rv_l.xml @@ -1,14 +1,20 @@ - + android:padding="@dimen/dp_5"> + + + \ No newline at end of file