diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 97bf9fc7d..f1dafa3f2 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -504,7 +504,7 @@ Red envelopes Average red envelope Congratulations on making a fortune - Hand out red envelopes + Hand out Please enter the amount Please enter quantity %1$s red packets in total @@ -1214,11 +1214,11 @@ Limited ride And limited avatar frame Red packets Popular red packets amount - drill + Diamonds Conditions no - Following anchor - Red packet%s diamonds/piece + Subscribing + %s diamonds/piece Total %s drill Go top up > Range Range is [%s] diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 3822f159a..15e77f693 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -504,7 +504,7 @@ Red envelopes Average red envelope Congratulations on making a fortune - Hand out red envelopes + Hand out Please enter the amount Please enter quantity %1$s red packets in total @@ -1215,11 +1215,11 @@ Limited ride And limited avatar frame Red packets Popular red packets amount - drill + Diamonds Conditions no - Following anchor - Red packet%s diamonds/piece + Subscribing + %s diamonds/piece Total %s drill Go top up > Range Range is [%s] 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 a01495062..fd4df13c5 100644 --- a/live/src/main/res/layout/view_receive_red_packet.xml +++ b/live/src/main/res/layout/view_receive_red_packet.xml @@ -1,5 +1,6 @@ + android:visibility="invisible" + tools:visibility="visible" /> + /> \ No newline at end of file diff --git a/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java b/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java index 3f73951ae..43a02db1a 100644 --- a/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java @@ -61,18 +61,18 @@ public class RedPacketInfoActivity extends AbsActivity implements View.OnClickLi } else { status.setText(R.string.red_packet_info_status_timeout); } - if (bean.getRedPacketStatus() == 1 && bean.getAmountRefund() == 0){ + if (bean.getRedPacketStatus() == 1 && bean.getAmountRefund() == 0) { gold.setVisibility(View.GONE); backAccountText.setText(R.string.red_packet_info_residue_none); - } else{ + } else { gold.setVisibility(View.VISIBLE); } if (bean.getRedPacketStatus() == 2 && bean.getAmountRefund() == 0) { gold.setImageResource(R.mipmap.diamond); - backAccountText.setText(mContext.getString(R.string.red_packet_info_residue_back) + " +" + bean.getAmountDiamond()); - }else if(bean.getRedPacketStatus()==2 && bean.getAmountRefund()>0){ + backAccountText.setText(" +" + bean.getAmountDiamond()+"\n" + mContext.getString(R.string.red_packet_info_residue_back)); + } else if (bean.getRedPacketStatus() == 2 && bean.getAmountRefund() > 0) { gold.setImageResource(R.mipmap.gold_coin); - backAccountText.setText(mContext.getString(R.string.red_packet_info_residue_back) + " +" + bean.getAmountRefund()); + backAccountText.setText(" +" + bean.getAmountRefund() +"\n"+ mContext.getString(R.string.red_packet_info_residue_back)); } }