From 9101ed4d47b997cb2af737ca2b206eb6e23eded9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Wed, 4 Jan 2023 14:25:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20https://jira.shanqu.cc/browse/GHZS-916?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/db/AskSearchHistoryDao.java | 89 ------------- .../com/gh/gamecenter/db/DatabaseHelper.java | 5 - .../java/com/gh/gamecenter/db/FilterDao.java | 118 ------------------ .../db/info/AskSearchHistoryInfo.java | 85 ------------- .../com/gh/gamecenter/db/info/FilterInfo.java | 41 ------ 5 files changed, 338 deletions(-) delete mode 100644 app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java delete mode 100644 app/src/main/java/com/gh/gamecenter/db/FilterDao.java delete mode 100644 app/src/main/java/com/gh/gamecenter/db/info/AskSearchHistoryInfo.java delete mode 100644 app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java diff --git a/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java b/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java deleted file mode 100644 index f983c14ba6..0000000000 --- a/app/src/main/java/com/gh/gamecenter/db/AskSearchHistoryDao.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.gh.gamecenter.db; - -import android.content.Context; -import android.text.TextUtils; - -import com.gh.gamecenter.db.info.AskSearchHistoryInfo; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class AskSearchHistoryDao { - - private DatabaseHelper helper; - private Dao dao; - - public AskSearchHistoryDao(Context context) { - try { - helper = DatabaseHelper.getHelper(context); - dao = helper.getDao(AskSearchHistoryInfo.class); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void add(String key, String communityId) { - try { - if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(communityId)) { - dao.createOrUpdate(createInfo(key, communityId)); - } - } catch (Exception e) { - - e.printStackTrace(); - } - } - - private AskSearchHistoryInfo createInfo(String key, String communityId) { - try { - List his = dao.queryBuilder(). - orderBy("time", false). - where().eq("communityId", communityId). - query(); - for (AskSearchHistoryInfo next : his) { - String dbKey = next.getKey(); - if (dbKey != null && dbKey.equals(key)) dao.delete(next); - } - } catch (Exception e) { - e.printStackTrace(); - } - - return new AskSearchHistoryInfo(key, communityId); - } - - public void deleteAll() { - CloseableIterator iterator = dao.iterator(); - while (iterator.hasNext()) { - try { - dao.delete(iterator.next()); - } catch (Exception e) { - - e.printStackTrace(); - } - } - return; - } - - public List getAll(String communityId) { - List history = new ArrayList(); - - try { - List his = dao.queryBuilder(). - orderBy("time", false). - where().eq("communityId", communityId). - query(); - Iterator hisIterator = his.iterator(); - while (hisIterator.hasNext()) { - history.add(hisIterator.next().getKey()); - } - } catch (Exception e) { - - e.printStackTrace(); - } - return history; - } - - -} diff --git a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java index 9c374ab94f..c4eead00a1 100644 --- a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java +++ b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java @@ -5,9 +5,7 @@ import android.database.sqlite.SQLiteDatabase; import androidx.collection.ArrayMap; -import com.gh.gamecenter.db.info.AskSearchHistoryInfo; import com.gh.gamecenter.db.info.DataCollectionInfo; -import com.gh.gamecenter.db.info.FilterInfo; import com.gh.gamecenter.db.info.GameTrendsInfo; import com.gh.gamecenter.db.info.PackageInfo; import com.gh.gamecenter.db.info.SearchHistoryInfo; @@ -57,7 +55,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { TableUtils.createTable(connectionSource, DataCollectionInfo.class); TableUtils.createTable(connectionSource, PackageInfo.class); TableUtils.createTable(connectionSource, GameTrendsInfo.class); - TableUtils.createTable(connectionSource, AskSearchHistoryInfo.class); } catch (SQLException e) { e.printStackTrace(); } @@ -68,11 +65,9 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { try { Utils.log("DatabaseHelper onUpgrade"); TableUtils.dropTable(connectionSource, SearchHistoryInfo.class, true); - TableUtils.dropTable(connectionSource, FilterInfo.class, true); TableUtils.dropTable(connectionSource, DataCollectionInfo.class, true); TableUtils.dropTable(connectionSource, PackageInfo.class, true); TableUtils.dropTable(connectionSource, GameTrendsInfo.class, true); - TableUtils.dropTable(connectionSource, AskSearchHistoryInfo.class, true); onCreate(database, connectionSource); } catch (SQLException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/gh/gamecenter/db/FilterDao.java b/app/src/main/java/com/gh/gamecenter/db/FilterDao.java deleted file mode 100644 index a528b22b8e..0000000000 --- a/app/src/main/java/com/gh/gamecenter/db/FilterDao.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.gh.gamecenter.db; - -import android.content.Context; - -import com.gh.gamecenter.db.info.PackageInfo; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.stmt.QueryBuilder; -import com.lightgame.utils.Utils; - -import java.util.List; - -public class FilterDao { - - private DatabaseHelper helper; - private Dao dao; - - public FilterDao(Context context) { - try { - helper = DatabaseHelper.getHelper(context); - dao = helper.getDao(PackageInfo.class); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public long getSince() { - try { - QueryBuilder builder = dao.queryBuilder(); - builder.orderBy("time", false).limit(1L); - List list = builder.query(); - if (list != null && list.size() != 0) { - return list.get(0).getTime(); - } - } catch (Exception e) { - e.printStackTrace(); - } - return 0; - } - - public boolean isFilter(String packageName) { - try { - PackageInfo filterEntity = dao.queryForId(packageName); - if (filterEntity != null) { - return true; - } - } catch (Exception e) { - e.printStackTrace(); - } - return false; - } - - /** - * 添加一个过滤包名 - */ - public void add(PackageInfo entity) { - try { - dao.create(entity); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 添加一堆过滤包名 - * MARK:必须保证list中packageName的唯一性 - */ - public void addAll(List list) { - try { - dao.create(list); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void deleteAll(List list) { - try { - dao.delete(list); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 删除一个过滤包名 - */ - public void delete(String packageName) { - try { - dao.deleteById(packageName); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 获取所有的过滤包名 - */ - public List getAll() { - try { - return dao.queryForAll(); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** - * 获取表中数据总数 - */ - public long getCount() { - try { - return dao.countOf(); - } catch (Exception e) { - e.printStackTrace(); - } - return 0; - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/db/info/AskSearchHistoryInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/AskSearchHistoryInfo.java deleted file mode 100644 index 93a923b3bc..0000000000 --- a/app/src/main/java/com/gh/gamecenter/db/info/AskSearchHistoryInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.gh.gamecenter.db.info; - -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - -import java.io.Serializable; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -@DatabaseTable(tableName = "tb_ask_search") -public class AskSearchHistoryInfo implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - @DatabaseField(id = true, columnName = "id") - private String id; - - @DatabaseField(columnName = "key") - private String key; - - @DatabaseField(columnName = "time") - private String time; - - @DatabaseField(columnName = "communityId") - private String communityId; - - public AskSearchHistoryInfo() { - - } - - public AskSearchHistoryInfo(String key, String communityId) { - this.key = key; - this.communityId = communityId; - Date date = new Date(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", - Locale.getDefault()); - this.time = format.format(date); - this.id = String.valueOf(date.getTime()); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getCommunityId() { - return communityId; - } - - public void setCommunityId(String communityId) { - this.communityId = communityId; - } - - @Override - public String toString() { - return "AskSearchHistoryInfo{" + - "key='" + key + '\'' + - ", time='" + time + '\'' + - ", communityId='" + communityId + '\'' + - '}'; - } -} diff --git a/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java deleted file mode 100644 index cbcb07a21c..0000000000 --- a/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gh.gamecenter.db.info; - -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - -import java.io.Serializable; - -@DatabaseTable(tableName = "tb_filter") -public class FilterInfo implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -7081532992425638784L; - - @DatabaseField(id = true, columnName = "packageName") - private String packageName; - - public FilterInfo() { - - } - - public FilterInfo(String packageName) { - super(); - this.packageName = packageName; - } - - public String getPackageName() { - return packageName; - } - - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - @Override - public String toString() { - return "FilterEntity [packageName=" + packageName + "]"; - } - -}