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

礼物墙

Browse Source 
第三方登录-新增校验
This commit is contained in:
Martin
2024-07-18 13:19:30 +08:00
parent 67e5e4e02f
commit b9164b6a08
6 changed files with 121 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
live/src/main/java/com/yunbao/live/bean/LiveReceiveGiftBean.java
View File

@@ -57,7 +57,7 @@ public class LiveReceiveGiftBean extends BaseModel {
private boolean isBlindBox = false;
private String namingLiveuid;
private String namingUid;
private String naming_user_id;
private String namingUserId;
private String namingLiveName;
private String namingUserName;
private String namingLiveAvatar;
@@ -90,12 +90,12 @@ public class LiveReceiveGiftBean extends BaseModel {
return this;
}
public String getNaming_user_id() {
return naming_user_id;
public String getNamingUserId() {
return namingUserId;
}
public void setNaming_user_id(String naming_user_id) {
this.naming_user_id = naming_user_id;
public void setNamingUserId(String namingUserId) {
this.namingUserId = namingUserId;
}
public String getMsg() {

1
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@@ -1150,6 +1150,7 @@ public class SocketSwClient {
receiveGiftBean.setNamingLiveName(map.getString("naming_live_name"));
receiveGiftBean.setNamingUid(map.getString("naming_uid"));
receiveGiftBean.setNamingLiveuid(map.getString("naming_liveuid"));
receiveGiftBean.setNamingUserId(map.getString("naming_user_id"));
receiveGiftBean.setUser_naming_status(map.getInteger("user_naming_status"));
receiveGiftBean.setmLiveUId(mLiveUid);
receiveGiftBean.setmTypeBuyGuard(false);

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

@@ -126,7 +126,7 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
} else {
mLoadingLayout.setVisibility(GiftCacheUtil.checkGiftIsDownload(model.getId()) ? View.GONE : View.VISIBLE);
}
if(model.isChecked()&& !StringUtil.isEmpty(model.getNamingLiveName())){
if(model.isChecked()&& !StringUtil.isEmpty(model.getNamingUserName())){
namingLayout.setVisibility(View.VISIBLE);
}else{
namingLayout.setVisibility(View.GONE);

4
live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
View File

@@ -180,7 +180,7 @@ public class LiveGiftViewHolder extends AbsViewHolder {
if (mGiftCount != null && mGiftCount.getVisibility() == View.VISIBLE) {
mGiftCount.setVisibility(View.INVISIBLE);
}
if(bean.getUid().equals(bean.getNaming_user_id())){
if(bean.getUid().equals(bean.getNamingUserId())){
if (mStar != null && mStar.getVisibility() != View.VISIBLE) {
mStar.setVisibility(View.VISIBLE);
}
@@ -203,7 +203,7 @@ public class LiveGiftViewHolder extends AbsViewHolder {
}
mLastGiftKey = bean.getKey();
// if (bean.getUid().equals(bean.getNaming_user_id())) {
if (bean.getUid().equals(bean.getNaming_user_id())) {
if (bean.getUid().equals(bean.getNamingUserId())) {
SVGAVideoEntity drawable = null;
if(WordUtil.isNewZh()&&LiveRoomViewHolder.drawableTitleCn!=null){
drawable = LiveRoomViewHolder.drawableTitleCn;