优化代码

陈硕
1 parent 87fb84bd
Showing 8 changed files with 55 additions and 129 deletions
app/src/main/java/com/cnlive/gundam/video/adpter/GiftAdapter.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/CommentFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/MessageContentInfo.java
app/src/main/java/com/cnlive/gundam/video/view/PlayerControllerView.java
app/src/main/res/layout/layout_player_controller_live_l.xml
@@ -33,12 +33,15 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
     private int mLayoutId;      // 条目布局文件ID
     private int mVariableId;    // DataBinding变量ID
     private  String roomId;
+    private final Gson gson2;
+
     public GiftAdapter(String roomId,Context context, List<GiftModle> list, int layoutId, int variableId) {
         this.mContext = context;
         this.mDataList = list;
         this.mLayoutId = layoutId;
         mVariableId = variableId;
         this.roomId=roomId;
+        gson2 = new Gson();
     }
@@ -59,7 +62,6 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
             @Override
             public void onClick(View v) {
                 CNMessageModle cnMessageModle = new CNMessageModle("giftType",new MessageInfo("0",mDataList.get(position).getGiftMessage(),"1","0",mDataList.get(position).getGiftMessage()));
-                Gson gson2=new Gson();
                 String obj2=gson2.toJson(cnMessageModle);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, new IChat.OnSendMessageListener() {
                     @Override
@@ -70,7 +72,6 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
                     @Override
                     public void onSuccess(CNMessage message) {
                         PlayerActivity context = (PlayerActivity) GiftAdapter.this.mContext;
-
                         ChatRoomFragment chatRoomFragment = (ChatRoomFragment) context.getSupportFragmentManager().findFragmentByTag("chatRoomFragment");
                         chatRoomFragment.giftItem(position);
@@ -107,9 +107,6 @@ public class PlayerLiveFragment extends Fragment implements PlayerAccelerometerS
             getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
         }
-        ChatRoomFragment chatRoomFragment = (ChatRoomFragment) getActivity().getSupportFragmentManager().findFragmentByTag("chatRoomFragment");
-        chatRoomFragment.doBarrage();
-
     }
@@ -22,6 +22,7 @@ import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.view.BaseVideoView;
 import com.cnlive.gundam.video.view.VideoView;
+
 /**
  * Created by gujun on 2017/4/5.
  */
@@ -24,11 +24,10 @@ import com.cnlive.gundam.user.model.User;
 import com.cnlive.gundam.user.util.InputUtil;
 import com.cnlive.gundam.video.adpter.CommonAdapter;
 import com.cnlive.gundam.video.adpter.GiftAdapter;
+import com.cnlive.gundam.video.barrage.BarrageBaseMessage;
 import com.cnlive.gundam.video.barrage.BarrageBaseView;
 import com.cnlive.gundam.video.model.GiftModle;
 import com.cnlive.gundam.video.model.MessageContent;
-import com.cnlive.gundam.video.utils.PlayerUtils;
-import com.cnlive.gundam.video.view.PlayerControllerView;
 import com.cnlive.libs.util.chat.ChatUtil;
 import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNUserInfo;
@@ -37,14 +36,14 @@ import com.cnlive.libs.video.barrage.BarrageLayout;
 import java.util.ArrayList;
+
 /**
  * @author 陈硕
  * @time 2017/5/27  13:57
  * @desc ${TODD}
  */
-public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback, MessageContentInfo.SendAndRecevieSucessCall {
+public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback, MessageContentInfo.OnChatListener {
-    PlayerControllerView.SwitchCompatChangeListener switchCompatChangeListener;
     private FragmentChatBinding fragmentChatBinding;
     private ArrayList<GiftModle> giftArray;
     private CommonAdapter<MessageContent> messageContentCommonAdapter;
@@ -125,15 +124,6 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         ChatUtil.sendMessage(IChat.CHATROOM, roomId, message, messageContentInfo.onSendMessageListener);
     }
-    @Override
-    public void sentSucess(ArrayList<MessageContent> messageContents) {
-        messageContentCommonAdapter.addItems((messageContents));
-    }
-
-    @Override
-    public void receaviceSucess(ArrayList<MessageContent> messageContents) {
-        messageContentCommonAdapter.addItems((messageContents));
-    }
     @Override
@@ -144,14 +134,20 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     private void initChat() {
         User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
-        String faceurl = activeAccountInfo.getFaceurl();
-        String nickname = activeAccountInfo.getNickname();
-        int uid = activeAccountInfo.getUid();
+        final String faceurl = activeAccountInfo.getFaceurl();
+        final String nickname = activeAccountInfo.getNickname();
+        final int uid = activeAccountInfo.getUid();
+
         if (uid != 0) {
+
             ChatUtil.connect(new CNUserInfo(uid + "", nickname, faceurl), messageContentInfo.onConnectListener);
         } else {
+
             ChatUtil.connect(messageContentInfo.onConnectListener);
+
         }
+
+
         ChatUtil.setOnReceiveMessageListener(messageContentInfo.onReceiveMessageListener);
     }
@@ -213,38 +209,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         barrageBottom();
         initMessageAdapter();
         messageContentInfo = new MessageContentInfo();
-        messageContentInfo.setOnReceiveAndSendListener(barrageLayout, roomId, getActivity(), ChatRoomFragment.this);
-    }
-
-
-    public void doBarrage() {
-        boolean isPortrait = PlayerUtils.isPortrait(getActivity());
-        final BarrageLayout barrageLayout = getActivity().findViewById(R.id.private_message);
-        barrageLayout.pause();
-        SwitchCompat switchCompat = getActivity().findViewById(R.id.barrage);
-        switchCompat.setChecked(false);
-        if (!isPortrait) {
-            PlayerControllerView viewById = getActivity().findViewById(R.id.controllerView);
-            viewById.setonswitchCompatChangeListene(switchCompatChangeListener = new PlayerControllerView.SwitchCompatChangeListener() {
-                @Override
-                public void onSwitchCompatChange(SwitchCompat barrageTop) {
-                    barrageTop.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                        @Override
-                        public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                            if (b) {
-                                barrageLayout.resume();
-
-                            } else {
-                                barrageLayout.pause();
-
-                            }
-                        }
-                    });
-                }
-            });
-
-
-        }
+        messageContentInfo.setOnReceiveAndSendListener( roomId, getActivity(), ChatRoomFragment.this);
     }
