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-15 11:29:39 +08:00
parent 09e5f9b984
commit 7226add482
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ public class GiftWallGiftDetail extends BaseModel {
@SerializedName("avatar")
private String avatar;
@SerializedName("naming_coin")
private int namingCoin;
private String namingCoin;
public int getUid() {
return uid;
@ -40,11 +40,11 @@ public class GiftWallGiftDetail extends BaseModel {
return this;
}
public int getNamingCoin() {
public String getNamingCoin() {
return namingCoin;
}
public GiftWallGiftDetail setNamingCoin(int namingCoin) {
public GiftWallGiftDetail setNamingCoin(String namingCoin) {
this.namingCoin = namingCoin;
return this;
}

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",

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

@ -74,7 +74,7 @@ public class GiftWallItemPopup extends CenterPopupView {
giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_button);
giftDetailsBtn.setEnabled(true);
giftDetailsBtn.setTextColor(Color.parseColor("#F16D00"));
}else {
} else {
giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_unselect_button);
giftDetailsBtn.setEnabled(false);
giftDetailsBtn.setTextColor(Color.parseColor("#F2F2F2"));
@ -112,7 +112,7 @@ public class GiftWallItemPopup extends CenterPopupView {
vacantPositionAwaits.setText(data.getUserNicename());
vacantPosition.setText(giftWallModel.getGiftname());
}
if (data.getNamingCoin() == 0) {
if (TextUtils.isEmpty(data.getNamingCoin()) || TextUtils.equals(data.getNamingCoin(), "0")) {
distanceNaming.setVisibility(GONE);
} else {
distanceNaming.setVisibility(VISIBLE);

11
live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
View File

@ -2,7 +2,6 @@ package com.yunbao.live.views;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.View;
import android.view.animation.AccelerateDecelerateInterpolator;
@ -74,7 +73,7 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
} else {
giftHeight = contextLayoutGiftHeight;
}
linearParams.height = (giftHeight-30) / 2;
linearParams.height = (giftHeight - 30) / 2;
itemView.setLayoutParams(linearParams);
}
});
@ -84,11 +83,11 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
}
ImgLoader.display(mContext, model.getIcon(), giftIcon);
ImgLoader.display(mContext, model.getCornerMark(), cornerMark);
if (!TextUtils.equals(model.getNamingLiveuid(), "0") && !TextUtils.equals(model.getNamingUid(), "0")) {
giftName.setText(model.getNamingUserName());
} else {
// if (!TextUtils.equals(model.getNamingLiveuid(), "0") && !TextUtils.equals(model.getNamingUid(), "0")) {
// giftName.setText(model.getNamingUserName());
// } else {
giftName.setText(model.getName());
}
// }
//特殊礼物红包
if (model.getType() == 9999999) {