Merge branch 'feat/qj/confide_optimize' into 'd/v_confide_optimized'

接通率优化

See merge request app_android_lib/YDL-Component!229

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.3'
+version = '1.0.4'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

config.gradle

 ext {
     dev_mode = false //组件发布的时候需要设置为false
-    ydl2PublishVersion = "0.2.0.3-SNAPSHOT"
+    ydl2PublishVersion = "0.2.0.4-SNAPSHOT"
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
@@ -234,7 +234,7 @@ ext {
             "ydl-m-home-api"               : "com.ydl:m-home-api:${ydlPublishVersion["m-home-api"]}",
             "ydl-m-consultant-api"         : "com.ydl:m-consultant-api:1.0.0",
             "ydl-m-dynamic-api"            : "com.ydl:m-dynamic-api:1.0.0",
-            "ydl-m-confide-api"            : "com.ydl:m-confide-api:1.0.3",
+            "ydl-m-confide-api"            : "com.ydl:m-confide-api:1.0.4",
             "ydl-m-course-api"             : "com.ydl:m-course-api:1.0.0",
     ]
 

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

@@ -20,7 +20,6 @@ import com.ydl.confide.home.bean.ConfideConnectResponse
 import com.ydl.webview.TellData
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.config.YDLConstants
-import com.ydl.ydlcommon.ui.Loading
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 
 /**
@@ -55,7 +54,6 @@ class ConfdieServiceImpl : IConfideService {
     }
 
     override fun connectionJava(id: Int, type: Int, activity: Activity, tellData: String?, callType: String?) {
-        Loading.show(activity)
         val myTellData: TellData? = if (tellData == null ) null else Gson().fromJson(tellData, TellData::class.java)
         ConfideWebServiceImpl().connectionJava(id, type, activity, myTellData, callType)
     }

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

@@ -175,11 +175,13 @@ class ConfideWebServiceImpl {
         activity: Activity,
         tellData: TellData?
     ) {
+        Loading.show(activity)
         ConfideHomeDataManager.getHttp()
             .submitOrderAndPay(ConnectParamJava("" + id, "" + type, callType ?: ""))
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
+                Loading.close()
                 if ("200" == it.code) {
                     when (it.data?.dialDetail?.dialStatus) {
                         0 -> {//连接成功
@@ -205,6 +207,7 @@ class ConfideWebServiceImpl {
                     ToastHelper.show(it.msg)
                 }
             }, {
+                Loading.close()
                 ToastHelper.show(it.message ?: "连接失败")
             })
     }
@@ -309,6 +312,7 @@ class ConfideWebServiceImpl {
                 }
             }, {
                 ToastHelper.show(it.message ?: "连接失败")
+                Loading.close()
             })
     }