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

同步PD问题:

Browse Source 
修复游戏房发言重复/不显示问题
修复贵族不显示英文问题
This commit is contained in:
zlzw 2024-06-07 16:59:39 +08:00
parent c263e3543c
commit d7ea130f86
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/shayu/phonelive/AppContext.java
View File

@ -323,14 +323,14 @@ public class AppContext extends CommonAppContext {
JSONObject map = received.getMsg().getJSONObject(0);
sendStartAnchorLive(map);
} else if (message.getTargetId().contains("v")) {
String contentJson = ((TextMessage) message.getContent()).getContent();
/*String contentJson = ((TextMessage) message.getContent()).getContent();
Log.e("wewe", contentJson);
SudGameSocketImEvent sudGameSocketImEvent = new Gson().fromJson(contentJson, SudGameSocketImEvent.class);
if (sudGameSocketImEvent.getMsg().isEmpty()) {
return false;
}
sudGameSocketImEvent.getMsg().get(0).setTime(time);
Bus.get().post(sudGameSocketImEvent);
Bus.get().post(sudGameSocketImEvent);*/
}
//主播页面
if (TextUtils.isEmpty(PortraitLiveManager.liveID) && SocketSwClient.mSocketHandler != null) {

6
common/src/main/java/com/yunbao/common/manager/imrongcloud/GameSwMicManager.java
View File

@ -433,7 +433,6 @@ public class GameSwMicManager {
});
}
String lastTime = "";
/**
* 处理游戏房Im消息
@ -444,10 +443,7 @@ public class GameSwMicManager {
if (msgDTOS.isEmpty()) return;
SudGameSocketImEvent.MsgDTO msgDTO = msgDTOS.get(0);
if(lastTime.equals(msgDTO.getTime())){
return;
}
lastTime = msgDTO.getTime();
//正常文字消息
if (TextUtils.equals(msgDTO.getMethod(), "SendMsg")) {
getView().insertItem(new SudGameChatImModel().setWelcomMessage(false).setNickname(msgDTO.getUname()).setTextMessage(msgDTO.getCt()));

2
live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
View File

@ -86,7 +86,7 @@ public class SocketRyChatUtil {
if (u == null) {
return;
}
System.out.println("融云发言:" + u.getDress().getMedal_new_en());
final SocketSendBean msg =
new SocketSendBean()
.param("_method_", Constants.SOCKET_SEND_MSG)

4
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -1007,6 +1007,7 @@ public class SocketRyClient {
try {
//增加粉丝徽章信息
chatBean.setMedalNmae(map.getString("medal_name"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
FansModel fansMedalBean = new NewLevelManager(mContext).getFansModel(map.getIntValue("medal_level"));
if (fansMedalBean != null)
chatBean.setMedalLevelImageUrl(fansMedalBean.getThumb());
@ -1048,7 +1049,7 @@ public class SocketRyClient {
chatBean.setBubble(obj.getString("bubble"));
chatBean.setMedal(obj.getString("medal"));
chatBean.setMedal_new(obj.getString("medal_new"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
chatBean.setMedal_new_en(obj.getString("medal_new_en"));
chatBean.setHot_num(obj.getString("hot_num"));
UserBean.DressBean dressBean = new UserBean.DressBean();
dressBean.setAvatar_frame(obj.getString("avatar_frame"));
@ -1069,6 +1070,7 @@ public class SocketRyClient {
FansModel fansMedalBean = new NewLevelManager(mContext).getFansModel(map.getIntValue("medal_level"));
u.setFansLevel(obj.getIntValue("medal_level"));
u.setFansEnterRoomUrl(obj.getString("medal_backgroup_thumb"));
CommonAppConfig.getInstance().getUserBean().getDress().setMedal_new_en(obj.getString("medal_new_en"));
if (fansMedalBean != null)
chatBean.setMedalLevelImageUrl(fansMedalBean.getThumb());
mListener.onEnterRoom(new LiveEnterRoomBean(u, chatBean));

4
live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
View File

@ -85,7 +85,7 @@ public class SocketSwChatUtil {
if (u == null) {
return;
}
System.out.println("声网发言:" + u.getDress().getMedal_new_en());
final SocketSendBean msg =
new SocketSendBean()
.param("_method_", Constants.SOCKET_SEND_MSG)
@ -99,6 +99,7 @@ public class SocketSwChatUtil {
.param("medal_honor", u.getMedal_no_display_src())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("uid", u.getId())
.param("liangname", u.getGoodName())
.param("vip_type", u.getVip().getType())
@ -180,6 +181,7 @@ public class SocketSwChatUtil {
.param("bubble", u.getDress().getBubble())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("guard_type", IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getGuardType())
.param("medal_name", u.getMedalName())
.param("medal_level", u.getMedalLevel())

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

@ -913,6 +913,7 @@ public class SocketSwClient {
try {
//增加粉丝徽章信息
chatBean.setMedalNmae(map.getString("medal_name"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
FansModel fansMedalBean = new NewLevelManager(mContext).getFansModel(map.getIntValue("medal_level"));
if (fansMedalBean != null)
chatBean.setMedalLevelImageUrl(fansMedalBean.getThumb());
@ -954,6 +955,7 @@ public class SocketSwClient {
chatBean.setBubble(obj.getString("bubble"));
chatBean.setMedal(obj.getString("medal"));
chatBean.setMedal_new(obj.getString("medal_new"));
chatBean.setMedal_new_en(obj.getString("medal_new_en"));
chatBean.setHot_num(obj.getString("hot_num"));
UserBean.DressBean dressBean = new UserBean.DressBean();
dressBean.setAvatar_frame(obj.getString("avatar_frame"));
@ -971,6 +973,7 @@ public class SocketSwClient {
//增加粉丝徽章信息
chatBean.setMedalNmae(obj.getString("medal_name"));
chatBean.setUserNiceName(obj.getString("user_nicename"));//名字
CommonAppConfig.getInstance().getUserBean().getDress().setMedal_new_en(obj.getString("medal_new_en"));
FansModel fansMedalBean = new NewLevelManager(mContext).getFansModel(map.getIntValue("medal_level"));
u.setFansLevel(obj.getIntValue("medal_level"));
u.setFansEnterRoomUrl(obj.getString("medal_backgroup_thumb"));