From 02c11a0c1f3eff82c9ec7722e94bf92145133551 Mon Sep 17 00:00:00 2001 From: zhc Date: Wed, 21 Feb 2024 17:58:06 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 ++- app/src/main/java/com/hjx/parent/AddTeacherActivity.java | 10 +++++++++- app/src/main/java/com/hjx/parent/YinsiActivity.java | 10 +++++++++- app/src/main/java/com/hjx/parent/fragment/MeFragment.java | 14 +++++++------- app/src/main/res/layout/activity_login.xml | 4 ++-- app/src/main/res/layout/activity_qr.xml | 2 +- app/src/main/res/layout/activity_sao.xml | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 0f34fef..c04d80d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + - + diff --git a/app/src/main/java/com/hjx/parent/AddTeacherActivity.java b/app/src/main/java/com/hjx/parent/AddTeacherActivity.java index 546f8ac..0755801 100644 --- a/app/src/main/java/com/hjx/parent/AddTeacherActivity.java +++ b/app/src/main/java/com/hjx/parent/AddTeacherActivity.java @@ -59,6 +59,7 @@ public class AddTeacherActivity extends BaseActivity { @Override protected void initView() { + btn_next.setEnabled(false); et_1.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { @@ -76,6 +77,7 @@ public class AddTeacherActivity extends BaseActivity { if (Common.isValidPhoneNumber(editable.toString())) { searchTeacher(editable.toString()); } else { + btn_next.setEnabled(false); rl_teacher.setVisibility(View.GONE); showToast("请输入正确的手机号码"); btn_next.setTextColor(Color.parseColor("#999999")); @@ -83,6 +85,7 @@ public class AddTeacherActivity extends BaseActivity { btn_next.setEnabled(false); } } else { + btn_next.setEnabled(false); rl_teacher.setVisibility(View.GONE); btn_next.setBackgroundResource(R.drawable.bg_solid_btn_grad); btn_next.setTextColor(Color.parseColor("#999999")); @@ -135,7 +138,12 @@ public class AddTeacherActivity extends BaseActivity { public void confirm(View view) { Intent intent = new Intent(); intent.putExtra("teacher", new Gson().toJson(teacher)); - setResult(1000,intent); + setResult(1000, intent); + finish(); + } + + @OnClick(R.id.tv_cancel) + public void back(View view) { finish(); } diff --git a/app/src/main/java/com/hjx/parent/YinsiActivity.java b/app/src/main/java/com/hjx/parent/YinsiActivity.java index 1a2ed03..90eea06 100644 --- a/app/src/main/java/com/hjx/parent/YinsiActivity.java +++ b/app/src/main/java/com/hjx/parent/YinsiActivity.java @@ -1,8 +1,12 @@ package com.hjx.parent; +import android.view.View; + import com.prws.common.base.BaseActivity; import com.prws.common.base.BasePresenter; +import butterknife.OnClick; + public class YinsiActivity extends BaseActivity { @Override @@ -28,7 +32,11 @@ public class YinsiActivity extends BaseActivity { @Override protected void initListener() { - findViewById(R.id.iv_back).setOnClickListener(view -> onBackPressed()); + } + + @OnClick(R.id.iv_back) + public void back(View view) { + finish(); } @Override diff --git a/app/src/main/java/com/hjx/parent/fragment/MeFragment.java b/app/src/main/java/com/hjx/parent/fragment/MeFragment.java index fb106b9..873ba85 100644 --- a/app/src/main/java/com/hjx/parent/fragment/MeFragment.java +++ b/app/src/main/java/com/hjx/parent/fragment/MeFragment.java @@ -153,13 +153,13 @@ public class MeFragment extends BaseFragment { mRootView.findViewById(R.id.view_3).setOnClickListener(view -> startActivityForResult(new Intent(getActivity(), AccountActivity.class), 1003)); } - @Override - public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - Intent intent = new Intent(getActivity(), LoginActivity.class); - startActivity(intent); - getActivity().finish(); - } +// @Override +// public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { +// super.onActivityResult(requestCode, resultCode, data); +// Intent intent = new Intent(getActivity(), LoginActivity.class); +// startActivity(intent); +// getActivity().finish(); +// } public void loadList() { StudentBean sb = new StudentBean(); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 507ac9a..49078f7 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="30dp" android:layout_marginTop="64dp" - android:text="登陆" + android:text="登录" android:textColor="#333333" android:textSize="25dp" android:textStyle="bold" @@ -120,7 +120,7 @@ android:layout_height="50dp" android:layout_marginTop="331dp" android:background="@drawable/bg_solid_btn" - android:text="登陆" + android:text="登录" android:textColor="@color/white" android:textSize="18dp" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/activity_qr.xml b/app/src/main/res/layout/activity_qr.xml index ab0ffc7..0573d7b 100644 --- a/app/src/main/res/layout/activity_qr.xml +++ b/app/src/main/res/layout/activity_qr.xml @@ -16,7 +16,7 @@