Merge branch 'dev' into feature/userinfo_collect

# Conflicts:
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	config.gradle
#	m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

app/build.gradle

@@ -183,7 +183,7 @@ dependencies {
         api project(':m-tests')
         api project(':m-consultant')
         implementation modularPublication('com.ydl:m-consultant-api')
-//        implementation project(':m-confide')
+        implementation project(':m-confide')
 
 
         api project(':m-home')

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -19,6 +19,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.umeng.analytics.MobclickAgent
+import com.ydl.audioim.YDLavManager
 import com.ydl.component.music.FragmentContainerActivity
 import com.ydl.component.mvp.DemoPresenter
 import com.ydl.media.audio.PlayService

config.gradle

@@ -42,13 +42,13 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.6",
+            "m-confide"       : "0.0.48.7.5",
             "m-consultant"    : "0.0.57.4",
             "m-fm"            : "0.0.29.3",
             "m-user"          : "0.0.59.28",
             "m-home"          : "0.0.19.1",
-            "m-im"            : "0.0.16.10",
-            "m-dynamic"       : "0.0.6.1",
+            "m-im"            : "0.0.16.11",
+            "m-dynamic"       : "0.0.7.5",
 
             "m-muse"          : "0.0.28.9",
             "m-tests"         : "0.0.24.0",
@@ -75,7 +75,7 @@ ext {
             "ydl-webview"     : "0.0.38.24",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.48.1",
+            "m-audioim"       : "0.0.48.2.5",
             "ydl-flutter-base": "0.0.10.9",
 
             //以下 几乎不会动
@@ -121,7 +121,7 @@ ext {
             "ydl-webview"     : "0.0.38.24",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.48.1",
+            "m-audioim"       : "0.0.48.2.5",
             "ydl-flutter-base": "0.0.10.9",
 
             //以下 几乎不会动

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.1.9@aar'){
+    api ('com.ydl:ydl-av:1.2.1@aar'){
         transitive = true
     }
 

m-audioim/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ydl.audioim" >
+          package="com.ydl.audioim">
 
-    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
     <application>
 
         <activity
-            android:name=".AudioHomeActivity"
-            android:screenOrientation="portrait" />
+                android:name=".AudioHomeActivity"
+                android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+                android:screenOrientation="portrait"/>
     </application>
 </manifest>

m-audioim/src/main/java/com/ydl/audioim/presenter/AudioHomePresenterImpl.kt

 package com.ydl.audioim.presenter
 
+import android.annotation.SuppressLint
 import com.ydl.audioim.BuildConfig
 import com.ydl.ydl_av.chat.config.YDLChatParam
 import com.ydl.audioim.contract.IAudioHomeActivityContract
@@ -65,6 +66,7 @@ class AudioHomePresenterImpl : BasePresenter<IAudioHomeActivityContract.View, IA
 //                })
 //    }
 
+    @SuppressLint("CheckResult")
     override fun connectException(param: ConnectExceptionCommand) {
         mModel.connectException(param)
                 .subscribeOn(Schedulers.io())
@@ -106,6 +108,7 @@ class AudioHomePresenterImpl : BasePresenter<IAudioHomeActivityContract.View, IA
     /**
      * 获取axb电话
      */
+    @SuppressLint("CheckResult")
     override fun getAXBPhone(cmd: ConnectCommand) {
         mModel.getAXBPhone(cmd)
                 .subscribeOn(Schedulers.io())
@@ -113,7 +116,7 @@ class AudioHomePresenterImpl : BasePresenter<IAudioHomeActivityContract.View, IA
                 .doOnSubscribe { mView.showProgressView() }
                 .doAfterTerminate { mView.dismissProgressView() }
                 .subscribe({
-                    if ("200".equals(it.code)){
+                    if ("200" == it.code){
                         if(0==it.data?.dialDetail?.dialStatus?:-1){
                             //连接成功
                             if(it.data?.dialDetail?.callConnectType?:-1==1){

m-dynamic/src/main/java/com/yidianling/dynamic/DynamicConstants.kt

@@ -68,7 +68,7 @@ class DynamicConstants {
 
         open var TOPIC_DETAIL_H5 = HttpConfig.H5_URL+ "active/topic-members/"
 
-        open var TRENF_INFO_SHARE_H5 = HttpConfig.H5_URL + "ask/"
+        open var TRENF_INFO_SHARE_H5 = HttpConfig.MH5_URL + "ask/"
 
         const val PUBLISH_TYPE = "publish_type"
 

m-im/src/main/java/com/yidianling/uikit/business/session/view/ImCommentBannerView.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
@@ -197,7 +198,8 @@ class ImCommentBannerView : LinearLayout {
                         }
                     }
                 }
-                else -> {}
+                else -> {
+                }
             }
         }
     }
@@ -206,11 +208,10 @@ class ImCommentBannerView : LinearLayout {
     //获取经过加密的名字 ： 徐**
     private fun getName(name: String?): String {
         var nameBuffer = StringBuffer()
-        name?.let {
-
+        if (name != null && !TextUtils.isEmpty(name)) {
             nameBuffer.append(name[0])
-            nameBuffer.append("**：")
         }
+        nameBuffer.append("**：")
         return nameBuffer.toString()
     }
 

m-tests/src/main/java/com/yidianling/tests/TestRetrofitApi.kt

@@ -56,11 +56,11 @@ interface TestRetrofitApi {
     fun fetchTopSearch(): Observable<BaseAPIResponse<MutableList<RecommendSearchItemBean>>>
 
     //获取测试列表 - NEW
-    @GET("test-item/list-by-newTag")
+    @GET("test-item/list-by-cate")
     @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
     fun fetchTestListByTag(
             //测试标签ID
-            @Query("testTagId") testTagId:String,
+            @Query("testCateId") testTagId:String,
             //筛选条件免费付费 2免费 3付费
             @Query("testPrice") testPrice:String = "",
             //筛选条件测试人数 条件4