Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haihang
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐丛奇
haihang
Commits
c3361d9f
Commit
c3361d9f
authored
Sep 07, 2018
by
chengxiuhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test main
parent
aeb4ed5e
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
22 deletions
+64
-22
EyeConfig.java
app/src/main/java/com/oo/eye/EyeConfig.java
+1
-1
SinglePeopleTestActivity.java
app/src/main/java/com/oo/eye/activity/SinglePeopleTestActivity.java
+30
-12
SinglePeopleAdapter.java
app/src/main/java/com/oo/eye/adapter/SinglePeopleAdapter.java
+5
-5
EyeApiService.java
app/src/main/java/com/oo/eye/net/EyeApiService.java
+1
-1
activity_singletest.xml
app/src/main/res/layout/activity_singletest.xml
+26
-3
strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/java/com/oo/eye/EyeConfig.java
View file @
c3361d9f
...
@@ -27,7 +27,7 @@ public class EyeConfig {
...
@@ -27,7 +27,7 @@ public class EyeConfig {
private
List
<
StudentBean
>
mStudents
;
private
List
<
StudentBean
>
mStudents
;
public
static
String
TEST_SCHOOL_ID
=
"8
4
"
;
public
static
String
TEST_SCHOOL_ID
=
"8
1
"
;
private
static
EyeConfig
instance
=
new
EyeConfig
();
private
static
EyeConfig
instance
=
new
EyeConfig
();
...
...
app/src/main/java/com/oo/eye/activity/SinglePeopleTestActivity.java
View file @
c3361d9f
package
com
.
oo
.
eye
.
activity
;
package
com
.
oo
.
eye
.
activity
;
import
android.graphics.drawable.ColorDrawable
;
import
android.graphics.drawable.ColorDrawable
;
import
android.os.Bundle
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.AdapterView
;
import
android.widget.AdapterView
;
import
android.widget.EditText
;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.ListView
;
import
android.widget.ListView
;
import
android.widget.PopupWindow
;
import
android.widget.PopupWindow
;
...
@@ -31,6 +33,7 @@ import java.util.ArrayList;
...
@@ -31,6 +33,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
import
rx.android.schedulers.AndroidSchedulers
;
import
rx.android.schedulers.AndroidSchedulers
;
...
@@ -49,6 +52,10 @@ public class SinglePeopleTestActivity extends BaseActivity {
...
@@ -49,6 +52,10 @@ public class SinglePeopleTestActivity extends BaseActivity {
@BindView
(
R
.
id
.
recycle_view
)
@BindView
(
R
.
id
.
recycle_view
)
RecyclerView
mRecycleView
;
RecyclerView
mRecycleView
;
@BindView
(
R
.
id
.
progress
)
RelativeLayout
mProgress
;
@BindView
(
R
.
id
.
key_test
)
EditText
mKeyTest
;
private
List
<
StudentBean
>
mStudentBeans
;
private
List
<
StudentBean
>
mStudentBeans
;
private
SinglePeopleAdapter
mPeopleAdapter
;
private
SinglePeopleAdapter
mPeopleAdapter
;
private
SearchParamBean
mSearchParamBean
=
new
SearchParamBean
();
private
SearchParamBean
mSearchParamBean
=
new
SearchParamBean
();
...
@@ -66,16 +73,9 @@ public class SinglePeopleTestActivity extends BaseActivity {
...
@@ -66,16 +73,9 @@ public class SinglePeopleTestActivity extends BaseActivity {
mSearchParamBean
.
setSchoolId
(
EyeConfig
.
TEST_SCHOOL_ID
);
mSearchParamBean
.
setSchoolId
(
EyeConfig
.
TEST_SCHOOL_ID
);
mRecycleView
.
setLayoutManager
(
new
LinearLayoutManager
(
this
));
mRecycleView
.
setLayoutManager
(
new
LinearLayoutManager
(
this
));
mStudentBeans
=
new
ArrayList
<>();
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
);
mPeopleAdapter
=
new
SinglePeopleAdapter
(
mStudentBeans
,
this
);
mRecycleView
.
setAdapter
(
mPeopleAdapter
);
mRecycleView
.
setAdapter
(
mPeopleAdapter
);
search
();
//
}
}
@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
})
...
@@ -97,7 +97,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
...
@@ -97,7 +97,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
mSchoolBean
=
schoolBeanOldResponse
.
getResultData
();
mSchoolBean
=
schoolBeanOldResponse
.
getResultData
();
if
(!
CheckUtil
.
isNull
(
mSchoolBean
))
{
if
(!
CheckUtil
.
isNull
(
mSchoolBean
))
{
setAreaData
();
setAreaData
();
}
else
{
}
else
{
ToastUtil
.
showMessage
(
"暂无数据"
);
ToastUtil
.
showMessage
(
"暂无数据"
);
}
}
}
}
...
@@ -111,6 +111,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
...
@@ -111,6 +111,7 @@ public class SinglePeopleTestActivity extends BaseActivity {
}
}
break
;
break
;
case
R
.
id
.
do_search
:
case
R
.
id
.
do_search
:
mSearchParamBean
.
setStudentId
(
mKeyTest
.
getText
().
toString
());
search
();
search
();
break
;
break
;
case
R
.
id
.
begin_test
:
case
R
.
id
.
begin_test
:
...
@@ -164,8 +165,12 @@ public class SinglePeopleTestActivity extends BaseActivity {
...
@@ -164,8 +165,12 @@ public class SinglePeopleTestActivity extends BaseActivity {
for
(
PopuBean
popuBean
:
popuBeans
)
{
for
(
PopuBean
popuBean
:
popuBeans
)
{
popuBean
.
setChick
(
false
);
popuBean
.
setChick
(
false
);
}
}
popuBeans
.
get
(
position
).
setChick
(
true
);
PopuBean
popuBean
=
popuBeans
.
get
(
position
);
popuBean
.
setChick
(
true
);
mPopuAdapter
.
notifyDataSetChanged
();
mPopuAdapter
.
notifyDataSetChanged
();
mSearchParamBean
.
setGrade
(
popuBean
.
getName
());
mSearchParamBean
.
setStudentId
(
""
);
search
();
}
}
});
});
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -177,19 +182,32 @@ public class SinglePeopleTestActivity extends BaseActivity {
...
@@ -177,19 +182,32 @@ public class SinglePeopleTestActivity extends BaseActivity {
* 搜索
* 搜索
*/
*/
private
void
search
()
{
private
void
search
()
{
mProgress
.
setVisibility
(
View
.
VISIBLE
);
EyeDataManager
.
getInstance
().
getStudents
(
mSearchParamBean
.
getParams
())
EyeDataManager
.
getInstance
().
getStudents
(
mSearchParamBean
.
getParams
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
new
RxCallback
<
OldResponseImpl
<
List
<
StudentBean
>>>()
{
.
subscribe
(
new
RxCallback
<
OldResponseImpl
<
List
<
StudentBean
>>>()
{
@Override
@Override
protected
void
onSuccess
(
OldResponseImpl
<
List
<
StudentBean
>>
listOldResponse
)
{
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
@Override
protected
void
onError
(
int
errorCode
,
String
errorMessage
)
{
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
View file @
c3361d9f
...
@@ -27,7 +27,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
...
@@ -27,7 +27,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
public
SinglePeopleAdapter
(
List
<
StudentBean
>
list
,
Context
context
)
{
public
SinglePeopleAdapter
(
List
<
StudentBean
>
list
,
Context
context
)
{
super
(
list
,
context
);
super
(
list
,
context
);
if
(!
CheckUtil
.
isEmpty
(
mList
))
{
if
(!
CheckUtil
.
isEmpty
(
mList
))
{
lastSelectBean
=
mList
.
get
(
0
);
lastSelectBean
=
mList
.
get
(
0
);
lastSelectBean
.
setChick
(
true
);
lastSelectBean
.
setChick
(
true
);
}
}
...
@@ -66,7 +66,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
...
@@ -66,7 +66,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
bean
.
setChick
(
true
);
bean
.
setChick
(
true
);
}
}
}
}
if
(!
bean
.
getNumber
().
equals
(
lastSelectBean
.
getNumber
()))
{
if
(!
bean
.
getNumber
().
equals
(
lastSelectBean
.
getNumber
()))
{
lastSelectBean
.
setChick
(
false
);
lastSelectBean
.
setChick
(
false
);
lastSelectBean
=
bean
;
lastSelectBean
=
bean
;
}
}
...
@@ -77,7 +77,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
...
@@ -77,7 +77,7 @@ public class SinglePeopleAdapter extends BaseRecyclerViewAdapter<StudentBean, It
@Override
@Override
public
int
getItemCount
()
{
public
int
getItemCount
()
{
return
10
;
return
mList
!=
null
?
mList
.
size
()
:
0
;
}
}
}
}
app/src/main/java/com/oo/eye/net/EyeApiService.java
View file @
c3361d9f
...
@@ -34,6 +34,6 @@ public interface EyeApiService {
...
@@ -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
);
Observable
<
OldResponseImpl
<
List
<
StudentBean
>>>
getStudents
(
@QueryMap
Map
<
String
,
String
>
params
);
}
}
app/src/main/res/layout/activity_singletest.xml
View file @
c3361d9f
...
@@ -3,12 +3,14 @@
...
@@ -3,12 +3,14 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/e_test_color"
>
android:background=
"@color/e_test_color"
>
<ImageView
<ImageView
android:id=
"@+id/back_iv"
android:id=
"@+id/back_iv"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/dp_12"
android:layout_margin=
"@dimen/dp_12"
android:src=
"@drawable/back"
/>
android:src=
"@drawable/back"
/>
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -50,9 +52,9 @@
...
@@ -50,9 +52,9 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<LinearLayout
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
...
@@ -67,6 +69,8 @@
...
@@ -67,6 +69,8 @@
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<EditText
<EditText
android:inputType=
"number"
android:digits=
"@string/filter_vcode"
android:id=
"@+id/key_test"
android:id=
"@+id/key_test"
android:layout_width=
"140dip"
android:layout_width=
"140dip"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -108,6 +112,7 @@
...
@@ -108,6 +112,7 @@
android:gravity=
"center_horizontal"
android:gravity=
"center_horizontal"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/dp_12"
>
android:paddingTop=
"@dimen/dp_12"
>
<RelativeLayout
<RelativeLayout
android:layout_width=
"@dimen/item_dimen_2"
android:layout_width=
"@dimen/item_dimen_2"
android:layout_height=
"@dimen/dp_40"
android:layout_height=
"@dimen/dp_40"
...
@@ -118,21 +123,24 @@
...
@@ -118,21 +123,24 @@
android:layout_width=
"1px"
android:layout_width=
"1px"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/line_color"
></View>
android:background=
"@color/line_color"
></View>
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"选择"
android:layout_centerInParent=
"true"
android:layout_centerInParent=
"true"
android:text=
"选择"
android:textColor=
"@color/text_color"
android:textColor=
"@color/text_color"
android:textSize=
"@dimen/sp_18"
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<View
<View
android:layout_alignParentRight=
"true"
android:layout_width=
"1px"
android:layout_width=
"1px"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_alignParentRight=
"true"
android:background=
"@color/line_color"
></View>
android:background=
"@color/line_color"
></View>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:layout_width=
"@dimen/item_dimen_5"
android:layout_width=
"@dimen/item_dimen_5"
android:layout_height=
"@dimen/dp_40"
android:layout_height=
"@dimen/dp_40"
...
@@ -221,6 +229,7 @@
...
@@ -221,6 +229,7 @@
android:background=
"@color/line_color"
></View>
android:background=
"@color/line_color"
></View>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<TextView
<TextView
android:id=
"@+id/begin_test"
android:id=
"@+id/begin_test"
android:layout_width=
"110dip"
android:layout_width=
"110dip"
...
@@ -234,6 +243,7 @@
...
@@ -234,6 +243,7 @@
android:text=
"开始测试"
android:text=
"开始测试"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_16"
/>
android:textSize=
"@dimen/sp_16"
/>
<android.support.v7.widget.RecyclerView
<android.support.v7.widget.RecyclerView
android:id=
"@+id/recycle_view"
android:id=
"@+id/recycle_view"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -241,4 +251,16 @@
...
@@ -241,4 +251,16 @@
android:layout_above=
"@+id/begin_test"
android:layout_above=
"@+id/begin_test"
android:layout_below=
"@+id/ddd"
></android.support.v7.widget.RecyclerView>
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>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
c3361d9f
...
@@ -38,4 +38,5 @@
...
@@ -38,4 +38,5 @@
<string
name=
"histroy_soure_input"
>
用户录入
</string>
<string
name=
"histroy_soure_input"
>
用户录入
</string>
<string
name=
"histroy_soure_calculate"
>
自动计算
</string>
<string
name=
"histroy_soure_calculate"
>
自动计算
</string>
<string
name=
"start"
>
开始
</string>
<string
name=
"start"
>
开始
</string>
<string
name=
"filter_vcode"
>
0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
</string>
</resources>
</resources>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment