关注消息修改

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

@@ -781,7 +781,7 @@
     <string name="live_close_exit">直接退出</string>
     <string name="user">用戶</string>
 
-    <string name="automatic_chat">阿萨飒飒飒飒飒飒萨达飒飒飒飒飒飒你都不主動我們怎麼會有故事，跟主播Say Hi吧~</string>
+    <string name="automatic_chat">你都不主動我們怎麼會有故事，跟主播Say Hi吧~</string>
     <string name="add_follow">+ 關注</string>
     <string name="add_into_active">進入活動</string>
 

config.gradle

@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //测试
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java

@@ -182,12 +182,12 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
     class Vh extends RecyclerView.ViewHolder {
 
         LinearLayout mBg, view_follow, view_action_game, view_zg, xydComplete;
-        TextView mTextView, tv_chat_active_into, tv_chat_avtive_name, tv_zg_anchorname, textTxt2;
+        TextView mTextView, tv_chat_active_into, tv_chat_avtive_name, tv_zg_anchorname, textTxt2,automatic_chat;
         RoundedImageView avatar;
         View v_chat_active_close;
         RecyclerView rv_chat_active;
         ImageView img_zg_img, btnAttention, textLeave;
-        FrameLayout attentionLayout;
+        LinearLayout attentionLayout;
         ClipPathCircleImage clipImage2;
 
         public Vh(View itemView) {
@@ -195,7 +195,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
             mBg = (LinearLayout) itemView.findViewById(R.id.bg);
             mTextView = (TextView) itemView.findViewById(R.id.text_txt);
             textTxt2 = (TextView) itemView.findViewById(R.id.text_txt2);
-            attentionLayout = (FrameLayout) itemView.findViewById(R.id.attention_layout);
+            attentionLayout = (LinearLayout) itemView.findViewById(R.id.attention_layout);
             clipImage2 = (ClipPathCircleImage) itemView.findViewById(R.id.clip_image2);
             itemView.setOnClickListener(mOnClickListener);
 
@@ -211,6 +211,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
             view_zg = (LinearLayout) itemView.findViewById(R.id.view_zg);
             xydComplete = (LinearLayout) itemView.findViewById(R.id.xyd_complete);
             tv_zg_anchorname = (TextView) itemView.findViewById(R.id.tv_zg_anchorname);
+            automatic_chat = (TextView) itemView.findViewById(R.id.automatic_chat);
             img_zg_img = (ImageView) itemView.findViewById(R.id.img_zg_img);
             btnAttention = (ImageView) itemView.findViewById(R.id.btn_attention);
             textLeave = (ImageView) itemView.findViewById(R.id.text_leave);

live/src/main/res/layout/item_live_chat.xml

@@ -181,11 +181,13 @@
             android:layout_height="45dp" />
     </LinearLayout>
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/attention_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/chat_message_bg"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:visibility="gone">
 
         <com.yunbao.common.views.weight.ClipPathCircleImage
@@ -196,11 +198,15 @@
             android:scaleType="centerCrop" />
 
         <TextView
-            android:layout_width="match_parent"
+            android:id="@+id/automatic_chat"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_weight="1"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="48dp"
+            android:layout_marginStart="10dp"
-            android:layout_marginEnd="73dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginBottom="3dp"
+            android:gravity="center_vertical"
             android:text="@string/automatic_chat"
             android:textColor="#FFFFFF"
             android:textSize="12sp" />
@@ -209,11 +215,11 @@
             android:id="@+id/btn_attention"
             android:layout_width="54dp"
             android:layout_height="26dp"
-            android:layout_gravity="end"
+            android:layout_marginStart="10dp"
-            android:layout_margin="11dp"
+            android:layout_marginEnd="11dp"
             android:src="@mipmap/btn_attention" />
 
-    </FrameLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/xyd_complete"