Merge remote-tracking branch 'origin/多端登录不互踢new' into 4.1.69(强绑手机号)

# Conflicts:
#	config.gradle
#	m-user/src/main/AndroidManifest.xml
#	m-user/src/main/java/com/yidianling/user/http/UserApi.kt
#	m-user/src/main/java/com/yidianling/user/mine/AccountSettingActivity.java

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.92",
+            "m-confide"       : "0.0.49.02",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.16",
@@ -33,14 +33,14 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.85",
+            "ydl-platform"    : "0.0.39.86",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.36",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.13",
-            "m-audioim"       : "0.0.49.29.22",
-            "ydl-flutter-base": "0.0.14.22",
+            "m-audioim"       : "0.0.49.29.30",
+            "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -88,16 +88,15 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.48.92",
+            "m-confide"       : "0.0.49.02",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.16",
             "m-home"          : "0.0.22.54",
-            "m-im"            : "0.0.18.39",
+            "m-im"            : "0.0.18.34",
             "m-dynamic"       : "0.0.7.19",
             "m-article"       : "0.0.0.6",
 
-
             "m-muse"          : "0.0.20.7",
             "m-tests"         : "0.0.24.9",
             "m-course"        : "0.0.42.19",
@@ -116,14 +115,14 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.85",
+            "ydl-platform"    : "0.0.39.86",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.36",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.11",
-            "m-audioim"       : "0.0.49.29.22",
-            "ydl-flutter-base": "0.0.14.22",
+            "m-audioim"       : "0.0.49.29.30",
+            "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -138,7 +137,7 @@ ext {
             "cardview-v7"                  : "com.android.support:cardview-v7:${version["androidSupportSdkVersion"]}",
             "annotations"                  : "com.android.support:support-annotations:${version["androidSupportSdkVersion"]}",
             "recyclerview-v7"              : "com.android.support:recyclerview-v7:${version["androidSupportSdkVersion"]}",
-            "constraint-layout"            : "com.android.support.constraint:constraint-layout:2.0.4",
+            "constraint-layout"            : "com.android.support.constraint:constraint-layout:1.1.3",
 
             //network
             "retrofit"                     : "com.squareup.retrofit2:retrofit:${version["retrofitSdkVersion"]}",

m-audioim/build.gradle

@@ -75,7 +75,7 @@ dependencies {
     kapt "com.alibaba:arouter-compiler:$arouter_compiler"
 
     api "com.alibaba:arouter-api:$arouter_api"
-    api ('com.ydl:ydl-av:1.2.5@aar'){
+    api ('com.ydl:ydl-av:1.2.8@aar'){
         transitive = true
     }
 

m-confide/src/main/java/com/ydl/confide/home/modular/service/ConfdieServiceImpl.kt

@@ -17,6 +17,8 @@ import com.ydl.webview.TellData
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.config.YDLConstants
 import com.ydl.ydlcommon.utils.YDLCacheUtils
+import com.yidianling.common.tools.RxSPTool
+import com.yidianling.common.tools.ToastUtil
 
 /**
  * Created by haorui on 2019-12-11 .
@@ -50,7 +52,7 @@ class ConfdieServiceImpl : IConfideService {
     }
 
     override fun connectionJava(id: Int, type: Int, activity: Activity, tellData: String?, callType: String?) {
-        var myTellData: TellData? = if (tellData == null ) null else Gson().fromJson(tellData, TellData::class.java)
+        val myTellData: TellData? = if (tellData == null ) null else Gson().fromJson(tellData, TellData::class.java)
         ConfideWebServiceImpl().connectionJava(id, type, activity, myTellData, callType)
     }
 

m-confide/src/main/java/com/ydl/confide/home/modular/service/ConfideWebServiceImpl.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.text.TextUtils
 import com.alibaba.android.arouter.launcher.ARouter
 import com.ydl.audioim.IntentConstants
+import com.ydl.audioim.YDLavManager
 import com.ydl.audioim.bean.ExpertInfoBean
 import com.ydl.audioim.widget.AxbConfirmDialog
 import com.ydl.confide.home.bean.ConnectParamJava
@@ -16,9 +17,12 @@ import com.ydl.confide.home.util.ConfideNetworkUtil
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.webview.TellData
+import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.ydl.ydlcommon.view.dialog.CommonDialog
+import com.yidianling.common.tools.RxSPTool
+import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.api.service.IUserService
 import com.yidianling.ydl_pay.pay.payDialog.CallBack
 import com.yidianling.ydl_pay.pay.payDialog.ConfidePayParams
@@ -107,6 +111,10 @@ class ConfideWebServiceImpl {
                             if (it.data?.dialDetail?.callConnectType ?: -1 == 3) {
                                 //声网
                                 it.data?.dialDetail?.agoraExpertInfo ?: return@subscribe
+                                if (!YDLavManager.isOnlineRtm){ // 判断如果账号在其它设备登录rtm是否在线
+                                    ToastUtil.toastShort("网络通话错误代码001")
+                                    return@subscribe
+                                }
                                 callAgora(
                                     activity,
                                     id,

m-user/src/main/AndroidManifest.xml

@@ -6,7 +6,10 @@
         <activity android:name=".mine.AccountUnRegisterActivity"
             android:screenOrientation="portrait"
             android:theme="@style/platform_NoTitleTheme"/>
-        <activity android:name=".ui.login.BindPhoneActivity"></activity>
+        <activity android:name=".ui.login.BindPhoneActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/platform_NoTitleTheme"
+            />
         <activity
             android:name=".ui.LoginActivity"
             android:screenOrientation="portrait"

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

@@ -142,9 +142,7 @@ interface UserApi {
     @FormUrlEncoded
     @POST("user/getNewUserJumpUrl")
     @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
-    fun getNewUserJumpUrl(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<String>>
-
-
+    fun getNewUserJumpUrl(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<String>> //获取新用户引导页面url
 
     //第三方登录获取用户信息
     @POST("login/v2/login_wechat_qq")

m-user/src/main/java/com/yidianling/user/mine/AccountSettingActivity.java

@@ -375,14 +375,15 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
                 String openid = map.get("openid");
                 String unionid = map.get("unionid");
                 userHttp.bindWX(new BindWX(openid, unionid))
+                        .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(o -> {
                             dismissProgressDialog();
-                            if(o.code == 0 ) {
+                            if (o.code == 0) {
                                 UserHelper.INSTANCE.getUserInfo().getUserInfo().setBind_weixin(1);
                                 jtv_wechat.setRightText("已绑定");
                                 ToastUtil.toastShort("绑定成功");
-                            }else{
+                            } else {
                                 ToastHelper.Companion.show(o.msg);
                             }
                         }, new ThrowableConsumer() {
@@ -449,7 +450,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
             if (flag != 2) {
                 //满足再次弹窗确认条件
                 noticeDialog(type);
-            } else {
+            }else{
                 unbindThirdLogin(type);
             }
         } else {
@@ -523,7 +524,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
      * 绑定手机
      */
     private void bindPhone() {
-        RegisterAndLoginActivity.Companion.start(this, true);
+        RegisterAndLoginActivity.Companion.start(this,true);
     }
 
     private String isNullString(String str) {