Merge remote-tracking branch 'origin/4.1.69(强绑手机号)' into 4.1.69(强绑手机号)

m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java

@@ -205,9 +205,6 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
      */
     @Override
     public void sendRedPacket(Activity activity) {
-//        Bundle bundle = new Bundle();
-//        bundle.putString("to_uid",toChatUsername);
-//        ImIn.INSTANCE.SendRedPacketActivity(activity,bundle,44);
         ImIn.INSTANCE.sendRedPacketIntent(activity, toChatUsername, 44);
     }
 

m-user/src/main/java/com/yidianling/user/http/request/BindPhoneJavaParam.kt

@@ -13,5 +13,6 @@ data class BindPhoneJavaParam(
         var phoneNumber: String,//手机号
         var verifyCode: String,// 验证码
         var uid: String,
-        var type: Int = 2//2：Android
+        var type: Int = 2,      //2：Android
+        var transferFlag:Int = 0        // 默认为0，1表示需要转换x账号到y账号触发 1800010011 code提醒触发重新登录标记
 )
\ No newline at end of file

m-user/src/main/java/com/yidianling/user/ui/login/BindPhoneActivity.kt

@@ -67,16 +67,7 @@ class BindPhoneActivity : BaseActivity() {
         mIsForceBindPhone = intent.getBooleanExtra("is_force_bind_phone",false)
         mIsFromGuide = intent.getBooleanExtra("is_from_guide", false)
         iv_back.setOnClickListener {
-            if (mIsForceBindPhone) {
-                //清除UserInfo
-                setUserinfo(null)
-                clearImData()
-                logout()
-                EventBus.getDefault().post(RefreshRecentContactListEvent())
-                finish()
-            } else {
-                LoginUtils.loginSuccessOperate(this)
-            }
+            onBackPressed()
         }
         tv_country_code.setOnClickListener {
             val intent = Intent(this, CountryListActivity::class.java)
@@ -229,18 +220,18 @@ class BindPhoneActivity : BaseActivity() {
         val phone = et_phone_number.text.toString().replace(" ", "")
         val code = et_code.text.toString()
         val bindPhoneParams =
-            BindPhoneJavaParam("", countryCode, phone, code, UserHelper.getUserInfo()!!.uid!!)
+            BindPhoneJavaParam("", countryCode, phone, code, UserHelper.getUserInfo()!!.uid!!,transferFlag=1)
         LoginApiRequestUtil.bindPhone(bindPhoneParams)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .doOnSubscribe { showProgressDialog() }
             .doAfterTerminate { dismissProgressDialog() }
             .subscribe({
+                RxKeyboardTool.hideSoftInput(this)
                 if (it.code == 200) {
                     ToastUtil.toastShort("绑定成功")
                     UserHelper.getUserInfo()!!.userInfo!!.bind_phone = 1
                     UserHelper.getUserInfo()!!.userInfo!!.phone = phone
-                    RxKeyboardTool.hideSoftInput(this)
                     if (mIsFromGuide) {
                         LoginUtils.loginSuccessOperate(this)
                     } else {
@@ -248,12 +239,14 @@ class BindPhoneActivity : BaseActivity() {
                     }
                 } else if (it.code == 1300000004) {    // 如果不是10分钟内注册，提示“绑定失败，此手机号已注册”，并标记此账号为无需强绑
                     ToastUtil.toastShort(it.msg)
-                    RxKeyboardTool.hideSoftInput(this)
                     if (mIsFromGuide) {
                         LoginUtils.loginSuccessOperate(this)
                     } else {
                         finish()
                     }
+                }else if(it.code==1800010011){
+                    RegisterAndLoginActivity.startFromGuide(this,false,mIsFromGuide)
+                    finish()
                 } else {
                     ToastUtil.toastShort(it.msg)//服务端返回{验证码错误&异常}信息
                 }
@@ -262,6 +255,19 @@ class BindPhoneActivity : BaseActivity() {
             })
     }
 
+    override fun onBackPressed() {
+        if (mIsForceBindPhone) {
+            //清除UserInfo
+            setUserinfo(null)
+            clearImData()
+            logout()
+            EventBus.getDefault().post(RefreshRecentContactListEvent())
+            finish()
+        } else {
+            LoginUtils.loginSuccessOperate(this)
+        }
+    }
+
 
     /**
      * 开始倒计时