diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
index d7f055a1e..4494d6149 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
@@ -32,9 +32,9 @@ import static com.yunbao.common.CommonAppContext.isReady;
  */
 public class RongcloudIMManager {
     //融云开发者平台注册app唯一识别符
-//    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
+    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
     //测试环境
-    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
+//    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
 
     private static final String CLASSNAME = "RongcloudIMManager";
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java
index 2daf5052d..d5f3f2c84 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java
@@ -212,7 +212,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View
                                                     public void onError(io.rong.imlib.model.Message message, RongIMClient.ErrorCode errorCode) {
                                                         Log.e("ry", "发送失敗" + errorCode.toString());
                                                         liveImDeletUtil.deleteMessages(message.getTargetId(), message.getMessageId());
-                                                    }
+                                                    }//BIZ_ERROR_DATABASE_ERROR
                                                 });
                                             } else {
                                                 ToastUtil.show(msg);
diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
index 5b03ccc87..50fbf8d0a 100644
--- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
@@ -415,7 +415,6 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onUpdata(String str) {
-        ToastUtil.show("121212");
         if ("UsertoRY".equals(str)) {
             DialogUitl.showSimpleDialog(mContext, WordUtil.getString(R.string.mic_tag), new DialogUitl.SimpleCallback() {
                 @Override
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index a77ac0d34..7ceb67d56 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -81,6 +81,7 @@ import com.yunbao.live.utils.LiveImDeletUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import cn.rongcloud.rtc.api.RCRTCEngine;
@@ -163,7 +164,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
     private boolean mFirstConnectSocket;//是否是第一次连接成功socket
     private int liveBg;
     private LiveImDeletUtil liveImDeletUtil;
-
+    private List<String> greetings  = new ArrayList<>();
 
     public PortraitLiveManager(Activity context, Intent intent) {
         this.mContext = context;
@@ -954,7 +955,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
         LiveHttpUtil.enterRoom(mLiveBean.getUid(), mLiveBean.getStream(), new HttpCallback() {
             @Override
             public void onSuccess(int code, String msg, String[] info) {
-                List<String> greetings;
+
                 if (code == 0 && info.length > 0) {
                     JSONObject obj = JSON.parseObject(info[0]);
                     mDanmuPrice = obj.getString("barrage_fee");
@@ -962,7 +963,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                     mChatLevel = obj.getIntValue("speak_limit");
                     mDanMuLevel = obj.getIntValue("barrage_limit");
                     liveBg = obj.getIntValue("live_bg");
-                    greetings = JSONArray.parseArray(obj.getJSONArray("greetings").toJSONString(), String.class);
+                    if (obj.containsKey("greetings")) {
+                        greetings = JSONArray.parseArray(obj.getJSONArray("greetings").toJSONString(), String.class);
+                    }
+
                     if (liveBg == 1) {
                         //直播间背景
                         ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack);