倾诉声网转axb交互调整

build.gradle

@@ -78,7 +78,7 @@ allprojects {
             }
         }
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
-        maven { url'http://developer.huawei.com/repo/' }
+//        maven { url'http://developer.huawei.com/repo/' }
         maven { url "https://jitpack.io" }
         maven {
             url 'https://maven.google.com'

config.gradle

@@ -182,7 +182,7 @@ ext {
             //功能组件 <<--- 再发这些，发完改这里的版本号
             "ydl-webview"                  : 'com.ydl:ydl-webview:0.0.18@aar',
             "ydl-media"                    : 'com.ydl:ydl-media:0.0.7@aar',
-            "ydl-audioim"                  : 'com.ydl:m-audioim:0.0.6@aar',
+            "ydl-audioim"                  : 'com.ydl:m-audioim:0.0.9@aar',
             "ydl-pay"                      : 'com.ydl:ydl-pay:0.0.2@aar',
 
             //业务组件 <<--- 最后发这些(只发改过的)

m-audioim/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.6
+VERSION_NAME=0.0.9
\ No newline at end of file

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

@@ -46,16 +46,15 @@ import com.ydl.audioim.player.AudioPlayer
 import com.ydl.audioim.presenter.AudioHomePresenterImpl
 import com.ydl.audioim.utils.DateUtils
 import com.ydl.audioim.widget.AxbConfirmDialog
+import com.ydl.burypointlib.ToastUtil
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.webview.RefreshWebEvent
-import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.BaseMvpActivity
-import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
 import com.ydl.ydlcommon.router.YdlCommonRouterManager
+import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
-import com.yidianling.common.tools.LogUtil
-import com.yidianling.common.tools.ToastUtil
+import com.ydl.ydlcommon.utils.remind.ToastHelper
 import de.greenrobot.event.EventBus
 import io.agora.rtc.IRtcEngineEventHandler
 import io.reactivex.Observable
@@ -375,7 +374,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 
     private fun setClickEvent() {
         //切换线路
-        tv_change_route.setOnClickListener { showChooseDialog() }
+        tv_change_route.setOnClickListener { showChooseDialog(1) }
         //挂断
         iv_hang_up.setOnClickListener {
             if (isConnectSuccess) {
@@ -423,7 +422,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
             override fun onCallRefused(response: CallLocalResponse?) {
                 //返回给主叫
                 LogUtil.i("[agora]${response?.calleeId}已拒绝呼叫邀请")
-                ToastUtil.toastShort("对方已拒绝")
+                ToastUtil.showToast(applicationContext,"对方已挂断")
                 leaveChannel()
             }
 
@@ -501,7 +500,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
                     } else if (permission.shouldShowRequestPermissionRationale) {
                         requestPermission()
                     } else {
-                        ToastUtil.toastLong(this, getString(R.string.need_storage_permission_hint))
+                        ToastHelper.show(getString(R.string.need_storage_permission_hint))
                         val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                         val uri = Uri.fromParts("package", packageName, null)
                         intent.data = uri
@@ -542,16 +541,16 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
                 }, {
                     waittingStatus()
                     if (!isConnectSuccess){
-                        iv_hang_up.setImageResource(R.mipmap.ico_close)
+//                        iv_hang_up.setImageResource(R.mipmap.ico_close)
                         //关闭音乐
                         stopPlaying()
                         //提示切换传统线路
                         //发送消息通知专家用户已挂断
                         YDLRTMClient.instances.cancelCall(listenerUid,channelId)
-                        showChooseDialog()
+                        showChooseDialog(2)
                     }
                 })
-        //加入频道
+        //加入频道135
         joinChannel()
         //双重保险：加入频道成功，通过服务端发推送给专家
         noticeServerPush(true)
@@ -621,12 +620,16 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
     /**
      * 线路选择弹窗
      */
-    private fun showChooseDialog() {
+    private fun showChooseDialog(type:Int) {
 
-        val dialog = AxbConfirmDialog(mContext, object : AxbConfirmDialog.OnClickEnsureListener {
+        val dialog = AxbConfirmDialog(mContext,type, object : AxbConfirmDialog.OnClickEnsureListener {
             override fun onClickEnsure() {
                 switchAXB()
             }
+
+            override fun onClose() {
+                userCloseCalling()
+            }
         })
         dialog.show()
     }
@@ -663,6 +666,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
     override fun dialPhone() {
         var phoneIntent = Intent(Intent.ACTION_DIAL, Uri.parse("tel:$axbPhone"))
         startActivity(phoneIntent)
+        finish()
     }
 
 
@@ -681,7 +685,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
         }
         //切换线路按钮可见
         tv_change_route.isEnabled = true
-        tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.white))
+        tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.white_f))
         tv_change_route.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(this, R.drawable.audio_home_img_choose_arrow), null)
     }
 
