Commit 7f4ee78e authored by fallenstardust's avatar fallenstardust

cardLoader移除不使用的context传参

parent e56ebab0
...@@ -31,7 +31,6 @@ import ocgcore.enums.LimitType; ...@@ -31,7 +31,6 @@ import ocgcore.enums.LimitType;
public class CardLoader implements ICardSearcher { public class CardLoader implements ICardSearcher {
private final LimitManager mLimitManager; private final LimitManager mLimitManager;
private final CardManager mCardManager; private final CardManager mCardManager;
private final Context context;
private CallBack mCallBack; private CallBack mCallBack;
private LimitList mLimitList; private LimitList mLimitList;
private static final String TAG = CardLoader.class.getSimpleName(); private static final String TAG = CardLoader.class.getSimpleName();
...@@ -47,8 +46,7 @@ public class CardLoader implements ICardSearcher { ...@@ -47,8 +46,7 @@ public class CardLoader implements ICardSearcher {
void onResetSearch(); void onResetSearch();
} }
public CardLoader(Context context) { public CardLoader() {
this.context = context;
mLimitManager = DataManager.get().getLimitManager(); mLimitManager = DataManager.get().getLimitManager();
mCardManager = DataManager.get().getCardManager(); mCardManager = DataManager.get().getCardManager();
mLimitList = mLimitManager.getTopLimit(); mLimitList = mLimitManager.getTopLimit();
......
...@@ -69,7 +69,7 @@ public class DeckListAdapter<T extends TextSelect> extends BaseQuickAdapter<T, D ...@@ -69,7 +69,7 @@ public class DeckListAdapter<T extends TextSelect> extends BaseQuickAdapter<T, D
} }
}); });
//初始化 //初始化
mCardLoader = new CardLoader(context); mCardLoader = new CardLoader();
imageLoader = new ImageLoader(); imageLoader = new ImageLoader();
mLimitList = new LimitList(); mLimitList = new LimitList();
mDeckLoader = new DeckLoader(); mDeckLoader = new DeckLoader();
......
...@@ -187,7 +187,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -187,7 +187,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
lbSetCode = findViewById(R.id.label_setcode); lbSetCode = findViewById(R.id.label_setcode);
cardManager = DataManager.get().getCardManager(); cardManager = DataManager.get().getCardManager();
packManager = DataManager.get().getPackManager(); packManager = DataManager.get().getPackManager();
cardLoader = new CardLoader(context); cardLoader = new CardLoader();
close.setOnClickListener((v) -> { close.setOnClickListener((v) -> {
if (mListener != null) { if (mListener != null) {
mListener.onClose(); mListener.onClose();
......
...@@ -100,7 +100,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB ...@@ -100,7 +100,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
btn_search.setOnClickListener((v) -> showSearch(true)); btn_search.setOnClickListener((v) -> showSearch(true));
mPackManager = DataManager.get().getPackManager(); mPackManager = DataManager.get().getPackManager();
mCardManager = DataManager.get().getCardManager(); mCardManager = DataManager.get().getCardManager();
mCardLoader = new CardLoader(getContext()); mCardLoader = new CardLoader();
mCardLoader.setCallBack(this); mCardLoader.setCallBack(this);
mCardSearcher = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader); mCardSearcher = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
mCardSearcher.setCallBack(this); mCardSearcher.setCallBack(this);
......
...@@ -241,7 +241,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -241,7 +241,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
mCardManager = DataManager.get().getCardManager(); mCardManager = DataManager.get().getCardManager();
// 初始化卡片加载器和回调接口 // 初始化卡片加载器和回调接口
mCardLoader = new CardLoader(getContext()); mCardLoader = new CardLoader();
mCardLoader.setCallBack(this); mCardLoader.setCallBack(this);
// 初始化卡片搜索器及其回调接口 // 初始化卡片搜索器及其回调接口
...@@ -665,7 +665,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -665,7 +665,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
// 初始化卡片搜索器中的项目列表,为卡片搜索功能准备基础数据 // 初始化卡片搜索器中的项目列表,为卡片搜索功能准备基础数据
mCardSearcher.initItems(); mCardSearcher.initItems();
// 初始化禁卡表列表下拉框,并通知整个卡组界面都显示为当前使用的禁卡表 // 初始化禁卡表列表下拉框,并通知整个卡组界面都显示为当前使用的禁卡表
initLimitListSpinners(mCardSearchLimitSpinner, mCardLoader.getLimitList()); initLimitListSpinners(mCardSearchLimitSpinner);
// 根据资源路径判断是否进入卡包展示模式 // 根据资源路径判断是否进入卡包展示模式
if (rs != null && rs.source != null) { if (rs != null && rs.source != null) {
String parentPath = rs.source.getParent(); String parentPath = rs.source.getParent();
...@@ -1602,9 +1602,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -1602,9 +1602,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
* 初始化限制列表下拉框 * 初始化限制列表下拉框
* *
* @param spinner 要初始化的Spinner控件 * @param spinner 要初始化的Spinner控件
* @param cur 当前选中的禁卡表对象,用于设置默认选中项,同时通知整个界面都显示该禁卡表的禁限情况
*/ */
private void initLimitListSpinners(Spinner spinner, LimitList cur) { private void initLimitListSpinners(Spinner spinner) {
// 刷新该spinner并配置选项 // 刷新该spinner并配置选项
refreshLimitListSpinnerItems(spinner); refreshLimitListSpinnerItems(spinner);
......
...@@ -94,7 +94,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat ...@@ -94,7 +94,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
savedInstanceState.putParcelable("android:support:fragments", null); savedInstanceState.putParcelable("android:support:fragments", null);
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
cardLoader = new CardLoader(getActivity()); cardLoader = new CardLoader();
imageLoader = new ImageLoader(); imageLoader = new ImageLoader();
setContentView(R.layout.activity_home); setContentView(R.layout.activity_home);
setExitAnimEnable(false); setExitAnimEnable(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