From 67fd5373bf77b6b1ed2b351cf057f79e8d383074 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Tue, 5 Aug 2025 16:14:35 +0800
Subject: [PATCH] =?UTF-8?q?bugfix;=20=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96;?=
 =?UTF-8?q?=20=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/hjx/parent/App.java          |  6 ++-
 .../main/java/com/hjx/parent/ImageActivity.java    |  6 +--
 .../main/java/com/hjx/parent/JudgeActivity.java    |  5 +++
 app/src/main/res/layout/activity_judge.xml         | 11 ++++++
 app/src/main/res/layout/dialog_add_error.xml       | 45 ++++++++++++----------
 5 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/hjx/parent/App.java b/app/src/main/java/com/hjx/parent/App.java
index 9840440..07de75d 100644
--- a/app/src/main/java/com/hjx/parent/App.java
+++ b/app/src/main/java/com/hjx/parent/App.java
@@ -5,6 +5,7 @@ import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class App extends CommonApplication {
@@ -24,13 +25,14 @@ public class App extends CommonApplication {
         return baiduToken;
     }
 
-    private static List<GradeAndSubject> gradeAndSubjects;
+    private static List<GradeAndSubject> gradeAndSubjects = new ArrayList<>();
 
     public void setGradeAndSubjects(List<GradeAndSubject> gradeAndSubjects) {
-        App.gradeAndSubjects = gradeAndSubjects;
+        App.gradeAndSubjects = gradeAndSubjects == null ? App.gradeAndSubjects : gradeAndSubjects;
     }
 
     public List<GradeAndSubject> getGradeAndSubjects() {
+        if (gradeAndSubjects == null) gradeAndSubjects = new ArrayList<>();
         return gradeAndSubjects;
     }
 
diff --git a/app/src/main/java/com/hjx/parent/ImageActivity.java b/app/src/main/java/com/hjx/parent/ImageActivity.java
index b861eb9..dfcacdc 100644
--- a/app/src/main/java/com/hjx/parent/ImageActivity.java
+++ b/app/src/main/java/com/hjx/parent/ImageActivity.java
@@ -155,12 +155,12 @@ public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implemen
 
         ArrayList<Rect> rects = new ArrayList<>();
         for (ImageBean.Cut cut: imageBean.getCuts()) {
-            if (cut.getRect1() == null) continue;
+            if (cut.getRect1() == null || !cut.isSelect()) continue;
             Rect rectV = cut.getRect1();
             rects.add(getRectB(rectV, bitmap, size));
         }
         if (list.isEmpty()) {
-            showToast("请先框选题目");
+            showToast("请选择要批改的题目");
             return;
         }
 
@@ -292,7 +292,7 @@ public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implemen
         for (CutPicBean.FigLoaction figLoaction : figLoactions) {
             ImageBean.Cut cut = new ImageBean.Cut();
             cut.setRect(figLoaction);
-            cut.setSelect(false);
+            cut.setSelect(true);
             cuts.add(cut);
         }
         list.get(index).setCuts(cuts);
diff --git a/app/src/main/java/com/hjx/parent/JudgeActivity.java b/app/src/main/java/com/hjx/parent/JudgeActivity.java
index c9facb6..cd064fe 100644
--- a/app/src/main/java/com/hjx/parent/JudgeActivity.java
+++ b/app/src/main/java/com/hjx/parent/JudgeActivity.java
@@ -61,6 +61,11 @@ public class JudgeActivity extends BaseRxActivity<ActivityJudgeBinding> {
             mList.forEach(it -> it.vb.getRoot().setSelected(true));
             checkCount();
         });
+        binding.btnSelectNone.setOnClickListener(v -> {
+            if (mList.isEmpty()) return;
+            mList.forEach(it -> it.vb.getRoot().setSelected(false));
+            checkCount();
+        });
         binding.btnAdd.setOnClickListener(v -> {
             if (mList.isEmpty()) return;
             List<TopicBean> selected = mList.stream()
diff --git a/app/src/main/res/layout/activity_judge.xml b/app/src/main/res/layout/activity_judge.xml
index df20695..4b865c5 100644
--- a/app/src/main/res/layout/activity_judge.xml
+++ b/app/src/main/res/layout/activity_judge.xml
@@ -56,6 +56,17 @@
             android:paddingVertical="4dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/btnSelectNone"
+            android:text="全不选"
+            android:textSize="16sp"
+            android:textColor="#333"
+            android:gravity="center_vertical"
+            android:paddingHorizontal="8dp"
+            android:paddingVertical="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
         <Space style="@style/empty_space"/>
         <TextView
diff --git a/app/src/main/res/layout/dialog_add_error.xml b/app/src/main/res/layout/dialog_add_error.xml
index be57050..6e63895 100644
--- a/app/src/main/res/layout/dialog_add_error.xml
+++ b/app/src/main/res/layout/dialog_add_error.xml
@@ -1,5 +1,6 @@
 <androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <LinearLayout
@@ -230,36 +231,38 @@
         </RadioGroup>
 
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginLeft="20dp"
+        <LinearLayout
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_marginHorizontal="20dp"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="15dp">
-
-            <TextView
-                android:id="@+id/add_topic"
-                android:layout_width="250dp"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:background="@drawable/bg_soild_blue_5"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:textSize="17sp" />
-
+            android:layout_marginBottom="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="40dp">
             <CheckBox
                 android:id="@+id/checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="30dp"
-                android:layout_centerVertical="true"
                 android:button="@drawable/checkbox_selector"
                 android:text="批量设置"
-                android:paddingLeft="8dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="0dp"
                 android:textColor="@color/text_title"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                tools:ignore="HardcodedText" />
 
-        </RelativeLayout>
+            <Space style="@style/empty_space"/>
+
+            <TextView
+                android:id="@+id/add_topic"
+                tools:text="全部加入错题"
+                android:layout_width="216dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_soild_blue_5"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </LinearLayout>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
     
-- 
1.9.0