Commit b70f6f6a authored by fallenstardust's avatar fallenstardust

取消CardSearcher禁限条件下拉框隐藏

parent 330a3543
...@@ -208,12 +208,9 @@ public class CardSearcher implements View.OnClickListener { ...@@ -208,12 +208,9 @@ public class CardSearcher implements View.OnClickListener {
@Override @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
long value = getSelect(limitListSpinner); long value = getSelect(limitListSpinner);
if (value <= 0) { if (value <= 0)
reset(limitSpinner); reset(limitSpinner);
limitSpinner.setVisibility(View.INVISIBLE);
} else {
limitSpinner.setVisibility(View.VISIBLE);
}
} }
@Override @Override
...@@ -597,7 +594,6 @@ public class CardSearcher implements View.OnClickListener { ...@@ -597,7 +594,6 @@ public class CardSearcher implements View.OnClickListener {
} }
keyWord.setText(null); keyWord.setText(null);
reset(otSpinner); reset(otSpinner);
reset(limitSpinner);
// reset(limitListSpinner); // reset(limitListSpinner);
if (limitListSpinner.getAdapter().getCount() > 1) { if (limitListSpinner.getAdapter().getCount() > 1) {
limitListSpinner.setSelection(1); limitListSpinner.setSelection(1);
......
...@@ -119,12 +119,12 @@ public class LimitManager implements Closeable { ...@@ -119,12 +119,12 @@ public class LimitManager implements Closeable {
mLimitLists.put("N/A", blank_list); mLimitLists.put("N/A", blank_list);
mLimitNames.add("N/A"); mLimitNames.add("N/A");
++mCount; ++mCount;
Log.e("加载情况","rs1="+rs1+" rs2="+rs2+" res3="+res3); Log.e("LimitManager加载情况", "rs1=" + rs1 + " rs2=" + rs2 + " res3=" + res3);
return rs1 && rs2 && res3; return rs1 && rs2 && res3;
} }
/** /**
* 从输入流加载配置文件数据 * 从输入流加载配置文件数据,主要运用于读取压缩包的禁卡表
* *
* @param inputStream 配置文件的输入流 * @param inputStream 配置文件的输入流
* @return 加载成功返回true * @return 加载成功返回true
...@@ -167,7 +167,7 @@ public class LimitManager implements Closeable { ...@@ -167,7 +167,7 @@ public class LimitManager implements Closeable {
// 解析限制项配置 // 解析限制项配置
String[] words = line.trim().split("[\t| ]+"); String[] words = line.trim().split("[\t| ]+");
if (words.length >= 2) { if (words.length >= 2) {
if(words[1].equals("$genesys")) { if (words[1].equals("$genesys")) {
tmp.addCredits(toNumber(words[0]), toNumber(words[2]));//保存genesys行的卡牌id和信用分值 tmp.addCredits(toNumber(words[0]), toNumber(words[2]));//保存genesys行的卡牌id和信用分值
} else { } else {
int id = toNumber(words[0]); int id = toNumber(words[0]);
...@@ -245,7 +245,7 @@ public class LimitManager implements Closeable { ...@@ -245,7 +245,7 @@ public class LimitManager implements Closeable {
} else if (tmp != null) { } else if (tmp != null) {
String[] words = line.trim().split("[\t| ]+"); String[] words = line.trim().split("[\t| ]+");
if (words.length >= 2) { if (words.length >= 2) {
if(words[1].equals("$genesys")) { if (words[1].equals("$genesys")) {
tmp.addCredits(toNumber(words[0]), toNumber(words[2]));//保存genesys行的卡牌id和信用分值 tmp.addCredits(toNumber(words[0]), toNumber(words[2]));//保存genesys行的卡牌id和信用分值
} else { } else {
int id = toNumber(words[0]); int id = toNumber(words[0]);
......
...@@ -66,8 +66,7 @@ ...@@ -66,8 +66,7 @@
style="@style/itemSpinnerStyle" style="@style/itemSpinnerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1" />
android:visibility="invisible" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
......
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