diff --git a/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java b/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java index cbd4448..f4ca843 100644 --- a/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java +++ b/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java @@ -12,6 +12,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.Glide; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -114,18 +115,22 @@ public class HomeworkShareActivity extends BaseRxActivity errorList = new ArrayList<>(); + List blankList = new ArrayList<>(); if (detail.getHomeworkList() != null && detail.getHomeworkList().size() != 0) { int total = detail.getHomeworkList().size(); - int correctNum = 0; + int correctNum = 0, blankNumber = 0; Set correctSet = new HashSet<>(); Set errorSet = new HashSet<>(); for (HomeWork homeWork: detail.getHomeworkList()) { if (homeWork.correction == 0) { correctNum ++; correctSet.addAll(homeWork.pointsObj); - } else { + } else if (homeWork.correction == 1){ errorList.add(homeWork); errorSet.addAll(homeWork.pointsObj); + } else if (homeWork.correction == 2) { + blankList.add(homeWork); + blankNumber ++; } } StringBuilder correctPoint = new StringBuilder(); @@ -136,11 +141,12 @@ public class HomeworkShareActivity extends BaseRxActivity { + + public BlankAdapter(@Nullable List data) { + super(R.layout.item_huyou_daily_blank, data); + } + + @Override + protected void convert(@NonNull BaseViewHolder holder, HomeWork homeWork) { + ImageView imageView = holder.getView(R.id.imageView); + Glide.with(mContext).load(homeWork.url).into(imageView); + } + } + public static class ErrorAdapter extends BaseQuickAdapter { public ErrorAdapter() { diff --git a/app/src/main/res/layout/activity_homework_share.xml b/app/src/main/res/layout/activity_homework_share.xml index 2d50262..b9a1415 100644 --- a/app/src/main/res/layout/activity_homework_share.xml +++ b/app/src/main/res/layout/activity_homework_share.xml @@ -7,7 +7,7 @@ android:background="#489AFA" android:layout_width="match_parent" android:layout_height="match_parent" - tools:ignore="HardcodedText,ContentDescription"> + tools:ignore="HardcodedText,ContentDescription,SmallSp"> @@ -112,6 +113,7 @@ android:layout_weight="1"> @@ -146,6 +148,7 @@ android:layout_weight="1"> @@ -180,6 +183,7 @@ android:layout_weight="1"> @@ -377,6 +381,52 @@ android:layout_height="wrap_content"/> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file