From 40297dd4a4ce4e37907f104c31c58b9ba5ffaa68 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Fri, 14 Feb 2025 14:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=99=BB=E5=BD=95=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=A6=96=E9=A1=B5;=20=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4,=20=E5=85=81=E8=AE=B8=E6=BB=9A=E5=8A=A8;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hjx/parent/LoginActivity.java    |   4 +-
 .../main/java/com/hjx/parent/SmsLoginActivity.java |   5 +
 app/src/main/res/layout/dialog_add_error.xml       | 463 +++++++++++----------
 3 files changed, 242 insertions(+), 230 deletions(-)

diff --git a/app/src/main/java/com/hjx/parent/LoginActivity.java b/app/src/main/java/com/hjx/parent/LoginActivity.java
index 0e6d562..c705f8b 100644
--- a/app/src/main/java/com/hjx/parent/LoginActivity.java
+++ b/app/src/main/java/com/hjx/parent/LoginActivity.java
@@ -88,7 +88,9 @@ public class LoginActivity extends BaseActivity {
         }
 
         findViewById(R.id.tvBack).setOnClickListener(v -> {
-            startActivity(new Intent(this, SmsLoginActivity.class));
+            Intent intent = new Intent(this, SmsLoginActivity.class);
+            intent.putExtra("fromLogin", true);
+            startActivity(intent);
             finish();
         });
 
diff --git a/app/src/main/java/com/hjx/parent/SmsLoginActivity.java b/app/src/main/java/com/hjx/parent/SmsLoginActivity.java
index 5a3fe6e..c868d9b 100644
--- a/app/src/main/java/com/hjx/parent/SmsLoginActivity.java
+++ b/app/src/main/java/com/hjx/parent/SmsLoginActivity.java
@@ -79,6 +79,11 @@ public class SmsLoginActivity extends BaseRxActivity<ActivitySmsLoginBinding> {
         binding.tv4.setOnClickListener(view -> {
             startActivity(new Intent(this, UserAgreementActivity.class));
         });
+
+        if (!getIntent().getBooleanExtra("fromLogin", false)) {
+            startActivity(new Intent(this, LoginActivity.class));
+            finish();
+        }
     }
 
     @SuppressLint("CheckResult")
diff --git a/app/src/main/res/layout/dialog_add_error.xml b/app/src/main/res/layout/dialog_add_error.xml
index fa22bd9..be57050 100644
--- a/app/src/main/res/layout/dialog_add_error.xml
+++ b/app/src/main/res/layout/dialog_add_error.xml
@@ -1,260 +1,265 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_solid_white_10_top"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="加入错题本"
-            android:textColor="@color/text_title"
-            android:textSize="17sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:id="@+id/iv_back"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
-            android:padding="10dp"
-            android:src="@mipmap/ic_close" />
-    </RelativeLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list_item"
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="20dp" />
-
-    <RelativeLayout
+    android:layout_height="match_parent">
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp">
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_solid_white_10_top"
+        android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#F5F5F5">
+            android:layout_height="50dp">
 
-            <ImageView
-                android:id="@+id/iv_topic"
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true" />
-        </RelativeLayout>
-    </RelativeLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:text="年级"
-        android:textColor="@color/text_title"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+                android:layout_centerInParent="true"
+                android:text="加入错题本"
+                android:textColor="@color/text_title"
+                android:textSize="17sp"
+                android:textStyle="bold" />
 
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_grade"
-        style="@style/customSpinnerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/selector_for_custom_spinner"
-        android:popupBackground="@drawable/shape_for_custom_spinner"
-        android:scrollbars="none" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:text="学期"
-        android:textColor="@color/text_title"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+            <ImageView
+                android:id="@+id/iv_back"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:padding="10dp"
+                android:src="@mipmap/ic_close" />
+        </RelativeLayout>
 
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_grade1"
-        style="@style/customSpinnerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/selector_for_custom_spinner"
-        android:entries="@array/grade_array"
-        android:popupBackground="@drawable/shape_for_custom_spinner"
-        android:scrollbars="none" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list_item"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="20dp" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:text="科目"
-        android:textColor="@color/text_title"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="90dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="20dp">
 
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_subject"
-        style="@style/customSpinnerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/selector_for_custom_spinner"
-        android:entries="@array/filter_subject"
-        android:popupBackground="@drawable/shape_for_custom_spinner"
-        android:scrollbars="none" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#F5F5F5">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:text="错误原因"
-        android:textColor="@color/text_title"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+                <ImageView
+                    android:id="@+id/iv_topic"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true" />
+            </RelativeLayout>
+        </RelativeLayout>
 
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_reason"
-        style="@style/customSpinnerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/selector_for_custom_spinner"
-        android:entries="@array/filter_subject"
-        android:popupBackground="@drawable/shape_for_custom_spinner"
-        android:scrollbars="none" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:text="年级"
+            android:textColor="@color/text_title"
+            android:textSize="15sp"
+            android:textStyle="bold" />
 
