Commit 9cfa01d01114fb529a161c0d67cf024cb46ace86
1 parent
af63de4898
Exists in
master
资源重命名
Showing
15 changed files
with
17 additions
and
22 deletions
Show diff stats
app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
... | ... | @@ -36,7 +36,6 @@ import com.trello.rxlifecycle2.android.RxLifecycleAndroid; |
36 | 36 | import java.text.SimpleDateFormat; |
37 | 37 | import java.util.ArrayList; |
38 | 38 | import java.util.Calendar; |
39 | -import java.util.Collections; | |
40 | 39 | import java.util.Date; |
41 | 40 | import java.util.HashMap; |
42 | 41 | import java.util.List; |
... | ... | @@ -505,20 +504,20 @@ public class StuHomeworkActivity extends BaseRxActivity<ActivityStudentHomeworkB |
505 | 504 | int subjectImg; |
506 | 505 | switch (data.homeworkSubject) { |
507 | 506 | case "语文": |
508 | - subjectImg = R.drawable.ic_chinese; | |
507 | + subjectImg = R.drawable.png_cover_chinese; | |
509 | 508 | break; |
510 | 509 | case "英语": |
511 | - subjectImg = R.drawable.ic_english; | |
510 | + subjectImg = R.drawable.png_cover_english; | |
512 | 511 | break; |
513 | 512 | case "物理": |
514 | - subjectImg = R.drawable.ic_physics; | |
513 | + subjectImg = R.drawable.png_cover_physics; | |
515 | 514 | break; |
516 | 515 | case "化学": |
517 | - subjectImg = R.drawable.ic_chemistry; | |
516 | + subjectImg = R.drawable.png_cover_chemistry; | |
518 | 517 | break; |
519 | 518 | case "数学": |
520 | 519 | default: |
521 | - subjectImg = R.drawable.ic_math; | |
520 | + subjectImg = R.drawable.png_cover_math; | |
522 | 521 | } |
523 | 522 | holder.setImageResource(R.id.ivSubject, subjectImg); |
524 | 523 | Date endDate = new Date(data.endTime.getTime() - 1000); | ... | ... |
app/src/main/java/com/hjx/parent/adapter/HomeworkAdapter.java
... | ... | @@ -23,20 +23,20 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkList, BaseViewHold |
23 | 23 | int subjectImg; |
24 | 24 | switch (homework.getSubject()) { |
25 | 25 | case "语文": |
26 | - subjectImg = R.drawable.ic_chinese; | |
26 | + subjectImg = R.drawable.png_cover_chinese; | |
27 | 27 | break; |
28 | 28 | case "英语": |
29 | - subjectImg = R.drawable.ic_english; | |
29 | + subjectImg = R.drawable.png_cover_english; | |
30 | 30 | break; |
31 | 31 | case "物理": |
32 | - subjectImg = R.drawable.ic_physics; | |
32 | + subjectImg = R.drawable.png_cover_physics; | |
33 | 33 | break; |
34 | 34 | case "化学": |
35 | - subjectImg = R.drawable.ic_chemistry; | |
35 | + subjectImg = R.drawable.png_cover_chemistry; | |
36 | 36 | break; |
37 | 37 | case "数学": |
38 | 38 | default: |
39 | - subjectImg = R.drawable.ic_math; | |
39 | + subjectImg = R.drawable.png_cover_math; | |
40 | 40 | } |
41 | 41 | helper.setImageResource(R.id.ivSubject, subjectImg); |
42 | 42 | ... | ... |
app/src/main/java/com/hjx/parent/adapter/HomeworkListAdapter.java
1 | 1 | package com.hjx.parent.adapter; |
2 | 2 | |
3 | -import android.content.Intent; | |
4 | 3 | import android.view.View; |
5 | 4 | import android.widget.TextView; |
6 | 5 | |
... | ... | @@ -8,10 +7,7 @@ import androidx.annotation.NonNull; |
8 | 7 | |
9 | 8 | import com.chad.library.adapter.base.BaseQuickAdapter; |
10 | 9 | import com.chad.library.adapter.base.BaseViewHolder; |
11 | -import com.google.gson.Gson; | |
12 | -import com.hjx.parent.HomeworkDetailActivity; | |
13 | 10 | import com.hjx.parent.R; |
14 | -import com.hjx.parent.function.Function0; | |
15 | 11 | import com.hjx.parent.function.Function1; |
16 | 12 | import com.prws.common.bean.homework.HomeworkList; |
17 | 13 | |
... | ... | @@ -32,20 +28,20 @@ public class HomeworkListAdapter extends BaseQuickAdapter<HomeworkList, BaseView |
32 | 28 | int subjectImg; |
33 | 29 | switch (homework.getSubject()) { |
34 | 30 | case "语文": |
35 | - subjectImg = R.drawable.ic_chinese; | |
31 | + subjectImg = R.drawable.png_cover_chinese; | |
36 | 32 | break; |
37 | 33 | case "英语": |
38 | - subjectImg = R.drawable.ic_english; | |
34 | + subjectImg = R.drawable.png_cover_english; | |
39 | 35 | break; |
40 | 36 | case "物理": |
41 | - subjectImg = R.drawable.ic_physics; | |
37 | + subjectImg = R.drawable.png_cover_physics; | |
42 | 38 | break; |
43 | 39 | case "化学": |
44 | - subjectImg = R.drawable.ic_chemistry; | |
40 | + subjectImg = R.drawable.png_cover_chemistry; | |
45 | 41 | break; |
46 | 42 | case "数学": |
47 | 43 | default: |
48 | - subjectImg = R.drawable.ic_math; | |
44 | + subjectImg = R.drawable.png_cover_math; | |
49 | 45 | } |
50 | 46 | holder.setImageResource(R.id.ivSubject, subjectImg); |
51 | 47 | ... | ... |
app/src/main/res/drawable/ic_chemistry.png
74.3 KB
app/src/main/res/drawable/ic_chinese.png
73.7 KB
app/src/main/res/drawable/ic_english.png
79.7 KB
app/src/main/res/drawable/ic_math.png
73 KB
app/src/main/res/drawable/ic_physics.png
71 KB
app/src/main/res/drawable/png_cover_chemistry.png
74.3 KB
app/src/main/res/drawable/png_cover_chinese.png
73.7 KB
app/src/main/res/drawable/png_cover_english.png
79.7 KB
app/src/main/res/drawable/png_cover_math.png
73 KB
app/src/main/res/drawable/png_cover_physics.png
71 KB
app/src/main/res/layout/item_homework.xml
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 | android:layout_height="75dp"> |
30 | 30 | <ImageView |
31 | 31 | android:id="@+id/ivSubject" |
32 | - tools:src="@drawable/ic_math" | |
32 | + tools:src="@drawable/png_cover_math" | |
33 | 33 | android:layout_marginStart="10dp" |
34 | 34 | android:layout_width="44dp" |
35 | 35 | android:layout_height="56dp" | ... | ... |
app/src/main/res/layout/item_homework_list.xml
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | android:layout_height="match_parent"> |
34 | 34 | <ImageView |
35 | 35 | android:id="@+id/ivSubject" |
36 | - tools:src="@drawable/ic_math" | |
36 | + tools:src="@drawable/png_cover_math" | |
37 | 37 | android:layout_marginStart="10dp" |
38 | 38 | android:layout_width="50dp" |
39 | 39 | android:layout_height="64dp" | ... | ... |