Skip to content

H
haihang
Commit c3361d9f by chengxiuhong
Options

test main

parent aeb4ed5e
Showing with 64 additions and 22 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 = "84";
public static String TEST_SCHOOL_ID = "81";
private static EyeConfig instance = new EyeConfig();
......
app/src/main/java/com/oo/eye/activity/SinglePeopleTestActivity.java
package com.oo.eye.activity;
import android.graphics.drawable.ColorDrawable;
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.LinearLayout;
import android.widget.ListView;
import android.widget.PopupWindow;
......@@ -31,6 +33,7 @@ import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.android.schedulers.AndroidSchedulers;
......@@ -49,6 +52,10 @@ public class SinglePeopleTestActivity extends BaseActivity {
@BindView(R.id.recycle_view)
RecyclerView mRecycleView;
@BindView(R.id.progress)
RelativeLayout mProgress;
@BindView(R.id.key_test)
EditText mKeyTest;
private List<StudentBean> mStudentBeans;
private SinglePeopleAdapter mPeopleAdapter;
private SearchParamBean mSearchParamBean = new SearchParamBean();
......@@ -66,16 +73,9 @@ public class SinglePeopleTestActivity extends BaseActivity {
mSearchParamBean.setSchoolId(EyeConfig.TEST_SCHOOL_ID);
mRecycleView.setLayoutManager(new LinearLayoutManager(this));
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);
mStudentBeans.add(mStudentBean);
}
mPeopleAdapter = new SinglePeopleAdapter(mStudentBeans, this);
mRecycleView.setAdapter(mPeopleAdapter);
search();//
}
@OnClick({R.id.back_iv, R.id.selete_area_lay, R.id.do_search, R.id.begin_test})
......@@ -97,7 +97,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
mSchoolBean = schoolBeanOldResponse.getResultData();
if (!CheckUtil.isNull(mSchoolBean)) {
setAreaData();
}else {
} else {
ToastUtil.showMessage("暂无数据");
}
}
......@@ -111,6 +111,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
}
break;
case R.id.do_search:
mSearchParamBean.setStudentId(mKeyTest.getText().toString());
search();
break;
case R.id.begin_test:
......@@ -164,8 +165,12 @@ public class SinglePeopleTestActivity extends BaseActivity {
for (PopuBean popuBean : popuBeans) {
popuBean.setChick(false);
}
popuBeans.get(position).setChick(true);
PopuBean popuBean = popuBeans.get(position);
popuBean.setChick(true);
mPopuAdapter.notifyDataSetChanged();
mSearchParamBean.setGrade(popuBean.getName());
mSearchParamBean.setStudentId("");
search();
}
});
} catch (Exception e) {
......@@ -177,19 +182,32 @@ public class SinglePeopleTestActivity extends BaseActivity {
* 搜索
*/
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);
mPeopleAdapter.appendToListAndNotify(listOldResponse.getData());
} else {
ToastUtil.showMessage("暂无数据");
}
}
@Override
protected void onError(int errorCode, String errorMessage) {
mProgress.setVisibility(View.GONE);
ToastUtil.showMessage(errorMessage);
}
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/oo/eye/adapter/SinglePeopleAdapter.java
......@@ -27,7 +27,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
public SinglePeopleAdapter(List<StudentBean> list, Context context) {
super(list, context);
if(!CheckUtil.isEmpty(mList)){
if (!CheckUtil.isEmpty(mList)) {
lastSelectBean = mList.get(0);
lastSelectBean.setChick(true);
}
......@@ -66,7 +66,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
bean.setChick(true);
}
}
if(!bean.getNumber().equals(lastSelectBean.getNumber())) {
if (!bean.getNumber().equals(lastSelectBean.getNumber())) {
lastSelectBean.setChick(false);
lastSelectBean = bean;
}
......@@ -77,7 +77,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
@Override
public int getItemCount () {
return 10;
}
public int getItemCount() {
return mList != null ? mList.size() : 0;
}
}
app/src/main/java/com/oo/eye/net/EyeApiService.java
......@@ -34,6 +34,6 @@ public interface EyeApiService {
/**
* 获取学生信息
*/
@GET(NetConfig.GET_SCHOOL)
@GET(NetConfig.CLASS_STUDENT)
Observable<OldResponseImpl<List<StudentBean>>> getStudents(@QueryMap Map<String ,String> params);
}
app/src/main/res/layout/activity_singletest.xml
......@@ -3,12 +3,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/e_test_color">
<ImageView
android:id="@+id/back_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_12"
android:src="@drawable/back" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -50,9 +52,9 @@
</LinearLayout>
<LinearLayout
android:layout_marginLeft="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -67,6 +69,8 @@
android:orientation="vertical">
<EditText
android:inputType="number"
android:digits="@string/filter_vcode"
android:id="@+id/key_test"
android:layout_width="140dip"
android:layout_height="wrap_content"
......@@ -108,6 +112,7 @@
android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_12">
<RelativeLayout
android:layout_width="@dimen/item_dimen_2"
android:layout_height="@dimen/dp_40"
......@@ -118,21 +123,24 @@
android:layout_width="1px"
android:layout_height="match_parent"
android:background="@color/line_color"></View>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择"
android:layout_centerInParent="true"
android:text="选择"
android:textColor="@color/text_color"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
<View
android:layout_alignParentRight="true"
android:layout_width="1px"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:background="@color/line_color"></View>
</RelativeLayout>
<RelativeLayout
android:layout_width="@dimen/item_dimen_5"
android:layout_height="@dimen/dp_40"
......@@ -221,6 +229,7 @@
android:background="@color/line_color"></View>
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/begin_test"
android:layout_width="110dip"
......@@ -234,6 +243,7 @@
android:text="开始测试"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recycle_view"
android:layout_width="match_parent"
......@@ -241,4 +251,16 @@
android:layout_above="@+id/begin_test"
android:layout_below="@+id/ddd"></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
app/src/main/res/values/strings.xml
......@@ -38,4 +38,5 @@
<string name="histroy_soure_input">用户录入</string>
<string name="histroy_soure_calculate">自动计算</string>
<string name="start">开始</string>
<string name="filter_vcode">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
</resources>
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