Merge branch 'feat/lp/lp_confide_8' into 'd/v_confide_2.0'

feat: 1.UI还原 2.拨打加入绑定手机号逻辑 3. 支付弹窗样式修改

See merge request app_android_lib/YDL-Component!96

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.49.98",
+            "m-confide"       : "0.0.50.01",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.26",
@@ -90,7 +90,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.49.98",
+            "m-confide"       : "0.0.50.01",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.26",

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

@@ -239,7 +239,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
 
             if (jumpUrl?.contains("payPage=1")){
                 //支付70%高度
-                setMaxHeight(RxImageTool.dp2px(495f))
+                setMaxHeight(RxImageTool.dp2px(480f))
             }else{
                 setMaxHeight(resources.displayMetrics.heightPixels)
             }
@@ -293,9 +293,11 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
     fun onEventMainThread(event: ConfideDialogEvent) {
 //        第一位表示拨打按钮，第二位代表再换一位按钮
         val show = event.show
-        if (show == 0) {
-            behavior?.state = BottomSheetBehavior.STATE_EXPANDED
-        }
+//        if (show == 0) {
+//            behavior?.state = BottomSheetBehavior.STATE_EXPANDED
+//        }
+
+        setMaxHeight(RxImageTool.dp2px(480f))
         layoutCall.visibility = if (show and 0x01 == 0x01) View.VISIBLE else View.GONE
         layoutChange.visibility = if (show and 0x02 == 0x01) View.VISIBLE else View.GONE
     }

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

@@ -173,24 +173,49 @@ class ConfideWebServiceImpl {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 Loading.close()
-                if ("200" == it.code && 0 == it.data?.dialDetail?.dialStatus && it.data?.dialDetail?.callConnectType == 3) {
-                    it.data?.dialDetail?.agoraExpertInfo ?: return@subscribe
-                    if (!YDLavManager.isOnlineRtm) { // 判断如果账号在其它设备登录rtm是否在线
-                        ToastUtil.toastShort("网络通话错误代码001")
-                        return@subscribe
+
+                if ("200" == it.code) {
+                    if (it.data?.dialDetail?.dialStatus != null) {
+                        if (100007 == it.data?.dialDetail?.dialStatus) {
+                            //支付弹窗
+                            otherwise?.invoke()
+                        } else if (100008 == it.data?.dialDetail?.dialStatus) {
+                            CommonDialog(activity)
+                                .setCancelAble(false)
+                                .setMessage(FinalString.TEL_BINDPHONE)
+                                .setLeftOnclick("忍痛放弃", null)
+                                .setRightClick("果断绑定") { view ->
+                                    try {
+                                        ModularServiceManager.provide(IUserService::class.java)
+                                            .wxBindToInputhonePage(activity as Activity)
+                                    } catch (e: Exception) {
+                                    }
+                                }
+                                .show()
+                        } else if (0 == it.data?.dialDetail?.dialStatus && it.data?.dialDetail?.callConnectType == 3) {
+                            it.data?.dialDetail?.agoraExpertInfo ?: return@subscribe
+                            if (!YDLavManager.isOnlineRtm) { // 判断如果账号在其它设备登录rtm是否在线
+                                ToastUtil.toastShort("网络通话错误代码001")
+                                return@subscribe
+                            }
+                            callAgora(
+                                activity,
+                                id,
+                                it.data!!.dialDetail!!.agoraExpertInfo!!,
+                                it.data.callId ?: "0",
+                                it.data.listenOrderId ?: 0L,
+                                null,
+                                it.data.isShowAxb,
+                                it.data?.dialDetail?.dialStatus.toString()
+                            )
+                        } else {
+                            ToastHelper.show(it.data?.dialDetail?.dialReason ?: "连接失败")
+                        }
+                    } else {
+                        ToastHelper.show(it.data?.dialDetail?.dialReason ?: "连接失败")
                     }
-                    callAgora(
-                        activity,
-                        id,
-                        it.data!!.dialDetail!!.agoraExpertInfo!!,
-                        it.data.callId ?: "0",
-                        it.data.listenOrderId ?: 0L,
-                        null,
-                        it.data.isShowAxb,
-                        it.data?.dialDetail?.dialStatus.toString()
-                    )
                 } else {
-                    otherwise?.invoke()
+                    ToastHelper.show(it.msg)
                 }
             }, {
                 ToastHelper.show(it.message ?: "连接失败")

m-confide/src/main/res/layout/activity_expert_intro.xml

@@ -23,7 +23,8 @@
             android:layout_height="36dp"
             android:layout_marginLeft="12dp"
             android:layout_marginTop="24dp"
-            android:padding="12dp"
+            android:padding="4dp"
+            android:scaleType="fitXY"
             android:src="@drawable/confide_back"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"

m-confide/src/main/res/layout/confide_home_activity.xml

@@ -142,7 +142,8 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:background="@color/white"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="gone"/>
 
         <View
             android:id="@+id/vFilterLine"

m-confide/src/main/res/layout/confide_recommend_view_new.xml

@@ -51,7 +51,7 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
+        android:layout_marginStart="12dp"
         android:textColor="@color/platform_color_333333"
         android:textSize="@dimen/platform_sp_16"
         android:textStyle="bold"
@@ -64,7 +64,7 @@
         android:id="@+id/ll_confide_data"
         app:layout_constraintTop_toBottomOf="@id/tv_name"
         app:layout_constraintStart_toEndOf="@id/img_bg"
-        android:layout_marginStart="14dp"
+        android:layout_marginStart="12dp"
         android:orientation="horizontal"
         >
         <LinearLayout
@@ -152,9 +152,11 @@
         android:id="@+id/flowlayout_tag"
         android:layout_width="0dp"
         android:layout_height="16dp"
-        android:layout_marginStart="14dp"
+        android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
         android:textColor="#9495A0"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/img_bg"
         app:layout_constraintEnd_toStartOf="@+id/price_content"

m-confide/src/main/res/layout/confide_webview.xml

@@ -47,6 +47,7 @@
         android:id="@+id/wv_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/white"
         android:layout_below="@id/rl_title"
         />