私聊改造UI校对backup

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -47,7 +47,7 @@ ext {
             "m-fm"            : "0.0.24",
             "m-user"          : "0.0.42",
             "m-home"          : "0.0.8.2",
-            "m-im"            : "0.0.4.63",
+            "m-im"            : "0.0.4.64",
             "m-dynamic"       : "0.0.2",
 
             "m-muse"          : "0.0.21",

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -452,6 +452,21 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
         String headUrl = ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoSmallImage;
         if (!TextUtils.isEmpty(headUrl)) {
             GlideApp.with(getActivity()).load(headUrl).into(small_head_img);
+            small_head_img.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (ActionHandlerStorage.getL(sessionId) != null) {//
+                        int userType = ActionHandlerStorage.getL(sessionId).getUserType();//1普通用户2专家3助理
+                        if (userType == 1 || userType == 3) {
+                            //跳转用户主页
+                            ActionHandlerStorage.getL(sessionId).showUserHome();
+                        } else if (userType == 2) {
+                            //跳转专家主页
+                            ActionHandlerStorage.getL(sessionId).showZhuanjPage();
+                        }
+                    }
+                }
+            });
         }
         // 帮助人数
         help_num = String.valueOf(ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoOrderNum);
@@ -502,7 +517,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
         }
 
         int commentCounter = ActionHandlerStorage.getL(sessionId).getInfo().commentCounter;
-        tv_all_comment_desc.setText("评论(" + String.valueOf(commentCounter) + ")");
+        tv_all_comment_desc.setText(String.valueOf(commentCounter));
 
         H5Params params = new H5Params(ActionHandlerStorage.getL(sessionId).getInfo().commentCounterUrl, "");
 

m-im/src/main/java/com/yidianling/uikit/business/session/view/ImCommentBannerView.kt

