注册登录内容修改

app/src/main/java/com/itant/shibei/base/BaseBeiActivity.java

@@ -55,4 +55,27 @@ public abstract class BaseBeiActivity extends BaseMVPActivity {
             }
         });
     }
+
+    protected void setTitle(String title, boolean backable) {
+        //iv_done = findViewById(R.id.iv_done);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        if (toolbar == null) {
+            return;
+        }
+        toolbar.setTitle(title);
+        //toolbar.setTitleTextColor(getResources().getColor(R.color.black_theme));
+
+        setSupportActionBar(toolbar);
+        if (!backable) {
+            return;
+        }
+        //关键下面两句话，设置了回退按钮，及点击事件的效果
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
 }

app/src/main/java/com/itant/shibei/ui/mine/login/LoginActivity.java

@@ -42,7 +42,7 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-        setTitle("使用电子邮箱登录");
+        setTitle("使用电子邮箱登录", false);
         et_email = findViewById(R.id.et_email);
         et_password = findViewById(R.id.et_password);
         ViewTool.setOnClickListener(this, this, new int[]{R.id.btn_login, R.id.tv_forget});

app/src/main/java/com/itant/shibei/ui/mine/register/fill/FillDataActivity.java

@@ -21,7 +21,6 @@ import com.miekir.mvp.presenter.InjectPresenter;
 public class FillDataActivity extends BaseBeiActivity implements IRegisterView {
     private TextInputEditText et_password;
     private TextInputEditText et_nickname;
-    private TextInputEditText et_cash_account;
 
     private BeiUser mBeiUser;
     private String email;
@@ -40,7 +39,6 @@ public class FillDataActivity extends BaseBeiActivity implements IRegisterView {
         setTitle("完善提现资料");
         et_password = findViewById(R.id.et_password);
         et_nickname = findViewById(R.id.et_nickname);
-        et_cash_account = findViewById(R.id.et_cash_account);
         email = getIntent().getStringExtra(RegisterActivity.KEY_EMAIL);
         code = getIntent().getStringExtra(RegisterActivity.KEY_CODE);
         findViewById(R.id.btn_finish).setOnClickListener(v -> {
@@ -51,7 +49,6 @@ public class FillDataActivity extends BaseBeiActivity implements IRegisterView {
     private void submitRegister() {
         String password = et_password.getEditableText().toString();
         String nickname = et_nickname.getEditableText().toString();
-        String cashAccount = et_cash_account.getEditableText().toString();
         if (TextUtils.isEmpty(password)) {
             ToastTool.showShort("请输入密码");
             return;
@@ -60,10 +57,6 @@ public class FillDataActivity extends BaseBeiActivity implements IRegisterView {
             ToastTool.showShort("请输入昵称");
             return;
         }
-        if (TextUtils.isEmpty(cashAccount)) {
-            ToastTool.showShort("请输入提现账号");
-            return;
-        }
 
         String encodeString = StringTool.getEncodeString(password);
         if (TextUtils.isEmpty(encodeString)) {
@@ -74,7 +67,6 @@ public class FillDataActivity extends BaseBeiActivity implements IRegisterView {
         mBeiUser.email = email;
         mBeiUser.password = encodeString;
         mBeiUser.nickName = nickname;
-        mBeiUser.cashAccount = cashAccount;
         showLoading();
         presenter.submitRegister(mBeiUser, code);
     }

app/src/main/res/layout/activity_fill_data.xml

@@ -65,32 +65,6 @@
             android:textSize="@dimen/text_normal_s" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_default"
-        android:layout_marginTop="@dimen/margin_default"
-        android:layout_marginEnd="@dimen/margin_default"
-        android:hint="请输入提现账号(目前仅支持支付宝)"
-        app:boxBackgroundMode="outline"
-        app:boxCornerRadiusBottomEnd="4dp"
-        app:boxCornerRadiusBottomStart="4dp"
-        app:boxCornerRadiusTopEnd="4dp"
-        app:boxCornerRadiusTopStart="4dp"
-        app:boxStrokeWidth="@dimen/width_stroke"
-        app:boxStrokeWidthFocused="@dimen/width_stroke">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_cash_account"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="numberDecimal"
-            android:digits="0123456789"
-            android:maxLength="11"
-            android:textSize="@dimen/text_normal_s" />
-    </com.google.android.material.textfield.TextInputLayout>
-
     <android.widget.Button
         android:id="@+id/btn_finish"
         android:layout_width="match_parent"
@@ -106,7 +80,4 @@
         android:textStyle="bold"
         android:background="@drawable/selector_btn"
         style="?android:attr/borderlessButtonStyle"/>
-
-
-
 </LinearLayout>