Skip to content
This repository was archived by the owner on Mar 4, 2022. It is now read-only.

Commit c78830a

Browse files
author
itning
committed
review
1 parent c9cd733 commit c78830a

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

app/src/main/java/top/itning/smpandroid/client/ClassClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface ClassClient {
2525
* @return 学生班级
2626
*/
2727
@GET("/class/student_class_users")
28-
Observable<RestModel<Page<StudentClassUser>>> getAllStudentGroup(@Query("page") Integer page, @Query("size") Integer size);
28+
Observable<RestModel<Page<StudentClassUser>>> getAllStudentClassUser(@Query("page") Integer page, @Query("size") Integer size);
2929

3030
/**
3131
* 获取学生签到信息

app/src/main/java/top/itning/smpandroid/ui/activity/MainActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class MainActivity extends AppCompatActivity implements StudentClassUserR
7979
@Nullable
8080
private Disposable recyclerViewDataDisposable;
8181
private List<StudentClassUser> studentClassUserList;
82-
private Page<StudentClassUser> studentGroupPage;
82+
private Page<StudentClassUser> studentClassUserPage;
8383
private Disposable joinDisposable;
8484

8585

@@ -130,7 +130,7 @@ private void initRecyclerView() {
130130
rv.addOnScrollListener(new AbstractLoadMoreListener() {
131131
@Override
132132
protected void onLoading(int countItem, int lastItem) {
133-
PageUtils.getNextPageAndSize(studentGroupPage, t -> initRecyclerViewData(false, t.getT1(), t.getT2()));
133+
PageUtils.getNextPageAndSize(studentClassUserPage, t -> initRecyclerViewData(false, t.getT1(), t.getT2()));
134134
}
135135
});
136136
initRecyclerViewData(true, PageUtils.DEFAULT_PAGE, PageUtils.DEFAULT_SIZE);
@@ -139,7 +139,7 @@ protected void onLoading(int countItem, int lastItem) {
139139
private void initRecyclerViewData(boolean clear, @Nullable Integer page, @Nullable Integer size) {
140140
swipeRefreshLayout.setRefreshing(true);
141141
recyclerViewDataDisposable = HttpHelper.get(ClassClient.class)
142-
.getAllStudentGroup(page, size)
142+
.getAllStudentClassUser(page, size)
143143
.subscribeOn(Schedulers.computation())
144144
.observeOn(AndroidSchedulers.mainThread())
145145
.subscribe(pageRestModel -> {
@@ -150,7 +150,7 @@ private void initRecyclerViewData(boolean clear, @Nullable Integer page, @Nullab
150150
if (clear) {
151151
studentClassUserList.clear();
152152
}
153-
studentGroupPage = pageRestModel.getData();
153+
studentClassUserPage = pageRestModel.getData();
154154
studentClassUserList.addAll(pageRestModel.getData().getContent());
155155
if (rv.getAdapter() != null) {
156156
rv.getAdapter().notifyDataSetChanged();

app/src/main/java/top/itning/smpandroid/ui/adapter/StudentClassUserRecyclerViewAdapter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@
2626
public class StudentClassUserRecyclerViewAdapter extends RecyclerView.Adapter<StudentClassUserRecyclerViewAdapter.ViewHolder> implements View.OnClickListener {
2727
private final Context context;
2828
private final OnItemClickListener<StudentClassUser> onItemClickListener;
29-
private final List<StudentClassUser> groupList;
29+
private final List<StudentClassUser> studentClassUserList;
3030
private final List<Integer> colorList = new ArrayList<>(7);
3131
private int nexIndex;
3232

33-
public StudentClassUserRecyclerViewAdapter(@NonNull List<StudentClassUser> groupList, @NonNull Context context, @Nullable OnItemClickListener<StudentClassUser> onItemClickListener) {
33+
public StudentClassUserRecyclerViewAdapter(@NonNull List<StudentClassUser> studentClassUserList, @NonNull Context context, @Nullable OnItemClickListener<StudentClassUser> onItemClickListener) {
3434
this.context = context;
3535
this.onItemClickListener = onItemClickListener;
36-
this.groupList = groupList;
36+
this.studentClassUserList = studentClassUserList;
3737
initColorArray();
3838
}
3939

4040
@NonNull
4141
@Override
4242
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
43-
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_student_join_group, parent, false);
43+
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_student_join_class, parent, false);
4444
view.setOnClickListener(this);
4545
return new ViewHolder(view);
4646
}
4747

4848
@Override
4949
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
50-
StudentClassUser studentClassUser = groupList.get(position);
50+
StudentClassUser studentClassUser = studentClassUserList.get(position);
5151
holder.itemView.setTag(studentClassUser);
5252
holder.peopleCount.setText(DateUtils.format(studentClassUser.getGmtCreate(), DateUtils.YYYYMMDDHHMM_DATE_TIME_FORMATTER_2));
5353
holder.className.setText(studentClassUser.getStudentClass().getName());
@@ -57,7 +57,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
5757

5858
@Override
5959
public int getItemCount() {
60-
return groupList.size();
60+
return studentClassUserList.size();
6161
}
6262

6363
@Override

0 commit comments

Comments
 (0)