hhhhhhh

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -40,7 +43,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8 (6)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (6)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -4,7 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/baselibrary/baselibrary.iml" filepath="$PROJECT_DIR$/library/baselibrary/baselibrary.iml" />
-      <module fileurl="file://G:\workspace_ooyby\haihang\eye_haihang.iml" filepath="G:\workspace_ooyby\haihang\eye_haihang.iml" />
+      <module fileurl="file://G:/workspace_ooyby/haihang/eye_haihang.iml" filepath="G:/workspace_ooyby/haihang/eye_haihang.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/haihang.iml" filepath="$PROJECT_DIR$/.idea/haihang.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/netlibrary/netlibrary.iml" filepath="$PROJECT_DIR$/library/netlibrary/netlibrary.iml" />

app/src/main/java/com/oo/eye/EyeConfig.java

@@ -27,6 +27,8 @@ public class EyeConfig {
 
 	private List<StudentBean> mStudents;
 
+	public static String TEST_SCHOOL_ID = "";
+
 	private static EyeConfig instance = new EyeConfig();
 
 	private EyeConfig(){

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

@@ -12,17 +12,24 @@ import android.widget.TextView;
 
 import com.app.baselibrary.base.common.BaseActivity;
 import com.app.baselibrary.commonUtil.CheckUtil;
+import com.app.baselibrary.commonUtil.ToastUtil;
 import com.oo.eye.EyeConfig;
 import com.oo.eye.R;
 import com.oo.eye.adapter.PopuAdapter;
 import com.oo.eye.adapter.SinglePeopleAdapter;
+import com.oo.eye.bean.SchoolBean;
+import com.oo.eye.bean.SearchParamBean;
 import com.oo.eye.bean.StudentBean;
+import com.oo.eye.net.EyeDataManager;
+import com.oo.seex.netlibrary.net.response.OldResponseImpl;
+import com.oo.seex.netlibrary.net.response.RxCallback;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
 
 /**
  * Date : 2018/8/28.
@@ -41,13 +48,17 @@ public class SinglePeopleTestActivity extends BaseActivity {
     RecyclerView mRecycleView;
     private List<StudentBean> mStudentBeans;
     private SinglePeopleAdapter mPeopleAdapter;
+    private SearchParamBean mSearchParamBean = new SearchParamBean();
+    private SchoolBean mSchoolBean;
     @Override
     protected int getLayoutId() {
         return R.layout.activity_singletest;
     }
 
+
     @Override
     protected void init() {
+        mSearchParamBean.setSchoolId(EyeConfig.TEST_SCHOOL_ID);
         mRecycleView.setLayoutManager(new LinearLayoutManager(this));
         mStudentBeans = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -69,7 +80,26 @@ public class SinglePeopleTestActivity extends BaseActivity {
                 finish();
                 break;
             case R.id.selete_area_lay:
-                showPopWindow();
+                if(!CheckUtil.isNull(mSchoolBean)){
+                    showPopWindow();
+                }else{
+                    EyeDataManager.getInstance().getSchoolInfo(EyeConfig.TEST_SCHOOL_ID)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new RxCallback<OldResponseImpl<SchoolBean>>() {
+                                @Override
+                                protected void onSuccess(OldResponseImpl<SchoolBean> schoolBeanOldResponse) {
+                                    if(schoolBeanOldResponse.getResultData() != null){
+                                        mSchoolBean = schoolBeanOldResponse.getResultData();
+                                        showPopWindow();
+                                    }
+                                }
+
+                                @Override
+                                protected void onError(int errorCode, String errorMessage) {
+                                    ToastUtil.showLongMessage(errorMessage);
+                                }
+                            });
+                }
                 break;
             case R.id.do_search:
 
@@ -109,4 +139,23 @@ public class SinglePeopleTestActivity extends BaseActivity {
         }
     }
 
+    /**
+     * 搜索
+     */
+    private void search(){
+        EyeDataManager.getInstance().getStudents(mSearchParamBean.getParams())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new RxCallback<OldResponseImpl<List<StudentBean>>>() {
+                    @Override
+                    protected void onSuccess(OldResponseImpl<List<StudentBean>> listOldResponse) {
+
+                    }
+
+                    @Override
+                    protected void onError(int errorCode, String errorMessage) {
+
+                    }
+                });
+    }
+
 }

app/src/main/java/com/oo/eye/bean/Request.java → app/src/main/java/com/oo/eye/bean/SearchParamBean.java

@@ -7,7 +7,7 @@ import java.util.Map;
  * Created by xucon on 2018/9/6.
  */
 
-public class Request {
+public class SearchParamBean {
 	private Map<String, String> params = new HashMap<>();
 
 	private String schoolId;
@@ -17,6 +17,10 @@ public class Request {
 	private String visionStatus;//A类：typeA，单眼5.0或以上：singleGood，双眼过5.0或以上：goodVision，任意眼有5.0以下的情况：badVision
 	private String testStatus;//为空或不传默认为all 全部：all，已测试：tested，未测试：untested
 
+	public Map<String, String> getParams() {
+		return params;
+	}
+
 	public void setSchoolId(String schoolId) {
 		params.put("schoolId",schoolId);
 	}

app/src/main/java/com/oo/eye/net/EyeDataManager.java

@@ -7,10 +7,12 @@ import com.oo.eye.bean.SchoolBean;
 import com.oo.eye.bean.StudentBean;
 import com.oo.seex.netlibrary.net.response.OldResponseImpl;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import rx.Observable;
+import rx.schedulers.Schedulers;
 
 /**
  * Desc:app管理类；（网络本地管理）
@@ -38,21 +40,26 @@ public class EyeDataManager {
      * 上传视力测试结果
      */
     public Observable<OldResponseImpl<String>> postEyeTestData(Map<String ,String> params){
-        return EyeNetManager.getInstance().getApiService(EyeApiService.class).postEyeTestData(params);
+        return EyeNetManager.getInstance().getApiService(EyeApiService.class).postEyeTestData(params)
+				.subscribeOn(Schedulers.io());
     }
 
     /**
      * 获取学校信息
      */
-    public Observable<OldResponseImpl<SchoolBean>> getSchoolInfo(Map<String ,String> params){
-        return EyeNetManager.getInstance().getApiService(EyeApiService.class).getSchoolInfo(params);
+    public Observable<OldResponseImpl<SchoolBean>> getSchoolInfo(String schoolId){
+		Map<String,String> map = new HashMap<>();
+		map.put("sid",schoolId);
+        return EyeNetManager.getInstance().getApiService(EyeApiService.class).getSchoolInfo(map)
+				.subscribeOn(Schedulers.io());
     }
 
     /**
      * 获取学生信息
      */
     public Observable<OldResponseImpl<List<StudentBean>>> getStudents(Map<String ,String> params){
-        return EyeNetManager.getInstance().getApiService(EyeApiService.class).getStudents(params);
+        return EyeNetManager.getInstance().getApiService(EyeApiService.class).getStudents(params)
+				.subscribeOn(Schedulers.io());
     }
 
 }