ios联调

陈硕
1 parent c6e316a1
Showing 5 changed files with 23 additions and 64 deletions
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
@@ -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();
     }
@@ -48,14 +48,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 +67,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();
     }
@@ -34,19 +34,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,7 +66,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();
@@ -123,7 +123,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,18 +152,19 @@ public class MessageContentInfo {
         onConnectListener = new IChat.OnConnectListener() {
             @Override
             public void onTokenIncorrect(String s) {
-
+                Log.v("dfasdfasd", "onTokenIncorrect");
             }
             @Override
             public void onSuccess(String s) {
                 joinChatRoom();
-           }
+            }
             @Override
             public void onError(int i, String s) {
+                Log.v("dfasdfasd", "onError");
             }
         };
@@ -175,15 +176,16 @@ 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);
+                Log.v("dfsd", obj2);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, onSendMessageListener);
             }
             @Override
             public void onError(int what, String extra) {
+                Log.v("dfsd", "onError");
             }
         });
@@ -196,5 +198,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);
-            }
-        });
-    }
-}