合并直播

common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java

@@ -1,6 +1,10 @@
 package com.yunbao.common.bean;
 
 public class AnchorStartLiveBean extends BaseModel{
+    public static final int TYPE_LIVE=0;
+    public static final int TYPE_CHAT=1;
+    public static final int TYPE_CALL_AUDIO=2;
+    public static final int TYPE_CALL_VIDEO=3;
     private String anchorName;
     private String avatar;
     private String roomId;

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -89,7 +89,7 @@ public class IMLoginManager extends BaseCacheManager {
             language = "zh";
         }
         if (!getBoolean(KEY_LANGUAGE, !TextUtils.equals(language, "zh"))) {
-            return Locale.TRADITIONAL_CHINESE;
+            return Locale.SIMPLIFIED_CHINESE;
         } else {
             return new Locale("en", "rUS");
         }

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

@@ -48,7 +48,7 @@ public class RongcloudIMManager {
         } else {
             RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key
         }
-        RONG_IM_KEY="lmxuhwagl7s1d";
+        //RONG_IM_KEY="lmxuhwagl7s1d";
     }
 
     /**