test main

app/src/main/java/com/oo/eye/activity/MorePeopleTestActivity.java

@@ -86,6 +86,8 @@ public class MorePeopleTestActivity extends BaseActivity {
     private PopuAdapter mPopuAdapter;
     private List<ClassBean> mClassBeans;//选择学校的所有小组
     private boolean isAll = true;//是否是全部学校
+    private List<PopuBean> mAreaList = new ArrayList<>();
+    private List<PopuBean> mClassList = new ArrayList<>();
 
     @Override
     protected int getLayoutId() {
@@ -125,7 +127,10 @@ public class MorePeopleTestActivity extends BaseActivity {
                 finish();
                 break;
             case R.id.selete_area_lay:
-                if (!CheckUtil.isNull(mSchoolBean)) {
+                popuPosition = 1;
+                if (!CheckUtil.isEmpty(mAreaList)) {
+                    showPopWindow(mAreaList);
+                } else if (!CheckUtil.isNull(mSchoolBean)) {
                     setAreaData();
                 } else {
                     EyeDataManager.getInstance().getSchoolInfo(EyeConfig.TEST_SCHOOL_ID)
@@ -156,7 +161,9 @@ public class MorePeopleTestActivity extends BaseActivity {
                 break;
             case R.id.selete1_lay:
                 popuPosition = 3;
-                if (!CheckUtil.isNull(mClassBeans)) {
+                if (!CheckUtil.isEmpty(mClassList)) {
+                    showPopWindow(mClassList);
+                } else if (!CheckUtil.isNull(mClassBeans)) {
                     setClassData();
                 } else {
                     EyeDataManager.getInstance().getSchoolInfo(EyeConfig.TEST_SCHOOL_ID)
@@ -218,7 +225,7 @@ public class MorePeopleTestActivity extends BaseActivity {
                 popuBean.setClassBeans(gradeBean.getClassList());
                 popuBeans.add(popuBean);
             }
-            popuPosition = 1;
+            mAreaList = popuBeans;
             showPopWindow(popuBeans);
         } else {
             ToastUtil.showMessage("暂无数据");
@@ -239,7 +246,7 @@ public class MorePeopleTestActivity extends BaseActivity {
                 popuBean.setClassId(gradeBean.getId());
                 popuBeans.add(popuBean);
             }
-            popuPosition = 3;
+            mClassList = popuBeans;
             showPopWindow(popuBeans);
         } else {
             if (isAll) {
@@ -303,7 +310,11 @@ public class MorePeopleTestActivity extends BaseActivity {
                 isAll = position == 0 ? true : false;
                 mClassBeans = popuBean.getClassBeans();
                 mSeleteAreaTv.setText(popuBean.getName());
-                mSearchParamBean.setGrade(popuBean.getName());
+                if (popuBean.getName().equals("全部学校")) {
+                    mSearchParamBean.setGrade("");
+                } else {
+                    mSearchParamBean.setGrade(popuBean.getName());
+                }
                 mSearchParamBean.setClassId("");
 //                mSearchParamBean.setTestStatus("all");
                 mSelete1Tv.setText("全部小组");

app/src/main/java/com/oo/eye/activity/SinglePeopleTestActivity.java

@@ -61,7 +61,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
     private SearchParamBean mSearchParamBean = new SearchParamBean();
     private SchoolBean mSchoolBean;
     private PopuAdapter mPopuAdapter;
-
+    private List<PopuBean> mAreaList = new ArrayList<>();
     @Override
     protected int getLayoutId() {
         return R.layout.activity_singletest;
@@ -85,7 +85,9 @@ public class SinglePeopleTestActivity extends BaseActivity {
                 finish();
                 break;
             case R.id.selete_area_lay:
-                if (!CheckUtil.isNull(mSchoolBean)) {
+                if (!CheckUtil.isEmpty(mAreaList)) {
+                    showPopWindow(mAreaList);
+                } else if (!CheckUtil.isNull(mSchoolBean)) {
                     setAreaData();
                 } else {
                     EyeDataManager.getInstance().getSchoolInfo(EyeConfig.TEST_SCHOOL_ID)
@@ -139,6 +141,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
                 popuBean.setName(gradeBean.getName());
                 popuBeans.add(popuBean);
             }
+            mAreaList = popuBeans;
             showPopWindow(popuBeans);
         } else {
             ToastUtil.showMessage("暂无数据");
@@ -172,7 +175,11 @@ public class SinglePeopleTestActivity extends BaseActivity {
                     PopuBean popuBean = popuBeans.get(position);
                     popuBean.setChick(true);
                     mPopuAdapter.notifyDataSetChanged();
-                    mSearchParamBean.setGrade(popuBean.getName());
+                    if (popuBean.getName().equals("全部学校")) {
+                        mSearchParamBean.setGrade("");
+                    } else {
+                        mSearchParamBean.setGrade(popuBean.getName());
+                    }
                     mSearchParamBean.setStudentId("");
                     mSeleteAreaTv.setText(popuBean.getName());
                     search();