diff --git a/.gitignore b/.gitignore index 4d2c27d43..fdc4e2e4c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ local.properties /tmp/full-r8-config.txt /outputs/apk /TabLayout/build +/app/google_test/release + diff --git a/common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java b/common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java index 2fa76feb8..aead6ba8e 100644 --- a/common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java +++ b/common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java @@ -40,6 +40,24 @@ public class GiftQuantityManager extends BaseCacheManager { return giftQuantityModels; } + /** + * 获取指导员备注信息 + * + * @return + */ + public List getGiftQuantityNew() { + List giftQuantityModels = getList(KEY_GIFT_QUANTITY, new TypeToken>() {}.getType()); + if (giftQuantityModels == null || giftQuantityModels.size() == 0) { + giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("9999").setFontColour("#ffffff")); + giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("3344").setFontColour("#ffffff")); + giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1314").setFontColour("#ffffff")); + giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("520").setFontColour("#ffffff")); + giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("50").setFontColour("#ffffff")); + giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("10").setFontColour("#ffffff")); + } + return giftQuantityModels; + } + /** * 缓存等级图标 * diff --git a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java index 7a654aaba..3a42c0a28 100644 --- a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java +++ b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java @@ -38,7 +38,7 @@ public class GiftNumberPopup extends BottomPopupView { super.onCreate(); RecyclerView giftList = findViewById(R.id.gift_list); giftList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false)); - GiftNumberAdapter giftNumberAdapter = new GiftNumberAdapter(new GiftQuantityManager(getContext()).getGiftQuantity()); + GiftNumberAdapter giftNumberAdapter = new GiftNumberAdapter(new GiftQuantityManager(getContext()).getGiftQuantityNew()); giftList.setAdapter(giftNumberAdapter); ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.to_can), new ViewClicksAntiShake.ViewClicksCallBack() { @Override diff --git a/common/src/main/res/layout/view_live_gift_number.xml b/common/src/main/res/layout/view_live_gift_number.xml index ff35975e1..d131b5295 100644 --- a/common/src/main/res/layout/view_live_gift_number.xml +++ b/common/src/main/res/layout/view_live_gift_number.xml @@ -15,7 +15,7 @@ + + + - diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 4cb3b319f..6595c5deb 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1256,7 +1256,7 @@ 升級還需%s經驗值，升至%s即可領取獎勵 恭喜，你已達到最高等級 包裹中暫無物品哦 - 自定義數量 + 自定義 禮物展館 已點亮%s個 圖鑒 @@ -1634,7 +1634,7 @@ 互動遊戲 女神說 發起問答 - 机器人语言设置 - 开通贵族 + 機器人語言設定 + 開通貴族 此設定後，所有機器人語言將會被翻譯覆蓋，請確認是否完成此操作 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 dae0f6b05..4740bec0d 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java @@ -1001,13 +1001,13 @@ public class LiveGiftPopup2 extends AbsDialogFragment { String userNextLevel = String.valueOf(Integer.parseInt(coinModel.getUserLevel())+1); StringBuffer stringBuffer = new StringBuffer(); if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - stringBuffer.append("升至Lv") + stringBuffer.append("升至Lv.") .append(userNextLevel) .append("還需") .append(leveNext) .append("經驗值"); } else { - stringBuffer.append("Up to Lv") + stringBuffer.append("Up to Lv.") .append(userNextLevel) .append("need") .append(leveNext) diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 02732481d..d5c572a98 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1454,7 +1454,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (mPkTimeCount > 0) {// if (mHandler != null) { time.setVisibility(View.VISIBLE); - String s1 = StringUtil.getDurationText(mPkTimeCount * 1000); + String s1 = StringUtil.getDurationText2(mPkTimeCount * 1000); time.setText("PK時間:" + s1); mHandler.sendEmptyMessageAtTime(WHAT_PK_TIME, getNextSecondTime()); if (mContext instanceof LiveAudienceActivity) { @@ -4428,7 +4428,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void run() { sendMoneyTime--; if (sendMoneyTime > 0) { - String s1 = StringUtil.getDurationText(sendMoneyTime * 1000); + String s1 = StringUtil.getDurationText2(sendMoneyTime * 1000); newDragonTv.setText(s1); newDragonTv.postDelayed(sendMoneyRunnable, 1000); } else { @@ -6549,7 +6549,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } else { timeTitle.setVisibility(View.VISIBLE); Log.e("多人Pk", "countdownRunnable mPkTimeCount:" + mPkTimeCount2); - String s1 = StringUtil.getDurationText(mPkTimeCount2 * 1000); + String s1 = StringUtil.getDurationText2(mPkTimeCount2 * 1000); textTime.setText(String.format(mContext.getString(R.string.pk_time), s1)); Log.e("多人Pk", "countdownRunnable s1:" + s1); timeTitle.postDelayed(countdownRunnable, 1000);