李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 bea4d87c7f463fd895fb9abb18dbb2f1f9b8a7de 1 个父辈 983d81b6

add

内嵌 并排对比
正在显示 3 个修改的文件 包含 21 行增加 和 60 行删除
... ... @@ -94,6 +94,9 @@ public class XscjActivity extends BaseActivity {
mScoreScoreAdapter = new ScoreScoreAdapter(R.layout.item_score, mScoreList);
rv_scores.setAdapter(mScoreScoreAdapter);
rv_scores.setLayoutManager(linearLayoutManager);
mExaminationListAdapter = new ExaminationListAdapter(R.layout.item_xiala_item, mExaminationList);
mDropBjAdapter = new DropBjAdapter(R.layout.item_xiala_item, bjList);
dropBj(); // 班级下拉框列表
}
... ... @@ -118,7 +121,7 @@ public class XscjActivity extends BaseActivity {
case R.id.btn_recovery://重置
finish();
break;
case R.id.ll_xuenian:
case R.id.ll_xuenian://考试
showExamination();
break;
}
... ... @@ -133,7 +136,6 @@ public class XscjActivity extends BaseActivity {
View inflate = LayoutInflater.from(this).inflate(R.layout.item_xiala, null);
RecyclerView rv = inflate.findViewById(R.id.item_xiala_recycler);
setRv(rv, 1, 0, 0);
mDropBjAdapter = new DropBjAdapter(R.layout.item_xiala_item, bjList);
rv.setAdapter(mDropBjAdapter);
pop = new PopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
pop.setOutsideTouchable(true);
... ... @@ -143,15 +145,14 @@ public class XscjActivity extends BaseActivity {
pop.setAnimationStyle(R.style.AnimTopMiddle);
pop.showAsDropDown(line4);
// mDropBjAdapter.change(bjList.get(bancun).getClass_id()); // 默认选中
// item 点击
mDropBjAdapter.setOnItemChildClickListener((adapter1, view, position) -> {
switch (view.getId()) {
case R.id.xiala_item_linear:
mDropBjAdapter.change(bjList.get(position).getClass_id()); // 选中
Config.ClassId = bjList.get(position).getClass_id();
mDropBjAdapter.change(mDropBjAdapter.getData().get(position).getClass_id()); // 选中
classId = bjList.get(position).getClass_id();
xscj_spinner.setText(bjList.get(position).getClass_name() + ""); // 班级
mDropBjAdapter.notifyDataSetChanged();
pop.dismiss();
break;
}
... ... @@ -168,7 +169,6 @@ public class XscjActivity extends BaseActivity {
View inflate = LayoutInflater.from(this).inflate(R.layout.item_xiala, null);
RecyclerView rv = inflate.findViewById(R.id.item_xiala_recycler);
setRv(rv, 1, 0, 0);
mExaminationListAdapter = new ExaminationListAdapter(R.layout.item_xiala_item, mExaminationList);
rv.setAdapter(mExaminationListAdapter);
popExamination = new PopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
popExamination.setOutsideTouchable(true);
... ... @@ -177,9 +177,6 @@ public class XscjActivity extends BaseActivity {
popExamination.setBackgroundDrawable(getResources().getDrawable(R.color.color_tm));
popExamination.setAnimationStyle(R.style.AnimTopMiddle);
popExamination.showAsDropDown(line4);
if (mExaminationList.size() > 0) {
mExaminationListAdapter.change(mExaminationList.get(0).getExam_id()); // 默认选中
}
// item 点击
mExaminationListAdapter.setOnItemChildClickListener((adapter1, view, position) -> {
... ... @@ -262,6 +259,7 @@ public class XscjActivity extends BaseActivity {
classId = bjList.get(0).getClass_id();
xscj_spinner.setText(bjList.get(0).getClass_name() + "");
}
mDropBjAdapter.change(bjList.get(0).getClass_id()); // 默认选中
getExamList();
}
}
... ... @@ -298,6 +296,7 @@ public class XscjActivity extends BaseActivity {
ll_xuenian.setVisibility(View.VISIBLE);
mExaminationList.addAll(teacherInfoBean.getData());
xscjEvalFxjg.setText(mExaminationList.get(0).getExam_name());
mExaminationListAdapter.change(mExaminationList.get(0).getExam_id()); // 默认选中
getChildScore(mExaminationList.get(0).getExam_id());
}
}
... ...
... ... @@ -45,5 +45,7 @@ public class ExaminationListAdapter extends BaseQuickAdapter<ExaminationList.Dat
this.id = id;
notifyDataSetChanged();
}
public int getSelectId() {
return id;
}
}
... ...
... ... @@ -95,57 +95,17 @@ public class KmcjFragment extends BaseFragment {
civ_head.setImageResource(R.mipmap.man_icon);
}
KemuListEntity.DataBean kbean = new KemuListEntity.DataBean();
kbean.setTitle("高考成绩");
kbean.setKemu("理综");
kbean.setFenshu("300");
kbean.setTime("2020-07-15 11:12-12:00");
for (int i = 0; i < 12; i++) {
// mList.add(kbean);
}
ExaminationListEntity.DataBeanX.DataBean beanx1 = new ExaminationListEntity.DataBeanX.DataBean();
beanx1.setName("单元");
beanx1.setSelect("0");
ExaminationListEntity.DataBeanX.DataBean beanx2 = new ExaminationListEntity.DataBeanX.DataBean();
beanx2.setName("期中");
List<ExaminationListEntity.DataBeanX.DataBean> ll = new ArrayList<>();
ll.add(beanx1);
ll.add(beanx2);
ExaminationListEntity.DataBeanX bean = new ExaminationListEntity.DataBeanX();
bean.setYear("2018-2019学年上");
bean.setSelect("0");
bean.setData(ll);
ExaminationListEntity.DataBeanX bean2 = new ExaminationListEntity.DataBeanX();
bean2.setYear("2018-2019学年下");
ExaminationListEntity.DataBeanX bean3 = new ExaminationListEntity.DataBeanX();
bean2.setYear("2017-2018学年下");
// list.add(bean);
// list.add(bean2);
// list.add(bean3);
// mYearAdapter = new YearAdapter(getActivity(), list);
// lv_year.setAdapter(mYearAdapter);
// listExamination.addAll(list.get(0).getData());
// mExaminationAdapter = new ExaminationAdapter(getActivity(), listExamination);
// lv_xueqi.setAdapter(mExaminationAdapter);
mKemuAdapter = new KemuAdapter(R.layout.item_kemu_achievement, mList);
rv_achievement.setLayoutManager(new LinearLayoutManager(getActivity()));
rv_achievement.setAdapter(mKemuAdapter);
mExaminationListAdapter = new ExaminationListAdapter(R.layout.item_xiala_item, mExaminationList);
getExamList();
}
PopupWindow pop;
private ExaminationListAdapter ExaminationListAdapter;
private ExaminationListAdapter mExaminationListAdapter;
// 考试列表
private void showSpin() {
... ... @@ -153,8 +113,7 @@ public class KmcjFragment extends BaseFragment {
View inflate = LayoutInflater.from(getActivity()).inflate(R.layout.item_xiala, null);
RecyclerView rv = inflate.findViewById(R.id.item_xiala_recycler);
setRv(rv, 1, 0, 0);
ExaminationListAdapter = new ExaminationListAdapter(R.layout.item_xiala_item, mExaminationList);
rv.setAdapter(ExaminationListAdapter);
rv.setAdapter(mExaminationListAdapter);
pop = new PopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
pop.setOutsideTouchable(true);
pop.setTouchable(true);
... ... @@ -163,17 +122,18 @@ public class KmcjFragment extends BaseFragment {
pop.setAnimationStyle(R.style.AnimTopMiddle);
pop.showAsDropDown(line4);
if (mExaminationList.size()>0) {
ExaminationListAdapter.change(mExaminationList.get(0).getExam_id()); // 默认选中
mExaminationListAdapter.change(mExaminationList.get(0).getExam_id()); // 默认选中
}
// item 点击
ExaminationListAdapter.setOnItemChildClickListener((adapter1, view, position) -> {
mExaminationListAdapter.setOnItemClickListener((adapter1, view, position) -> {
switch (view.getId()) {
case R.id.xiala_item_linear:
ExaminationListAdapter.change(mExaminationList.get(position).getExam_id()); // 选中
mExaminationListAdapter.change(mExaminationList.get(position).getExam_id()); // 选中
xscj_eval_fxjg.setText(mExaminationList.get(position).getExam_name() + ""); // 班级
pop.dismiss();
getChildScore(ExaminationListAdapter.getData().get(position).getExam_id());
mExaminationListAdapter.notifyDataSetChanged();
getChildScore(mExaminationListAdapter.getData().get(position).getExam_id());
break;
}
});
... ...