归类

app/src/main/java/com/miekir/ym/ui/home/login/ILoginView.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.login;
+package com.miekir.ym.ui.home.more.login;
 
 import com.miekir.mvp.view.IView;
 import com.miekir.ym.bean.BeiUser;

app/src/main/java/com/miekir/ym/ui/home/login/LoginActivity.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.login;
+package com.miekir.ym.ui.home.more.login;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -19,7 +19,7 @@ import com.miekir.ym.base.YangActivity;
 import com.miekir.ym.bean.BeiUser;
 import com.miekir.ym.manager.UserInfoManager;
 import com.miekir.ym.tool.StringTool;
-import com.miekir.ym.ui.home.register.RegisterActivity;
+import com.miekir.ym.ui.home.more.register.RegisterActivity;
 
 import rx_activity_result2.RxActivityResult;
 

app/src/main/java/com/miekir/ym/ui/home/login/LoginPresenter.java

@@ -1,10 +1,9 @@
-package com.miekir.ym.ui.home.login;
+package com.miekir.ym.ui.home.more.login;
 
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
 import com.miekir.network.RetrofitHelper;
-import com.miekir.network.widget.observe.MvpObserver;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
 import com.miekir.ym.bean.BeiUser;

app/src/main/java/com/miekir/ym/ui/home/register/CodePresenter.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.register;
+package com.miekir.ym.ui.home.more.register;
 
 import com.miekir.mvp.presenter.BasePresenter;
 import com.miekir.network.RetrofitHelper;

app/src/main/java/com/miekir/ym/ui/home/register/ICodeView.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.register;
+package com.miekir.ym.ui.home.more.register;
 
 import com.miekir.mvp.view.IView;
 

app/src/main/java/com/miekir/ym/ui/home/register/RegisterActivity.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.register;
+package com.miekir.ym.ui.home.more.register;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -16,6 +16,7 @@ import com.miekir.common.utils.ViewTool;
 import com.miekir.mvp.presenter.InjectPresenter;
 import com.miekir.ym.R;
 import com.miekir.ym.base.YangActivity;
+import com.miekir.ym.ui.home.more.register.fill.FillDataActivity;
 
 import java.lang.ref.WeakReference;
 
@@ -106,17 +107,17 @@ public class RegisterActivity extends YangActivity implements View.OnClickListen
                     return;
                 }
 
-//                Intent fillDataIntent = new Intent(this, FillDataActivity.class);
-//                fillDataIntent.putExtra(KEY_EMAIL, email);
-//                fillDataIntent.putExtra(KEY_CODE, code);
-//                RxActivityResult.on(this).startIntent(fillDataIntent)
-//                        .filter(result -> result.resultCode() == RESULT_OK)
-//                        .doOnNext(result -> {
-//                            // 注册成功之后关闭登录界面
-//                            setResult(RESULT_OK);
-//                            finish();
-//                        })
-//                        .subscribe();
+                Intent fillDataIntent = new Intent(this, FillDataActivity.class);
+                fillDataIntent.putExtra(KEY_EMAIL, email);
+                fillDataIntent.putExtra(KEY_CODE, code);
+                RxActivityResult.on(this).startIntent(fillDataIntent)
+                        .filter(result -> result.resultCode() == RESULT_OK)
+                        .doOnNext(result -> {
+                            // 注册成功之后关闭登录界面
+                            setResult(RESULT_OK);
+                            finish();
+                        })
+                        .subscribe();
                 break;
 
             case R.id.btn_get_code:

app/src/main/java/com/miekir/ym/ui/home/register/fill/FillDataActivity.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.register.fill;
+package com.miekir.ym.ui.home.more.register.fill;
 
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -11,7 +11,7 @@ import com.miekir.ym.base.YangActivity;
 import com.miekir.ym.bean.BeiUser;
 import com.miekir.ym.manager.UserInfoManager;
 import com.miekir.ym.tool.StringTool;
-import com.miekir.ym.ui.home.register.RegisterActivity;
+import com.miekir.ym.ui.home.more.register.RegisterActivity;
 
 /**
  * @author Miekir

app/src/main/java/com/miekir/ym/ui/home/register/fill/IRegisterView.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.register.fill;
+package com.miekir.ym.ui.home.more.register.fill;
 
 import com.miekir.mvp.view.IView;
 import com.miekir.ym.bean.BeiUser;

app/src/main/java/com/miekir/ym/ui/home/register/fill/RegisterPresenter.java

@@ -1,4 +1,4 @@
-package com.miekir.ym.ui.home.register.fill;
+package com.miekir.ym.ui.home.more.register.fill;
 
 import android.text.TextUtils;