Commit 5d51220c authored by fallenstardust's avatar fallenstardust

添加切换模式时,重置禁限筛选条件设置

parent e86850f4
...@@ -212,17 +212,16 @@ public class CardSearcher implements View.OnClickListener { ...@@ -212,17 +212,16 @@ public class CardSearcher implements View.OnClickListener {
}); });
genesys_Switch.setChecked(mSettings.getGenesysMode() != 0); genesys_Switch.setChecked(mSettings.getGenesysMode() != 0);
genesys_Switch.setOnCheckedChangeListener((buttonView, isChecked) -> { genesys_Switch.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked) { //根据开关切换两种模式禁卡表的显示和隐藏
genesys_limitListSpinner.setVisibility(View.VISIBLE); genesys_limitListSpinner.setVisibility(isChecked ? View.VISIBLE : View.GONE);
genesys_limitSpinner.setVisibility(View.VISIBLE); genesys_limitSpinner.setVisibility(isChecked ? View.VISIBLE : View.GONE);
limitListSpinner.setVisibility(View.GONE); limitListSpinner.setVisibility(isChecked ? View.GONE : View.VISIBLE);
limitSpinner.setVisibility(View.GONE); limitSpinner.setVisibility(isChecked ? View.GONE : View.VISIBLE);
} else { //同时通知整个界面都显示该禁卡表的禁限情况
genesys_limitListSpinner.setVisibility(View.GONE); LimitList limit = mLimitManager.getLimit(getSelectText(isChecked ? genesys_limitListSpinner : limitListSpinner));
genesys_limitSpinner.setVisibility(View.GONE); mICardSearcher.setLimitList(limit);
limitListSpinner.setVisibility(View.VISIBLE); mCallBack.setLimit(limit);
limitSpinner.setVisibility(View.VISIBLE); reset(isChecked ? genesys_limitSpinner : limitSpinner);
}
genesys_Switch.setText(isChecked ? "起源赛制模式" : "传统禁限模式"); genesys_Switch.setText(isChecked ? "起源赛制模式" : "传统禁限模式");
mSettings.setGenesysMode(isChecked ? 1 : 0); mSettings.setGenesysMode(isChecked ? 1 : 0);
}); });
...@@ -545,6 +544,7 @@ public class CardSearcher implements View.OnClickListener { ...@@ -545,6 +544,7 @@ public class CardSearcher implements View.OnClickListener {
spinner.setSelection(index); spinner.setSelection(index);
} }
} }
private void refreshLimitListSpinnerItems(Spinner spinner) { private void refreshLimitListSpinnerItems(Spinner spinner) {
// 首先清除所有现有的item // 首先清除所有现有的item
if (spinner.getAdapter() != null && spinner.getAdapter() instanceof SimpleSpinnerAdapter) { if (spinner.getAdapter() != null && spinner.getAdapter() instanceof SimpleSpinnerAdapter) {
...@@ -733,7 +733,7 @@ public class CardSearcher implements View.OnClickListener { ...@@ -733,7 +733,7 @@ public class CardSearcher implements View.OnClickListener {
.atk(text(atkText)) .atk(text(atkText))
.def(text(defText)) .def(text(defText))
.pscale(getIntSelect(pScale)) .pscale(getIntSelect(pScale))
.limitType(genesys_Switch.isChecked() ? getIntSelect(genesys_limitSpinner) : getIntSelect(limitSpinner) ) .limitType(genesys_Switch.isChecked() ? getIntSelect(genesys_limitSpinner) : getIntSelect(limitSpinner))
.limitName(genesys_Switch.isChecked() ? getSelectText(genesys_limitListSpinner) : getSelectText(limitListSpinner)) .limitName(genesys_Switch.isChecked() ? getSelectText(genesys_limitListSpinner) : getSelectText(limitListSpinner))
.setcode(getSelect(setCodeSpinner)) .setcode(getSelect(setCodeSpinner))
.category(getSelect(categorySpinner)) .category(getSelect(categorySpinner))
......
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