Skip to content

H
haihang
Commit c78b2ad6 by chengxiuhong
Options

test main

parent c398e257
Showing with 112 additions and 34 deletions
app/src/main/java/com/oo/eye/activity/TestResurtListActivity.java
...@@ -27,6 +27,7 @@ import com.oo.eye.bean.PopuBean; ...@@ -27,6 +27,7 @@ import com.oo.eye.bean.PopuBean;
import com.oo.eye.bean.SchoolBean; import com.oo.eye.bean.SchoolBean;
import com.oo.eye.bean.SearchParamBean; import com.oo.eye.bean.SearchParamBean;
import com.oo.eye.bean.StudentBean; import com.oo.eye.bean.StudentBean;
import com.oo.eye.db.DbManager;
import com.oo.eye.net.EyeDataManager; import com.oo.eye.net.EyeDataManager;
import com.oo.seex.netlibrary.net.response.OldResponseImpl; import com.oo.seex.netlibrary.net.response.OldResponseImpl;
import com.oo.seex.netlibrary.net.response.RxCallback; import com.oo.seex.netlibrary.net.response.RxCallback;
...@@ -61,8 +62,8 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -61,8 +62,8 @@ public class TestResurtListActivity extends BaseActivity {
ImageView mSeleteIv; ImageView mSeleteIv;
@BindView(R.id.selete_lay) @BindView(R.id.selete_lay)
LinearLayout mSeleteLay; LinearLayout mSeleteLay;
// @BindView(R.id.selete1_tv) // @BindView(R.id.selete1_tv)
// TextView mSelete1Tv; // TextView mSelete1Tv;
@BindView(R.id.selete1_iv) @BindView(R.id.selete1_iv)
ImageView mSelete1Iv; ImageView mSelete1Iv;
@BindView(R.id.selete1_lay) @BindView(R.id.selete1_lay)
...@@ -94,6 +95,7 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -94,6 +95,7 @@ public class TestResurtListActivity extends BaseActivity {
private PopuAdapter mPopuAdapter; private PopuAdapter mPopuAdapter;
private int popuPosition;//1学校,2小组 private int popuPosition;//1学校,2小组
private SchoolBean mSchoolBean; private SchoolBean mSchoolBean;
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {
return R.layout.activity_testresult; return R.layout.activity_testresult;
...@@ -112,19 +114,39 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -112,19 +114,39 @@ public class TestResurtListActivity extends BaseActivity {
} }
private boolean isA; private boolean isA;
private boolean isTemporary;//是否是临时报表
@OnClick({R.id.title_1, R.id.title_2, R.id.back_iv, R.id.selete_area_lay, R.id.selete_lay, R.id.selete1_lay, R.id.selete2_lay, R.id.do_search}) @OnClick({R.id.title_1, R.id.title_2, R.id.back_iv, R.id.selete_area_lay, R.id.selete_lay, R.id.selete1_lay, R.id.selete2_lay, R.id.do_search})
public void onClick(View view) { public void onClick(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.title_1: case R.id.title_1:
isTemporary = false;
mTitle1.setSelected(true); mTitle1.setSelected(true);
mTitle2.setSelected(false); mTitle2.setSelected(false);
mSeleteAreaLay.setVisibility(View.VISIBLE); mSeleteAreaLay.setVisibility(View.VISIBLE);
if (isA) {
mSelete2Iv.setImageResource(R.drawable.select3_sel);
} else {
mSelete2Iv.setImageResource(R.drawable.select3_nor);
}
mResultListAdapter.clearAndNotify();
search();
break; break;
case R.id.title_2: case R.id.title_2:
isTemporary = true;
mTitle1.setSelected(false); mTitle1.setSelected(false);
mTitle2.setSelected(true); mTitle2.setSelected(true);
mSeleteAreaLay.setVisibility(View.GONE); mSeleteAreaLay.setVisibility(View.GONE);
if (isTemporaryA) {
mSelete2Iv.setImageResource(R.drawable.select3_sel);
} else {
mSelete2Iv.setImageResource(R.drawable.select3_nor);
}
if (CheckUtil.isEmpty(mTemporaryClassList)) {
getTemporaryClass();
}
mResultListAdapter.clearAndNotify();
searchTemporary();
break; break;
case R.id.back_iv: case R.id.back_iv:
finish(); finish();
...@@ -161,46 +183,60 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -161,46 +183,60 @@ public class TestResurtListActivity extends BaseActivity {
case R.id.selete_lay: case R.id.selete_lay:
popuPosition = 2; popuPosition = 2;
if (!CheckUtil.isEmpty(mClassList)) { if (isTemporary) {
showPopWindow(mClassList); showPopWindow(mTemporaryClassList);
} else if (!CheckUtil.isNull(mClassBeans)) {
setClassData();
} else { } else {
EyeDataManager.getInstance().getSchoolInfo(EyeConfig.TEST_SCHOOL_ID) if (!CheckUtil.isEmpty(mClassList)) {
.observeOn(AndroidSchedulers.mainThread()) showPopWindow(mClassList);
.subscribe(new RxCallback<OldResponseImpl<SchoolBean>>() { } else if (!CheckUtil.isNull(mClassBeans)) {
@Override setClassData();
protected void onSuccess(OldResponseImpl<SchoolBean> schoolBeanOldResponse) { } else {
if (schoolBeanOldResponse.getResultData() != null) { EyeDataManager.getInstance().getSchoolInfo(EyeConfig.TEST_SCHOOL_ID)
mSchoolBean = schoolBeanOldResponse.getResultData(); .observeOn(AndroidSchedulers.mainThread())
if (!CheckUtil.isNull(mSchoolBean)) { .subscribe(new RxCallback<OldResponseImpl<SchoolBean>>() {
setClassData(); @Override
} else { protected void onSuccess(OldResponseImpl<SchoolBean> schoolBeanOldResponse) {
ToastUtil.showMessage("暂无数据"); if (schoolBeanOldResponse.getResultData() != null) {
mSchoolBean = schoolBeanOldResponse.getResultData();
if (!CheckUtil.isNull(mSchoolBean)) {
setClassData();
} else {
ToastUtil.showMessage("暂无数据");
}
} }
} }
}
@Override @Override
protected void onError(int errorCode, String errorMessage) { protected void onError(int errorCode, String errorMessage) {
ToastUtil.showLongMessage(errorMessage); ToastUtil.showLongMessage(errorMessage);
} }
}); });
}
} }
break; break;
case R.id.selete1_lay://双眼1.0以上 case R.id.selete1_lay://双眼1.0以上
// showPopWindow(3); // showPopWindow(3);
break; break;
case R.id.selete2_lay://仅看A类 case R.id.selete2_lay://仅看A类
isA = !isA; if (isTemporary) {
if (isA) { isTemporaryA = !isTemporaryA;
mSelete2Iv.setImageResource(R.drawable.select3_sel); if (isTemporaryA) {
mSearchParamBean.setVisionStatus("typeA"); mSelete2Iv.setImageResource(R.drawable.select3_sel);
} else {
mSelete2Iv.setImageResource(R.drawable.select3_nor);
}
searchTemporary();
} else { } else {
mSelete2Iv.setImageResource(R.drawable.select3_nor); isA = !isA;
mSearchParamBean.setVisionStatus(""); if (isA) {
mSelete2Iv.setImageResource(R.drawable.select3_sel);
mSearchParamBean.setVisionStatus("typeA");
} else {
mSelete2Iv.setImageResource(R.drawable.select3_nor);
mSearchParamBean.setVisionStatus("");
}
search();
} }
search();
break; break;
case R.id.do_search: case R.id.do_search:
mSearchParamBean.setStudentId(mKeyTest.getText().toString()); mSearchParamBean.setStudentId(mKeyTest.getText().toString());
...@@ -208,6 +244,7 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -208,6 +244,7 @@ public class TestResurtListActivity extends BaseActivity {
break; break;
} }
} }
private void setAreaData() { private void setAreaData() {
List<GradeBean> gradeBeans = mSchoolBean.getGradeList(); List<GradeBean> gradeBeans = mSchoolBean.getGradeList();
if (!CheckUtil.isEmpty(gradeBeans)) { if (!CheckUtil.isEmpty(gradeBeans)) {
...@@ -251,6 +288,7 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -251,6 +288,7 @@ public class TestResurtListActivity extends BaseActivity {
} }
} }
} }
private void showPopWindow(List<PopuBean> popuBeans) { private void showPopWindow(List<PopuBean> popuBeans) {
LinearLayout view = mSeleteLay; LinearLayout view = mSeleteLay;
switch (popuPosition) { switch (popuPosition) {
...@@ -312,12 +350,20 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -312,12 +350,20 @@ public class TestResurtListActivity extends BaseActivity {
mSeleteTv.setText("全部小组"); mSeleteTv.setText("全部小组");
break; break;
case 2://小组 case 2://小组
mSearchParamBean.setClassId(popuBean.getClassId()); if (isTemporary) {
mSeleteTv.setText(popuBean.getName()); className = popuBean.getName();
} else {
mSearchParamBean.setClassId(popuBean.getClassId());
mSeleteTv.setText(popuBean.getName());
}
break; break;
} }
mSearchParamBean.setStudentId(""); if (isTemporary) {
search(); searchTemporary();
} else {
mSearchParamBean.setStudentId("");
search();
}
} }
@Override @Override
...@@ -353,4 +399,36 @@ public class TestResurtListActivity extends BaseActivity { ...@@ -353,4 +399,36 @@ public class TestResurtListActivity extends BaseActivity {
} }
}); });
} }
private List<PopuBean> mTemporaryClassList = new ArrayList<>();//临时报表的组
//获取临时报表的组
public void getTemporaryClass() {
List<String> strings = DbManager.getInstance(this).getClasses(this);
PopuBean all = new PopuBean();
all.setName("全部小组");
all.setChick(true);
mTemporaryClassList.add(all);
if (!CheckUtil.isEmpty(strings)) {
for (String string : strings) {
PopuBean popuBean = new PopuBean();
popuBean.setName(string);
mTemporaryClassList.add(popuBean);
}
}
}
private String className;
private boolean isTemporaryA;//搜索的时候是否A
//获取临时报表的组
public void searchTemporary() {
List<StudentBean> list = DbManager.getInstance(this).getStudents(this, className, isTemporaryA);
if (!CheckUtil.isEmpty(list)) {
mResultListAdapter.clear();
mResultListAdapter.appendToListAndNotify(list);
} else {
ToastUtil.showMessage("暂无数据");
}
}
} }
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