diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 0092f6deb..98be91513 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -324,7 +324,7 @@ sent UnlockVIP - + Pieces I sent one. Give Continuous delivery @@ -1212,14 +1212,14 @@ Limited ride And limited avatar frame Return to account Popularity Red packet Red packets - Save popular red packets + Popular red packets amount drill Conditions - " no" + no Following anchor - Red envelope %s diamonds/piece - Total consumption of %s drill + Red packet%s diamonds/piece + Total %s drill Go top up > Range Range is [%s] Randomly available @@ -1236,19 +1236,19 @@ Limited ride And limited avatar frame 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 5. What can you do with the red envelopes you grab? Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected - Congratulations on getting the red envelope + Congratulations Red Envelope Get %s View Lucky Audience > - Give the anchor a gift to express his heart + Give a gift to heart Countdown :%s - Red envelope to be opened :%s + To open :%s %s red packet Too bad Miss the red envelope Check out your luck %s drew %s in the lucky red envelope number - Red envelope released successfully + Red successfully diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 80e4ccec4..60f31bd30 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -324,7 +324,7 @@ sent UnlockVIP - + Pieces I sent one. Give Continuous delivery @@ -1213,14 +1213,14 @@ Limited ride And limited avatar frame Return to account Popularity Red packet Red packets - Save popular red packets + Popular red packets amount drill Conditions - " no" + no Following anchor - Red envelope %s diamonds/piece - Total consumption of %s drill + Red packet%s diamonds/piece + Total %s drill Go top up > Range Range is [%s] value @@ -1237,17 +1237,17 @@ Limited ride And limited avatar frame 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 5. What can you do with the red envelopes you grab? Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected - Congratulations on getting the red envelope + Congratulations Red Envelope Get %s View Lucky Audience > - Give the anchor a gift to express his heart + Give a gift to heart Countdown :%s - Red envelope to be opened :%s + To open :%s %s red packet Too bad Miss the red envelope Check out your luck %s drew %s in the lucky red envelope number - Red envelope released successfully + >Red successfully diff --git a/config.gradle b/config.gradle index 5b318adeb..53b09310b 100644 --- a/config.gradle +++ b/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", diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java index 650a3057b..777d7714b 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java +++ b/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 { 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 { } }); } else { + mPrice.setTextSize(TypedValue.COMPLEX_UNIT_SP,11); mRadioButton.setOnClickListener(mOnClickListener); mPrice.setTextColor(Color.parseColor("#c8c8c8")); mPayico.setVisibility(View.VISIBLE); diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java index 8dc15a0f4..c599db1af 100644 --- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java +++ b/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(); } diff --git a/live/src/main/res/layout/item_live_gift.xml b/live/src/main/res/layout/item_live_gift.xml index eff7e9d70..e5a29d947 100644 --- a/live/src/main/res/layout/item_live_gift.xml +++ b/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" /> diff --git a/live/src/main/res/layout/view_receive_red_packet.xml b/live/src/main/res/layout/view_receive_red_packet.xml index b8e95fa59..a01495062 100644 --- a/live/src/main/res/layout/view_receive_red_packet.xml +++ b/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" /> diff --git a/live/src/main/res/layout/view_red_packet.xml b/live/src/main/res/layout/view_red_packet.xml index fb80f6b5e..c1dfae7e7 100644 --- a/live/src/main/res/layout/view_red_packet.xml +++ b/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" /> diff --git a/live/src/main/res/layout/view_send_red_packet.xml b/live/src/main/res/layout/view_send_red_packet.xml index 7945de26c..19d18bd6c 100644 --- a/live/src/main/res/layout/view_send_red_packet.xml +++ b/live/src/main/res/layout/view_send_red_packet.xml @@ -129,7 +129,7 @@ android:layout_marginTop="213dp"> + android:textSize="13sp" /> - - + android:textSize="10sp" /> + @@ -227,99 +230,109 @@ 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"> - - - + - + + + - + - + - + - + - + - + - + - - + + + + + + + + + + - diff --git a/main/src/main/res/layout/item_main_list.xml b/main/src/main/res/layout/item_main_list.xml index 25e67ac3a..595f46b03 100644 --- a/main/src/main/res/layout/item_main_list.xml +++ b/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" />