From 36364a3420312f092f3395f7fa5ab613ec9dc67f Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Mon, 4 Aug 2025 17:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hjx/parent/JudgeActivity.java    |  17 +++++++++--
 app/src/main/res/drawable/check_circle_12.xml      |  15 ++++++++++
 app/src/main/res/drawable/png_ic_check_circle.png  | Bin 0 -> 1076 bytes
 app/src/main/res/layout/activity_judge.xml         |  31 +++++++++++++++++++++
 4 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/check_circle_12.xml
 create mode 100644 app/src/main/res/drawable/png_ic_check_circle.png

diff --git a/app/src/main/java/com/hjx/parent/JudgeActivity.java b/app/src/main/java/com/hjx/parent/JudgeActivity.java
index ec203e2..606f4ae 100644
--- a/app/src/main/java/com/hjx/parent/JudgeActivity.java
+++ b/app/src/main/java/com/hjx/parent/JudgeActivity.java
@@ -52,6 +52,11 @@ public class JudgeActivity extends BaseRxActivity<ActivityJudgeBinding> {
                         prepareRects(rects);
                     });
                 });
+        binding.btnSelectAll.setOnClickListener(v -> {
+            if (mList.isEmpty()) return;
+            mList.forEach(it -> it.vb.getRoot().setSelected(true));
+            checkCount();
+        });
     }
 
     private void prepareRects(List<Rect> rects) {
@@ -90,11 +95,11 @@ public class JudgeActivity extends BaseRxActivity<ActivityJudgeBinding> {
                 .subscribe(it -> {
                     if (it.correctResult == 1) {
                         it.vb.ivResult.setImageResource(R.drawable.png_ic_judge_correct);
-                        it.vb.getRoot().setSelected(false);
                     } else if (it.correctResult == 2) {
                         it.vb.ivResult.setImageResource(R.drawable.png_ic_judge_wrong);
-                        it.vb.getRoot().setSelected(true);
                     }
+                    it.vb.getRoot().setSelected(it.correctResult != 1);
+                    checkCount();
                 }, th -> {
                     cancelLoadingDialog();
                     Log.e(getClass().getName(), "", th);
@@ -118,8 +123,12 @@ public class JudgeActivity extends BaseRxActivity<ActivityJudgeBinding> {
         return vb;
     }
 
+    @SuppressLint("SetTextI18n")
     private void checkCount() {
-        //
+        int count = (int) mList.stream().filter(it -> it.vb.getRoot().isSelected()).count();
+        if (count == 0) binding.btnAdd.setText("加入错题");
+        else binding.btnAdd.setText("加入错题(" + count + ")");
+        binding.btnAdd.setEnabled(count > 0);
     }
 
     /** bitmapRect 转换为 viewRect */
@@ -150,6 +159,8 @@ public class JudgeActivity extends BaseRxActivity<ActivityJudgeBinding> {
         final LayoutJudgeRectBinding vb;
 
         String url;
+
+        /** 0：未批改；1：正确；2：错误；3：未作答  */
         int correctResult = 0;
 
         public JudgeCut(int index, Bitmap bitmap, Rect rect, LayoutJudgeRectBinding vb) {
diff --git a/app/src/main/res/drawable/check_circle_12.xml b/app/src/main/res/drawable/check_circle_12.xml
new file mode 100644
index 0000000..ffed048
--- /dev/null
+++ b/app/src/main/res/drawable/check_circle_12.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="12dp" android:height="12dp">
+        <selector>
+            <item android:state_checked="true"
+                android:drawable="@drawable/png_ic_check_circle"/>
+            <item>
+                <shape>
+                    <corners android:radius="20dp"/>
+                    <stroke android:width="1.5dp" android:color="#333"/>
+                </shape>
+            </item>
+        </selector>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/png_ic_check_circle.png b/app/src/main/res/drawable/png_ic_check_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..97c455a8850dc4875c2ec89dfe98c24509f7c1a5
GIT binary patch
literal 1076
zcmV-41k3x0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px&?ny*JR7gv;R$FWoWfcC-?Ciz5w??^SXJ|Btk%Ebd8g20bj5l6*F@jhjF&bh*
zLU$xstwvWv;)TdelfLkP4_>O!_~MH+BuZjh1wwpKs6>ehGmVs{?q#-iFSEza?995`
z-LCuMJk9+7ne&~?_kZUnw0YJXN#E}Gi#x&mFbKT>t*V;y4KOZ&=<8CceDeCC_-`w@
zp;j9SZN5if|GP}sNr10i5DZuVjWc{hGs&B-F1Kw0NT}v+B0feyq@CmCdki*-g%@=t
z{AvAO1AwHN2MK%xfVa*7O)y(yr4mogF2t_cKd<h}tn>TDej*+K@L0V)gAN(V@CP19
z4L}|-p8@kHo-s3D2E^wKrR%$PnMmqFAISQUfV*5f2GO(nV0g^_b^sFE-#vuVMFNFg
zqce+z@Q%45%5_qvTi@eIC}@5OV5>s`u*vXmvU}nHNLuc50(Mn5F<mHxAL!J%7k~{C
z44P*N*y#E>VI(6@lTAg@@B77N3$x(sHx6`t-$~?daIX_nOrQRFSlW2!eMB^ASH@;n
zxnyl1`DpeP2=tE2?^Aj*y1i592{p4{AYs(DuMlsU8H`TJn)wyLPgH%-t0b$r36R4C
zFwtIPF#K^R0P<1uZU}r1K!|}KjP%t9k=j(0M$A3L{E=Ix(>8z(f@Cigi`E^pFUPOg
z?`yUE{Q@f6g-T^qe<?O!51L5LbP4guc>ul4oM#H$JCh7ub}0OQdVL_^`_;`rCrL9)
z1QzWDJsl1rMMe8v)^a}r*vy~{dA|9Pv_feQL{_uMK(x;->kE1^db}1uiUV@oEL1a~
zayx*xmP-4E^CR=Q1z+UR`2&<)0)7&}xYJ0&Nn<eLu<u`hivc;_;{Yu6ps-?z9EPa5
z!$f$^t>=_g!9G#oZvpCN=0EbV?nx`%wai+UsG-SBdkv+r$&!{ICR7ePhmuhQA;3VH
znYYd;QJaztkEEJ=i0Yf%0Zk>%R0wSAizh8_>dDC4t=J~3xl<rKUac$-Hy<>s(r+A$
zH665dYHojpFaqGbF&Tac<772QpY3ZrXyS%usbHQi6eBIALK@B9V$5C0AhoT$+_@ta
zf!tXlYLp7wuqt-tpXz47nZ?55j=7;#9g5wJNGKSp6FcM>;^vyzIUs6gw?KkDES#*E
zF%9tZh7$b`xz6?hIPOL62m;f<H6{F+L)7|ITMrzbVCJzhf|J)XS9IHcO>Dg^qP&H`
z1Fp=}2GoiJ#{>FbN2Uj|R{iTXABncYKGo6CXMACyJoKm1{rmFfx4cz&M$WaxC+q^z
uHW2lKd399*Xco+u!2C_gs+?$dZTSZoRMo2ekn0Zs0000<MNUMnLSTZ98UC99

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_judge.xml b/app/src/main/res/layout/activity_judge.xml
index 6cc4468..26f1399 100644
--- a/app/src/main/res/layout/activity_judge.xml
+++ b/app/src/main/res/layout/activity_judge.xml
@@ -39,4 +39,35 @@
             android:layout_height="match_parent" />
     </FrameLayout>
 
+    <LinearLayout
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingHorizontal="16dp"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="64dp">
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/btnSelectAll"
+            android:text="全选"
+            android:textSize="16sp"
+            android:textColor="#333"
+            android:gravity="center_vertical"
+            android:paddingHorizontal="8dp"
+            android:paddingVertical="4dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <Space style="@style/empty_space"/>
+        <TextView
+            android:id="@+id/btnAdd"
+            android:text="加入错题"
+            android:textSize="16sp"
+            android:textColor="@color/white"
+            android:gravity="center"
+            android:background="@drawable/shape_radius_5"
+            android:backgroundTint="#1C90F3"
+            android:layout_width="112dp"
+            android:layout_height="36dp"/>
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
-- 
1.9.0