|
@@ -10,7 +10,6 @@ import android.view.View;
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.NonNull;
|
|
|
|
|
|
|
|
import com.google.android.material.textfield.TextInputEditText;
|
|
import com.google.android.material.textfield.TextInputEditText;
|
|
|
-
|
|
|
|
|
import com.miekir.common.utils.ToastTool;
|
|
import com.miekir.common.utils.ToastTool;
|
|
|
import com.miekir.common.utils.ViewTool;
|
|
import com.miekir.common.utils.ViewTool;
|
|
|
import com.miekir.mvp.presenter.InjectPresenter;
|
|
import com.miekir.mvp.presenter.InjectPresenter;
|
|
@@ -19,6 +18,7 @@ import com.miekir.ym.base.YangActivity;
|
|
|
import com.miekir.ym.bean.BeiUser;
|
|
import com.miekir.ym.bean.BeiUser;
|
|
|
import com.miekir.ym.manager.UserInfoManager;
|
|
import com.miekir.ym.manager.UserInfoManager;
|
|
|
import com.miekir.ym.tool.StringTool;
|
|
import com.miekir.ym.tool.StringTool;
|
|
|
|
|
+import com.miekir.ym.ui.home.more.forget.ForgetActivity;
|
|
|
import com.miekir.ym.ui.home.more.register.RegisterActivity;
|
|
import com.miekir.ym.ui.home.more.register.RegisterActivity;
|
|
|
|
|
|
|
|
import rx_activity_result2.RxActivityResult;
|
|
import rx_activity_result2.RxActivityResult;
|
|
@@ -84,15 +84,15 @@ public class LoginActivity extends YangActivity implements View.OnClickListener,
|
|
|
switch (v.getId()) {
|
|
switch (v.getId()) {
|
|
|
case R.id.tv_forget:
|
|
case R.id.tv_forget:
|
|
|
// 忘记密码
|
|
// 忘记密码
|
|
|
-// Intent forgetIntent = new Intent(this, ForgetActivity.class);
|
|
|
|
|
-// RxActivityResult.on(this).startIntent(forgetIntent)
|
|
|
|
|
-// .filter(result -> result.resultCode() == RESULT_OK)
|
|
|
|
|
-// .doOnNext(result -> {
|
|
|
|
|
-// // 找回密码成功之后关闭登录界面
|
|
|
|
|
-// //startActivity(new Intent(LoginActivity.this, MineActivity.class));
|
|
|
|
|
-// finish();
|
|
|
|
|
-// })
|
|
|
|
|
-// .subscribe();
|
|
|
|
|
|
|
+ Intent forgetIntent = new Intent(this, ForgetActivity.class);
|
|
|
|
|
+ RxActivityResult.on(this).startIntent(forgetIntent)
|
|
|
|
|
+ .filter(result -> result.resultCode() == RESULT_OK)
|
|
|
|
|
+ .doOnNext(result -> {
|
|
|
|
|
+ // 找回密码成功之后关闭登录界面
|
|
|
|
|
+ //startActivity(new Intent(LoginActivity.this, MineActivity.class));
|
|
|
|
|
+ finish();
|
|
|
|
|
+ })
|
|
|
|
|
+ .subscribe();
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case R.id.btn_login:
|
|
case R.id.btn_login:
|