feat: 回滚+UI还原

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -1485,20 +1485,20 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
             needRefresh = true
         }
 
-        val orderToPayTime = SharedPreferencesEditor.getString("orderToPayTime")
-
-        var timeLimit = if (TextUtils.isEmpty(orderToPayTime)) {
-            0L
-        } else {
-            orderToPayTime.toLong()
-        }
-
-
-        if (isShow && !(consultSubPayDialog != null && consultSubPayDialog?.isShowing == true)) {
-            if (findRouteService(IUserService::class.java).isLogin() && System.currentTimeMillis() > timeLimit) {
-                getPresenter().fetchPromptPayment()
-            }
-        }
+//        val orderToPayTime = SharedPreferencesEditor.getString("orderToPayTime")
+//
+//        var timeLimit = if (TextUtils.isEmpty(orderToPayTime)) {
+//            0L
+//        } else {
+//            orderToPayTime.toLong()
+//        }
+//
+//
+//        if (isShow && !(consultSubPayDialog != null && consultSubPayDialog?.isShowing == true)) {
+//            if (findRouteService(IUserService::class.java).isLogin() && System.currentTimeMillis() > timeLimit) {
+//                getPresenter().fetchPromptPayment()
+//            }
+//        }
 
         ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_PAGE_VISIT)
         ActionCountUtils.count("daoyi_advertisement_page|daoyi_advertisement_visit", "6")

m-consultant/src/main/res/layout/consultant_expert_consult_sub_pay_dialog.xml

@@ -71,13 +71,20 @@
             android:layout_marginRight="@dimen/platform_dp_16"
             android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/avaterIv"
-                android:layout_width="41dp"
-                android:layout_height="41dp"
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/platform_dp_12"
-                android:layout_marginRight="@dimen/platform_dp_8"/>
+                android:layout_marginRight="@dimen/platform_dp_8"
+                app:cardCornerRadius="4dp">
+
+                <ImageView
+                    android:id="@+id/avaterIv"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:scaleType="centerCrop" />
+            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"

m-im/src/main/java/com/yidianling/im/session/SessionHelper.java

@@ -481,7 +481,7 @@ public class SessionHelper {
         NimUIKit.registerMsgItemViewHolder(CustomAttachLingxiAnswerQuestion.class, MsgViewHolderLingxiAnswerQuestion.class);//灵犀2.0-回答问题
         NimUIKit.registerMsgItemViewHolder(CustomAttachLingxiFirstQuestion.class, MsgViewHolderLingxiFirstQuestion.class);//灵犀2.0-首问语
         NimUIKit.registerMsgItemViewHolder(CustomAttachLingXiJumpConfideList.class, MsgViewHolderLingXiJumpConfideList.class);//灵犀2.0-倾诉列表
-        NimUIKit.registerMsgItemViewHolder(CustomAttachConsultSubScriptPayment.class, MsgViewHolderConsultSubScribePayment.class);//咨询预约支付
+//        NimUIKit.registerMsgItemViewHolder(CustomAttachConsultSubScriptPayment.class, MsgViewHolderConsultSubScribePayment.class);//咨询预约支付
 
 
     }

m-im/src/main/java/com/yidianling/im/session/extension/CustomAttachParser.java

@@ -158,9 +158,9 @@ public class CustomAttachParser implements MsgAttachmentParser {
                 case CustomAttachmentType.TYPE_LINGXI_FIRST_QUESTION: //首问语
                     attachment = new CustomAttachLingxiFirstQuestion();
                     break;
-                case CustomAttachmentType.TYPE_CONSULT_SUBSCRIBE_PAY:
-                    attachment = new CustomAttachConsultSubScriptPayment();
-                    break;
+//                case CustomAttachmentType.TYPE_CONSULT_SUBSCRIBE_PAY:
+//                    attachment = new CustomAttachConsultSubScriptPayment();
+//                    break;
                 default:
                     attachment = new DefaultCustomAttachment();
                     break;