@@ -932,7 +936,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 ////            tv_toast.postDelayed({
 ////                tv_toast.visibility = View.GONE
 ////            }, 1000)
-            ToastUtil.toastShort(msg)
+            ToastHelper.show(msg?:"")
         }
     }
 

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

@@ -7,8 +7,8 @@ import com.ydl.ydl_av.messge_service.callback.InitListener
 import com.ydl.ydl_av.messge_service.callback.LoginCallback
 import com.ydl.ydl_av.messge_service.request.LoginParam
 import com.ydl.audioim.http.AudioApiRequestUtil
+import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.yidianling.common.tools.LogUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 

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

 package com.ydl.audioim.presenter
 
-import android.app.Activity
 import com.ydl.audioim.BuildConfig
 import com.ydl.ydl_av.chat.config.YDLChatParam
-import com.ydl.audioim.R
 import com.ydl.audioim.contract.IAudioHomeActivityContract
 import com.ydl.audioim.http.command.ConnectCommand
 import com.ydl.audioim.http.command.ConnectFinishCommand
@@ -12,8 +10,8 @@ import com.ydl.audioim.http.command.NoticePushCommand
 import com.ydl.audioim.model.AudioHomeModelImpl
 import com.ydl.ydlcommon.mvp.base.BasePresenter
 import com.ydl.ydlcommon.router.YdlCommonRouterManager
+import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.yidianling.common.tools.LogUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 

m-audioim/src/main/java/com/ydl/audioim/widget/AxbConfirmDialog.kt

