Merge remote-tracking branch 'origin/4.1.66' into 4.1.66

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderSwitchKeFuTips.java

@@ -31,6 +31,21 @@ public class MsgViewHolderSwitchKeFuTips extends MsgViewHolderBase {
     }
 
     @Override
+    protected boolean isShowBubble() {
+        return false;
+    }
+
+    @Override
+    protected boolean isShowHeadImage() {
+        return false;
+    }
+
+    @Override
+    protected boolean isMiddleItem() {
+        return true;
+    }
+
+    @Override
     protected void bindContentView() {
         CustomAttachmentSwitchKeFuTips customBusinessCard = (CustomAttachmentSwitchKeFuTips) message.getAttachment();
         textViewTips.setText(customBusinessCard.to_content);

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
+    android:gravity="center"
+    android:paddingTop="@dimen/platform_dp_3"
+    android:paddingBottom="@dimen/platform_dp_3"
+    android:paddingLeft="@dimen/platform_dp_6"
+    android:paddingRight="@dimen/platform_dp_6"
+    android:background="@drawable/im_kefu_tips_bg"
     >
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/im_kefu_tips_bg"
-        android:paddingTop="3dp"
-        android:paddingBottom="@dimen/platform_dp_3"
-        android:paddingLeft="@dimen/platform_dp_2"
-        android:paddingRight="@dimen/platform_dp_2"
         android:id="@+id/tips_kefu"
+        android:textColor="@color/black"
         android:text="将为您服务"
         />
 </LinearLayout>
\ No newline at end of file

m-im/src/main/res_avchat/drawable/im_kefu_tips_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#30999999" />
-    <corners android:radius="@dimen/platform_dp_10" />
+    <corners android:radius="10dp"/>
 </shape>