diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
index 5d0251f04..b453a10b5 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
@@ -1001,34 +1001,37 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
String userNextLevel = coinModel.getUserLevelUpgrades();
StringBuffer stringBuffer = new StringBuffer();
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
- stringBuffer.append("升級還需")
- .append(userNextLevel)
- .append("經驗值,升至")
+ stringBuffer.append("升至Lv")
+ .append(coinModel.getUserLevel()+1)
+ .append("還需")
.append(leveNext)
- .append("即可領取獎勵");
+ .append("經驗值");
} else {
- stringBuffer.append(userNextLevel)
- .append(" experience upgrade,")
+ stringBuffer.append("Up to Lv")
+ .append(coinModel.getUserLevel()+1)
+ .append("need")
.append(leveNext)
- .append(" receive rewards");
+ .append("experience");
}
String hint = stringBuffer.toString();
- int leveNextIndexOf = hint.indexOf(leveNext);
- int leveNextSize = leveNext.length();
- int userNextLevelIndexOf = hint.indexOf(userNextLevel);
- int userNextLevelSize = userNextLevel.length();
- SpannableStringBuilder builder = new SpannableStringBuilder();
- builder.append(hint);
- builder.setSpan(new
- ForegroundColorSpan(Color.parseColor("#FFC722")),
- leveNextIndexOf, leveNextIndexOf + leveNextSize,
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- builder.setSpan(new
- ForegroundColorSpan(Color.parseColor("#FFC722")),
- userNextLevelIndexOf, userNextLevelIndexOf + userNextLevelSize,
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- lvTipsTv.setText(builder);
+// int leveNextIndexOf = hint.indexOf(leveNext);
+// int leveNextSize = leveNext.length();
+// int userNextLevelIndexOf = hint.indexOf(userNextLevel);
+// int userNextLevelSize = userNextLevel.length();
+
+// SpannableStringBuilder builder = new SpannableStringBuilder();
+// builder.append(hint);
+// builder.setSpan(new
+// ForegroundColorSpan(Color.parseColor("#FFC722")),
+// leveNextIndexOf, leveNextIndexOf + leveNextSize,
+// Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+// builder.setSpan(new
+// ForegroundColorSpan(Color.parseColor("#FFC722")),
+// userNextLevelIndexOf, userNextLevelIndexOf + userNextLevelSize,
+// Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ lvTipsTv.setText(hint);
progressBar.setProgress(new BigDecimal(coinModel.getUserLevelCurrentConsumption()).intValue());
progressBar.setMax(maxLeve.intValue());
} catch (Exception e) {
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 3188a4624..87ea64cac 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -3153,7 +3153,7 @@
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
- android:text="主播發起了整蠱娛樂,點擊查看"
+ android:text="@string/anchor_initiated_prank_entertainment"
android:textColor="@color/black1"
android:textSize="12dp" />
@@ -3173,7 +3173,7 @@
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:singleLine="true"
- android:text="查看"
+ android:text="@string/see_tips"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="visible"
diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml
index a90c84a9d..ed44353dc 100644
--- a/live/src/main/res/values-zh/strings.xml
+++ b/live/src/main/res/values-zh/strings.xml
@@ -178,4 +178,6 @@
<整蠱
請輸入簡短標題
默認樣式
+ 主播發起了整蠱娛樂,點擊查看
+ 查看
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index 1f2bbb1fe..6d008d159 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -181,5 +181,8 @@
<trick
Please enter a brief title.
Default style
+ The anchor initiated prank entertainment, click to view
+ See
+
\ No newline at end of file