添加直播界面的聊天

陈硕
1 parent 2f7e48bc
Showing 3 changed files with 16 additions and 26 deletions
app/src/main/java/com/cnlive/gundam/stream/ui/activity/StreamActivity.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/MessageContentInfo.java
@@ -27,6 +27,7 @@ import com.cnlive.gundam.stream.model.ShowView;
 import com.cnlive.gundam.stream.ui.adapter.SimpleAdapter;
 import com.cnlive.gundam.stream.util.ChatConnect;
 import com.cnlive.gundam.stream.util.TimerUtil;
+import com.cnlive.gundam.video.model.CNMessageModle;
 import com.cnlive.libs.stream.base.IStreamer;
 import com.cnlive.libs.stream.model.ActivityConfig;
 import com.cnlive.libs.stream.model.Filters;
@@ -37,9 +38,6 @@ import com.cnlive.libs.util.chat.model.CNMessage;
 import com.cnlive.libs.util.chat.model.CNUserInfo;
 import com.google.gson.Gson;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.List;
@@ -104,7 +102,6 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         binding.setIsShow(showView);
         binding.chatRecyclerView.setLayoutManager(new LinearLayoutManager(this));
         chatItemList = new ArrayList<>();
-
         timerUtil = new TimerUtil(this);
     }
@@ -118,7 +115,7 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         ExtensionModel extensionModel = new ExtensionModel(channelName, coverImgUrl);
         extensions = new Gson().toJson(extensionModel);
-        roomId = activityId;
+        roomId = channelId;
     }
     public void onClick(View view) {
@@ -390,24 +387,29 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
     @Override
     public void onChatState(int what) {
+
     }
     @Override
     public void onChatMessage(CNMessage cnMessage) {
-        //// TODO: 5/23/2017 Recyclerview添加数据
-        String headUrl = cnMessage.getUserInfo().getHeadUrl() == null ? "" : cnMessage.getUserInfo().getHeadUrl();
-        String userName = cnMessage.getUserInfo().getUserName() == null ? "" : cnMessage.getUserInfo().getUserName();
-        String content = null;
         try {
-            content = cnMessage.getContent() == null ? "" : (String) new JSONObject(cnMessage.getContent()).get("message");
-        } catch (JSONException e) {
+            Gson gson = new Gson();
+            CNMessageModle cnMessageModle = gson.fromJson(cnMessage.getContent(), CNMessageModle.class);
+            String messagecontent = cnMessageModle.getMessage().getContent();
+            String messageType = cnMessageModle.getType();
+            if (messageType.equals("giftType")) {
+                chatItemList.add(new ChatItem(cnMessage.getUserInfo().getHeadUrl(), cnMessage.getUserInfo().getUserName(), "送了" + messagecontent));
+            } else if (messageType.equals("chatRoom")) {
+                chatItemList.add(new ChatItem(cnMessage.getUserInfo().getHeadUrl(), cnMessage.getUserInfo().getUserName(), messagecontent));
+
+            } else if (messageType.equals("joinType")) {
+                chatItemList.add(new ChatItem(cnMessage.getUserInfo().getHeadUrl(), cnMessage.getUserInfo().getUserName(), "加入"));
+            }
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        ChatItem chatItem = new ChatItem(headUrl, userName, content);
-        chatItemList.add(chatItem);
         chatAdapter = new SimpleAdapter(this, chatItemList, R.layout.item_chat, com.cnlive.gundam.BR.chat);
         binding.setChatAdapter(chatAdapter);
-
     }
     private void getOnlinePerson() {
@@ -8,7 +8,6 @@ import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.SwitchCompat;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -142,7 +141,6 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.v("fdfsfaf","dfasdfsafdfadf");
         ChatUtil.disconnect(false);
     }
@@ -3,7 +3,6 @@ package com.cnlive.gundam.video.fragment.chat;
 import android.content.Context;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.Log;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.video.barrage.BarrageBaseMessage;
@@ -68,10 +67,7 @@ public class MessageContentInfo {
                             CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
                             String messagecontent = cnMessageModle.getMessage().getContent();
                             String messageType = cnMessageModle.getType();
-
-
                             if (messageType.equals(giftType)) {
-
                                 barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "送了" + messagecontent, ""));
                                 messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": 送了" + messagecontent, message.getUserInfo().getHeadUrl(), true));
                             } else if (messageType.equals(ChatRoom)) {
@@ -79,11 +75,9 @@ public class MessageContentInfo {
                                     messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " :", message.getUserInfo().getHeadUrl(), false));
                                 } else {
                                     messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), " :" + messagecontent, message.getUserInfo().getHeadUrl(), true));
-
                                 }
                                 barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
-
                             } else if (messageType.equals(JoinType)) {
                                 String userName = message.getUserInfo().getUserName();
                                 if (TextUtils.isEmpty(userName)) {
@@ -152,7 +146,6 @@ public class MessageContentInfo {
         onConnectListener = new IChat.OnConnectListener() {
             @Override
             public void onTokenIncorrect(String s) {
-                Log.v("dfasdfasd", "onTokenIncorrect");
             }
             @Override
@@ -164,7 +157,6 @@ public class MessageContentInfo {
             @Override
             public void onError(int i, String s) {
-                Log.v("dfasdfasd", "onError");
             }
         };
@@ -179,13 +171,11 @@ public class MessageContentInfo {
                 CNMessageModle cnMessageModle = new CNMessageModle(JoinType, new MessageInfo("", "", "", "", ""));
                 Gson gson2 = new Gson();
                 String obj2 = gson2.toJson(cnMessageModle);
-                Log.v("dfsd", obj2);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, onSendMessageListener);
             }
             @Override
             public void onError(int what, String extra) {
-                Log.v("dfsd", "onError");
             }
         });