|
@@ -24,6 +24,7 @@ import com.ethanhua.skeleton.Skeleton;
|
|
|
import com.github.gzuliyujiang.calendarpicker.CalendarPicker;
|
|
|
import com.github.gzuliyujiang.calendarpicker.core.ColorScheme;
|
|
|
import com.lxj.xpopup.XPopup;
|
|
|
+import com.lxj.xpopup.core.BasePopupView;
|
|
|
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
|
|
|
import com.scwang.smart.refresh.layout.api.RefreshLayout;
|
|
|
import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
|
|
@@ -99,7 +100,7 @@ public class NewMatchActivity extends BaseTabActivity implements CricketNewView,
|
|
|
private CricketNewPresenter mPresenter;
|
|
|
private Timer mTimer;
|
|
|
private TournamentDialog tournamentDialog;
|
|
|
-
|
|
|
+ private BasePopupView popupView;
|
|
|
@Override
|
|
|
protected int getLayoutResId() {
|
|
|
return R.layout.activity_match_new;
|
|
@@ -155,6 +156,12 @@ public class NewMatchActivity extends BaseTabActivity implements CricketNewView,
|
|
|
requestList(1);
|
|
|
}
|
|
|
});
|
|
|
+ popupView = new XPopup.Builder(getContext())
|
|
|
+ .moveUpToKeyboard(true)
|
|
|
+ .isDestroyOnDismiss(false)
|
|
|
+ .isLightNavigationBar(true)
|
|
|
+ .navigationBarColor(getContext().getResources().getColor(R.color.colorWhite))
|
|
|
+ .asCustom(tournamentDialog);
|
|
|
initData();
|
|
|
}
|
|
|
|
|
@@ -166,7 +173,7 @@ public class NewMatchActivity extends BaseTabActivity implements CricketNewView,
|
|
|
mFiltrateAdapter.getItem(position).setCheck(!mFiltrateAdapter.getItem(position).isCheck());
|
|
|
int id = mFiltrateAdapter.getData().get(position).getId();
|
|
|
List<CricketFiltrateBean> tList = new ArrayList<>();
|
|
|
- if(tournamentDialog.mAdapter.getItemCount()>0){
|
|
|
+ if(tournamentDialog.mAdapter!=null && tournamentDialog.mAdapter.getItemCount()>0){
|
|
|
tList.addAll(tournamentDialog.mAdapter.getData());
|
|
|
for(int i=0; i<tList.size();i++){
|
|
|
if(id == tournamentDialog.mAdapter.getData().get(i).getId()){
|
|
@@ -370,13 +377,7 @@ public class NewMatchActivity extends BaseTabActivity implements CricketNewView,
|
|
|
//展开筛选联赛弹窗
|
|
|
if(tournamentDialog != null){
|
|
|
if (tournamentDialog != null) {
|
|
|
- new XPopup.Builder(getContext())
|
|
|
- .moveUpToKeyboard(true)
|
|
|
- .isDestroyOnDismiss(false)
|
|
|
- .isLightNavigationBar(true)
|
|
|
- .navigationBarColor(getContext().getResources().getColor(R.color.colorWhite))
|
|
|
- .asCustom(tournamentDialog)
|
|
|
- .show();
|
|
|
+ popupView.show();
|
|
|
}
|
|
|
}
|
|
|
}else if(id == R.id.ll_all_live){
|