axb隐藏改为可配置

config.gradle

@@ -42,7 +42,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.35",
+            "m-confide"       : "0.0.48.36",
             "m-consultant"    : "0.0.59.15",
             "m-fm"            : "0.0.29.3",
             "m-user"          : "0.0.60.3",
@@ -75,7 +75,7 @@ ext {
             "ydl-webview"     : "0.0.38.29",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.49.15",
+            "m-audioim"       : "0.0.49.17",
             "ydl-flutter-base": "0.0.14.12",
 
             //以下 几乎不会动
@@ -121,7 +121,7 @@ ext {
             "ydl-webview"     : "0.0.38.29",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.49.15",
+            "m-audioim"       : "0.0.49.17",
             "ydl-flutter-base": "0.0.10.9",
 
             //以下 几乎不会动

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

@@ -34,6 +34,7 @@ import com.ydl.audioim.player.AudioPlayer
 import com.ydl.audioim.presenter.AudioHomePresenterImpl
 import com.ydl.audioim.utils.AudioLogUtils
 import com.ydl.audioim.utils.DateUtils
+import com.ydl.audioim.widget.AxbConfirmDialog
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.webview.RefreshWebEvent
@@ -161,6 +162,7 @@ class AudioHomeActivity :
     private var mPlayer: AudioPlayer? = null
     private var vibrator: Vibrator? = null
     private var handler: Handler? = null
+    private var isShowAxb = true
     //声网
     private var voiceManage: YDLVoiceManager? = null
 
@@ -392,6 +394,7 @@ class AudioHomeActivity :
         listenerUid = intent.getStringExtra(IntentConstants.INTENT_LISTENER_UID)
         listenId = intent.getStringExtra(IntentConstants.INTENT_LISTEN_ID)
         commentUrl = intent.getStringExtra(IntentConstants.INTENT_COMMENT_URL)
+        isShowAxb = intent.getBooleanExtra(IntentConstants.INTENT_ISSHOWAXB, true)
 
         val logBean = AgoraLogInfoBean(
             expertHeadUrl,
@@ -448,11 +451,16 @@ class AudioHomeActivity :
             option.transform = 0
             YDLImageCacheManager.showImage(this, expertHeadUrl, iv_head, option)
         }
+
+        if (!isShowAxb) {
+            tv_change_route.visibility = View.GONE
+        }
+
     }
 
     private fun setClickEvent() {
         //切换线路 隐藏掉切换线路弹窗
-//        tv_change_route.setOnClickListener { showChooseDialog(1) }
+        tv_change_route.setOnClickListener { showChooseDialog(1) }
         //挂断
         iv_hang_up.setOnClickListener {
             if (Utils.isFastClick()) {
@@ -583,9 +591,7 @@ class AudioHomeActivity :
                         })
                     //通话结束或挂断时，上传日志文件
                     uploadLog()
-                    showToast("对方手机暂时不在身边，请稍后再试")
-                    userCloseCalling()
-//                    showChooseDialog(2)
+                    showChooseDialog(2)
                 }
             }
 
@@ -684,26 +690,25 @@ class AudioHomeActivity :
 
     /**
      * 线路选择弹窗
-     * 隐藏切换axb弹窗，李云要求的
      */
-//    private fun showChooseDialog(type: Int) {
-//
-//        val dialog =
-//            AxbConfirmDialog(mContext, type, object : AxbConfirmDialog.OnClickEnsureListener {
-//                override fun onClickEnsure() {
-//                    switchAXB()
-//                }
-//
-//                override fun onClose() {
-//                    // 如果声网未连接成功，切换axb的弹框是自动弹出的，当关闭弹框的时候，执行用户挂断操作
-//                    // 如果声网连接成功，点击右上角按钮弹出切换axb弹框，但是关闭时用户不执行挂断操作
-//                    if (!isConnectSuccess) {
-//                        userCloseCalling()
-//                    }
-//                }
-//            })
-//        dialog.show()
-//    }
+    private fun showChooseDialog(type: Int) {
+
+        val dialog =
+            AxbConfirmDialog(mContext, type, object : AxbConfirmDialog.OnClickEnsureListener {
+                override fun onClickEnsure() {
+                    switchAXB()
+                }
+
+                override fun onClose() {
+                    // 如果声网未连接成功，切换axb的弹框是自动弹出的，当关闭弹框的时候，执行用户挂断操作
+                    // 如果声网连接成功，点击右上角按钮弹出切换axb弹框，但是关闭时用户不执行挂断操作
+                    if (!isConnectSuccess) {
+                        userCloseCalling()
+                    }
+                }
+            })
+        dialog.show()
+    }
 
     /**
      * 切换成axb路线请求
@@ -773,19 +778,24 @@ class AudioHomeActivity :
         if (!isConnectSuccess) {
             //页面等待文案调整
             tv_waiting.visibility = View.GONE
-//            tv_change_doctor.text = "对方暂无应答，正在为您切换线路重播"
-//            tv_change_doctor.visibility = View.VISIBLE
+            tv_change_doctor.text = "对方暂无应答，正在为您切换线路重播"
+            tv_change_doctor.visibility = View.VISIBLE
+        }
+
+        if (!isShowAxb) {
+            tv_change_route.visibility = View.GONE
+        }else{
+            //切换线路按钮可见
+            tv_change_route.isEnabled = true
+
+            tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.platform_white))
+            tv_change_route.setCompoundDrawablesWithIntrinsicBounds(
+                null,
+                null,
+                ContextCompat.getDrawable(this, R.drawable.audioim_img_choose_arrow),
+                null
+            )
         }
-        //切换线路按钮可见，隐藏掉，临时发布版本，李云说的
-//        tv_change_route.isEnabled = true
-
-//        tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.platform_white))
-//        tv_change_route.setCompoundDrawablesWithIntrinsicBounds(
-//            null,
-//            null,
-//            ContextCompat.getDrawable(this, R.drawable.audioim_img_choose_arrow),
-//            null
-//        )
 
     }
 

m-audioim/src/main/java/com/ydl/audioim/IntentConstants.java

@@ -21,4 +21,5 @@ public interface IntentConstants {
     String INTENT_TOTAL_DURATION= "intent_total_duration";
     String INTENT_LISTEN_ID= "intent_listen_id";
     String INTENT_COMMENT_URL= "intent_comment_url";
+    String INTENT_ISSHOWAXB= "intent_isshowaxb";
 }

m-audioim/src/main/res/layout/audioim_activity_audio_home.xml

@@ -20,7 +20,7 @@
         android:text="切换至传统电话"
         android:textColor="@color/platform_color_50FFFFFF"
         android:textSize="13sp"
-        android:visibility="gone" />
+        android:visibility="visible" />
 
 
     <RelativeLayout

m-confide/src/main/java/com/ydl/confide/home/bean/ConfideConnectResponse.kt

@@ -16,6 +16,7 @@ class ConfideConnectResponse{
     var listenOrderPrice : Double? = null //订单金额
     var userBaseInfoRespDto : UserBaseInfoRespDto?=null
     var coupon :CouponData? = null //优惠信息
+    var isShowAxb = true
 }
 
 class DialDetail{