Commit ba675edd authored by fallenstardust's avatar fallenstardust

显示搜索结果中,添加移除收藏夹操作不会覆盖掉结果显示

parent 6d5bc4d2
...@@ -219,13 +219,15 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -219,13 +219,15 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
favConf.save("#Favorite"); favConf.save("#Favorite");
favConf.read(); favConf.read();
Favorite.clear(); Favorite.clear();
SparseArray<Card> id = mCardLoader.readCards(ConfigManager.mLines, false); if (!DeckManagerActivityImpl.isSearchResult) {
if (id != null) { SparseArray<Card> id = mCardLoader.readCards(ConfigManager.mLines, false);
for (int i = 0; i < id.size(); i++) if (id != null) {
Favorite.add(id.valueAt(i)); for (int i = 0; i < id.size(); i++)
Favorite.add(id.valueAt(i));
}
if (mCallBack != null)
mCallBack.onSearchResult(Favorite, true);
} }
if (mCallBack != null)
mCallBack.onSearchResult(Favorite, true);
} }
......
...@@ -149,6 +149,8 @@ public class CardSearcher implements View.OnClickListener { ...@@ -149,6 +149,8 @@ public class CardSearcher implements View.OnClickListener {
} }
if (mCallBack != null) if (mCallBack != null)
mCallBack.onSearchResult(Favorite, false); mCallBack.onSearchResult(Favorite, false);
DeckManagerActivityImpl.isSearchResult = false;
} }
}); });
...@@ -543,6 +545,7 @@ public class CardSearcher implements View.OnClickListener { ...@@ -543,6 +545,7 @@ public class CardSearcher implements View.OnClickListener {
, getSelect(typeMonsterSpinner2)); , getSelect(typeMonsterSpinner2));
lineKey = 0; lineKey = 0;
} }
DeckManagerActivityImpl.isSearchResult = true;
} }
private void resetAll() { private void resetAll() {
......
...@@ -103,6 +103,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -103,6 +103,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
private DialogPlus mDialog; private DialogPlus mDialog;
private DialogPlus builderShareLoading; private DialogPlus builderShareLoading;
private boolean isExit = false; private boolean isExit = false;
public static boolean isSearchResult;
public static List<Card> Favorite = new ArrayList<Card>(); public static List<Card> Favorite = new ArrayList<Card>();
@Override @Override
...@@ -287,6 +288,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -287,6 +288,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
Favorite.add(id.valueAt(i)); Favorite.add(id.valueAt(i));
} }
onSearchResult(Favorite, true); onSearchResult(Favorite, true);
isSearchResult = false;
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment