修复游戏房发言重复/不显示问题

修复贵族不显示英文问题

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -228,14 +228,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) {

common/src/main/java/com/yunbao/common/manager/imrongcloud/GameSwMicManager.java

@@ -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()));

config.gradle

@@ -11,7 +11,7 @@ ext {
             //正式、
             serverHost       : "https://napi.yaoulive.com",
 //             测试
-            //serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             buildTime        : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
 
@@ -29,6 +29,6 @@ ext {
             //是否上报异常日志
             isUploadLog      : true,
             //是否打包成插件包模式
-            isPluginModel    : true,
+            isPluginModel    : false,
     ]
 }

gradle.properties

@@ -13,7 +13,7 @@
 #Thu Feb 04 00:05:45 CST 2021
 android.injected.testOnly=false
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
@@ -23,8 +23,8 @@ android.enableJetifier=true
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=10809
+systemProp.https.proxyPort=7890
-systemProp.http.proxyPort=10809
+systemProp.http.proxyPort=7890
 
 
 #android.enableR8.fullMode=true

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

@@ -1048,7 +1048,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 +1069,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));

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

@@ -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())

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

@@ -954,6 +954,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 +972,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"));