From 8bdee4f73b3a1a367427fcc22e91189ae9ea9ad2 Mon Sep 17 00:00:00 2001
From: huangzhuanghua <401742778@qq.com>
Date: Thu, 19 May 2016 18:37:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3filter=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=B2=A1=E6=B7=BB=E5=8A=A0=E8=BF=9B=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=8E=B7=E5=8F=96filter=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=97=B6=E5=A6=82=E6=9E=9C=E8=BF=94=E5=9B=9E=E7=9A=84?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=89=E4=BA=8E500=E5=88=99=E7=BB=A7?=
=?UTF-8?q?=E7=BB=AD=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/misc.xml | 2 +-
app/build.gradle | 6 +++---
.../main/java/com/gh/gamecenter/SplashScreenActivity.java | 6 +++---
.../com/gh/gamecenter/manager/DataCollectionManager.java | 2 +-
.../main/java/com/gh/gamecenter/manager/FilterManager.java | 3 +++
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 45bb483c5e..1a3eaffb45 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index d994b4fb22..4965fd57d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
task('processWithJavassist') << {
- String classPath = file('build/intermediates/classes/debug')//项目编译class所在目录
+ String classPath = file('build/intermediates/classes/release')//项目编译class所在目录
dodola.patch.PatchClass.process(classPath, project(':hackdex').buildDir
.absolutePath + '/intermediates/classes/debug')//第二个参数是hackdex的class所在目录
}
@@ -38,8 +38,8 @@ android {
applicationId "com.gh.gamecenter"
minSdkVersion 14
targetSdkVersion 19
- versionCode 10
- versionName "1.45"
+ versionCode 11
+ versionName "1.451"
}
buildTypes {
diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
index 89450fa54c..f99bd59057 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
@@ -188,13 +188,13 @@ public class SplashScreenActivity extends BaseActivity {
if (hasFocus && isFirst) {
// 第一次启动，把package.txt文件内容加载进数据库
- if (sp.getBoolean("isFirstLaunch", true)) {
+ if (!sp.getBoolean("isLoadFilter", false)) {
try {
List list = new ArrayList();
BufferedReader reader = new BufferedReader(
new InputStreamReader(getAssets().open(
"package.txt")));
- String line = null;
+ String line;
while ((line = reader.readLine()) != null) {
list.add(new FilterInfo(line));
}
@@ -202,8 +202,8 @@ public class SplashScreenActivity extends BaseActivity {
FilterManager filterManager = new FilterManager(
getApplicationContext());
filterManager.addAllFilter(list);
+ sp.edit().putBoolean("isLoadFilter", true).apply();
} catch (IOException e1) {
-
e1.printStackTrace();
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java
index c9c611775f..f600bc33e3 100644
--- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java
+++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java
@@ -195,7 +195,7 @@ public class DataCollectionManager {
ids.add(dataCollectionEntity.getId());
}
- if (ids.size() > 20) {
+ if (ids.size() < 20) {
return;
}
diff --git a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java
index 939a7924a0..f1af031602 100644
--- a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java
+++ b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java
@@ -69,6 +69,9 @@ public class FilterManager {
}
dao.addAll(list);
sp.edit().putString("filter_time", today).apply();
+ if (list.size() == 500){
+ getFilterFromServer(today);
+ }
} catch (JSONException e) {
e.printStackTrace();
}