第三方绑定手机号逻辑优化

app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java

@@ -20,6 +20,7 @@ import androidx.core.content.ContextCompat;
 import com.coorchice.library.utils.LogUtils;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
+import com.yizhuan.erban.UIHelper;
 import com.yizhuan.erban.base.BaseLoginAct;
 import com.yizhuan.erban.ui.login.ui.CodeEditText;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -30,6 +31,11 @@ import com.yizhuan.xchat_android_core.code.CodeType;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_core.user.UserModel;
+import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -67,6 +73,7 @@ public class BindCodeActivity extends BaseLoginAct {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
         setContentView(R.layout.activity_login_code);
         initWhiteTitleBar("");
         onFindViews();
@@ -112,6 +119,7 @@ public class BindCodeActivity extends BaseLoginAct {
         codeEt = null;
         super.onDestroy();
         stopCountDownTimer();
+        EventBus.getDefault().unregister(this);
     }
 
 
@@ -224,11 +232,19 @@ public class BindCodeActivity extends BaseLoginAct {
                 })
                 .doOnError(throwable -> toast(throwable.getMessage()))
                 .flatMap(s -> UserModel.get().updateCurrentUserInfo())
-                .doFinally(() -> {
-                    getDialogManager().dismissDialog();
+                .doOnSuccess(s -> {
+                    setResult(RESULT_OK);
                     finish();
                 })
                 .subscribe();
     }
 
+    //在updateCurrentUserInfo里面会发出NeedCompleteInfoEvent事件
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onNeedCompleteInfo(NeedCompleteInfoEvent event) {
+        getDialogManager().dismissDialog();
+        setResult(RESULT_OK);
+        finish();
+    }
+
 }