yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.PK倒计时是， 神龙倒计时 改成只有分钟秒格式

Browse Source 
2.送礼物自定义数量下移
This commit is contained in:
ningwenqiang 2024-09-29 14:53:05 +08:00
parent c42b3db7d2
commit ed1bd72d0a
7 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -17,3 +17,5 @@ local.properties
/tmp/full-r8-config.txt
/outputs/apk
/TabLayout/build
/app/google_test/release

18
common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java
View File

@ -40,6 +40,24 @@ public class GiftQuantityManager extends BaseCacheManager {
return giftQuantityModels;
}
/**
* 获取指导员备注信息
*
* @return
*/
public List<GiftQuantityModel> getGiftQuantityNew() {
List<GiftQuantityModel> giftQuantityModels = getList(KEY_GIFT_QUANTITY, new TypeToken<List<GiftQuantityModel>>() {}.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;
}
/**
* 缓存等级图标
*

2
common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
View File

@ -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

16
common/src/main/res/layout/view_live_gift_number.xml
View File

@ -15,7 +15,7 @@
<LinearLayout
android:layout_width="80dp"
android:layout_height="190dp"
android:layout_height="188dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="48dp"
@ -23,22 +23,26 @@
android:background="@drawable/bg_selection_quantity"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:layout_marginTop="2dp"
android:id="@+id/gift_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<TextView
android:clickable="true"
android:id="@+id/custom_quantity"
android:layout_width="match_parent"
android:layout_height="28dp"
android:gravity="center"
android:layout_marginTop="2dp"
android:layout_marginBottom="4dp"
android:text="@string/custom_quantity"
android:textColor="#FFFFFF"
android:textSize="14sp"
android:focusable="true" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/gift_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

6
common/src/main/res/values-zh/strings.xml
View File

@ -1256,7 +1256,7 @@
<string name="leveling_points">升級還需%s經驗值，升至%s即可領取獎勵</string>
<string name="reach_the_top">恭喜，你已達到最高等級</string>
<string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
<string name="custom_quantity">自定義數量</string>
<string name="custom_quantity">自定義</string>
<string name="gift_wall">禮物展館</string>
<string name="has_been_lit">已點亮%s個</string>
<string name="codex">圖鑒</string>
@ -1634,7 +1634,7 @@
<string name="live_interaction_game">互動遊戲</string>
<string name="live_interaction_god_say">女神說</string>
<string name="live_interaction_ask_question">發起問答</string>
<string name="ai_anguage_settings">机器人语言设置</string>
<string name="open_vip_live">开通贵族</string>
<string name="ai_anguage_settings">機器人語言設定</string>
<string name="open_vip_live">開通貴族</string>
<string name="chang_langue_tips">此設定後，所有機器人語言將會被翻譯覆蓋，請確認是否完成此操作</string>
</resources>

4
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
View File

@ -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)

6
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -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);