Skip to content

H
haihang
Commit 67809f15 by chengxiuhong
Options

test main

parent e68e46da
Showing with 265 additions and 39 deletions
app/src/main/java/com/oo/eye/activity/MorePeopleTestActivity.java
......@@ -249,7 +249,7 @@ public class MorePeopleTestActivity extends BaseActivity {
mClassList = popuBeans;
showPopWindow(popuBeans);
} else {
if (isAll) {
if (!isAll) {
ToastUtil.showMessage("暂无数据");
}
}
......
app/src/main/java/com/oo/eye/activity/TestResurtListActivity.java
......@@ -15,10 +15,21 @@ import android.widget.RelativeLayout;
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.TestResultListAdapter;
import com.oo.eye.bean.ClassBean;
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;
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;
......@@ -26,6 +37,7 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.android.schedulers.AndroidSchedulers;
/**
* Date : 2018/8/28.
......@@ -49,8 +61,8 @@ public class TestResurtListActivity extends BaseActivity {
ImageView mSeleteIv;
@BindView(R.id.selete_lay)
LinearLayout mSeleteLay;
@BindView(R.id.selete1_tv)
TextView mSelete1Tv;
// @BindView(R.id.selete1_tv)
// TextView mSelete1Tv;
@BindView(R.id.selete1_iv)
ImageView mSelete1Iv;
@BindView(R.id.selete1_lay)
......@@ -71,7 +83,17 @@ public class TestResurtListActivity extends BaseActivity {
TextView mTitle2;
@BindView(R.id.textView)
TextView mTextView;
@BindView(R.id.progress)
RelativeLayout mProgress;
private List<ClassBean> mClassBeans;//选择学校的所有小组
private boolean isAll = true;//是否是全部学校
private List<PopuBean> mAreaList = new ArrayList<>();
private List<PopuBean> mClassList = new ArrayList<>();
private SearchParamBean mSearchParamBean = new SearchParamBean();
private TestResultListAdapter mResultListAdapter;
private PopuAdapter mPopuAdapter;
private int popuPosition;//1学校,2小组
private SchoolBean mSchoolBean;
@Override
protected int getLayoutId() {
return R.layout.activity_testresult;
......@@ -83,16 +105,15 @@ public class TestResurtListActivity extends BaseActivity {
mTitle2.setSelected(false);
mRecycleView.setLayoutManager(new LinearLayoutManager(this));
List<StudentBean> list = new ArrayList<>();
for (int i = 0; i < 10; i++) {
StudentBean chartsBean = new StudentBean();
list.add(chartsBean);
}
mRecycleView.setAdapter(new TestResultListAdapter(list, this));
mResultListAdapter = new TestResultListAdapter(list, this);
mRecycleView.setAdapter(mResultListAdapter);
mSearchParamBean.setSchoolId(EyeConfig.TEST_SCHOOL_ID);
search();
}
private boolean isA;
@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) {
switch (view.getId()) {
case R.id.title_1:
......@@ -107,39 +128,136 @@ public class TestResurtListActivity extends BaseActivity {
finish();
break;
case R.id.selete_area_lay:
showPopWindow(1);
popuPosition = 1;
if (!CheckUtil.isEmpty(mAreaList)) {
showPopWindow(mAreaList);
} 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) {
mSchoolBean = schoolBeanOldResponse.getResultData();
if (!CheckUtil.isNull(mSchoolBean)) {
setAreaData();
} else {
ToastUtil.showMessage("暂无数据");
}
}
}
@Override
protected void onError(int errorCode, String errorMessage) {
ToastUtil.showLongMessage(errorMessage);
}
});
}
break;
case R.id.selete_lay:
showPopWindow(2);
popuPosition = 2;
if (!CheckUtil.isEmpty(mClassList)) {
showPopWindow(mClassList);
} else if (!CheckUtil.isNull(mClassBeans)) {
setClassData();
} 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();
if (!CheckUtil.isNull(mSchoolBean)) {
setClassData();
} else {
ToastUtil.showMessage("暂无数据");
}
}
}
@Override
protected void onError(int errorCode, String errorMessage) {
ToastUtil.showLongMessage(errorMessage);
}
});
}
break;
case R.id.selete1_lay:
showPopWindow(3);
case R.id.selete1_lay://双眼1.0以上
// showPopWindow(3);
break;
case R.id.selete2_lay://仅看A类
isA = !isA;
if (isA) {
mSelete2Iv.setImageResource(R.drawable.select3_sel);
mSearchParamBean.setVisionStatus("typeA");
} else {
mSelete2Iv.setImageResource(R.drawable.select3_nor);
mSearchParamBean.setVisionStatus("");
}
search();
break;
case R.id.do_search:
mSearchParamBean.setStudentId(mKeyTest.getText().toString());
search();
break;
}
}
private void setAreaData() {
List<GradeBean> gradeBeans = mSchoolBean.getGradeList();
if (!CheckUtil.isEmpty(gradeBeans)) {
List<PopuBean> popuBeans = new ArrayList<>();
PopuBean all = new PopuBean();
all.setName("全部学校");
all.setChick(true);
popuBeans.add(all);
for (GradeBean gradeBean : gradeBeans) {
PopuBean popuBean = new PopuBean();
popuBean.setName(gradeBean.getName());
popuBean.setClassBeans(gradeBean.getClassList());
popuBeans.add(popuBean);
}
mAreaList = popuBeans;
showPopWindow(popuBeans);
} else {
ToastUtil.showMessage("暂无数据");
}
}
private void showPopWindow(int position) {
private void setClassData() {
if (!CheckUtil.isEmpty(mClassBeans)) {
List<PopuBean> popuBeans = new ArrayList<>();
PopuBean all = new PopuBean();
all.setName("全部小组");
all.setClassId("");
all.setChick(true);
popuBeans.add(all);
for (ClassBean gradeBean : mClassBeans) {
PopuBean popuBean = new PopuBean();
popuBean.setName(gradeBean.getClasses());
popuBean.setClassId(gradeBean.getId());
popuBeans.add(popuBean);
}
mClassList = popuBeans;
showPopWindow(popuBeans);
} else {
if (!isAll) {
ToastUtil.showMessage("暂无数据");
}
}
}
private void showPopWindow(List<PopuBean> popuBeans) {
LinearLayout view = mSeleteLay;
switch (position) {
switch (popuPosition) {
case 1:
view = mSeleteAreaLay;
break;
case 2:
view = mSeleteLay;
break;
case 3:
view = mSelete1Lay;
break;
}
try {
View conview = View.inflate(this, R.layout.popu_list, null);
......@@ -150,7 +268,8 @@ public class TestResurtListActivity 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];
view.getLocationOnScreen(location);
// popupWindow.setAnimationStyle(R.style.style_pop_animation);// 动画效果必须放在showAsDropDown()方法上边，否则无效
......@@ -160,7 +279,7 @@ public class TestResurtListActivity extends BaseActivity {
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
itemClick(position);
}
});
} catch (Exception e) {
......@@ -169,6 +288,36 @@ public class TestResurtListActivity extends BaseActivity {
}
private void itemClick(int position) {
List<PopuBean> popuBeans = mPopuAdapter.getBeanList();
for (PopuBean popuBean : popuBeans) {
popuBean.setChick(false);
}
PopuBean popuBean = popuBeans.get(position);
popuBean.setChick(true);
mPopuAdapter.notifyDataSetChanged();
switch (popuPosition) {
case 1://学校
isAll = position == 0 ? true : false;
mClassBeans = popuBean.getClassBeans();
mSeleteAreaTv.setText(popuBean.getName());
if (popuBean.getName().equals("全部学校")) {
mSearchParamBean.setGrade("");
} else {
mSearchParamBean.setGrade(popuBean.getName());
}
mSearchParamBean.setClassId("");
mSeleteTv.setText("全部小组");
break;
case 2://小组
mSearchParamBean.setClassId(popuBean.getClassId());
mSeleteTv.setText(popuBean.getName());
break;
}
mSearchParamBean.setStudentId("");
search();
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -176,4 +325,30 @@ public class TestResurtListActivity extends BaseActivity {
ButterKnife.bind(this);
}
/**
* 搜索
*/
private void search() {
mProgress.setVisibility(View.VISIBLE);
EyeDataManager.getInstance().getStudents(mSearchParamBean.getParams())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new RxCallback<OldResponseImpl<List<StudentBean>>>() {
@Override
protected void onSuccess(OldResponseImpl<List<StudentBean>> listOldResponse) {
if (listOldResponse != null && listOldResponse.getData() != null) {
mProgress.setVisibility(View.GONE);
mResultListAdapter.clear();
mResultListAdapter.appendToListAndNotify(listOldResponse.getData());
} else {
ToastUtil.showMessage("暂无数据");
}
}
@Override
protected void onError(int errorCode, String errorMessage) {
mProgress.setVisibility(View.GONE);
ToastUtil.showMessage(errorMessage);
}
});
}
}
app/src/main/res/layout/activity_morepeople.xml
......@@ -24,10 +24,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:id="@+id/selete_area_lay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -49,7 +51,9 @@
android:src="@drawable/more" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:id="@+id/selete_lay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -72,7 +76,9 @@
<LinearLayout
android:id="@+id/selete1_lay"
android:layout_marginLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
......@@ -93,12 +99,16 @@
</LinearLayout>
<ImageView
android:layout_marginLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/search" />
<LinearLayout
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -121,10 +131,13 @@
</LinearLayout>
<TextView
android:paddingBottom="@dimen/dp_6"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:id="@+id/do_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:text="查询"
android:textColor="@color/indicator_color"
android:textSize="@dimen/sp_18" />
......@@ -133,7 +146,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_95"
android:layout_marginTop="@dimen/dp_90"
android:background="@color/white"></LinearLayout>
<LinearLayout
......
app/src/main/res/layout/activity_singletest.xml
......@@ -26,11 +26,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_40"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/selete_area_lay"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
......@@ -54,6 +57,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_marginLeft="@dimen/dp_20"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -92,7 +97,9 @@
android:id="@+id/do_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:paddingRight="@dimen/dp_20"
android:text="查询"
android:textColor="@color/indicator_color"
android:textSize="@dimen/sp_18" />
......@@ -102,7 +109,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_95"
android:layout_marginTop="@dimen/dp_90"
android:background="@color/white"></LinearLayout>
<LinearLayout
......
app/src/main/res/layout/activity_testresult.xml
......@@ -22,6 +22,8 @@
android:id="@+id/title_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:text="结果报表"
android:textColor="@color/indicator_light_color"
android:textSize="24sp"
......@@ -31,12 +33,14 @@
android:layout_width="1px"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/white" />
<TextView
android:id="@+id/title_2"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="临时报表"
......@@ -63,13 +67,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/selete_area_lay"
android:layout_width="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_height="wrap_content"
android:orientation="horizontal">
......@@ -90,10 +97,12 @@
</LinearLayout>
<LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:id="@+id/selete_lay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:orientation="horizontal">
<TextView
......@@ -113,11 +122,13 @@
</LinearLayout>
<LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:visibility="gone"
android:id="@+id/selete1_lay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:orientation="horizontal">
<TextView
......@@ -137,10 +148,12 @@
</LinearLayout>
<LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:id="@+id/selete2_lay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:orientation="horizontal">
<ImageView
......@@ -148,7 +161,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/select3_sel" />
android:src="@drawable/select3_nor" />
<TextView
android:id="@+id/selete2_tv"
......@@ -162,12 +175,16 @@
</LinearLayout>
<ImageView
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:src="@drawable/search" />
<LinearLayout
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -190,10 +207,12 @@
</LinearLayout>
<TextView
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_6"
android:id="@+id/do_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:text="查询"
android:textColor="@color/indicator_color"
android:textSize="@dimen/sp_18" />
......@@ -202,7 +221,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_95"
android:layout_marginTop="@dimen/dp_90"
android:background="@color/white"></LinearLayout>
<LinearLayout
......@@ -358,5 +377,16 @@
android:layout_height="match_parent"
android:layout_below="@+id/ddd"
android:layout_marginBottom="@dimen/dp_20"></android.support.v7.widget.RecyclerView>
<RelativeLayout
android:id="@+id/progress"
android:layout_below="@+id/ddd"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#60000000">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
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