处理评论页面刷新问题以及聊天页面的 bug处理

吴奎庆
1 parent 204c4c04
Showing 20 changed files with 783 additions and 31 deletions
app/src/main/java/com/cnlive/gundam/main/presenter/VodDetailPresenter.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/LoadImgAdapter.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/mul/BaseBindingAdapter.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/CustomGiftPopupWindow.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/GlideCircleTransform.java
app/src/main/java/com/cnlive/gundam/user/util/InputUtil.java
app/src/main/java/com/cnlive/gundam/video/activity/PlayerActivity.java
app/src/main/java/com/cnlive/gundam/video/adpter/GiftAdapter.java
app/src/main/java/com/cnlive/gundam/video/adpter/UGCGiftAdapter.java
app/src/main/java/com/cnlive/gundam/video/fragment/CommentDetailsFragment.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/UGCChatRoomFragment.java
app/src/main/res/anim/push_bottom_in.xml
app/src/main/res/anim/push_buttom_out.xml
app/src/main/res/layout/fragment_player_ugc_live.xml
app/src/main/res/layout/fragment_ugc_chat.xml
app/src/main/res/layout/layout_chat_input.xml
app/src/main/res/layout/layout_popupwindow_gift.xml
app/src/main/res/values/styles.xml
@@ -12,11 +12,13 @@ import com.cnlive.libs.util.chat.model.ErrorMessage;
 import com.cnlive.libs.util.comment.CommentUtil;
 import com.cnlive.libs.util.comment.base.CommentCallback;
 import com.cnlive.libs.util.comment.base.CommentListCallback;
+import com.cnlive.libs.util.data.okhttpUtil.utils.L;
 import com.cnlive.libs.util.model.CommentItem;
 import com.cnlive.libs.util.model.CommentPage;
 import java.util.ArrayList;
 import java.util.List;
+
 /**
  * 创建：wukuiqing
  * <p>
@@ -38,14 +40,14 @@ public class VodDetailPresenter {
     }
-    public void getData()
-    {
+    public void getData() {
         mDatas.add(new CommentTitleViewModel("0"));
-        commentFragment.onLoadDataComplete(null,mDatas);
+        commentFragment.onLoadDataComplete(null, mDatas);
     }
-    public void getComment(final boolean scrollState, String mContentId, int page) {
+    public void getComment(final boolean scrollState, String mContentId, int page) {
+        L.e("data:" + page);
         commentUtil.readAllComment(mContentId, page, pageCount, new CommentListCallback() {
             @Override
@@ -7,8 +7,8 @@ import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
-
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.cnlive.gundam.main.ui.widget.GlideCircleTransform;
 /**
@@ -20,7 +20,7 @@ public class LoadImgAdapter {
     @BindingAdapter({"circleUrl"})
     public static void loadCircleImage(ImageView iv, String url) {
-        Glide.with(iv.getContext()).load(url).into(iv);
+        Glide.with(iv.getContext()).load(url).bitmapTransform(new GlideCircleTransform(iv.getContext())).into(iv);
     }
@@ -182,6 +182,12 @@ public class BaseBindingAdapter&lt;D, B extends ViewDataBinding&gt; extends RecyclerVi
     }
+    public void clear(){
+       if( mDatas!=null){
+           mDatas.clear();
+       }
+    }
+
     public List<D> getDatas() {
         return mDatas;
     }
+package com.cnlive.gundam.main.ui.widget;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.ColorDrawable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.LayoutPopupwindowGiftBinding;
+import com.cnlive.gundam.video.adpter.GiftAdapter;
+import com.cnlive.gundam.video.fragment.chat.UGCChatRoomFragment;
+import com.cnlive.gundam.video.model.GiftModle;
+
+import java.util.ArrayList;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/7/14
+ * <p>
+ * 描述：
+ */
+
+public class CustomGiftPopupWindow extends PopupWindow {
+    Context mContext;
+    RecyclerView popRecycle;
+    ArrayList<GiftModle> giftArray;
+    LayoutPopupwindowGiftBinding binding;
+
+    public CustomGiftPopupWindow(Context context) {
+        super(context);
+        mContext = context;
+
+        //初始化
+//        initPop();
+
+    }
+
+
+
+    private void initPop() {
+        giftArray = new ArrayList<>();
+//        view = LayoutInflater.from(mContext).inflate(R.layout.layout_popupwindow_gift, null);
+        binding= DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.layout_popupwindow_gift, null, false);
+
+        popRecycle = binding.popRecycle;
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 6);
+        popRecycle.setLayoutManager(gridLayoutManager);
+        popRecycle.addItemDecoration(new RecyclerSpace(10));
+        this.setContentView(binding.getRoot());// 设置View
+        this.setWidth(LinearLayout.LayoutParams.MATCH_PARENT);// 设置弹出窗口的宽
+        this.setHeight(LinearLayout.LayoutParams.WRAP_CONTENT);// 设置弹出窗口的高
+
+        this.setFocusable(true);// 设置弹出窗口可
+        this.setAnimationStyle(R.style.gift_popwindow_anim_style);// 设置动画
+        this.setBackgroundDrawable(new ColorDrawable(0x22000000));// 设置背景透明
+        binding.getRoot().setOnTouchListener(new View.OnTouchListener() {// 如果触摸位置在窗口外面则销毁
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                // TODO Auto-generated method stub
+                int height = binding.popRl.getTop();
+                int y = (int) event.getY();
+                if (event.getAction() == MotionEvent.ACTION_UP) {
+                    if (y < height) {
+                        dismiss();
+                    }
+                }
+                return true;
+            }
+        });
+    }
+
+
+    public void setData(GiftAdapter adapter) {
+        initPop();
+        binding.setGiftAdapter(adapter);
+
+
+
+    }
+
+
+}
@@ -23,7 +23,8 @@ public class GlideCircleTransform extends BitmapTransformation {
         super(context);
     }
-    @Override protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+    @Override
+    protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
         return circleCrop(pool, toTransform);
     }
@@ -51,7 +52,8 @@ public class GlideCircleTransform extends BitmapTransformation {
         return result;
     }
-    @Override public String getId() {
+    @Override
+    public String getId() {
         return getClass().getName();
     }
 }
@@ -2,6 +2,7 @@ package com.cnlive.gundam.user.util;
 import android.content.Context;
 import android.graphics.drawable.BitmapDrawable;
+import android.inputmethodservice.InputMethodService;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -12,6 +13,7 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -65,6 +67,8 @@ public class InputUtil {
             }
         });
         mMsgEditText = (EditText) contentView.findViewById(R.id.chat_content);
+//        ImageView mEmoticonsutton = (ImageView) contentView.findViewById(R.id.emoticons_button);
+
         mMsgEditText.setOnKeyListener(new View.OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
@@ -121,8 +125,17 @@ public class InputUtil {
         mMsgEditText.requestFocus();
         mInputPopupWindow.setSoftInputMode(PopupWindow.INPUT_METHOD_NEEDED);
         mInputPopupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        InputMethodManager imm = (InputMethodManager) mContext.getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        final InputMethodManager imm = (InputMethodManager) mContext.getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.toggleSoftInput(1000, InputMethodManager.HIDE_NOT_ALWAYS);
+
+//        mEmoticonsutton.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//
+//                imm.showSoftInput(mMsgEditText, 0);
+//            }
+//        });
+
     }
@@ -93,7 +93,7 @@ public class PlayerActivity extends AppCompatActivity {
         if (!(PlayerUtils.isPortrait(this)) && (fragment instanceof PlayerLiveFragment || fragment instanceof PlayerVodFragment)) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        } else if (SharedPreferencesHelper.getInstance(this).getIntValue("ishow") == 0) {
+        } else if (SharedPreferencesHelper.getInstance(this).getIntValue("ishow",-1) == 0) {
             EventBus.getDefault().post(new MsgEvent());
         } else {
             super.onBackPressed();
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.video.activity.PlayerActivity;
 import com.cnlive.gundam.video.fragment.chat.ChatRoomFragment;
+import com.cnlive.gundam.video.fragment.chat.UGCChatRoomFragment;
 import com.cnlive.gundam.video.model.CNMessageModle;
 import com.cnlive.gundam.video.model.GiftModle;
 import com.cnlive.gundam.video.model.MessageInfo;
@@ -32,15 +33,15 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
     private List<GiftModle> mDataList;
     private int mLayoutId;      // 条目布局文件ID
     private int mVariableId;    // DataBinding变量ID
-    private  String roomId;
+    private String roomId;
     private final Gson gson2;
-    public GiftAdapter(String roomId,Context context, List<GiftModle> list, int layoutId, int variableId) {
+    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;
+        this.roomId = roomId;
         gson2 = new Gson();
@@ -61,8 +62,8 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
         holder.binding.getRoot().findViewById(R.id.ll_item).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CNMessageModle cnMessageModle = new CNMessageModle("giftType",new MessageInfo("0",mDataList.get(position).getGiftMessage(),"1","0",mDataList.get(position).getGiftMessage()));
-                String obj2=gson2.toJson(cnMessageModle);
+                CNMessageModle cnMessageModle = new CNMessageModle("giftType", new MessageInfo("0", mDataList.get(position).getGiftMessage(), "1", "0", mDataList.get(position).getGiftMessage()));
+                String obj2 = gson2.toJson(cnMessageModle);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, new IChat.OnSendMessageListener() {
                     @Override
                     public void onAttached(CNMessage message) {
@@ -72,8 +73,19 @@ 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);
+                        if (context.getSupportFragmentManager().findFragmentByTag("chatRoomFragment") != null) {
+                            if (context.getSupportFragmentManager().findFragmentByTag("chatRoomFragment").getClass() == ChatRoomFragment.class) {
+                                ChatRoomFragment chatRoomFragment = (ChatRoomFragment) context.getSupportFragmentManager().findFragmentByTag("chatRoomFragment");
+                                chatRoomFragment.giftItem(position);
+                            }
+                        }
+                        if (context.getSupportFragmentManager().findFragmentByTag("UGCChatRoomFragment") != null ) {
+                            if (context.getSupportFragmentManager().findFragmentByTag("UGCChatRoomFragment").getClass() == UGCChatRoomFragment.class) {
+                                UGCChatRoomFragment chatRoomFragment = (UGCChatRoomFragment) context.getSupportFragmentManager().findFragmentByTag("UGCChatRoomFragment");
+                                chatRoomFragment.giftItem(position);
+                            }
+                        }
+
                     }
+package com.cnlive.gundam.video.adpter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.video.activity.PlayerActivity;
+import com.cnlive.gundam.video.fragment.chat.ChatRoomFragment;
+import com.cnlive.gundam.video.fragment.chat.UGCChatRoomFragment;
+import com.cnlive.gundam.video.model.CNMessageModle;
+import com.cnlive.gundam.video.model.GiftModle;
+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.google.gson.Gson;
+
+import java.util.List;
+
+/**
+ * @author 陈硕
+ * @time 2017/5/27  16:04
+ * @desc ${TODD}
+ */
+
+public class UGCGiftAdapter extends RecyclerView.Adapter<UGCGiftAdapter.RVHolder> {
+    private Context mContext;
+    private List<GiftModle> mDataList;
+    private int mLayoutId;      // 条目布局文件ID
+    private int mVariableId;    // DataBinding变量ID
+    private  String roomId;
+    private final Gson gson2;
+
+    public UGCGiftAdapter(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();
+
+
+    }
+
+
+    @Override
+    public RVHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        ViewDataBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), mLayoutId, parent, false);
+        RVHolder holder = new RVHolder(binding.getRoot());
+        holder.binding = binding;
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(final RVHolder holder, final int position) {
+        holder.binding.setVariable(mVariableId, mDataList.get(position));
+        holder.binding.getRoot().findViewById(R.id.ll_item).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CNMessageModle cnMessageModle = new CNMessageModle("giftType",new MessageInfo("0",mDataList.get(position).getGiftMessage(),"1","0",mDataList.get(position).getGiftMessage()));
+                String obj2=gson2.toJson(cnMessageModle);
+                ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, new IChat.OnSendMessageListener() {
+                    @Override
+                    public void onAttached(CNMessage message) {
+
+                    }
+
+                    @Override
+                    public void onSuccess(CNMessage message) {
+                        PlayerActivity context = (PlayerActivity) UGCGiftAdapter.this.mContext;
+                        UGCChatRoomFragment chatRoomFragment = (UGCChatRoomFragment) context.getSupportFragmentManager().findFragmentByTag("UGCChatRoomFragment");
+                        chatRoomFragment.giftItem(position);
+
+                    }
+
+                    @Override
+                    public void onError(CNMessage message, int what, String extra) {
+
+                    }
+                });
+            }
+        });
+        holder.binding.executePendingBindings();
+    }
+
+    @Override
+    public int getItemCount() {
+        return mDataList == null ? 0 : mDataList.size();
+    }
+
+    class RVHolder extends RecyclerView.ViewHolder {
+        ViewDataBinding binding;
+
+        RVHolder(View view) {
+            super(view);
+        }
+    }
+}
@@ -195,6 +195,8 @@ public class CommentDetailsFragment extends Fragment implements VodDetialView {
         presenter.addCommment(mContentId, s1, message);
     }