@@ -253,4 +218,14 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+    @Override
+    public void onchat(ArrayList<MessageContent> messageContents) {
+        messageContentCommonAdapter.addItems((messageContents));
+
+    }
+
+    @Override
+    public void onbarrage(BarrageBaseMessage barrageBaseMessage) {
+        barrageLayout.addMessage(barrageBaseMessage);
+    }
 }
 package com.cnlive.gundam.video.fragment.chat;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,7 +16,6 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.util.InputUtil;
 import com.cnlive.gundam.video.adpter.CommentAdapter;
-import com.cnlive.libs.util.Config;
 import com.cnlive.libs.util.chat.model.ErrorMessage;
 import com.cnlive.libs.util.comment.CommentUtil;
 import com.cnlive.libs.util.comment.base.CommentCallback;
@@ -29,6 +26,7 @@ import com.cnlive.libs.util.model.CommentPage;
 import com.cnlive.libs.util.model.CommentProgram;
 import java.util.List;
+import java.util.Random;
 /**
  * @author 陈硕
@@ -78,10 +76,9 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
         inputUtil.setonSendCommentCallBack(this);
         int uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
         if(uid!=0){
-            userID=uid+"";
+            userID=String.valueOf(uid);
         }else {
-            TelephonyManager telephonyManager = (TelephonyManager) Config.getContext().getSystemService(Context.TELEPHONY_SERVICE);
-            userID=telephonyManager.getDeviceId();}
+            userID=String.valueOf(new Random().nextInt(100));}
     }
@@ -172,7 +169,7 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
                 if (errorMessage != null && errorMessage.getErrorCode().equals("0")) {
                     Toast.makeText(getActivity(), "评论成功", Toast.LENGTH_SHORT).show();
-                    edit_comment.setText("");
+                    edit_comment.setText("我来说两句.....");
                     commentAdapter.clearItems();
                     getCommentMesaage();
                 } else Toast.makeText(getActivity(), "评论失败", Toast.LENGTH_SHORT).show();
@@ -12,7 +12,6 @@ import com.cnlive.gundam.video.model.MessageInfo;
 import com.cnlive.libs.util.chat.ChatUtil;
 import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNMessage;
-import com.cnlive.libs.video.barrage.BarrageLayout;
 import com.google.gson.Gson;
 import java.util.ArrayList;
@@ -31,46 +30,40 @@ public class MessageContentInfo {
     private Handler mHandler;
     private ArrayList<com.cnlive.gundam.video.model.MessageContent> messageContentArrayList;
     private Context mContext;
-    private SendAndRecevieSucessCall mSendAndRecevieSucessCall;
+    private OnChatListener onChatListener;
     private String roomId;
-    private BarrageLayout barrageLayout;
     private String JoinType = "joinType";
     private String ChatRoom = "chatRoom";
     private String giftType = "giftType";
     private Gson gson;
-    public void setOnReceiveAndSendListener(BarrageLayout barrageLayout, String roomID, Context context, SendAndRecevieSucessCall sendAndRecevieSucessCall) {
+    public void setOnReceiveAndSendListener(String roomID, Context context, OnChatListener sendAndRecevieSucessCall) {
         this.roomId = roomID;
         this.mContext = context;
         gson = new Gson();
-        this.mSendAndRecevieSucessCall = sendAndRecevieSucessCall;
+        this.onChatListener = sendAndRecevieSucessCall;
         mHandler = new Handler();
         messageContentArrayList = new ArrayList<>();
-        this.barrageLayout = barrageLayout;
         initListener();
     }
-
     private void initListener() {
-
-
         onReceiveMessageListener = new IChat.OnReceiveMessageListener() {
             @Override
             public void processMessage(final CNMessage message) {
-
                 mHandler.post(new Runnable() {
                     @Override
                     public void run() {
                         try {
-
-
                             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, ""));
+                                if (onChatListener != null) {
+                                    onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "送了" + messagecontent, ""));
+                                }
                                 messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": 送了" + messagecontent, message.getUserInfo().getHeadUrl(), true));
                             } else if (messageType.equals(ChatRoom)) {
                                 if (message.getUserInfo().getUserId().equals(ChatUtil.getCurrentUserInfo().getUserId())) {
@@ -78,8 +71,9 @@ public class MessageContentInfo {
                                 } else {
                                     messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), " :" + messagecontent, message.getUserInfo().getHeadUrl(), true));
                                 }
-                                barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
-
+                                if (onChatListener != null) {
+                                    onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
+                                }
                             } else if (messageType.equals(JoinType)) {
                                 String userName = message.getUserInfo().getUserName();
                                 if (TextUtils.isEmpty(userName)) {
@@ -88,15 +82,15 @@ public class MessageContentInfo {
                                 if (userName.equals(UserService.getInstance(mContext).getActiveAccountInfo().getNickname())) {
                                     return;
                                 }
-                                barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "来了", ""));
-
+                                if (onChatListener != null) {
+                                    onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "来了", ""));
+                                }
                                 messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": " + "来了", message.getUserInfo().getHeadUrl(), true));
-
                             }
-
-                            mSendAndRecevieSucessCall.receaviceSucess(messageContentArrayList);
-
-                        } catch (Exception e) {
+                            if (onChatListener != null) {
+                                onChatListener.onchat(messageContentArrayList);
+                            }
+                       } catch (Exception e) {
                             e.printStackTrace();
                         }
                     }
@@ -109,37 +103,24 @@ public class MessageContentInfo {
         onSendMessageListener = new IChat.OnSendMessageListener() {
             @Override
             public void onAttached(CNMessage message) {
-
             }
-
             @Override
             public void onSuccess(CNMessage message) {
-
                 try {
-
                     CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
                     String messagecontent = cnMessageModle.getMessage().getContent();
                     String messageType = cnMessageModle.getType();
-
-
-                    if (messageType.equals(ChatRoom)) {
-                        barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
-
+                   if (messageType.equals(ChatRoom)) {
+                        onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
                         messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " :", message.getUserInfo().getHeadUrl(), false));
-
-                        mSendAndRecevieSucessCall.sentSucess(messageContentArrayList);
+                        onChatListener.onchat(messageContentArrayList);
                     }
-
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-
-
             }
-
             @Override
             public void onError(CNMessage message, int what, String extra) {
-
             }
         };
@@ -148,14 +129,10 @@ public class MessageContentInfo {
             @Override
             public void onTokenIncorrect(String s) {
             }
-
             @Override
             public void onSuccess(String s) {
                 joinChatRoom();
-
             }
-
-
             @Override
             public void onError(int i, String s) {
@@ -165,7 +142,7 @@ public class MessageContentInfo {
     }
-    private void joinChatRoom() {
+    public void joinChatRoom() {
         ChatUtil.joinChatRoom(roomId, 0, new IChat.OnOperationListener() {
             @Override
             public void onSuccess(int what, String extra) {
@@ -181,10 +158,11 @@ public class MessageContentInfo {
         });
     }
-    public interface SendAndRecevieSucessCall {
-        void sentSucess(ArrayList<com.cnlive.gundam.video.model.MessageContent> messageContents);
+    public interface OnChatListener {
+        void onchat(ArrayList<com.cnlive.gundam.video.model.MessageContent> messageContents);
+
+        void onbarrage(BarrageBaseMessage barrageBaseMessage);
-        void receaviceSucess(ArrayList<com.cnlive.gundam.video.model.MessageContent> messageContents);
     }
@@ -11,7 +11,6 @@ import android.databinding.ObservableLong;
 import android.databinding.ViewDataBinding;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.SwitchCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -21,7 +20,6 @@ import android.widget.SeekBar;
 import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
-import com.cnlive.gundam.databinding.LayoutPlayerControllerLiveLBinding;
 import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.utils.VideoRateUtil;
 import com.cnlive.libs.util.Config;
@@ -186,7 +184,6 @@ public class PlayerControllerView extends RelativeLayout implements SeekBar.OnSe
                 binding.setVariable(BR.title, observableTitle);
                 binding.setVariable(BR.showController, observableShow);
                 binding.setVariable(BR.isPlay, observableIsPlay);
-                if(switchCompatChangeListener!=null)switchCompatChangeListener.onSwitchCompatChange(((LayoutPlayerControllerLiveLBinding) this.binding).barrageTop);
                 isUgc = false;
                 break;
             case UGC_VOD_P:
@@ -406,14 +403,6 @@ public class PlayerControllerView extends RelativeLayout implements SeekBar.OnSe
         void onSwitchRate(String rate);
     }
-    public interface  SwitchCompatChangeListener{
-       void onSwitchCompatChange(SwitchCompat barrageTop);
-    }
-    private  SwitchCompatChangeListener switchCompatChangeListener;
-    public void setonswitchCompatChangeListene(SwitchCompatChangeListener switchCompatChangeListener){
-        this.switchCompatChangeListener=switchCompatChangeListener;
-    }
-
 }
@@ -175,18 +175,6 @@
                         android:textColor="@android:color/white"
                         android:visibility="@{hasRate.get() ? View.VISIBLE : View.GONE}" />
-                    <android.support.v7.widget.SwitchCompat
-                        android:id="@+id/barrage_top"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:background="@null"
-                        android:textIsSelectable="false"
-                        android:layout_marginRight="10dp"
-                        android:layout_toLeftOf="@+id/rate"
-                        android:thumb="@drawable/switch_thumb"
-                        app:switchMinWidth="15dp"
-                        app:track="@drawable/switch_track" />
                 </RelativeLayout>