Merge branch 'master' into dev_6.5.4_tmp
This commit is contained in:
commit
c8f443c105
@ -463,10 +463,10 @@ public class LiveGiftPopup extends AbsDialogFragment {
|
|||||||
userNextLevel, leveNext);
|
userNextLevel, leveNext);
|
||||||
int leveNextIndexOf = hint.indexOf(leveNext);
|
int leveNextIndexOf = hint.indexOf(leveNext);
|
||||||
int leveNextSize = leveNext.length();
|
int leveNextSize = leveNext.length();
|
||||||
int userNextLevelIndexOf = msg.indexOf(userNextLevel);
|
int userNextLevelIndexOf = hint.indexOf(userNextLevel);
|
||||||
int userNextLevelSize = userNextLevel.length();
|
int userNextLevelSize = userNextLevel.length();
|
||||||
SpannableStringBuilder builder = new SpannableStringBuilder();
|
SpannableStringBuilder builder = new SpannableStringBuilder();
|
||||||
builder.append(msg);
|
builder.append(hint);
|
||||||
builder.setSpan(new
|
builder.setSpan(new
|
||||||
ForegroundColorSpan(Color.parseColor("#FFC722")),
|
ForegroundColorSpan(Color.parseColor("#FFC722")),
|
||||||
leveNextIndexOf, leveNextIndexOf + leveNextSize,
|
leveNextIndexOf, leveNextIndexOf + leveNextSize,
|
||||||
@ -476,6 +476,8 @@ public class LiveGiftPopup extends AbsDialogFragment {
|
|||||||
userNextLevelIndexOf, userNextLevelIndexOf + userNextLevelSize,
|
userNextLevelIndexOf, userNextLevelIndexOf + userNextLevelSize,
|
||||||
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
|
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||||
leaveHint.setText(builder);
|
leaveHint.setText(builder);
|
||||||
|
progressBar.setProgress(nextLeve);
|
||||||
|
progressBar.setMax(maxLeve);
|
||||||
} else {
|
} else {
|
||||||
String hint = getString(R.string.reach_the_top);
|
String hint = getString(R.string.reach_the_top);
|
||||||
leaveHint.setText(hint);
|
leaveHint.setText(hint);
|
||||||
|
Loading…
Reference in New Issue
Block a user