Commit 4218b64d authored by fallenstardust's avatar fallenstardust

优化CardSearcher执行线程

parent e7a630cf
......@@ -108,6 +108,7 @@ int main(int argc, char* argv[]) {
#else
char* name = argv[i+1];
#endif
wchar_t fname[1024];
BufferIO::DecodeUTF8(name, fname);
index = GetListBoxIndex(ygo::mainGame->lstReplayList, fname);
......@@ -119,6 +120,7 @@ int main(int argc, char* argv[]) {
ygo::mainGame->lstReplayList->setSelected(index);
ClickButton(ygo::mainGame->btnLoadReplay);
}
break;//只播放一个
} else if(!strcmp(arg, "-s")) { // Single
exit_on_return = !keep_on_return;
......
......@@ -24,6 +24,7 @@ import cn.garymb.ygomobile.loader.ICardSearcher;
import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerAdapter;
import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerItem;
import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit;
import ocgcore.DataManager;
import ocgcore.LimitManager;
import ocgcore.StringManager;
......@@ -135,7 +136,7 @@ public class CardSearcher implements View.OnClickListener {
myFavButton.setOnClickListener(v -> {
if(isShowFavorite()){
hideFavorites();
hideFavorites(true);
} else {
showFavorites(true);
}
......@@ -278,16 +279,30 @@ public class CardSearcher implements View.OnClickListener {
myFavButton.setSelected(true);
if (mCallBack != null) {
mCallBack.onSearchStart();
}
if (mCallBack != null) {
VUiKit.post(() -> {
mCallBack.onSearchResult(CardFavorites.get().getCards(mCardLoader), !showList);
});
}
}
public void hideFavorites(){
public void hideFavorites(boolean reload){
mShowFavorite = false;
myFavButton.setSelected(false);
if (mCallBack != null) {
mCallBack.onSearchStart();
}
if (reload) {
VUiKit.post(() -> {
search();
});
} else {
if (mCallBack != null) {
VUiKit.post(() -> {
mCallBack.onSearchResult(Collections.emptyList(), true);
});
}
}
}
......@@ -529,8 +544,7 @@ public class CardSearcher implements View.OnClickListener {
@Override
public void onClick(View v) {
if (v.getId() == R.id.btn_search) {
hideFavorites();
search();
hideFavorites(true);
} else if (v.getId() == R.id.btn_reset) {
resetAll();
}
......
......@@ -13,7 +13,6 @@ public class CardData implements Parcelable {
public CardData(int code) {
Code = code;
}
public int Code;
public int Ot;
public int Alias;
......
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