Skip to content

H
haihang
Commit 7326473e by chengxiuhong
Options

test main

parent 19ff1236
Showing with 84 additions and 43 deletions
app/src/main/java/com/oo/eye/EyeConfig.java
......@@ -27,7 +27,7 @@ public class EyeConfig {
private List<StudentBean> mStudents;
public static String TEST_SCHOOL_ID = "";
public static String TEST_SCHOOL_ID = "84";
private static EyeConfig instance = new EyeConfig();
......
app/src/main/java/com/oo/eye/activity/EyeTestMainActivity.java
......@@ -11,8 +11,6 @@ import com.app.baselibrary.commonUtil.ToastUtil;
import com.oo.eye.EyeConfig;
import com.oo.eye.R;
import com.oo.eye.bean.StudentBean;
import com.oo.eye.mvp.PresenterFactory;
import com.oo.eye.mvp.contract.EyeMainContract;
import java.util.ArrayList;
......@@ -23,7 +21,7 @@ import butterknife.OnClick;
* 视力测试
*/
public class EyeTestMainActivity extends BaseActivity implements EyeMainContract.View {
public class EyeTestMainActivity extends BaseActivity {
@BindView(R.id.test_setting)
LinearLayout mTestSetting;
......@@ -37,7 +35,6 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract
LinearLayout mLinEyeTestStatistics;
@BindView(R.id.lin_eye_test_setting)
LinearLayout mLinEyeTestSetting;
private EyeMainContract.Presenter mPresenter;
private boolean isRequestFinish = false;
......@@ -48,8 +45,6 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract
@Override
protected void init() {
mPresenter = PresenterFactory.createEyeMainPresenter(this);
mPresenter.getEye(this);
}
protected void onResume() {
......@@ -62,9 +57,6 @@ public class EyeTestMainActivity extends BaseActivity implements EyeMainContract
super.onPause();
}
public void setPresenter(EyeMainContract.Presenter presenter) {
this.mPresenter = presenter;
}
public void getEyeSuccee() {
isRequestFinish = true;
......
app/src/main/java/com/oo/eye/activity/MorePeopleTestActivity.java
......@@ -6,6 +6,7 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.AdapterView;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
......@@ -21,6 +22,7 @@ import com.oo.eye.EyeConfig;
import com.oo.eye.R;
import com.oo.eye.adapter.MorePeopleAdapter;
import com.oo.eye.adapter.PopuAdapter;
import com.oo.eye.bean.PopuBean;
import com.oo.eye.bean.StudentBean;
import java.util.ArrayList;
......@@ -159,7 +161,12 @@ public class MorePeopleTestActivity extends BaseActivity {
conview.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int xoff = -(conview.getMeasuredWidth() / 2 - view.getWidth() / 2);
popupWindow.showAsDropDown(view, xoff, 0);
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
}
});
} catch (Exception e) {
e.printStackTrace();
}
......
app/src/main/java/com/oo/eye/activity/SinglePeopleTestActivity.java
......@@ -4,6 +4,7 @@ import android.graphics.drawable.ColorDrawable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.AdapterView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.PopupWindow;
......@@ -17,6 +18,8 @@ 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.GradeBean;
import com.oo.eye.bean.PopuBean;
import com.oo.eye.bean.SchoolBean;
import com.oo.eye.bean.SearchParamBean;
import com.oo.eye.bean.StudentBean;
......@@ -50,6 +53,8 @@ public class SinglePeopleTestActivity extends BaseActivity {
private SinglePeopleAdapter mPeopleAdapter;
private SearchParamBean mSearchParamBean = new SearchParamBean();
private SchoolBean mSchoolBean;
private PopuAdapter mPopuAdapter;
@Override
protected int getLayoutId() {
return R.layout.activity_singletest;
......@@ -63,34 +68,38 @@ public class SinglePeopleTestActivity extends BaseActivity {
mStudentBeans = new ArrayList<>();
for (int i = 0; i < 10; i++) {
StudentBean mStudentBean = new StudentBean();
mStudentBean.setRealname("范特西"+i);
mStudentBean.setNumber("20160101"+i);
mStudentBean.setClasses("动车组"+i);
mStudentBean.setBirthday("20110101"+i);
mStudentBean.setRealname("范特西" + i);
mStudentBean.setNumber("20160101" + i);
mStudentBean.setClasses("动车组" + i);
mStudentBean.setBirthday("20110101" + i);
mStudentBeans.add(mStudentBean);
}
mPeopleAdapter = new SinglePeopleAdapter(mStudentBeans, this);
mRecycleView.setAdapter(mPeopleAdapter);
}
@OnClick({R.id.back_iv,R.id.selete_area_lay, R.id.do_search, R.id.begin_test})
@OnClick({R.id.back_iv, R.id.selete_area_lay, R.id.do_search, R.id.begin_test})
public void onClick(View view) {
switch (view.getId()) {
case R.id.back_iv:
finish();
break;
case R.id.selete_area_lay:
if(!CheckUtil.isNull(mSchoolBean)){
showPopWindow();
}else{
if (!CheckUtil.isNull(mSchoolBean)) {
setAreaData();
} 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){
if (schoolBeanOldResponse.getResultData() != null) {
mSchoolBean = schoolBeanOldResponse.getResultData();
showPopWindow();
if (!CheckUtil.isNull(mSchoolBean)) {
setAreaData();
}else {
ToastUtil.showMessage("暂无数据");
}
}
}
......@@ -102,11 +111,11 @@ public class SinglePeopleTestActivity extends BaseActivity {
}
break;
case R.id.do_search:
search();
break;
case R.id.begin_test:
StudentBean bean = mPeopleAdapter.getLastSelectBean();
if(!CheckUtil.isNull(bean)) {
if (!CheckUtil.isNull(bean)) {
ArrayList<StudentBean> list = new ArrayList<>();
list.add(bean);
EyeConfig.getInstance().setStudents(list);
......@@ -116,7 +125,22 @@ public class SinglePeopleTestActivity extends BaseActivity {
}
}
private void showPopWindow() {
private void setAreaData() {
List<GradeBean> gradeBeans = mSchoolBean.getGradeList();
if (!CheckUtil.isEmpty(gradeBeans)) {
List<PopuBean> popuBeans = new ArrayList<>();
for (GradeBean gradeBean : gradeBeans) {
PopuBean popuBean = new PopuBean();
popuBean.setName(gradeBean.getName());
popuBeans.add(popuBean);
}
showPopWindow(popuBeans);
} else {
ToastUtil.showMessage("暂无数据");
}
}
private void showPopWindow(final List<PopuBean> popuBeans) {
try {
View conview = View.inflate(this, R.layout.popu_list, null);
PopupWindow popupWindow = new PopupWindow(conview, RelativeLayout.LayoutParams.WRAP_CONTENT,
......@@ -126,14 +150,24 @@ public class SinglePeopleTestActivity extends BaseActivity {
ColorDrawable cd = new ColorDrawable(0x00ffffff);// 背景颜色全透明
popupWindow.setBackgroundDrawable(cd);
ListView listView = (ListView) conview.findViewById(R.id.list_view);
listView.setAdapter(new PopuAdapter(this, null));
mPopuAdapter = new PopuAdapter(this, popuBeans);
listView.setAdapter(mPopuAdapter);
int[] location = new int[2];
mSeleteAreaLay.getLocationOnScreen(location);
// popupWindow.setAnimationStyle(R.style.style_pop_animation);// 动画效果必须放在showAsDropDown()方法上边，否则无效
conview.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int xoff = -(conview.getMeasuredWidth() / 2 - mSeleteAreaLay.getWidth() / 2);
popupWindow.showAsDropDown(mSeleteAreaLay, xoff, 0);
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
for (PopuBean popuBean : popuBeans) {
popuBean.setChick(false);
}
popuBeans.get(position).setChick(true);
mPopuAdapter.notifyDataSetChanged();
}
});
} catch (Exception e) {
e.printStackTrace();
}
......@@ -142,7 +176,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
/**
* 搜索
*/
private void search(){
private void search() {
EyeDataManager.getInstance().getStudents(mSearchParamBean.getParams())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new RxCallback<OldResponseImpl<List<StudentBean>>>() {
......
app/src/main/java/com/oo/eye/activity/TestResurtListActivity.java
......@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.AdapterView;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
......@@ -156,7 +157,12 @@ public class TestResurtListActivity extends BaseActivity {
conview.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int xoff = -(conview.getMeasuredWidth() / 2 - view.getWidth() / 2);
popupWindow.showAsDropDown(view, xoff, 0);
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
}
});
} catch (Exception e) {
e.printStackTrace();
}
......
app/src/main/java/com/oo/eye/adapter/PopuAdapter.java
......@@ -33,7 +33,7 @@ public class PopuAdapter extends BaseAdapter {
@Override
public int getCount() {
return 6;
return mBeanList.size();
}
@Override
......@@ -52,14 +52,14 @@ public class PopuAdapter extends BaseAdapter {
View view = inflater.inflate(R.layout.item_popu_more, null);
final TextView textView = (TextView) view.findViewById(R.id.name_tv);
ImageView imageView = (ImageView) view.findViewById(R.id.choice_tv);
// PopuBean bean=mBeanList.get(position);
// if (bean.isChick()){
// imageView.setVisibility(View.VISIBLE);
// imageView.setImageResource(R.drawable.selectitem);
// }else {
// imageView.setVisibility(View.INVISIBLE);
// }
// textView.setText(data[position]);
PopuBean bean = mBeanList.get(position);
if (bean.isChick()) {
imageView.setVisibility(View.VISIBLE);
imageView.setImageResource(R.drawable.selectitem);
} else {
imageView.setVisibility(View.INVISIBLE);
}
textView.setText(bean.getName());
return view;
}
}
app/src/main/java/com/oo/eye/net/EyeApiService.java
......@@ -9,7 +9,9 @@ import java.util.Map;
import retrofit2.http.FieldMap;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.QueryMap;
import rx.Observable;
/**
......@@ -27,11 +29,11 @@ public interface EyeApiService {
/**
* 获取学校信息
*/
@POST(NetConfig.GET_SCHOOL)
Observable<OldResponseImpl<SchoolBean>> getSchoolInfo(@FieldMap Map<String ,String> params);
@GET(NetConfig.GET_SCHOOL)
Observable<OldResponseImpl<SchoolBean>> getSchoolInfo(@QueryMap Map<String ,String> params);
/**
* 获取学生信息
*/
@POST(NetConfig.GET_SCHOOL)
Observable<OldResponseImpl<List<StudentBean>>> getStudents(@FieldMap Map<String ,String> params);
@GET(NetConfig.GET_SCHOOL)
Observable<OldResponseImpl<List<StudentBean>>> getStudents(@QueryMap Map<String ,String> params);
}
app/src/main/java/com/oo/eye/net/NetConfig.java
......@@ -7,7 +7,7 @@ package com.oo.eye.net;
public class NetConfig {
public static final String REALY_HOST = "https://seex.dev.iouou.cn";
public static final String DEBUG_HOST ="https://seex.roll.iouou.cn";
public static final String DEBUG_HOST ="https://seex.inner.iouou.cn";
/**
* 获取学生
*/
......
app/src/main/res/layout/activity_morepeople.xml
......@@ -37,7 +37,7 @@
android:id="@+id/selete_area_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择学校"
android:text="全部学校"
android:textColor="@color/white"
android:textSize="@dimen/sp_18" />
......
app/src/main/res/layout/activity_singletest.xml
......@@ -37,7 +37,7 @@
android:id="@+id/selete_area_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择学校"
android:text="全部学校"
android:textColor="@color/white"
android:textSize="@dimen/sp_18" />
......
app/src/main/res/layout/activity_testresult.xml
......@@ -77,7 +77,7 @@
android:id="@+id/selete_area_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择学校"
android:text="全部学校"
android:textColor="@color/white"
android:textSize="@dimen/sp_18" />
......
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