重置筛选条件时不重置禁卡表

移除cardsearcherfragment重复的初始化禁卡表加载

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchFragment.java

@@ -105,24 +105,13 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         mCardSearcher = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
         mCardSearcher.setCallBack(this);
         setListeners();
-        DialogPlus dlg = DialogPlus.show(getContext(), null, getString(R.string.loading));
-        VUiKit.defer().when(() -> {
-            DataManager.get().load();
-            if (activity.getmLimitManager().getCount() > 0) {
-                mCardLoader.setLimitList(activity.getmLimitManager().getLastLimit());
-            }
-        }).fail((e) -> {
-            YGOUtil.showTextToast(getString(R.string.tip_load_cdb_error), Toast.LENGTH_SHORT);
-            Log.e(IrrlichtBridge.TAG, "load cdb", e);
-        }).done((rs) -> {
-            dlg.dismiss();
-            isLoad = true;
-            mCardLoader.loadData();
-            mCardSearcher.initItems();
-            //数据库初始化完毕后搜索被传入的关键字
-            intentSearch(intentSearchMessage);
-            isInitCdbOk = true;
-        });
+        isLoad = true;
+        mCardLoader.loadData();
+        mCardSearcher.initItems();
+        //数据库初始化完毕后搜索被传入的关键字
+        intentSearch(intentSearchMessage);
+        isInitCdbOk = true;
+
     }
 
     @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java

@@ -213,7 +213,6 @@ public class CardSearcher implements View.OnClickListener {
                 if (value <= 0)
                     reset(limitSpinner);
 
-                Log.e("onItemSelected", "position:" + position + " id:" + id+" name:" + getSelectText(limitListSpinner));
                 LimitList limit = mLimitManager.getLimit(getSelectText(limitListSpinner));
                 mICardSearcher.setLimitList(limit);
                 //同时通知整个界面都显示该禁卡表的禁限情况
@@ -678,9 +677,9 @@ public class CardSearcher implements View.OnClickListener {
         keyWord.setText(null);
         reset(otSpinner);
 //        reset(limitListSpinner);
-        if (limitListSpinner.getAdapter().getCount() > 1) {
-            limitListSpinner.setSelection(1);
-        }
+//        if (limitListSpinner.getAdapter().getCount() > 1) {//因为禁卡表选择记录已变为保存形式，所以这里不再重置为第一个禁卡表
+//            limitListSpinner.setSelection(1);
+//        }
         reset(limitSpinner);
         reset(typeSpinner);
         reset(typeSpellSpinner);