@@ -17,31 +17,39 @@ import kotlinx.android.synthetic.main.dialog_axb_confirm.*
 class AxbConfirmDialog : Dialog {
     private var activity: Activity? = null
     private var listener: OnClickEnsureListener? = null
+    private var type :Int = 1 //弹窗类型，1为手动切换axb布局，2为自动切换axb布局
 
-    constructor(activity: Activity?, listener: OnClickEnsureListener?) : super(activity) {
+    constructor(activity: Activity?,type:Int, listener: OnClickEnsureListener?) : super(activity) {
         this.activity = activity
         this.listener = listener
+        this.type = type
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (this.type==2){
+            setContentView(R.layout.dialog_autoaxb_confirm)
+        }else{
             setContentView(R.layout.dialog_axb_confirm)
+        }
+
         setCanceledOnTouchOutside(false)
+        setCancelable(false)
         window.setBackgroundDrawable(ColorDrawable())
         ic_close.setOnClickListener {
+            listener?.onClose()
             dismiss()
         }
 
         rl_ensure.setOnClickListener {
-            if (listener != null) {
-                listener!!.onClickEnsure()
-            }
+            listener?.onClickEnsure()
             dismiss()
         }
     }
 
     interface OnClickEnsureListener {
         fun onClickEnsure()
+        fun onClose()
     }
 
     override fun show() {

m-audioim/src/main/res/drawable/audio_circle_blue_4.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <corners android:radius="90dp" />
+    <solid android:color="@color/platform_google_blue" />
+
+</shape>
\ No newline at end of file

m-audioim/src/main/res/drawable/audio_home_autoaxb_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <corners android:radius="6dp" />
+    <solid android:color="@color/platform_white" />
+
+</shape>
\ No newline at end of file

m-audioim/src/main/res/drawable/audio_home_button_autoaxb_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="20dp" />
+    <gradient android:startColor="#1DA1F2"
+        android:endColor="#23B2FA"
+        android:angle="180"/>
+
+</shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="315dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/ic_close"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_gravity="right"
+        android:src="@drawable/ico_close" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        android:layout_marginTop="20dp"
+        android:paddingTop="21dp"
+        android:background="@drawable/audio_home_autoaxb_background"
+        android:orientation="vertical">
+
+
+        <ImageView
+            android:layout_width="273dp"
+            android:layout_height="162dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginLeft="21dp"
+            android:layout_marginRight="21dp"
+            android:src="@drawable/switch_axb" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="23dp"
+            android:gravity="center_horizontal"
+            android:text="当前网络不稳定\n已切换为传统通话模式"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="18dp"
+            android:lineSpacingMultiplier="1.2"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="7dp"
+            android:gravity="center_horizontal">
+            <TextView
+                android:layout_width="4dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/audio_circle_blue_4">
+            </TextView>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="您的真实号码将全程保密"
+                android:textColor="@color/platform_color_666666"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:textSize="12dp" />
+            <TextView
+                android:layout_width="4dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/audio_circle_blue_4">
+            </TextView>
+        </LinearLayout>
+
+
+        <RelativeLayout
+            android:id="@+id/rl_ensure"
+            android:layout_width="182dp"
+            android:layout_height="38dp"
+            android:layout_marginTop="40dp"
+            android:background="@drawable/audio_home_button_autoaxb_background">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center_horizontal"
+                android:drawableLeft="@drawable/audio_home_ic_phone"
+                android:drawablePadding="6dp"
+                android:gravity="center_horizontal"
+                android:text="呼叫"
+                android:textColor="@color/platform_white"
+                android:textSize="16dp"
+                android:textStyle="bold" />
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="30dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:layout_marginTop="10dp"
+            android:text="呼出号码需与注册号码一致，否则无法接通"
+            android:textColor="@color/platform_color_999999"
+            android:textSize="10dp" />
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file

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

@@ -97,10 +97,12 @@
                 android:drawableLeft="@drawable/audio_home_ic_phone"
                 android:gravity="center_horizontal"
                 android:text="呼叫"
-                android:textColor="@color/white"
+                android:textColor="@color/platform_white"
                 android:textSize="17sp"
                 android:textStyle="bold" />
         </RelativeLayout>
 
     </LinearLayout>
+
+
 </android.support.v7.widget.CardView>
\ No newline at end of file

m-confide/modular.gradle

@@ -8,7 +8,7 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-confide-module-xlzx"
                 // 上报的业务模块 aar 包的版本号
-                version = "0.0.10"
+                version = "0.0.11"
             }
 
             ydl{
@@ -16,7 +16,7 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-confide-module-ydl"
                 // 上报的业务模块 aar 包的版本号
-                version = "0.0.10"
+                version = "0.0.11"
             }
         }
 

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

@@ -9,7 +9,6 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.jcodecraeer.xrecyclerview.ProgressStyle
 import com.jcodecraeer.xrecyclerview.XRecyclerView
 import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
-import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.adapter.ConfideHomeAdapter
 import com.ydl.confide.home.bean.ConfideHomeAllFiltersBean
@@ -28,6 +27,7 @@ import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.ydl.ydlcommon.view.DrawableRightTextView
 import com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
+import com.yidianling.common.tools.RxImageTool
 import com.yidianling.router.RouterManager
 import kotlinx.android.synthetic.main.confidehome_home_activity.*
 import kotlinx.android.synthetic.main.confidehome_title_bar.*