修复

common/src/main/res/values-en-rUS/string.xml

@@ -324,7 +324,7 @@
     <string name="live_send_gift_1">sent </string>
     <string name="live_ktgz">UnlockVIP</string>
 
-    <string name="live_send_gift_2"> </string>
+    <string name="live_send_gift_2">Pieces</string>
     <string name="live_send_gift_3">I sent one.</string>
     <string name="live_gift_send">Give</string>
     <string name="live_gift_send_lian">Continuous delivery</string>
@@ -1212,14 +1212,14 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_info_residue_back">Return to account</string>
     <string name="red_packet_user_tips2">Popularity Red packet</string>
     <string name="main_tabs_red_packet">Red packets</string>
-    <string name="save_popular_red_packets">Save popular red packets</string>
+    <string name="save_popular_red_packets">Popular red packets</string>
     <string name="amount">amount</string>
     <string name="drill">drill</string>
     <string name="conditions">Conditions</string>
-    <string name="there_is_no">" no"</string>
+    <string name="there_is_no">no</string>
     <string name="following_anchor">Following anchor</string>
-    <string name="red_envelope_rill">Red envelope %s diamonds/piece</string>
+    <string name="red_envelope_rill">Red packet%s diamonds/piece</string>
-    <string name="total_consumption_of_drill">Total consumption of %s drill</string>
+    <string name="total_consumption_of_drill">Total  %s drill</string>
     <string name="top_up_now">Go top up ></string>
     <string name="range_range_is">Range Range is [%s]</string>
     <string name="randomly_available">Randomly available</string>
@@ -1236,19 +1236,19 @@ Limited ride And limited avatar frame</string>
     <string name="send_red_packet_illustrate8">Red envelopes that are not claimed after opening, and red envelopes that are not opened after the anchor broadcasts, will be returned to your account</string>
     <string name="send_red_packet_illustrate9">5. What can you do with the red envelopes you grab?</string>
     <string name="send_red_packet_illustrate10">Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected</string>
-    <string name="congratulations_on_getting_the_red_envelope">Congratulations on getting the red envelope</string>
+    <string name="congratulations_on_getting_the_red_envelope">Congratulations Red Envelope</string>
     <string name="cred_envelope_obtained">Get %s</string>
     <string name="view_lucky_viewers">View Lucky Audience ></string>
-    <string name="anchor_his_heart">Give the anchor a gift to express his heart</string>
+    <string name="anchor_his_heart">Give  a gift to heart</string>
     <string name="red_packet_countdown">Countdown :%s</string>
-    <string name="open_red_packet">Red envelope to be opened :%s</string>
+    <string name="open_red_packet">To open :%s</string>
     <string name="together_to_achieve_goal">%s red packet</string>
     <string name="red_too_bad">Too bad</string>
     <string name="red_too_bad2">Miss the red envelope</string>
     <string name="check_out_your_luck">Check out your luck</string>
     <string name="lucky_red_envelope">%s drew %s in the lucky red envelope</string>
     <string name="lucky_red_envelope_amount">number</string>
-    <string name="red_envelope_released_successfully">Red  envelope  released  successfully</string>
+    <string name="red_envelope_released_successfully">Red  successfully</string>
 
 
 </resources>

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

@@ -324,7 +324,7 @@
     <string name="live_send_gift_1">sent </string>
     <string name="live_ktgz">UnlockVIP</string>
 
-    <string name="live_send_gift_2"> </string>
+    <string name="live_send_gift_2">Pieces</string>
     <string name="live_send_gift_3">I sent one.</string>
     <string name="live_gift_send">Give</string>
     <string name="live_gift_send_lian">Continuous delivery</string>
@@ -1213,14 +1213,14 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_info_residue_back">Return to account</string>
     <string name="red_packet_user_tips2">Popularity Red packet</string>
     <string name="main_tabs_red_packet">Red packets</string>
-    <string name="save_popular_red_packets">Save popular red packets</string>
+    <string name="save_popular_red_packets">Popular red packets</string>
     <string name="amount">amount</string>
     <string name="drill">drill</string>
     <string name="conditions">Conditions</string>
-    <string name="there_is_no">" no"</string>
+    <string name="there_is_no">no</string>
     <string name="following_anchor">Following anchor</string>
-    <string name="red_envelope_rill">Red envelope %s diamonds/piece</string>
+    <string name="red_envelope_rill">Red packet%s diamonds/piece</string>
-    <string name="total_consumption_of_drill">Total consumption of %s drill</string>
+    <string name="total_consumption_of_drill">Total  %s drill</string>
     <string name="top_up_now">Go top up ></string>
     <string name="range_range_is">Range Range is [%s]</string>
     <string name="red_packet_value">value</string>
@@ -1237,17 +1237,17 @@ Limited ride And limited avatar frame</string>
     <string name="send_red_packet_illustrate8">Red envelopes that are not claimed after opening, and red envelopes that are not opened after the anchor broadcasts, will be returned to your account</string>
     <string name="send_red_packet_illustrate9">5. What can you do with the red envelopes you grab?</string>
     <string name="send_red_packet_illustrate10">Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected</string>
-    <string name="congratulations_on_getting_the_red_envelope">Congratulations on getting the red envelope</string>
+    <string name="congratulations_on_getting_the_red_envelope">Congratulations Red Envelope</string>
     <string name="cred_envelope_obtained">Get %s</string>
     <string name="view_lucky_viewers">View Lucky Audience ></string>
-    <string name="anchor_his_heart">Give the anchor a gift to express his heart</string>
+    <string name="anchor_his_heart">Give  a gift to heart</string>
     <string name="red_packet_countdown">Countdown :%s</string>
