Merge branch 'dev_6.5.5'

# Conflicts:
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

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

@@ -11,8 +11,9 @@
         android:id="@+id/gift_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="dadsad"
+        android:text="中文测试中文测试"
         android:layout_weight="1"
+        android:maxEms="9"
         android:textColor="@color/white"
         android:textSize="16sp" />
 

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

@@ -33,7 +33,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/user_list"
-            android:layout_width="200dp"
+            android:layout_width="250dp"
             tools:listitem="@layout/view_red_packet_luck_user"
             android:layout_height="241dp"
             android:layout_marginTop="26dp" />

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

@@ -148,7 +148,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="30dp">
 
@@ -161,19 +161,37 @@
                 android:text="@string/there_is_no"
                 android:textColor="#FDD04A"
                 android:textSize="13sp" />
-
-            <Button
-                android:id="@+id/following_anchor"
+            <LinearLayout
                 android:layout_width="0dp"
-                android:layout_height="30dp"
-                android:layout_gravity="end"
-                android:layout_marginStart="5dp"
+                android:layout_height="70dp"
                 android:layout_weight="1"
-                android:background="@drawable/background_red_packet_select"
-                android:gravity="center"
-                android:text="@string/following_anchor"
-                android:textColor="#FDD04A"
-                android:textSize="10sp" />
+                android:orientation="vertical"
+                >
+                <Button
+                    android:id="@+id/following_anchor"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_gravity="end"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/background_red_packet_select"
+                    android:gravity="center"
+                    android:text="@string/following_anchor"
+                    android:layout_marginBottom="5dp"
+                    android:textColor="#FDD04A"
+                    android:textSize="10sp" />
+                <Button
+                    android:id="@+id/fans_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_gravity="end"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/background_red_packet_select"
+                    android:gravity="center"
+                    android:text="@string/live_send_red_packge_fans_group"
+                    android:textColor="#FDD04A"
+                    android:textSize="10sp" />
+            </LinearLayout>
+
         </LinearLayout>
     </LinearLayout>
 
@@ -181,7 +199,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="23dp"
-        android:layout_marginTop="266dp"
+        android:layout_marginTop="286dp"
         android:layout_marginEnd="29dp">
 
         <TextView
@@ -232,8 +250,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/background_send_red_packet_illustrate"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:visibility="gone">
 
 
         <androidx.core.widget.NestedScrollView

live/src/main/res/values-en/strings.xml

@@ -115,4 +115,6 @@
     <string name="live_fans_group_buy_buy">%s Diamond</string>
     <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
     <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
+    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
 </resources>

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

@@ -113,4 +113,6 @@
     <string name="live_fans_group_buy_buy">%s鑽購買</string>
     <string name="live_fans_group_enter_room">粉絲團成員歡迎進房</string>
     <string name="live_fans_group_send_gift_tips">粉絲團等級達到 Lv%s 可送出該禮物</string>
+    <string name="live_rad_pack_join_fans_group_tip">加入粉絲團可開啟【加入】</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">加入粉絲團可開啟</string>
 </resources>