From 7083c3e3a1e467b3e5bacb2de649f61a9acce234 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Thu, 20 Mar 2025 17:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=86=E4=BA=AB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=9C=AA=E5=81=9A=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hjx/parent/HomeworkShareActivity.java | 27 ++++++-
 .../main/res/layout/activity_homework_share.xml    | 85 +++++++++++++++++++++-
 app/src/main/res/layout/item_huyou_daily_blank.xml | 18 +++++
 3 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/layout/item_huyou_daily_blank.xml

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<ActivityHomeworkShareB
 
         String temp = indent + "在本次作业中，答对题目有 %s 道，%s掌握的很好；答错题目有 %s 道，错题涵盖的知识点主要有%s，这部分还要再加强学习。错题老师已经帮你收录到错题本中，要记得复习整理错题，及时消灭薄弱知识点。";
         List<HomeWork> errorList = new ArrayList<>();
+        List<HomeWork> 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<KeyValue> correctSet = new HashSet<>();
             Set<KeyValue> 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<ActivityHomeworkShareB
             for (KeyValue point: errorSet) {
                 errorPoint.append("、").append(point.Value);
             }
-            float rate = 100f * correctNum / total;
+            float rate = 100f * correctNum / Math.max(total - blankNumber, 1);
             int errorNum = total - correctNum;
             binding.tvPercent.setText(new DecimalFormat("0").format(rate));
             binding.tvCorrect.setText(String.valueOf(correctNum));
             binding.tvWrong.setText(String.valueOf(errorNum));
+            binding.tvBlank.setText(String.valueOf(blankNumber));
 
             String correct = "-", error = "-";
             if (correctPoint.length() != 0) correct = correctPoint.substring(1);
@@ -164,6 +170,8 @@ public class HomeworkShareActivity extends BaseRxActivity<ActivityHomeworkShareB
         }
 
         mAdapter.setNewData(errorList);
+        binding.rvBlank.setAdapter(new BlankAdapter(blankList));
+        binding.viewBlank.setVisibility(blankList.isEmpty() ? View.GONE : View.VISIBLE);
     }
 
     private String fromColor(String str, String color) {
@@ -196,6 +204,19 @@ public class HomeworkShareActivity extends BaseRxActivity<ActivityHomeworkShareB
         return s;
     }
 
+    public static class BlankAdapter extends BaseQuickAdapter<HomeWork, BaseViewHolder> {
+
+        public BlankAdapter(@Nullable List<HomeWork> 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<HomeWork, BaseViewHolder> {
 
         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">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -31,6 +31,7 @@
                     android:tint="@color/white"
                     android:src="@drawable/svg_arrow_head_start_black"
                     android:paddingEnd="16dp"
+                    android:paddingStart="0px"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
@@ -112,6 +113,7 @@
                         android:layout_weight="1">
                         <LinearLayout
                             android:paddingEnd="20dp"
+                            android:paddingStart="0px"
                             android:gravity="center_vertical"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -146,6 +148,7 @@
                         android:layout_weight="1">
                         <LinearLayout
                             android:paddingEnd="20dp"
+                            android:paddingStart="0px"
                             android:gravity="center_vertical"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -180,6 +183,7 @@
                         android:layout_weight="1">
                         <LinearLayout
                             android:paddingEnd="20dp"
+                            android:paddingStart="0px"
                             android:gravity="center_vertical"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content">
@@ -377,6 +381,52 @@
                                 android:layout_height="wrap_content"/>
                         </LinearLayout>
                     </LinearLayout>
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:gravity="center_vertical"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                            <ImageView
+                                android:src="@drawable/png_icon_statistical_accuracy"
+                                android:layout_width="12dp"
+                                android:layout_height="13dp"/>
+                            <TextView
+                                android:text="未做题数"
+                                android:textSize="11sp"
+                                android:textColor="#333"
+                                android:textStyle="bold"
+                                android:layout_marginStart="5dp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"/>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:layout_marginTop="8dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:id="@+id/tvBlank"
+                                tools:text="88"
+                                android:textSize="14sp"
+                                android:textColor="#489AFA"
+                                android:textStyle="bold"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"/>
+                            <TextView
+                                android:text="道"
+                                android:textSize="9sp"
+                                android:textColor="#489AFA"
+                                android:textStyle="bold"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
+                        </LinearLayout>
+                    </LinearLayout>
                 </LinearLayout>
                 <TextView
                     android:id="@+id/tvRating"
@@ -426,6 +476,39 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/viewBlank"
+                android:orientation="vertical"
+                android:background="@drawable/shape_radius_10"
+                android:backgroundTint="@color/white"
+                android:paddingHorizontal="16dp"
+                android:paddingBottom="16dp"
+                android:layout_marginTop="12dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="未做题目"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:textColor="#333"
+                    android:paddingStart="24dp"
+                    android:paddingEnd="4dp"
+                    android:paddingTop="4dp"
+                    android:background="@drawable/bg_homework_error"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvBlank"
+                    android:orientation="vertical"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+
+            <LinearLayout
                 android:id="@+id/flComment"
                 android:orientation="vertical"
                 android:background="@drawable/shape_radius_10"
diff --git a/app/src/main/res/layout/item_huyou_daily_blank.xml b/app/src/main/res/layout/item_huyou_daily_blank.xml
new file mode 100644
index 0000000..b716f05
--- /dev/null
+++ b/app/src/main/res/layout/item_huyou_daily_blank.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:background="@drawable/bg_feedback_blank"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="UseCompoundDrawables,HardcodedText,SmallSp,ContentDescription">
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:adjustViewBounds="true"
+        android:layout_margin="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
-- 
1.9.0