Merge branch 'dev_6.5.0_anchor_call_me'

# Conflicts:
#	common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

common/src/main/res/values/strings.xml

@@ -734,6 +734,8 @@
     <string name="live_mic">語音連麥</string>
     <string name="live_wks">周星榜</string>
     <string name="live_zslk">暫時離開</string>
+    <string name="live_fun_call_me">聯繫方式</string>
+    <string name="live_fun_anchor_say">女神說</string>
     <string name="live_zslk1">恢復直播</string>
     <string name="live_set_wishlist_num">請輸入數字</string>
     <string name="guard_tip_day">您是當前主播的周守護\n守護日期截止到</string>
@@ -1088,6 +1090,7 @@
     <string name="say_something3">說點什麽吧...</string>
     <string name="come_hint">%s 来了</string>
 
+    <string name="layout_live_anchor_say_ready_title">女神說</string>
 
 
 </resources>