diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index 3217887d5..379bda1cc 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -8,8 +8,6 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -23,6 +21,9 @@ import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.Toast; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.log.LogUtil; @@ -49,8 +50,6 @@ import com.yizhuan.erban.common.widget.dialog.DialogUiHelper; import com.yizhuan.erban.common.widget.dialog.LoginPopupDialog; import com.yizhuan.erban.reciever.ConnectiveChangedReceiver; import com.yizhuan.erban.ui.login.AddUserInfoActivity; -import com.yizhuan.erban.ui.login.BindCodeActivity; -import com.yizhuan.erban.ui.login.BindPhoneActivity; import com.yizhuan.erban.ui.login.ErbanQQMemberBindAndLoginActivity; import com.yizhuan.erban.ui.login.ForgetPswActivity; import com.yizhuan.erban.ui.login.LoginActivity; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java index 85a6af682..f7698bef2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java @@ -31,6 +31,7 @@ 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.bean.UserInfo; +import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -40,6 +41,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import io.reactivex.Single; import io.reactivex.SingleObserver; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -246,7 +248,10 @@ public class BindCodeActivity extends BaseLoginAct { } @Override - public void onSuccess(UserInfo s) { + public void onSuccess(UserInfo userInfo) { + if (TextUtils.isEmpty(userInfo.getNick()) || TextUtils.isEmpty(userInfo.getAvatar())) { + EventBus.getDefault().post(new NeedCompleteInfoEvent()); + } getDialogManager().dismissDialog(); toast("绑定手机号成功"); setResult(RESULT_OK);