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 { 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 @@ - - - - - - - - - - - - + + android:layout_height="wrap_content" + android:background="@drawable/bg_solid_white_10_top" + android:orientation="vertical"> + android:layout_height="50dp"> - - - - - + android:layout_centerInParent="true" + android:text="加入错题本" + android:textColor="@color/text_title" + android:textSize="17sp" + android:textStyle="bold" /> - - - + + - + - + - + - + + + - + - + - + - + - + - + android:background="@drawable/selector_for_custom_spinner" + android:entries="@array/filter_subject" + android:popupBackground="@drawable/shape_for_custom_spinner" + android:scrollbars="none" /> + + - - + android:background="@drawable/selector_for_custom_spinner" + android:entries="@array/filter_subject" + android:popupBackground="@drawable/shape_for_custom_spinner" + android:scrollbars="none" /> + - + - - + android:textSize="15sp" + android:textStyle="bold" /> + + - - + + + + + + + + + + + + + + +