Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
huangzhuanghua
2016-07-19 11:04:56 +08:00
parent 1b03e434a7
commit b0e401bbbd
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
View File

@ -234,7 +234,7 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
manager.addOrUpdate(new GameInfo(apkEntity.getPackageName(),
gameEntity.getId(), gameEntity.getName()));
}
} else {
} else if (TextUtils.isEmpty(gameEntity.getId())) {
if (TextUtils.isEmpty(gameEntity.getType())
|| TextUtils.isEmpty(gameEntity.getLink())
|| TextUtils.isEmpty(gameEntity.getName())
@ -354,15 +354,16 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
HashMap<String, Boolean> map;
GameEntity gameEntity;
for (ConcernInfo info : infos) {
map = info.getPackageNames();
for (String key : map.keySet()) {
if (map.get(key)) {
if (!mPackageManager.isSignature(key)) {
for (int i = 0, size = list.size(); i < size; i++) {
gameEntity = list.get(i);
if (gameEntity.getId().equals(info.getId())
&& gameEntity.getTag() != null && gameEntity.getTag().size() != 0
&& gameEntity.getApk() != null) {
for (int i = 0, size = list.size(); i < size; i++) {
gameEntity = list.get(i);
if (gameEntity.getId().equals(info.getId())
&& gameEntity.getTag() != null && gameEntity.getTag().size() != 0
&& gameEntity.getApk() != null) {
map = info.getPackageNames();
for (String key : map.keySet()) {
if (map.get(key) && !mPackageManager.isSignature(key)) {
pluginSize++;
if (pluginList.size() < 3) {
for (ApkEntity apkEntity : gameEntity.getApk()) {
if (apkEntity.getPackageName().equals(key)) {
GameEntity entity = gameEntity.clone();
@ -371,11 +372,7 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
ArrayList<ApkEntity> apkList = new ArrayList<ApkEntity>();
apkList.add(apkEntity);
entity.setApk(apkList);
pluginSize++;
if (pluginList.size()< 3) {
pluginList.add(entity);
return;
}
pluginList.add(entity);
break;
}
}
@ -852,8 +849,8 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
}
for (int i = 0, size = subjectList.size(); i < size; i++) {
if (position >= offset && position <= subjectList.get(i).getData().size() + offset){
int index = position -offset-1;
if (index<0){
int index = position - offset - 1;
if (index < 0){
index = 0;
}
gameEntity = subjectList.get(i).getData().get(index);

13
app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
View File

@ -151,7 +151,7 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
manager.addOrUpdate(new GameInfo(apkEntity.getPackageName(),
gameEntity.getId(), gameEntity.getName()));
}
} else {
} else if (TextUtils.isEmpty(gameEntity.getId())) {
if (TextUtils.isEmpty(gameEntity.getType())
|| TextUtils.isEmpty(gameEntity.getLink())
|| TextUtils.isEmpty(gameEntity.getName())
@ -328,12 +328,13 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
GameEntity gameEntity;
for (int i = 0; i < subjectList.size(); i++) {
if (position >= offset && position <= subjectList.get(i).getData().size() + offset) {
int index = position -offset;
if (index<0){
int index = position - offset;
if (index < 0){
index = 0;
}
gameEntity = subjectList.get(i).getData().get(index);
if (position == offset && TextUtils.isEmpty(gameEntity.getImage()) || position == offset+1&&!TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
if (position == offset && TextUtils.isEmpty(gameEntity.getImage())
|| position == offset + 1 && !TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
holder.thumb.setVisibility(View.GONE);
holder.title.setText(subjectList.get(i).getName());
if (TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())&&position!=0){
@ -432,8 +433,8 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
GameEntity gameEntity;
for (int i = 0, size = subjectList.size(); i < size; i++) {
if (position >= offset && position <= subjectList.get(i).getData().size() + offset) {
int index = position -offset-1;
if (index<0){
int index = position - offset - 1;
if (index < 0){
index = 0;
}
gameEntity = subjectList.get(i).getData().get(index);