feat: 网络状态001问题修复

api/confide/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply from: "../../maven_push_api.gradle"
 
-version = '1.0.0'
+version = '1.0.3'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

api/confide/src/main/java/com/ydl/confide/api/IConfideService.kt

@@ -34,4 +34,6 @@ interface IConfideService : IProvider {
         doctorId: String,
         uid: String
     )
+
+    fun isOnlineRtm():Boolean
 }
\ No newline at end of file

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.47",
+            "m-confide"       : "0.0.50.50",
             "m-consultant"    : "0.0.60.74",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.72",
@@ -88,7 +88,7 @@ ext {
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.47",
+            "m-confide"       : "0.0.50.50",
             "m-consultant"    : "0.0.60.74",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.72",
@@ -121,7 +121,7 @@ ext {
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",
-            "m-confide-api"   : "1.0.0",
+            "m-confide-api"   : "1.0.3",
             "m-consultant-api": "0.0.5.63",
             "m-course-api"    : "0.0.3.6",
             "m-fm-api"        : "0.0.3",

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

@@ -10,11 +10,11 @@ import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import android.widget.TextView
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
 import android.widget.RelativeLayout
+import android.widget.TextView
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -24,6 +24,7 @@ import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.interfaces.DraweeController
 import com.jcodecraeer.xrecyclerview.ProgressStyle
 import com.jcodecraeer.xrecyclerview.XRecyclerView
+import com.ydl.audioim.YDLavManager
 import com.ydl.confide.R
 import com.ydl.confide.api.ConfideRoute
 import com.ydl.confide.home.adapter.ConfideHomeAdapter
@@ -247,6 +248,19 @@ class ConfideHomeActivity :
         }
 
         if (!confidedId.isNullOrBlank() && !doctorId.isNullOrBlank()) {
+            if (!YDLavManager.isOnlineRtm) {
+                YDLavManager.instances.login(
+                    PhoneCallIn.getUserService().getUserInfo()?.uid
+                ) { _: Boolean, _ ->
+                    showPayOrDetail(confidedId, doctorId)
+                }
+            } else {
+                showPayOrDetail(confidedId, doctorId)
+            }
+        }
+    }
+
+    private fun showPayOrDetail(confidedId: String, doctorId: String) {
         ConfideWebServiceImpl().connectionJava(
             confidedId.toInt(),
             3,
@@ -256,7 +270,6 @@ class ConfideHomeActivity :
             showDoctorDetail(confidedId, doctorId)
         }
     }
-    }
 
     private fun showDoctorDetail(confideId: String, doctorId: String) {
         val url = HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(confideId) + "&payPage=1"

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

@@ -98,6 +98,10 @@ class ConfdieServiceImpl : IConfideService {
         YDLavManager.instances.init(app, avManagerKey)
     }
 
+    override fun isOnlineRtm(): Boolean {
+        return YDLavManager.isOnlineRtm
+    }
+
     override fun showAxbConfirmDialog(activity: Activity?, type: Int, phoneNumber: String?) {
         val dialog = AxbConfirmDialog(activity, type, object : AxbConfirmDialog.OnClickEnsureListener {
             override fun onClickEnsure() {

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

@@ -14,6 +14,7 @@ import com.ydl.audioim.widget.AxbConfirmDialog
 import com.ydl.confide.home.bean.ConnectParamJava
 import com.ydl.confide.home.constants.FinalString
 import com.ydl.confide.home.http.ConfideHomeDataManager
+import com.ydl.confide.router.PhoneCallIn
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.webview.TellData
@@ -73,6 +74,27 @@ class ConfideWebServiceImpl {
         tellData: TellData?,
         callType: String?
     ) {
+        if (!YDLavManager.isOnlineRtm) {
+            YDLavManager.instances.login(PhoneCallIn.getUserService().getUserInfo()?.uid) { isSuccess: Boolean, _ ->
+                if (isSuccess) {
+                    toDial(id, type, callType, activity, tellData)
+                } else {
+                    ToastUtil.toastShort("网络通话错误代码001")
+                }
+            }
+        }else{
+            toDial(id, type, callType, activity, tellData)
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    private fun toDial(
+        id: Int,
+        type: Int,
+        callType: String?,
+        activity: Activity,
+        tellData: TellData?
+    ) {
         ConfideHomeDataManager.getHttp()
             .connectionJava(ConnectParamJava("" + id, "" + type, callType))
             .subscribeOn(Schedulers.io())

m-confide/src/main/java/com/ydl/confide/intro/ItemIntroHolder.kt

@@ -16,6 +16,7 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.dou361.ijkplayer.widget.IjkVideoView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.interfaces.DraweeController
+import com.ydl.audioim.YDLavManager
 import com.ydl.confide.R
 import com.ydl.confide.api.ConfideRoute
 import com.ydl.confide.databinding.ItemExpertIntroBinding
@@ -122,13 +123,14 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
                 }
                 else -> {
                     if (!item.confideId.isNullOrBlank()) {
-                        ConfideWebServiceImpl().connectionJava(
-                            item.confideId!!.toInt(),
-                            3,
-                            it.context as Activity,
-                            null
-                        ) {
-                            showDoctorDetail(item, true)
+                        if (!YDLavManager.isOnlineRtm) {
+                            YDLavManager.instances.login(
+                                PhoneCallIn.getUserService().getUserInfo()?.uid
+                            ) { _: Boolean, _ ->
+                                showPayOrDetail(item, it)
+                            }
+                        } else {
+                            showPayOrDetail(item, it)
                         }
                     }
                 }
@@ -313,6 +315,17 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
             if (item.isVideo) View.GONE else if (item.playUrl.isNullOrBlank()) View.GONE else View.VISIBLE
     }
 
+    private fun showPayOrDetail(item: VideoViewModel, it: View) {
+        ConfideWebServiceImpl().connectionJava(
+            item.confideId!!.toInt(),
+            3,
+            it.context as Activity,
+            null
+        ) {
+            showDoctorDetail(item, true)
+        }
+    }
+
     fun onAttach(videoView: IjkVideoView) {
         this.video = videoView
         binding.videoView.addView(videoView)