zhanghaochen / ParentControl

Download as
Browse Code »

Commit 02c11a0c1f3eff82c9ec7722e94bf92145133551

Authored by zhc
1 parent 0648fe46aa
Exists in master

BUG修改

Showing 7 changed files with 31 additions and 14 deletions   Show diff stats
  1 +<?xml version="1.0" encoding="UTF-8"?>
1 2 <project version="4">
2 3 <component name="DesignSurface">
3 4 <option name="filePathToZoomLevelMap">
... ... @@ -42,7 +43,7 @@
42 43 </map>
43 44 </option>
44 45 </component>
45   - <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
  46 + <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
46 47 <output url="file://$PROJECT_DIR$/build/classes" />
47 48 </component>
48 49 <component name="ProjectType">
... ...
app/src/main/java/com/hjx/parent/AddTeacherActivity.java
Diff comments   View file @02c11a0
... ... @@ -59,6 +59,7 @@ public class AddTeacherActivity extends BaseActivity {
59 59  
60 60 @Override
61 61 protected void initView() {
  62 + btn_next.setEnabled(false);
62 63 et_1.addTextChangedListener(new TextWatcher() {
63 64 @Override
64 65 public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
... ... @@ -76,6 +77,7 @@ public class AddTeacherActivity extends BaseActivity {
76 77 if (Common.isValidPhoneNumber(editable.toString())) {
77 78 searchTeacher(editable.toString());
78 79 } else {
  80 + btn_next.setEnabled(false);
79 81 rl_teacher.setVisibility(View.GONE);
80 82 showToast("请输入正确的手机号码");
81 83 btn_next.setTextColor(Color.parseColor("#999999"));
... ... @@ -83,6 +85,7 @@ public class AddTeacherActivity extends BaseActivity {
83 85 btn_next.setEnabled(false);
84 86 }
85 87 } else {
  88 + btn_next.setEnabled(false);
86 89 rl_teacher.setVisibility(View.GONE);
87 90 btn_next.setBackgroundResource(R.drawable.bg_solid_btn_grad);
88 91 btn_next.setTextColor(Color.parseColor("#999999"));
... ... @@ -135,7 +138,12 @@ public class AddTeacherActivity extends BaseActivity {
135 138 public void confirm(View view) {
136 139 Intent intent = new Intent();
137 140 intent.putExtra("teacher", new Gson().toJson(teacher));
138   - setResult(1000,intent);
  141 + setResult(1000, intent);
  142 + finish();
  143 + }
  144 +
  145 + @OnClick(R.id.tv_cancel)
  146 + public void back(View view) {
139 147 finish();
140 148 }
141 149  
... ...
app/src/main/java/com/hjx/parent/YinsiActivity.java
Diff comments   View file @02c11a0
1 1 package com.hjx.parent;
2 2  
  3 +import android.view.View;
  4 +
3 5 import com.prws.common.base.BaseActivity;
4 6 import com.prws.common.base.BasePresenter;
5 7  
  8 +import butterknife.OnClick;
  9 +
6 10 public class YinsiActivity extends BaseActivity {
7 11  
8 12 @Override
... ... @@ -28,7 +32,11 @@ public class YinsiActivity extends BaseActivity {
28 32  
29 33 @Override
30 34 protected void initListener() {
31   - findViewById(R.id.iv_back).setOnClickListener(view -> onBackPressed());
  35 + }
  36 +
  37 + @OnClick(R.id.iv_back)
  38 + public void back(View view) {
  39 + finish();
32 40 }
33 41  
34 42 @Override
... ...
app/src/main/java/com/hjx/parent/fragment/MeFragment.java
Diff comments   View file @02c11a0
... ... @@ -153,13 +153,13 @@ public class MeFragment extends BaseFragment {
153 153 mRootView.findViewById(R.id.view_3).setOnClickListener(view -> startActivityForResult(new Intent(getActivity(), AccountActivity.class), 1003));
154 154 }
155 155  
156   - @Override
157   - public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
158   - super.onActivityResult(requestCode, resultCode, data);
159   - Intent intent = new Intent(getActivity(), LoginActivity.class);
160   - startActivity(intent);
161   - getActivity().finish();
162   - }
  156 +// @Override
  157 +// public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
  158 +// super.onActivityResult(requestCode, resultCode, data);
  159 +// Intent intent = new Intent(getActivity(), LoginActivity.class);
  160 +// startActivity(intent);
  161 +// getActivity().finish();
  162 +// }
163 163  
164 164 public void loadList() {
165 165 StudentBean sb = new StudentBean();
... ...
app/src/main/res/layout/activity_login.xml
Diff comments   View file @02c11a0
... ... @@ -11,7 +11,7 @@
11 11 android:layout_height="wrap_content"
12 12 android:layout_marginLeft="30dp"
13 13 android:layout_marginTop="64dp"
14   - android:text="登陆"
  14 + android:text="登录"
15 15 android:textColor="#333333"
16 16 android:textSize="25dp"
17 17 android:textStyle="bold"
... ... @@ -120,7 +120,7 @@
120 120 android:layout_height="50dp"
121 121 android:layout_marginTop="331dp"
122 122 android:background="@drawable/bg_solid_btn"
123   - android:text="登陆"
  123 + android:text="登录"
124 124 android:textColor="@color/white"
125 125 android:textSize="18dp"
126 126 app:layout_constraintLeft_toLeftOf="parent"
... ...
app/src/main/res/layout/activity_qr.xml
Diff comments   View file @02c11a0
... ... @@ -16,7 +16,7 @@
16 16 <TextView
17 17 android:layout_width="wrap_content"
18 18 android:layout_height="wrap_content"
19   - android:text="扫码登陆"
  19 + android:text="扫码登录"
20 20 android:textColor="#333333"
21 21 android:textSize="18dp"
22 22 app:layout_constraintLeft_toLeftOf="@id/view_1"
... ...
app/src/main/res/layout/activity_sao.xml
Diff comments   View file @02c11a0
... ... @@ -16,7 +16,7 @@
16 16 <TextView
17 17 android:layout_width="wrap_content"
18 18 android:layout_height="wrap_content"
19   - android:text="扫码登陆"
  19 + android:text="扫码登录"
20 20 android:textColor="#333333"
21 21 android:textSize="18dp"
22 22 app:layout_constraintLeft_toLeftOf="@id/view_1"
... ...