Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp

谷俊
2 parents dcb12a4f 67043045
Showing 6 changed files with 35 additions and 86 deletions
app/src/main/java/com/cnlive/gundam/stream/ui/activity/StreamActivity.java
app/src/main/java/com/cnlive/gundam/video/fragment/PlayerLiveFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/PlayerUgcLiveFragment.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
app/src/main/java/com/cnlive/gundam/video/fragment/chat/UgcLiveChatFragment.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() {
@@ -50,7 +50,8 @@ public class PlayerLiveFragment extends Fragment implements PlayerAccelerometerS
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_player_live, container, false);
-        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, ChatRoomFragment.newInstance(), "chatRoomFragment").commit();
+        program = (VideoListProgram) getArguments().getSerializable("program");
+        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, ChatRoomFragment.newInstance(program.getChannelId()), "chatRoomFragment").commit();
         return binding.getRoot();
     }
@@ -16,7 +16,7 @@ import android.widget.Toast;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentPlayerUgcLiveBinding;
 import com.cnlive.gundam.main.model.VideoListProgram;
-import com.cnlive.gundam.video.fragment.chat.UgcLiveChatFragment;
+import com.cnlive.gundam.video.fragment.chat.ChatRoomFragment;
 import com.cnlive.gundam.video.model.VideoModel;
 import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.view.BaseVideoView;
@@ -57,8 +57,8 @@ public class PlayerUgcLiveFragment extends Fragment implements BaseVideoView.OnU
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_player_ugc_live, container, false);
-        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, UgcLiveChatFragment.newInstance(), "ugcLiveChatFragment").commit();
         initData();
+        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, ChatRoomFragment.newInstance(id), "chatRoomFragment").commit();
         return binding.getRoot();
     }
@@ -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;
@@ -48,14 +47,15 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     private FragmentChatBinding fragmentChatBinding;
     private ArrayList<GiftModle> giftArray;
     private CommonAdapter<MessageContent> messageContentCommonAdapter;
-    private String roomId = "ChatRoom06";
     private MessageContentInfo messageContentInfo;
     public SwitchCompat switchCompatBottom;
     private BarrageLayout barrageLayout;
+    private String roomId;
-    public static ChatRoomFragment newInstance() {
+    public static ChatRoomFragment newInstance(String id ) {
         Bundle args = new Bundle();
+        args.putString("roomID",id);
         ChatRoomFragment fragment = new ChatRoomFragment();
         fragment.setArguments(args);
         return fragment;
@@ -66,6 +66,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         fragmentChatBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_chat, container, false);
+        roomId = getArguments().getString("roomID");
         return fragmentChatBinding.getRoot();
     }
@@ -140,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;
@@ -34,19 +33,19 @@ public class MessageContentInfo {
     private Context mContext;
     private SendAndRecevieSucessCall mSendAndRecevieSucessCall;
     private String roomId;
-    private  BarrageLayout barrageLayout;
+    private BarrageLayout barrageLayout;
     private String JoinType = "joinType";
-    private  String  ChatRoom ="chatRoom";
-    private  String  giftType = "giftType";
+    private String ChatRoom = "chatRoom";
+    private String giftType = "giftType";
-    public void setOnReceiveAndSendListener(BarrageLayout   barrageLayout,String roomID, Context context, SendAndRecevieSucessCall sendAndRecevieSucessCall) {
+    public void setOnReceiveAndSendListener(BarrageLayout barrageLayout, String roomID, Context context, SendAndRecevieSucessCall sendAndRecevieSucessCall) {
         this.roomId = roomID;
         this.mContext = context;
         this.mSendAndRecevieSucessCall = sendAndRecevieSucessCall;
         mHandler = new Handler();
         messageContentArrayList = new ArrayList<>();
-        this.barrageLayout =barrageLayout;
+        this.barrageLayout = barrageLayout;
         initListener();
     }
@@ -66,12 +65,9 @@ public class MessageContentInfo {
                             Gson gson = new Gson();
                             CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
-                            String messagecontent =cnMessageModle.getMessage().getContent();
+                            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)) {
@@ -123,7 +117,7 @@ public class MessageContentInfo {
                     Gson gson = new Gson();
                     CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
-                    String messagecontent =cnMessageModle.getMessage().getContent();
+                    String messagecontent = cnMessageModle.getMessage().getContent();
                     String messageType = cnMessageModle.getType();
@@ -152,14 +146,13 @@ public class MessageContentInfo {
         onConnectListener = new IChat.OnConnectListener() {
             @Override
             public void onTokenIncorrect(String s) {
-
             }
             @Override
             public void onSuccess(String s) {
                 joinChatRoom();
-           }
+            }
             @Override
@@ -175,10 +168,9 @@ public class MessageContentInfo {
         ChatUtil.joinChatRoom(roomId, 0, new IChat.OnOperationListener() {
             @Override
             public void onSuccess(int what, String extra) {
-                CNMessageModle  cnMessageModle = new CNMessageModle(JoinType,new MessageInfo("","","","",""));
-                Gson gson2=new Gson();
-                String obj2=gson2.toJson(cnMessageModle);
-                Log.v("dfsd",obj2);
+                CNMessageModle cnMessageModle = new CNMessageModle(JoinType, new MessageInfo("", "", "", "", ""));
+                Gson gson2 = new Gson();
+                String obj2 = gson2.toJson(cnMessageModle);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, onSendMessageListener);
             }
@@ -196,5 +188,4 @@ public class MessageContentInfo {
     }
-
 }
-package com.cnlive.gundam.video.fragment.chat;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.SwitchCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.cnlive.gundam.R;
-import com.cnlive.gundam.video.view.PlayerControllerView;
-
-/**
- * @author 陈硕
- * @time 2017/6/29  19:36
- * @desc ${TODD}
- */
-public class UgcLiveChatFragment extends ChatRoomFragment {
-
-    public static UgcLiveChatFragment newInstance() {
-        Bundle args = new Bundle();
-        UgcLiveChatFragment fragment = new UgcLiveChatFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return super.onCreateView(inflater, container, savedInstanceState);
-    }
-
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        PlayerControllerView viewById = getActivity().findViewById(R.id.controllerView);
-        viewById.setonswitchCompatChangeListene(new PlayerControllerView.SwitchCompatChangeListener() {
-            @Override
-            public void onSwitchCompatChange(SwitchCompat barrageTop) {
-                barrageTop.setVisibility(View.INVISIBLE);
-            }
-        });
-    }
-}