+    boolean mRefrush;
+
     @Override
     public void onLoadDataComplete(VodDetailModel model, List datas) {
         mDatas = datas;
@@ -206,7 +208,8 @@ public class CommentDetailsFragment extends Fragment implements VodDetialView {
         binding.srvVodDetail.setOnLoadListener(new SwipeRecyclerView.OnLoadListener() {
             @Override
             public void onRefresh() {
-                presenter.getComment(false, mContentId, page);
+                presenter.getComment(false, mContentId, 1);
+                mRefrush = true;
             }
             @Override
@@ -217,7 +220,7 @@ public class CommentDetailsFragment extends Fragment implements VodDetialView {
             }
         });
-        binding.srvVodDetail.setRefreshEnable(true);
+        binding.srvVodDetail.setRefreshEnable(false);
         binding.srvVodDetail.setStickyListener(new SwipeRecyclerView.StickyListener() {
             @Override
             public void onSticky(boolean isVisible) {
@@ -243,18 +246,28 @@ public class CommentDetailsFragment extends Fragment implements VodDetialView {
         if (binding.srvVodDetail.isRefreshing()) {
             binding.srvVodDetail.complete();
         }
+
         if (mDatas == null) {
             binding.srvVodDetail.onNoMore("快来抢沙发喽~");
             loadMoreEnable = false;
         } else if (isScroll) {
             adapter.add(1, mDatas.get(0));
-            binding.srvVodDetail.getRecyclerView().scrollToPosition(1);
+            binding.srvVodDetail.getRecyclerView().scrollToPosition(0);
         } else {
+//            if (mRefrush) {
+//                adapter.clear();
+//                mDatas.add(0, new CommentTitleViewModel("0"));
+//                mRefrush=false;
+//            }
+
             adapter.addDatas(mDatas);
+//            binding.srvVodDetail.setRefreshing(false);
+//            binding.srvVodDetail.onNoMore("");
             if (mDatas.size() < 2) {
                 binding.srvVodDetail.onNoMore("暂无更多评论~");
                 loadMoreEnable = false;
             }
+
             page++;
         }
@@ -17,6 +17,7 @@ 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.ChatRoomFragment;
+import com.cnlive.gundam.video.fragment.chat.UGCChatRoomFragment;
 import com.cnlive.gundam.video.model.VideoModel;
 import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.view.BaseVideoView;
@@ -59,7 +60,7 @@ public class PlayerUgcLiveFragment extends Fragment implements BaseVideoView.OnU
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_player_ugc_live, container, false);
         initData();
-        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, ChatRoomFragment.newInstance(id), "chatRoomFragment").commit();
+        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, UGCChatRoomFragment.newInstance(id), "UGCChatRoomFragment").commit();
         return binding.getRoot();
     }
@@ -12,6 +12,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.SwitchCompat;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,6 +24,7 @@ import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentChatBinding;
 import com.cnlive.gundam.main.model.MsgEvent;
+import com.cnlive.gundam.main.ui.widget.CustomGiftPopupWindow;
 import com.cnlive.gundam.main.ui.widget.GlideCircleTransform;
 import com.cnlive.gundam.main.ui.widget.RecyclerSpace;
 import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
@@ -67,6 +69,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     private String roomId;
     private int[] imaSource;
     private String[] gitName;
+    CustomGiftPopupWindow popGift;
     public static ChatRoomFragment newInstance(String id) {
@@ -95,6 +98,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         initListener();
         EventBus.getDefault().register(this);
         faceurl = UserService.getInstance(getActivity()).getActiveAccountInfo().getFaceurl();
+         popGift= new CustomGiftPopupWindow(getActivity());
         initDate();
         initGift();
         int checkCallPhonePermission = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_PHONE_STATE);
@@ -195,16 +199,19 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         fragmentChatBinding.imgGift.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                int i = View.INVISIBLE == fragmentChatBinding.rlGift.getVisibility() ? View.VISIBLE : View.INVISIBLE;
-                SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", i);
-                fragmentChatBinding.rlGift.setVisibility(i);
+//                int i = View.INVISIBLE == fragmentChatBinding.rlGift.getVisibility() ? View.VISIBLE : View.INVISIBLE;
+//                SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", i);
+//                fragmentChatBinding.rlGift.setVisibility(i);
+                popGift.setData(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
+                popGift.showAtLocation(fragmentChatBinding.getRoot(),Gravity.BOTTOM| Gravity.CENTER_HORIZONTAL, 0, 200);
+
             }
         });
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 6);
         fragmentChatBinding.recyclerGift.setLayoutManager(gridLayoutManager);
         fragmentChatBinding.recyclerGift.addItemDecoration(new RecyclerSpace(10));