-    <string name="open_red_packet">Red envelope to be opened :%s</string>
+    <string name="open_red_packet">To open :%s</string>
     <string name="together_to_achieve_goal">%s red packet</string>
     <string name="red_too_bad">Too bad</string>
     <string name="red_too_bad2">Miss the red envelope</string>
     <string name="check_out_your_luck">Check out your luck</string>
     <string name="lucky_red_envelope">%s drew %s in the lucky red envelope</string>
     <string name="lucky_red_envelope_amount">number</string>
-    <string name="red_envelope_released_successfully">Red  envelope  released  successfully</string>
+    <string name="red_envelope_released_successfully">>Red  successfully</string>
 </resources>

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/LiveGiftAdapter.java

@@ -3,6 +3,7 @@ package com.yunbao.live.adapter;
 import android.content.Context;
 import android.graphics.Color;
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -243,6 +244,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter<LiveGiftAdapter.Vh> {
                     mPayico.setVisibility(View.GONE);
                     mPrice.setText(mContext.getString(R.string.build_up_popularity));
                     mPrice.setTextColor(Color.parseColor("#db8c4a"));
+                    mPrice.setTextSize(TypedValue.COMPLEX_UNIT_SP,8);
                     ViewClicksAntiShake.clicksAntiShake(mRadioButton, new ViewClicksAntiShake.ViewClicksCallBack() {
                         @Override
                         public void onViewClicks() {
@@ -253,6 +255,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter<LiveGiftAdapter.Vh> {
                         }
                     });
                 } else {
+                    mPrice.setTextSize(TypedValue.COMPLEX_UNIT_SP,11);
                     mRadioButton.setOnClickListener(mOnClickListener);
                     mPrice.setTextColor(Color.parseColor("#c8c8c8"));
                     mPayico.setVisibility(View.VISIBLE);

live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java

@@ -165,7 +165,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
                                             .show();
                                 } else {
                                     new XPopup.Builder(getContext())
-                                            .asCustom(new ResultRendPacketPopup(getContext(), true, data.setRedPacketId(redPacketInfoModel.getSuperJackpotId()), true))
+                                            .asCustom(new ResultRendPacketPopup(getContext(), true, data.setSuperJackpotId(redPacketInfoModel.getSuperJackpotId()), true))
                                             .show();
                                 }
 

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

@@ -68,6 +68,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
+            android:gravity="center"
             android:textColor="@color/gray3"
             android:textSize="11sp" />
 

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

@@ -96,7 +96,7 @@
         android:background="@drawable/background_open_red_packet"
         android:text="@string/red_packet_open"
         android:textColor="#FFE9BF"
-        android:textSize="36sp"
+        android:textSize="32sp"
         android:textStyle="bold"
         android:visibility="invisible" />
 

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

@@ -47,7 +47,7 @@
                 android:id="@+id/open_red_packet"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="待開紅包:4"
+                android:text="@string/open_red_packet"
                 android:textColor="@color/white"
                 android:textSize="9sp" />
         </LinearLayout>

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

@@ -129,7 +129,7 @@
         android:layout_marginTop="213dp">
 
         <androidx.cardview.widget.CardView
-            android:layout_width="50dp"
+            android:layout_width="72dp"
             android:layout_height="35dp"
             android:layout_marginStart="43dp"
             app:cardBackgroundColor="#E82936"
@@ -142,10 +142,10 @@
                 android:gravity="center"
                 android:text="@string/conditions"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="13sp" />
         </androidx.cardview.widget.CardView>
 
-        <FrameLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginStart="15dp"
@@ -163,15 +163,17 @@
 
             <Button
                 android:id="@+id/following_anchor"
-                android:layout_width="75dp"
+                android:layout_width="0dp"
                 android:layout_height="30dp"
                 android:layout_gravity="end"
+                android:layout_marginStart="5dp"
+                android:layout_weight="1"
                 android:background="@drawable/background_red_packet_select"
                 android:gravity="center"
                 android:text="@string/following_anchor"
                 android:textColor="#FDD04A"
-                android:textSize="12sp" />
+                android:textSize="10sp" />
-        </FrameLayout>
+        </LinearLayout>
     </LinearLayout>
 
     <FrameLayout
@@ -183,7 +185,7 @@
 
         <TextView
             android:id="@+id/red_envelope_rill"
-            android:layout_width="wrap_content"
+            android:layout_width="105dp"
             android:layout_height="wrap_content"
             android:text="@string/red_envelope_rill"
             android:textColor="@color/white"
@@ -191,9 +193,10 @@
 
         <TextView
             android:id="@+id/total_consumption_of_drill"
-            android:layout_width="wrap_content"
+            android:layout_width="105dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
+            android:gravity="end"
             android:text="@string/total_consumption_of_drill"
             android:textColor="@color/white"
             android:textSize="12sp" />
@@ -227,10 +230,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/background_send_red_packet_illustrate"
-        android:clickable="true"
+
-        android:focusable="true"
         android:visibility="gone">
-<!--结果-->
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="392dp">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <!--结果-->
                 <LinearLayout
                     android:layout_width="245dp"
                     android:layout_height="match_parent"
@@ -320,6 +330,9 @@
                     android:layout_gravity="end"
                     android:layout_margin="12dp"
                     android:src="@mipmap/meiyan_icon_close" />
+            </FrameLayout>
+        </androidx.core.widget.NestedScrollView>
+
 
     </FrameLayout>
 </FrameLayout>

main/src/main/res/layout/item_main_list.xml

@@ -13,8 +13,9 @@
         android:layout_width="40dp"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
+        android:gravity="center"
         android:textColor="@color/gray1"
-        android:textSize="23sp"
+        android:textSize="20sp"
         android:textStyle="bold" />
 
     <RelativeLayout