Merge branch 'feat/lp/lp_v4.3.95' into 'd/v4.3.95'

声网优化代码合并

See merge request app_android_lib/YDL-Component!140

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -1259,7 +1259,7 @@ class AudioHomeActivity :
         totalDisposable =
             Observable.interval(0, 1, TimeUnit.SECONDS)
                 .subscribeOn(Schedulers.computation())
-                .take(remainTime!!.toLong() + 60)
+                .take(remainTime!!.toLong() + 1)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({
                     localRemainTime =

m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt

@@ -552,21 +552,21 @@ class ConsultantAudioHomeActivity :
      * 初始化界面用户信息
      */
     private fun initUser() {
-        var userName = "咨询用户"
+        var userName = "咨询师"
         if (null != mAudioMessageBean) {
-            if (!TextUtils.isEmpty(mAudioMessageBean!!.userName)) {
-                userName = mAudioMessageBean!!.userName!!
+            if (!TextUtils.isEmpty(mAudioMessageBean?.userName)) {
+                userName = mAudioMessageBean?.userName!!
             }
-            if (!TextUtils.isEmpty(mAudioMessageBean!!.userIcon)) {
+            if (!TextUtils.isEmpty(mAudioMessageBean?.userIcon)) {
                 var option = SimpleImageOpConfiger()
                 option.errorPic = R.drawable.audioim_head_place_hold_pic
                 option.loadingPic = R.drawable.audioim_head_place_hold_pic
                 option.transform = 0
-                YDLImageCacheManager.showImage(this, mAudioMessageBean!!.userIcon, iv_head, option)
+                YDLImageCacheManager.showImage(this, mAudioMessageBean?.userIcon, iv_head, option)
             } else {
                 iv_head.setBackgroundResource(R.drawable.audioim_head_place_hold_pic)
             }
-            userId = mAudioMessageBean!!.userId?.toInt() ?: -1
+            userId = mAudioMessageBean?.userId?.toInt() ?: -1
         } else {
             iv_head.setBackgroundResource(R.drawable.audioim_head_place_hold_pic)
         }