-    <TextView
-        android:id="@+id/tv_student"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:text="学生"
-        android:textColor="@color/text_title"
-        android:visibility="gone"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_grade"
+            style="@style/customSpinnerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/selector_for_custom_spinner"
+            android:popupBackground="@drawable/shape_for_custom_spinner"
+            android:scrollbars="none" />
 
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_student"
-        style="@style/customSpinnerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="20dp"
-        android:visibility="gone"
-        android:background="@drawable/selector_for_custom_spinner"
-        android:entries="@array/filter_subject"
-        android:popupBackground="@drawable/shape_for_custom_spinner"
-        android:scrollbars="none" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:text="学期"
+            android:textColor="@color/text_title"
+            android:textSize="15sp"
+            android:textStyle="bold" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:text="来源"
-        android:textColor="@color/text_title"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_grade1"
+            style="@style/customSpinnerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/selector_for_custom_spinner"
+            android:entries="@array/grade_array"
+            android:popupBackground="@drawable/shape_for_custom_spinner"
+            android:scrollbars="none" />
 
-    <RadioGroup
-        android:id="@+id/type_radio"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:text="科目"
+            android:textColor="@color/text_title"
+            android:textSize="15sp"
+            android:textStyle="bold" />
 
-        <RadioButton
-            android:layout_width="65dp"
-            android:layout_height="match_parent"
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_subject"
+            style="@style/customSpinnerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
             android:layout_marginRight="20dp"
-            android:background="@drawable/radio_button_selector"
-            android:button="@null"
-            android:gravity="center"
-            android:text="课内"
-            android:textColor="@drawable/radio_text_selector"
-            android:textSize="14sp" />
+            android:background="@drawable/selector_for_custom_spinner"
+            android:entries="@array/filter_subject"
+            android:popupBackground="@drawable/shape_for_custom_spinner"
+            android:scrollbars="none" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:text="错误原因"
+            android:textColor="@color/text_title"
+            android:textSize="15sp"
+            android:textStyle="bold" />
 
-        <RadioButton
-            android:layout_width="65dp"
-            android:layout_height="match_parent"
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_reason"
+            style="@style/customSpinnerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
             android:layout_marginRight="20dp"
-            android:background="@drawable/radio_button_selector"
-            android:button="@null"
-            android:gravity="center"
-            android:text="课外"
-            android:textColor="@drawable/radio_text_selector"
-            android:textSize="14sp" />
-    </RadioGroup>
+            android:background="@drawable/selector_for_custom_spinner"
+            android:entries="@array/filter_subject"
+            android:popupBackground="@drawable/shape_for_custom_spinner"
+            android:scrollbars="none" />
 
+        <TextView
+            android:id="@+id/tv_student"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:text="学生"
+            android:textColor="@color/text_title"
+            android:visibility="gone"
+            android:textSize="15sp"
+            android:textStyle="bold" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginBottom="15dp">
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_student"
+            style="@style/customSpinnerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="20dp"
+            android:visibility="gone"
+            android:background="@drawable/selector_for_custom_spinner"
+            android:entries="@array/filter_subject"
+            android:popupBackground="@drawable/shape_for_custom_spinner"
+            android:scrollbars="none" />
 
         <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" />
-
-        <CheckBox
-            android:id="@+id/checkbox"
             android:layout_width="wrap_content"
-            android:layout_height="30dp"
+            android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:button="@drawable/checkbox_selector"
-            android:text="批量设置"
-            android:paddingLeft="8dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:text="来源"
             android:textColor="@color/text_title"
-            android:textSize="14sp" />
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <RadioGroup
+            android:id="@+id/type_radio"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
 
-    </RelativeLayout>
-</LinearLayout>
+            <RadioButton
+                android:layout_width="65dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="20dp"
+                android:background="@drawable/radio_button_selector"
+                android:button="@null"
+                android:gravity="center"
+                android:text="课内"
+                android:textColor="@drawable/radio_text_selector"
+                android:textSize="14sp" />
+
+            <RadioButton
+                android:layout_width="65dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="20dp"
+                android:background="@drawable/radio_button_selector"
+                android:button="@null"
+                android:gravity="center"
+                android:text="课外"
+                android:textColor="@drawable/radio_text_selector"
+                android:textSize="14sp" />
+        </RadioGroup>
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginLeft="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" />
+
+            <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:textColor="@color/text_title"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
     
-- 
1.9.0