-        fragmentChatBinding.setGiftAdapter(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
+//        fragmentChatBinding.setGiftAdapter(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
     }
@@ -295,8 +302,9 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @Subscribe(threadMode = ThreadMode.MAIN) //第2步:注册一个在后台线程执行的方法,用于接收事件
     public void onUserEvent(MsgEvent event) {
-        fragmentChatBinding.rlGift.setVisibility(View.INVISIBLE);
-        SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", 4);
+//        fragmentChatBinding.rlGift.setVisibility(View.INVISIBLE);
+//        SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", 4);
+
     }
 }
+package com.cnlive.gundam.video.fragment.chat;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.databinding.BindingAdapter;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.SwitchCompat;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.cnlive.gundam.BR;
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.FragmentChatBinding;
+import com.cnlive.gundam.databinding.FragmentUgcChatBinding;
+import com.cnlive.gundam.main.model.MsgEvent;
+import com.cnlive.gundam.main.ui.widget.CustomGiftPopupWindow;
+import com.cnlive.gundam.main.ui.widget.GlideCircleTransform;
+import com.cnlive.gundam.main.ui.widget.RecyclerSpace;
+import com.cnlive.gundam.user.auth.UserService;
+import com.cnlive.gundam.user.model.User;
+import com.cnlive.gundam.user.util.InputUtil;
+import com.cnlive.gundam.user.util.ToastUtil;
+import com.cnlive.gundam.video.activity.PlayerActivity;
+import com.cnlive.gundam.video.adpter.CommonAdapter;
+import com.cnlive.gundam.video.adpter.GiftAdapter;
+import com.cnlive.gundam.video.adpter.UGCGiftAdapter;
+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.libs.util.chat.ChatUtil;
+import com.cnlive.libs.util.chat.base.IChat;
+import com.cnlive.libs.util.chat.model.CNUserInfo;
+import com.cnlive.libs.video.barrage.BarrageLayout;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+
+
+/**
+ * @author 陈硕
+ * @time 2017/5/27  13:57
+ * @desc ${TODD}
+ */
+public class UGCChatRoomFragment extends Fragment implements InputUtil.SendCallback, MessageContentInfo.OnChatListener {
+
+    private final int PERMISSION_REQUEST_CODE = 0x1001;
+
+    private FragmentUgcChatBinding fragmentChatBinding;
+    private ArrayList<GiftModle> giftArray;
+    private CommonAdapter<MessageContent> messageContentCommonAdapter;
+    private MessageContentInfo messageContentInfo;
+    public SwitchCompat switchCompatBottom;
+    private BarrageLayout barrageLayout;
+    private String roomId;
+    private int[] imaSource;
+    private String[] gitName;
+    CustomGiftPopupWindow popGift;
+
+
+    public static UGCChatRoomFragment newInstance(String id) {
+        Bundle args = new Bundle();
+        args.putString("roomID", id);
+        UGCChatRoomFragment fragment = new UGCChatRoomFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        fragmentChatBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_ugc_chat, container, false);
+        roomId = getArguments().getString("roomID");
+        return fragmentChatBinding.getRoot();
+
+    }
+
+    String faceurl;
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initListener();
+        EventBus.getDefault().register(this);
+        faceurl = UserService.getInstance(getActivity()).getActiveAccountInfo().getFaceurl();
+         popGift= new CustomGiftPopupWindow(getActivity());
+        initDate();
+        initGift();
+        int checkCallPhonePermission = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_PHONE_STATE);
+        if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE}, PERMISSION_REQUEST_CODE);
+        } else {
+            initChat();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                initChat();
+            } else {
+                ToastUtil.show(getActivity(), "使用聊天功能,请通过权限审核");
+            }
+        }
+    }
+
+    private void barrageBottom() {
+        switchCompatBottom = fragmentChatBinding.barrage;
+        switchCompatBottom.setChecked(false);
+        barrageLayout = getActivity().findViewById(R.id.private_message);
+        barrageLayout.init(BarrageBaseView.class, 300, 10, 10, 0.5f);
+        barrageLayout.pause();
+        switchCompatBottom.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+                if (isChecked) {
+                    barrageLayout.resume();
+
+                } else {
+                    barrageLayout.pause();
+
+                }
+            }
+        });
+
+
+    }
+
+    @BindingAdapter("android:src")
+    public static void setSrc(ImageView view, int resId) {
+        view.setImageResource(resId);
+    }
+
+    @BindingAdapter({"imageUrl"})
+    public static void loadImage(ImageView imageView, String url) {
+        if (url == null || url.equals("")) {
+//            imageView.setImageResource(R.mipmap.ic_launcher);
+
+            Glide.with(imageView.getContext()).load(R.mipmap.ic_launcher).bitmapTransform(new GlideCircleTransform(imageView.getContext())).error(R.mipmap.ic_launcher).into(imageView);
+        } else {
+            Glide.with(imageView.getContext()).load(url).bitmapTransform(new GlideCircleTransform(imageView.getContext())).error(R.mipmap.ic_launcher).into(imageView);
+        }
+    }
+
+    @Override
+    public void sendMessage(String message) {
+        ChatUtil.sendMessage(IChat.CHATROOM, roomId, message, messageContentInfo.onSendMessageListener);
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        ChatUtil.disconnect(false);
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void initChat() {
+        User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+        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);
+
+    }
+
+    private void initMessageAdapter() {
+        if (messageContentCommonAdapter == null)
+            messageContentCommonAdapter = new CommonAdapter<>(getActivity(), R.layout.item_list_right, BR.user);
+        UGCChatRoomFragment.this.fragmentChatBinding.setMessageAdapter(messageContentCommonAdapter);
+
+    }
+
+    private void initGiftAdapter() {
+        fragmentChatBinding.imgGift.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+//                int i = View.INVISIBLE == fragmentChatBinding.rlGift.getVisibility() ? View.VISIBLE : View.INVISIBLE;
+//                SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", i);
+//                fragmentChatBinding.rlGift.setVisibility(i);
+                popGift.setData(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
+                popGift.showAtLocation(fragmentChatBinding.getRoot(),Gravity.BOTTOM| Gravity.CENTER_HORIZONTAL, 0, 200);
+
+            }
+        });
+//        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 6);
+//        fragmentChatBinding.recyclerGift.setLayoutManager(gridLayoutManager);
+//        fragmentChatBinding.recyclerGift.addItemDecoration(new RecyclerSpace(10));
+
+//        fragmentChatBinding.setGiftAdapter(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
+    }
+
+
+    private void initDate() {
+        imaSource = new int[]{R.drawable.porsch_small80, R.drawable.fighter_small80,
+                R.drawable.plane_small80,
+                R.drawable.beer, R.drawable.chicken,
+                R.drawable.cucumber, R.drawable.flower,
+                R.drawable.hug, R.drawable.mouth,
+                R.drawable.ring, R.drawable.rose, R.drawable.continuous};
+        gitName = new String[]{"跑车", "歼灭机", "飞机", "啤酒",
+                "小鸡", "小黄瓜", "鲜花", "抱抱", "亲吻", "戒指", "玫瑰花", "荧光棒"};
+        giftArray = new ArrayList<>();
+        for (int i = 0; i < 12; i++) {
+            giftArray.add(new GiftModle(gitName[i], imaSource[i]));
+        }
+    }
+
+    /**
+     * 设置礼物
+     */
+    private void initGift() {
+        fragmentChatBinding.sendMessage.setOnClickListener(new View.OnClickListener() {
+
+            private InputUtil inputUtil;
+
+            @Override
+            public void onClick(View view) {
+                inputUtil = new InputUtil(getContext(), UGCChatRoomFragment.this);
+                inputUtil.showInput(view);
+            }
+        });
+        initGiftAdapter();
+
+
+    }
+
+    /**
+     * 初始化监听事件
+     */
+    private void initListener() {
+        barrageBottom();
+        initMessageAdapter();
+        messageContentInfo = new MessageContentInfo();
+        messageContentInfo.setOnReceiveAndSendListener(roomId, getActivity(), UGCChatRoomFragment.this);
+    }
+
+
+    public void giftItem(int postion) {
+//        fragmentChatBinding.rlGift.setVisibility(View.INVISIBLE);
+
+        messageContents.add(new MessageContent(messageContents.get(0).getName(), "送了" + gitName[postion] + ":", faceurl, false));
+        messageContentCommonAdapter.addItems((messageContents));
+    }
+
+    ArrayList<MessageContent> messageContents;
+
+    /**
+     * 聊天的回调接口
+     *
+     * @param messageContents
+     */
+    @Override
+    public void onchat(ArrayList<MessageContent> messageContents) {
+        this.messageContents = messageContents;
+        messageContentCommonAdapter.addItems((messageContents));
+
+    }
+
+    /**
+     * 弹幕
+     *
+     * @param barrageBaseMessage
+     */
+    @Override
+    public void onbarrage(BarrageBaseMessage barrageBaseMessage) {
+        barrageLayout.addMessage(barrageBaseMessage);
+    }
+
+    //在处理礼物返回问题
+
+
+    /**
+     * 接收页面   {@link PlayerActivity}
+     *
+     * @param event 处理 礼物出现后activity 和fragment的返回问题.
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN) //第2步:注册一个在后台线程执行的方法,用于接收事件
+    public void onUserEvent(MsgEvent event) {
+
+//        fragmentChatBinding.rlGift.setVisibility(View.INVISIBLE);
+//        SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", 4);
+
+    }
+
+}
+<?xml version="1.0" encoding="utf-8"?>
+<!-- res/anim文件夹下定义  -->
+<!-- 名为push_bottom_in.xml -->
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <translate
+        android:duration="500"
+        android:fromYDelta="100%p"
+        android:toYDelta="0" />
+
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- push_buttom_out.xml-->
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <translate
+        android:duration="500"
+        android:fromYDelta="0"
+        android:toYDelta="50%p" />
+</set>
 \ No newline at end of file
@@ -26,7 +26,9 @@
             android:id="@+id/contentLayout"
             android:layout_width="match_parent"
             android:layout_height="200dp"
-            android:layout_alignParentBottom="true">
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
         </RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="messageAdapter"
+            type="com.cnlive.gundam.video.adpter.CommonAdapter" />
+
+        <variable
+            name="giftAdapter"
+            type="com.cnlive.gundam.video.adpter.GiftAdapter" />
+    </data>
+
+    <RelativeLayout
+        android:id="@+id/lin"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/transparent">
+
+
+        <ListView
+            android:id="@+id/list_message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/edit_layout"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:divider="@null"
+            android:scrollbars="none"
+            android:stackFromBottom="true"
+            android:transcriptMode="alwaysScroll"
+            app:Adapter="@{messageAdapter}" />
+
+
+        <RelativeLayout
+            android:id="@+id/edit_layout"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="#22555756"
+            android:orientation="horizontal"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
+
+            <ImageView
+                android:padding="4dp"
+                android:id="@+id/sendMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:src="@drawable/btn_send_message" />
+
+
+            <ImageView
+               android:layout_marginRight="20dp"
+                android:layout_alignParentRight="true"
+                android:id="@+id/img_gift"
+                android:padding="6dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/gift" />
+
+            <android.support.v7.widget.SwitchCompat
+                android:visibility="gone"
+                android:id="@+id/barrage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@null"
+                android:textIsSelectable="false"
+                android:thumb="@drawable/switch_thumb"
+                app:switchMinWidth="30dp"
+                app:track="@drawable/switch_track" />
+
+
+        </RelativeLayout>
+
+
+        <!--<RelativeLayout-->
+            <!--android:id="@+id/rl_gift"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_above="@id/edit_layout"-->
+            <!--android:background="#979797"-->
+            <!--android:visibility="invisible">-->
+
+            <!--<android.support.v7.widget.RecyclerView-->
+                <!--android:padding="5dp"-->
+                <!--android:id="@+id/recycler_gift"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--app:adapter="@{giftAdapter}" />-->
+
+        <!--</RelativeLayout>-->
+
+
+    </RelativeLayout>
+
+
+</layout>
 \ No newline at end of file
@@ -29,15 +29,26 @@
             android:paddingTop="9dp">
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="8dp"
                 android:background="#ffffff"
                 android:orientation="horizontal">
+                <ImageView
+                    android:visibility="gone"
+                    android:id="@+id/emoticons_button"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="8dp"
+                    android:src="@drawable/expression_face_selector" />
                 <EditText
+                    android:layout_marginLeft="5dp"
+                    android:layout_toLeftOf="@+id/send"
+                    android:layout_toRightOf="@+id/emoticons_button"
                     android:id="@+id/chat_content"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -51,7 +62,22 @@
                     android:textColor="#323333"
                     android:textColorHint="#c3c3c9"
                     android:textSize="16sp" />
-            </LinearLayout>
+
+                <TextView
+                    android:visibility="gone"
+                    android:id="@+id/send"
+                    android:layout_width="50dp"
+                    android:layout_height="30dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:background="@drawable/btn_send_chat_selector"
+                    android:gravity="center"
+                    android:text="发送"
+                    android:textColor="@color/chat_send_text"
+                    android:textSize="16sp" />
+            </RelativeLayout>
         </RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="giftAdapter"
+            type="com.cnlive.gundam.video.adpter.GiftAdapter" />
+
+    </data>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/pop_rl"
+
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.RecyclerView
+
+            android:id="@+id/pop_recycle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:padding="5dp"
+            app:adapter="@{giftAdapter}" />
+    </RelativeLayout>
+
+</layout>
 \ No newline at end of file
@@ -20,4 +20,13 @@
         <item name="android:windowBackground">@color/transparent</item><!--背景透明-->
         <item name="android:backgroundDimEnabled">false</item><!--模糊-->
     </style>
+
+    <!--礼物弹出框的动画的style-->
+    <style name="gift_popwindow_anim_style">
+        <item name="android:windowEnterAnimation">@anim/push_bottom_in</item>
+        <!-- 指定显示的动画xml -->
+
+        <item name="android:windowExitAnimation">@anim/push_buttom_out</item>
+        <!-- 指定消失的动画xml -->
+    </style>
 </resources>