@@ -46,7 +46,7 @@ class ImCommentBannerView : LinearLayout {
     private val STATUS_OUT = 1
     private var curTipIndex = 0
     private var lastTimeMillis: Long = 0
-    private val ANIM_DELAYED_MILLIONS = 2 * 1000
+    private val ANIM_DELAYED_MILLIONS = 3 * 1000
     /**
      * 动画持续时长
      */

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceDetailView.kt

@@ -62,7 +62,7 @@ class ExpertConsultServiceDetailView : RelativeLayout {
             }
         }
         if (bean.productSpecDtos != null && bean.productSpecDtos.size > 0) {
-            val mBean: ServiceItemBean.ProductsBean.ProductSpecDtosBean = bean.productSpecDtos.sortedWith(mCompare)[0]
+            val mBean: ServiceItemBean.ProductsBean.ProductSpecDtosBean = bean.productSpecDtos.sortedWith(mCompare).last()
             //价格，取productSpecDtos数组最后一个价格，不保留小数
             consult_service_service_price.text = String.format(
                 "%.0f",
@@ -86,7 +86,7 @@ class ExpertConsultServiceDetailView : RelativeLayout {
 
             //起售次数展示
             consult_service_low_buy_time.visibility = View.VISIBLE
-            consult_service_low_buy_time.text = "（${bean.productDto.packageNum}次起售）"
+            consult_service_low_buy_time.text = "(${bean.productDto.packageNum}次起售)"
         } else {
             consult_service_is_package.text = "单次"
             consult_service_times.text = "1次"

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceItemView.kt

@@ -56,7 +56,7 @@ class ExpertConsultServiceItemView : LinearLayout {
             service_item_title.text = "       ${bean.productDto.name}"
             //起售次数展示
             service_item_low_buy_time.visibility = View.VISIBLE
-            service_item_low_buy_time.text = "（${bean.productDto.packageNum}次起售）"
+            service_item_low_buy_time.text = "(${bean.productDto.packageNum}次起售)"
         } else {
             //隐藏套餐布局
             service_item_package.visibility = View.GONE
@@ -74,7 +74,7 @@ class ExpertConsultServiceItemView : LinearLayout {
             }
         }
         if (bean.productSpecDtos != null && bean.productSpecDtos.size > 0) {
-            val mBean: ServiceItemBean.ProductsBean.ProductSpecDtosBean = bean.productSpecDtos.sortedWith(mCompare)[0]
+            val mBean: ServiceItemBean.ProductsBean.ProductSpecDtosBean = bean.productSpecDtos.sortedWith(mCompare).last()
             //价格，取productSpecDtos数组最小价格，不保留小数
             service_item_price.text = String.format(
                 "%.0f",

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceTypeItemView.kt

@@ -2,6 +2,7 @@ package com.yidianling.uikit.custom.widget.expertConsultService.view
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Typeface
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
@@ -56,9 +57,11 @@ class ExpertConsultServiceTypeItemView : LinearLayout {
 
         if (isSelected) {
             im_expert_info_dialog_type_item_text.setTextColor((Color.parseColor("#1DA1F2")))
+            im_expert_info_dialog_type_item_text.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
             im_expert_info_dialog_type_item_text.setBackgroundResource(R.drawable.im_expert_info_dialog_type_item_selected_bg)
         } else {
             im_expert_info_dialog_type_item_text.setTextColor((Color.parseColor("#999999")))
+            im_expert_info_dialog_type_item_text.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
             im_expert_info_dialog_type_item_text.setBackgroundResource(R.drawable.im_expert_info_dialog_type_item_unselected_bg)
         }
     }
@@ -69,9 +72,11 @@ class ExpertConsultServiceTypeItemView : LinearLayout {
     fun updateStatus(isSelected: Boolean) {
         if (isSelected) {
             im_expert_info_dialog_type_item_text.setTextColor((Color.parseColor("#1DA1F2")))
+            im_expert_info_dialog_type_item_text.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
             im_expert_info_dialog_type_item_text.setBackgroundResource(R.drawable.im_expert_info_dialog_type_item_selected_bg)
         } else {
             im_expert_info_dialog_type_item_text.setTextColor((Color.parseColor("#999999")))
+            im_expert_info_dialog_type_item_text.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
             im_expert_info_dialog_type_item_text.setBackgroundResource(R.drawable.im_expert_info_dialog_type_item_unselected_bg)
         }
     }

m-im/src/main/res/layout/im_expert_consult_service_detail_view.xml

@@ -5,14 +5,6 @@
     android:layout_height="match_parent"
     tools:parentTag="android.widget.RelativeLayout">
 
-    <LinearLayout
-        android:id="@+id/consult_service_title_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:orientation="horizontal"
-        android:paddingRight="15dp">
-
     <ImageView
         android:id="@+id/im_expert_service_list_left_back_btn"
         android:layout_width="36dp"
@@ -24,11 +16,20 @@
         android:scaleType="centerCrop"
         android:src="@drawable/im_expert_service_list_left_back" />
 
+    <LinearLayout
+        android:id="@+id/consult_service_title_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:layout_marginLeft="36dp"
+        android:orientation="horizontal"
+        android:paddingRight="15dp">
+
         <TextView
             android:id="@+id/consult_service_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="调节孕期情绪烦躁，建立积极心态面对新生活"
+            android:text="调节孕期情绪烦躁，建立积极心态面"
             android:textColor="#1A1A1A"
             android:textSize="20dp"
             android:textStyle="bold" />
@@ -51,8 +52,6 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-
-
             <TextView
                 android:id="@+id/consult_service_desc_title"
                 android:layout_width="match_parent"
@@ -325,7 +324,9 @@
                 android:layout_height="match_parent"
                 android:text="￥"
                 android:textColor="#FF5040"
-                android:textSize="10dp" />
+                android:textSize="12dp"
+                android:textStyle="bold"
+                android:layout_marginTop="4dp"/>
 
             <TextView
                 android:id="@+id/consult_service_service_price"
@@ -333,7 +334,7 @@
                 android:layout_height="wrap_content"
                 android:text="320"
                 android:textColor="#FF5040"
-                android:textSize="16dp"
+                android:textSize="20dp"
                 android:textStyle="bold" />
 
             <TextView
@@ -361,7 +362,7 @@
             android:gravity="center"
             android:text="立即预约"
             android:textColor="#ffffff"
-            android:textSize="14dp"
+            android:textSize="16dp"
             android:textStyle="bold" />
     </LinearLayout>
 

m-im/src/main/res/layout/im_expert_consult_service_item_view.xml

@@ -58,7 +58,9 @@
                     android:layout_height="match_parent"
                     android:text="￥"
                     android:textColor="#FF5040"
-                    android:textSize="10dp" />
+                    android:textSize="9dp"
+                    android:textStyle="bold"
+                    android:layout_marginTop="4dp"/>
 
                 <TextView
                     android:id="@+id/service_item_price"
@@ -67,7 +69,8 @@
                     android:text="320"
                     android:textColor="#FF5040"
                     android:textSize="16dp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:layout_marginBottom="1dp"/>
             </LinearLayout>
 
             <TextView
@@ -99,6 +102,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="99.9%"
+                android:layout_marginLeft="1dp"
                 android:textColor="#1A1A1A"
                 android:textSize="12dp" />
 

m-im/src/main/res/layout/im_expert_consult_service_type_item_view.xml

@@ -15,7 +15,7 @@
         android:gravity="center"
         tools:text="婚姻家庭"
         android:textColor="#999999"
-        android:text="12dp"
+        android:textSize="12dp"
         android:background="@drawable/im_expert_info_dialog_type_item_unselected_bg"/>
 
 </LinearLayout>
\ No newline at end of file

m-im/src/main/res/layout/im_expert_consult_service_view.xml

@@ -29,6 +29,7 @@
         android:id="@+id/expert_consult_service_top_scroll"
         android:layout_width="match_parent"
         android:layout_height="44dp"
+        android:layout_marginTop="6dp"
         android:paddingLeft="15dp"
         android:clipToPadding="false"
         android:scrollbars="none">

m-im/src/main/res_uikit/drawable/im_unfocus_btn_bg.xml

@@ -6,7 +6,7 @@
 
     <corners android:radius="10dp"/>
 
-    <stroke android:width="1dp"
+    <stroke android:width="0.5dp"
         android:color="#CCCCCC"/>
 
 </shape>
\ No newline at end of file

m-im/src/main/res_uikit/layout/im_expert_info_dialog_layout.xml

@@ -27,7 +27,7 @@
                 android:layout_height="95dp"
                 android:layout_centerHorizontal="true"
                 android:scaleType="fitXY"
-                android:layout_marginTop="25dp"
+                android:layout_marginTop="20dp"
                 android:src="@drawable/im_expert_info_dialog_top_bg" />
         </LinearLayout>
 
@@ -46,8 +46,7 @@
                 android:layout_marginRight="@dimen/platform_dp_20"
                 android:text="数据更新于昨日24点，壹点灵通过严谨数据统计机制，对咨询师的数据进行持续的监督管理，确保提供真实有效的数据参考。"
                 android:textColor="@color/im_color_242424"
-                android:textSize="@dimen/im_text_size_16"
-                android:textStyle="bold" />
+                android:textSize="15dp"/>
 
             <LinearLayout
                 android:layout_width="match_parent"