新增h5功能

live/src/main/java/com/yunbao/live/bean/LiveChatBean.java

@@ -1,6 +1,7 @@
 package com.yunbao.live.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.bean.MsgModel;
 
 /**
@@ -40,6 +41,41 @@ public class LiveChatBean {
     private String prankIcon;
     private String hot_card;
     private MsgModel msgModel = new MsgModel();//自定义消息体
+    @SerializedName("noble_id")
+    private String nobleId = "";
+
+    @SerializedName("noble_icon")
+    private String nobleIcon = "";
+
+    @SerializedName("bubbleSrc")
+    private String bubbleSrc = "";
+
+    public String getNobleId() {
+        return nobleId;
+    }
+
+    public LiveChatBean setNobleId(String nobleId) {
+        this.nobleId = nobleId;
+        return this;
+    }
+
+    public String getNobleIcon() {
+        return nobleIcon;
+    }
+
+    public LiveChatBean setNobleIcon(String nobleIcon) {
+        this.nobleIcon = nobleIcon;
+        return this;
+    }
+
+    public String getBubbleSrc() {
+        return bubbleSrc;
+    }
+
+    public LiveChatBean setBubbleSrc(String bubbleSrc) {
+        this.bubbleSrc = bubbleSrc;
+        return this;
+    }
 
     public MsgModel getMsgModel() {
         return msgModel;
@@ -179,7 +215,7 @@ public class LiveChatBean {
 
     @JSONField(name = "liangname")
     public void setLiangName(String liangName) {
-        if(!"0".equals(liangName)){
+        if (!"0".equals(liangName)) {
             this.liangName = liangName;
         }
     }
@@ -221,7 +257,6 @@ public class LiveChatBean {
     }
 
 
-
     @JSONField(name = "medal_name")
     public String getMedalNmae() {
         return medalNmae;

live/src/main/java/com/yunbao/live/socket/SocketRyClient.java

@@ -659,6 +659,9 @@ public class SocketRyClient {
                 chatBean.setManager(obj.getIntValue("usertype") == Constants.SOCKET_USER_TYPE_ADMIN);
                 chatBean.setContent(WordUtil.getString(R.string.live_enter_room));
                 chatBean.setGuardType(obj.getIntValue("guard_type"));
+                chatBean.setNobleId(obj.getString("noble_id"));//貴族ID
+                chatBean.setNobleIcon(obj.getString("noble_icon"));//貴族圖標
+                chatBean.setBubbleSrc(obj.getString("bubbleSrc"));//氣泡
                 //增加粉丝徽章信息
                 chatBean.setMedalNmae(obj.getString("medal_name"));
                 FansMedalBean fansMedalBean = CommonAppConfig.getInstance().getAnchorFansMedal(obj.getIntValue("medal_level"));

live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

@@ -1043,8 +1043,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                                     .setmChatLevel(mChatLevel)
                                     .setmDanMuLevel(mDanMuLevel)
                                     .setLiveBg(liveBg)));
-                    EventBus.getDefault().post("close_login");
-                    EventBus.getDefault().post("oneUesrOver");
+
 
                     //进入直播间
                     AdjustEvent adjustEvent1 = new AdjustEvent("hiepcu");