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

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693 2023-08-16 16:23:28 +08:00
parent 60ce5572cf
commit 9bce235817
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
View File

@ -23,6 +23,9 @@ public class GiftWallGiftDetail extends BaseModel {
}
public String getUserNicename() {
if (userNicename.length() > 5) {
userNicename = userNicename.substring(0, 5) + "...";
}
return userNicename;
}

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

@ -128,15 +128,21 @@
android:text="@string/regular_bubble"
android:textColor="#6F43FF"
android:textSize="12sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/achievement_img_list"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginStart="8dp"
android:background="@drawable/background_achievement_details_list"
android:layout_marginTop="6dp"
android:layout_marginEnd="8dp" />
android:background="@drawable/background_achievement_details_list"
android:layout_marginEnd="8dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/achievement_img_list"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="match_parent" />
</FrameLayout>
<TextView
android:id="@+id/gift_details_btn2"

4
config.gradle
View File

@ -9,9 +9,9 @@ ext {
]
manifestPlaceholders = [
//正式、
serverHost : "https://napi.yaoulive.com",
// serverHost : "https://napi.yaoulive.com",
// 测试
// serverHost : "https://ceshi.yaoulive.com",
serverHost : "https://ceshi.yaoulive.com",

6
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@ -465,10 +465,10 @@ public class LiveGiftPopup extends AbsDialogFragment {
diamondText.setText(coinModel.getCoin());
lvStr.setText("Lv." + coinModel.getUserLevel());
int nextLeve = Integer.parseInt(coinModel.getUserNextLevelRewards());
int maxLeve = Integer.parseInt(coinModel.getUserLevelMax())+Integer.parseInt(coinModel.getUserLevelCurrentConsumption());
int maxLeve = Integer.parseInt(coinModel.getUserLevelMax()) + Integer.parseInt(coinModel.getUserLevelCurrentConsumption());
findViewById(R.id.red_point).setVisibility((!TextUtils.isEmpty(coinModel.getUsersPackRedDot())) &&
TextUtils.equals(coinModel.getUsersPackRedDot(), "1") ? View.VISIBLE : View.GONE);
if (!TextUtils.equals(coinModel.getUserLevel(),coinModel.getUserLevelMax())) {
if (!TextUtils.equals(coinModel.getUserLevel(), coinModel.getUserLevelMax())) {
String leveNext = String.valueOf(nextLeve);
String userNextLevel = coinModel.getUserLevelUpgrades();
String hint = String.format(getString(R.string.leveling_points),
@ -1102,7 +1102,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
if (goldText != null) {
goldText.setText(goldCoin);
}
if (mGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mGiftBean.getSwf().contains("svga")) {
if (!mGiftBean.getSwf().contains("svga")) {
showLianBtn();
}
if (mGiftBean.getType() == 7) {